diff options
Diffstat (limited to 'pkgs/tools/archivers')
-rwxr-xr-x | pkgs/tools/archivers/gnutar/builder.sh | 3 | ||||
-rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 5 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/tools/archivers/unzip/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/tools/archivers/unzip/default.nix | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | pkgs/tools/archivers/zip/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/tools/archivers/zip/default.nix | 4 |
6 files changed, 3 insertions, 17 deletions
diff --git a/pkgs/tools/archivers/gnutar/builder.sh b/pkgs/tools/archivers/gnutar/builder.sh deleted file mode 100755 index a73f5a6d5b8dc..0000000000000 --- a/pkgs/tools/archivers/gnutar/builder.sh +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh -e -. $stdenv/setup -genericBuild diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index e5cbf559cf8f5..893c0fb0f4c7f 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,12 +1,9 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "gnutar-1.13.25"; - system = stdenv.system; - builder = ./builder.sh; src = fetchurl { url = ftp://alpha.gnu.org/gnu/tar/tar-1.13.25.tar.gz; md5 = "6ef8c906e81eee441f8335652670ac4a"; }; - inherit stdenv; } diff --git a/pkgs/tools/archivers/unzip/builder.sh b/pkgs/tools/archivers/unzip/builder.sh index f0b9d031802c7..0166eecce6b73 100755..100644 --- a/pkgs/tools/archivers/unzip/builder.sh +++ b/pkgs/tools/archivers/unzip/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh -e - . $stdenv/setup builder() { diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix index 8467e00d029df..c871c7755d6e7 100644 --- a/pkgs/tools/archivers/unzip/default.nix +++ b/pkgs/tools/archivers/unzip/default.nix @@ -1,12 +1,10 @@ {stdenv, fetchurl}: -derivation { +stdenv.mkDerivation { name = "unzip-5.50"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.info-zip.org/pub/infozip/src/unzip550.tar.gz; md5 = "798592d62e37f92571184236947122ed"; }; - inherit stdenv; } diff --git a/pkgs/tools/archivers/zip/builder.sh b/pkgs/tools/archivers/zip/builder.sh index b68fdfe32b83c..04fb0ec967f84 100755..100644 --- a/pkgs/tools/archivers/zip/builder.sh +++ b/pkgs/tools/archivers/zip/builder.sh @@ -1,5 +1,3 @@ -#! /bin/sh - . $stdenv/setup || exit 1 tar xvfz $src || exit 1 diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 7b4ea02fb4055..d5f8f910a7e8b 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -1,10 +1,8 @@ -{stdenv, fetchurl}: derivation { +{stdenv, fetchurl}: stdenv.mkDerivation { name = "zip-2.3"; - system = stdenv.system; builder = ./builder.sh; src = fetchurl { url = ftp://ftp.info-zip.org/pub/infozip/src/zip23.tar.gz; md5 = "5206a99541f3b0ab90f1baa167392c4f"; }; - stdenv = stdenv; } |