diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-10-29 14:08:04 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-10-29 14:10:01 +0200 |
commit | d298b5ed2687bc6195ed7cd8a106539fb4cdae10 (patch) | |
tree | be942f0bbccb4e8d4e7f9460d7159554de528ac0 /pkgs | |
parent | 3d5600d8b82dbbb05bb47a853000c722d112fdea (diff) | |
parent | cc523714a6590973d8cfc3bc3f5b8d2705057762 (diff) | |
download | nixlib-d298b5ed2687bc6195ed7cd8a106539fb4cdae10.tar nixlib-d298b5ed2687bc6195ed7cd8a106539fb4cdae10.tar.gz nixlib-d298b5ed2687bc6195ed7cd8a106539fb4cdae10.tar.bz2 nixlib-d298b5ed2687bc6195ed7cd8a106539fb4cdae10.tar.lz nixlib-d298b5ed2687bc6195ed7cd8a106539fb4cdae10.tar.xz nixlib-d298b5ed2687bc6195ed7cd8a106539fb4cdae10.tar.zst nixlib-d298b5ed2687bc6195ed7cd8a106539fb4cdae10.zip |
Merge #19960: fetchfile: remove
vcunat: it is unused, and it would better be implemented via a fixed-output derivation instead of manually checking the hash (if someone actually needed this).
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/build-support/fetchfile/builder.sh | 11 | ||||
-rw-r--r-- | pkgs/build-support/fetchfile/default.nix | 11 |
2 files changed, 0 insertions, 22 deletions
diff --git a/pkgs/build-support/fetchfile/builder.sh b/pkgs/build-support/fetchfile/builder.sh deleted file mode 100644 index b849491fc5ab..000000000000 --- a/pkgs/build-support/fetchfile/builder.sh +++ /dev/null @@ -1,11 +0,0 @@ -source $stdenv/setup - -echo "copying $pathname into $out..." - -cp "$pathname" "$out" || exit 1 - -actual=$(md5sum -b $out | cut -c1-32) -if test "$actual" != "$md5"; then - echo "hash is $actual, expected $md5" - exit 1 -fi diff --git a/pkgs/build-support/fetchfile/default.nix b/pkgs/build-support/fetchfile/default.nix deleted file mode 100644 index 685c1e69520a..000000000000 --- a/pkgs/build-support/fetchfile/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{stdenv}: {pathname, md5 ? "", sha256 ? ""}: stdenv.mkDerivation { - name = baseNameOf (toString pathname); - builder = ./builder.sh; - pathname = pathname; -} // if (sha256 == "") then { - md5 = (stdenv.lib.fetchMD5warn "fetchfile" pathname md5); - id = md5; -} else { - sha256 = sha256; - id = sha256; -} |