diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-11-27 18:01:39 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-27 18:01:39 +0000 |
| commit | 38af11b9ce8dba5e313df282187a8074f4499577 (patch) | |
| tree | 85dd5805c020480c11173cfbeb5d335c627e017a /pkgs/build-support | |
| parent | 1b2536c13909688721f3d0a7772b2537d83ab050 (diff) | |
| parent | 7bab2ce0db6cf72e4609169e74b2e22b4ec8ecbb (diff) | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/appimage/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/build-support/fetchurl/tests.nix | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix index b974b8f68712c..bcda40c800faa 100644 --- a/pkgs/build-support/appimage/default.nix +++ b/pkgs/build-support/appimage/default.nix @@ -79,7 +79,6 @@ rec { gtk3 bashInteractive gnome.zenity - python2 xorg.xrandr which perl diff --git a/pkgs/build-support/fetchurl/tests.nix b/pkgs/build-support/fetchurl/tests.nix index fc7fb25e158ff..e348d77db0bdc 100644 --- a/pkgs/build-support/fetchurl/tests.nix +++ b/pkgs/build-support/fetchurl/tests.nix @@ -1,8 +1,8 @@ -{ invalidateFetcherByDrvHash, fetchurl, jq, moreutils, ... }: { +{ testers, fetchurl, jq, moreutils, ... }: { # Tests that we can send custom headers with spaces in them header = let headerValue = "Test '\" <- These are some quotes"; - in invalidateFetcherByDrvHash fetchurl { + in testers.invalidateFetcherByDrvHash fetchurl { url = "https://httpbin.org/headers"; sha256 = builtins.hashString "sha256" (headerValue + "\n"); curlOptsList = [ "-H" "Hello: ${headerValue}" ]; |