diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-22 18:19:10 -0700 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-22 18:19:10 -0700 |
| commit | 11a9ac00fc34ca9948ae05c034fa730163626e40 (patch) | |
| tree | 90b3ed6837b3f97239f6efbe763929cdaaa5795b /pkgs/build-support | |
| parent | 563389a7fdd85b1ca1d4c6590785df62f52c8d6d (diff) | |
| parent | 6543c61311c0397775253dd3d7f1f41154fc6189 (diff) | |
| download | nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.tar nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.gz nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.bz2 nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.lz nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.xz nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.tar.zst nixlib-11a9ac00fc34ca9948ae05c034fa730163626e40.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/tools/networking/xh/default.nix
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/fetchdocker/fetchDockerConfig.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/fetchdocker/fetchDockerLayer.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix index e8b2403d8f33..9fd813bfa575 100644 --- a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix +++ b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix @@ -1,4 +1,4 @@ -pkgargs@{ lib, haskellPackages, writeText, gawk }: +pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: let generic-fetcher = import ./generic-fetcher.nix pkgargs; diff --git a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix index 0fbbc078efc3..869ba637429c 100644 --- a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix +++ b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix @@ -1,4 +1,4 @@ -pkgargs@{ lib, haskellPackages, writeText, gawk }: +pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: let generic-fetcher = import ./generic-fetcher.nix pkgargs; |