diff options
| author | Pavol Rusnak <pavol@rusnak.io> | 2021-01-24 01:40:18 +0100 |
|---|---|---|
| committer | Pavol Rusnak <pavol@rusnak.io> | 2021-01-24 01:49:49 +0100 |
| commit | 90f73381120f7ae9e0d5f0f6dc16cb141c658494 (patch) | |
| tree | 5683ff0c39f9ac901e181fc0591cf03c2b95b07a /pkgs/build-support/docker | |
| parent | 2f34b4b883932f0ee2c1787e704f3915786e8cca (diff) | |
| download | nixpkgs-90f73381120f7ae9e0d5f0f6dc16cb141c658494.tar nixpkgs-90f73381120f7ae9e0d5f0f6dc16cb141c658494.tar.gz nixpkgs-90f73381120f7ae9e0d5f0f6dc16cb141c658494.tar.bz2 nixpkgs-90f73381120f7ae9e0d5f0f6dc16cb141c658494.tar.lz nixpkgs-90f73381120f7ae9e0d5f0f6dc16cb141c658494.tar.xz nixpkgs-90f73381120f7ae9e0d5f0f6dc16cb141c658494.tar.zst nixpkgs-90f73381120f7ae9e0d5f0f6dc16cb141c658494.zip | |
treewide: stdenv.lib -> lib
Diffstat (limited to 'pkgs/build-support/docker')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/build-support/docker/nix-prefetch-docker.nix | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 916d3cd003e..0c9d4f110ad 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -94,7 +94,7 @@ rec { inherit imageDigest; imageName = finalImageName; imageTag = finalImageTag; - impureEnvVars = stdenv.lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars; outputHashMode = "flat"; outputHashAlgo = "sha256"; outputHash = sha256; diff --git a/pkgs/build-support/docker/nix-prefetch-docker.nix b/pkgs/build-support/docker/nix-prefetch-docker.nix index 6341eb0154b..61e917461ed 100644 --- a/pkgs/build-support/docker/nix-prefetch-docker.nix +++ b/pkgs/build-support/docker/nix-prefetch-docker.nix @@ -1,6 +1,4 @@ -{ stdenv, makeWrapper, nix, skopeo, jq }: - -with stdenv.lib; +{ lib, stdenv, makeWrapper, nix, skopeo, jq }: stdenv.mkDerivation { name = "nix-prefetch-docker"; @@ -12,13 +10,13 @@ stdenv.mkDerivation { installPhase = '' install -vD ${./nix-prefetch-docker} $out/bin/$name; wrapProgram $out/bin/$name \ - --prefix PATH : ${makeBinPath [ nix skopeo jq ]} \ + --prefix PATH : ${lib.makeBinPath [ nix skopeo jq ]} \ --set HOME /homeless-shelter ''; preferLocalBuild = true; - meta = { + meta = with lib; { description = "Script used to obtain source hashes for dockerTools.pullImage"; maintainers = with maintainers; [ offline ]; platforms = platforms.unix; |