lix-project/hydra
3
0
Fork 6
Code Issues 2 Pull requests 1 Packages Projects Releases Wiki Activity

Merge pull request #1197 from DeterminateSystems/civetweb-ipv6-smile

Browse source 
flake: add ipv6 support to civetweb
This commit is contained in:
Graham Christensen 2022-04-07 14:37:32 -04:00 committed by GitHub
parent 6d9fac2577 be6077d2bb
commit 05ce23aaa2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/manual/src/configuration.md
View file

@ -112,10 +112,14 @@ as below. A port of `:0` will make the exposer choose a random, available port.
```conf ```conf
queue_runner_metrics_address = 127.0.0.1:9198 queue_runner_metrics_address = 127.0.0.1:9198
# or
queue_runner_metrics_address = [::]:9198
``` ```
```shell ```shell
$ hydra-queue-runner --prometheus-address 127.0.0.1:9198 $ hydra-queue-runner --prometheus-address 127.0.0.1:9198
# or
$ hydra-queue-runner --prometheus-address [::]:9198
``` ```
Using LDAP as authentication backend (optional) Using LDAP as authentication backend (optional)

9
flake.nix
View file

@ -44,7 +44,14 @@
# Overlay these packages to use dependencies from the Nixpkgs everything # Overlay these packages to use dependencies from the Nixpkgs everything
# else uses, to side-step the version difference: glibc is 2.32 in the # else uses, to side-step the version difference: glibc is 2.32 in the
# nix-pinned Nixpkgs, but 2.33 in the newNixpkgs commit. # 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" { }; prometheus-cpp = final.callPackage "${newNixpkgs}/pkgs/development/libraries/prometheus-cpp" { };
# Add LDAP dependencies that aren't currently found within nixpkgs. # Add LDAP dependencies that aren't currently found within nixpkgs.