diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-01-02 03:01:35 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2023-01-02 03:04:32 +0100 |
| commit | 5810109b422a3d578ab803280b594133b20576f2 (patch) | |
| tree | 945523abae70d25e7e1c1987757d53e1bc7e8d17 /pkgs/servers/http | |
| parent | c791e28190627f19d9506683f296cc970ef655ee (diff) | |
| parent | 3f1573f21671b737b24efeed714958cf0e5cc7f5 (diff) | |
Merge branch 'staging-next' into staging
- readline6 attribute removed from all-packages.nix in d879125d61a0be8ecb2afddaca8f2b0530db0260 - readline attribute was bumped to readline82 in 50adabdd60d590c951824974356a9ccb9bb73ffc
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/dufs/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/modules.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/http/webhook/default.nix | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/pkgs/servers/http/dufs/default.nix b/pkgs/servers/http/dufs/default.nix index af02b7199610e..e7229a3d3a67f 100644 --- a/pkgs/servers/http/dufs/default.nix +++ b/pkgs/servers/http/dufs/default.nix @@ -23,6 +23,9 @@ rustPlatform.buildRustPackage rec { Security ]; + # FIXME: checkPhase on darwin will leave some zombie spawn processes + # see https://github.com/NixOS/nixpkgs/issues/205620 + doCheck = !stdenv.isDarwin; checkFlags = [ # tests depend on network interface, may fail with virtual IPs. "--skip=validate_printed_urls" diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 64be47874a40d..7c3e6255c4034 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -102,15 +102,15 @@ let self = { brotli = { name = "brotli"; - src = let gitsrc = fetchFromGitHub { + src = let src' = fetchFromGitHub { name = "brotli"; owner = "google"; repo = "ngx_brotli"; - rev = "25f86f0bac1101b6512135eac5f93c49c63609e3"; - sha256 = "02hfvfa6milj40qc2ikpb9f95sxqvxk4hly3x74kqhysbdi06hhv"; + rev = "6e975bcb015f62e1f303054897783355e2a877dc"; + sha256 = "sha256-G0IDYlvaQzzJ6cNTSGbfuOuSXFp3RsEwIJLGapTbDgo="; }; in - runCommand "ngx_brotli-src" { } '' - cp -a ${gitsrc} $out + runCommand "brotli" { } '' + cp -a ${src'} $out substituteInPlace $out/filter/config \ --replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev brotli} ''; diff --git a/pkgs/servers/http/webhook/default.nix b/pkgs/servers/http/webhook/default.nix index c19866cf8d87a..6daf06e117aa3 100644 --- a/pkgs/servers/http/webhook/default.nix +++ b/pkgs/servers/http/webhook/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, nixosTests }: buildGoModule rec { @@ -20,6 +21,8 @@ buildGoModule rec { doCheck = false; + passthru.tests = { inherit (nixosTests) webhook; }; + meta = with lib; { description = "Incoming webhook server that executes shell commands"; homepage = "https://github.com/adnanh/webhook"; |