diff options
author | Shea Levy <shea@shealevy.com> | 2011-08-24 19:16:43 +0000 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2011-08-24 19:16:43 +0000 |
commit | 4d70ba6cc960555c9e1f701a88517e99232b2148 (patch) | |
tree | 7fc328746167a757526bf4165584e3bfb8a83b4f /pkgs/tools/archivers | |
parent | 5d62c65d6e085481a36c857e8b86f88d80b1c565 (diff) | |
parent | b58016b007444b25ab5256eb21896cd859038901 (diff) |
Merge from trunk up through r28790
svn path=/nixpkgs/branches/stdenv-updates/; revision=28792
Diffstat (limited to 'pkgs/tools/archivers')
-rw-r--r-- | pkgs/tools/archivers/sharutils/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/archivers/unshield/default.nix | 15 | ||||
-rw-r--r-- | pkgs/tools/archivers/zip/builder.sh | 7 | ||||
-rw-r--r-- | pkgs/tools/archivers/zip/default.nix | 17 |
4 files changed, 24 insertions, 19 deletions
diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 88f4592b34ca4..15b8ead7d38b5 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext }: stdenv.mkDerivation rec { - name = "sharutils-4.10"; + name = "sharutils-4.11.1"; src = fetchurl { url = "mirror://gnu/sharutils/${name}.tar.bz2"; - sha256 = "0q9g8ywsd5vwzzzvrgq3hzfqsdln9rhsqq0dhiwv2sr974c4xz5h"; + sha256 = "1mallg1gprimlggdisfzdmh1xi676jsfdlfyvanlcw72ny8fsj3g"; }; # GNU Gettext is needed on non-GNU platforms. diff --git a/pkgs/tools/archivers/unshield/default.nix b/pkgs/tools/archivers/unshield/default.nix index bc7906e2243f7..251a62ee48940 100644 --- a/pkgs/tools/archivers/unshield/default.nix +++ b/pkgs/tools/archivers/unshield/default.nix @@ -1,10 +1,15 @@ -{stdenv, fetchurl, zlib}: +{stdenv, fetchsvn, zlib, autoconf, automake, libtool}: stdenv.mkDerivation { - name = "unshield-0.6"; - src = fetchurl { - url = mirror://sourceforge/synce/Unshield/0.6/unshield-0.6.tar.gz; - sha256 = "07q48zwvjz9f8barql4b894fzz897agscvj13i6gkpy862aya41b"; + name = "unshield-0.7pre3955"; + src = fetchsvn { + url = https://synce.svn.sourceforge.net/svnroot/synce/trunk/unshield; + rev = 3955; + sha256 = "0rpk7sb7b0v19qn4jn0iih505l4zkpns3mrbmm88p61xiz06zg7a"; }; configureFlags = "--with-zlib=${zlib}"; + buildInputs = [autoconf automake libtool]; + preConfigure = '' + ./bootstrap + ''; } diff --git a/pkgs/tools/archivers/zip/builder.sh b/pkgs/tools/archivers/zip/builder.sh deleted file mode 100644 index da58762b4342b..0000000000000 --- a/pkgs/tools/archivers/zip/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -source $stdenv/setup - -buildFlags="-f unix/Makefile generic" - -installFlags="-f unix/Makefile prefix=$out INSTALL=cp" - -genericBuild diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix index 9498bf089ff25..884af0f0b0354 100644 --- a/pkgs/tools/archivers/zip/default.nix +++ b/pkgs/tools/archivers/zip/default.nix @@ -1,12 +1,19 @@ -{stdenv, fetchurl}: stdenv.mkDerivation { - name = "zip-2.32"; - builder = ./builder.sh; +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "zip-3.0"; + src = fetchurl { - url = ftp://ftp.info-zip.org/pub/infozip/src/zip232.tgz; - md5 = "8a4da4460386e324debe97f3b7fe4d96"; + url = ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz; + sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"; }; + buildFlags="-f unix/Makefile generic"; + + installFlags="-f unix/Makefile prefix=$(out) INSTALL=cp"; + meta = { homepage = http://www.info-zip.org; }; } + |