diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-01-15 17:46:46 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-01-15 17:46:46 +0100 |
| commit | c0d2951fa6f27449373765e6e6eb3e5200b45301 (patch) | |
| tree | 9fe735a2418a531cac733d9bb1e95d072466c5dd /pkgs/build-support | |
| parent | 83c50873f5810152bf1aad2b9a97a225926d04cf (diff) | |
| parent | bb9601719890dc04241304bb1a5cf224683d5740 (diff) | |
| download | nixlib-c0d2951fa6f27449373765e6e6eb3e5200b45301.tar nixlib-c0d2951fa6f27449373765e6e6eb3e5200b45301.tar.gz nixlib-c0d2951fa6f27449373765e6e6eb3e5200b45301.tar.bz2 nixlib-c0d2951fa6f27449373765e6e6eb3e5200b45301.tar.lz nixlib-c0d2951fa6f27449373765e6e6eb3e5200b45301.tar.xz nixlib-c0d2951fa6f27449373765e6e6eb3e5200b45301.tar.zst nixlib-c0d2951fa6f27449373765e6e6eb3e5200b45301.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/docker/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 2ce034134d06..916d3cd003ee 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -109,7 +109,7 @@ rec { ''; # We need to sum layer.tar, not a directory, hence tarsum instead of nix-hash. - # And we cannot untar it, because then we cannot preserve permissions ecc. + # And we cannot untar it, because then we cannot preserve permissions etc. tarsum = runCommand "tarsum" { nativeBuildInputs = [ go ]; } '' |