From 3f303b479cf4d04f8210938e032ceb5acec015ef Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 7 Apr 2022 11:26:45 -0700 Subject: [PATCH 1/2] flake: add ipv6 support to civetweb --- flake.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index b41dc8e0..01b0c988 100644 --- a/flake.nix +++ b/flake.nix @@ -44,7 +44,14 @@ # Overlay these packages to use dependencies from the Nixpkgs everything # else uses, to side-step the version difference: glibc is 2.32 in the # nix-pinned Nixpkgs, but 2.33 in the newNixpkgs commit. - civetweb = final.callPackage "${newNixpkgs}/pkgs/development/libraries/civetweb" { }; + civetweb = (final.callPackage "${newNixpkgs}/pkgs/development/libraries/civetweb" { }).overrideAttrs + # Can be dropped once newNixpkgs points to a revision containing + # https://github.com/NixOS/nixpkgs/pull/167751 + ({ cmakeFlags ? [ ], ... }: { + cmakeFlags = cmakeFlags ++ [ + "-DCIVETWEB_ENABLE_IPV6=1" + ]; + }); prometheus-cpp = final.callPackage "${newNixpkgs}/pkgs/development/libraries/prometheus-cpp" { }; # Add LDAP dependencies that aren't currently found within nixpkgs. From be6077d2bbdc468588059ba7cb07a85664db2d1e Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Thu, 7 Apr 2022 11:28:21 -0700 Subject: [PATCH 2/2] doc/manual: demonstrate ipv6 metrics address for queue-runner --- doc/manual/src/configuration.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/manual/src/configuration.md b/doc/manual/src/configuration.md index bac93c33..2700625d 100644 --- a/doc/manual/src/configuration.md +++ b/doc/manual/src/configuration.md @@ -112,10 +112,14 @@ as below. A port of `:0` will make the exposer choose a random, available port. ```conf queue_runner_metrics_address = 127.0.0.1:9198 +# or +queue_runner_metrics_address = [::]:9198 ``` ```shell $ hydra-queue-runner --prometheus-address 127.0.0.1:9198 +# or +$ hydra-queue-runner --prometheus-address [::]:9198 ``` Using LDAP as authentication backend (optional)