diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-07 20:14:04 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2010-08-07 20:14:04 +0000 |
commit | 46082f25f9a79e9224a34126cf38e2d3967e2649 (patch) | |
tree | 173a0f0b2c9973f3a1430b2d7476f31fbffe12e5 /pkgs/tools/archivers | |
parent | a70b44b3cbf7babd8613b005a619422969c750ff (diff) | |
parent | 4ed96dfbc27186ba5cced3a99e25b6867cac5fd0 (diff) |
Updating from trunk
svn path=/nixpkgs/branches/stdenv-updates/; revision=23027
Diffstat (limited to 'pkgs/tools/archivers')
-rw-r--r-- | pkgs/tools/archivers/cpio/default.nix | 49 | ||||
-rw-r--r-- | pkgs/tools/archivers/cpio/latest.nix | 45 | ||||
-rw-r--r-- | pkgs/tools/archivers/p7zip/default.nix | 13 |
3 files changed, 66 insertions, 41 deletions
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 8e14ff178660c..1700f03d7bd8e 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -1,45 +1,24 @@ {stdenv, fetchurl}: -stdenv.mkDerivation ({ - name = "cpio-2.11"; - +stdenv.mkDerivation { + name = "cpio-2.9"; + src = fetchurl { - url = mirror://gnu/cpio/cpio-2.11.tar.bz2; - sha256 = "1gavgpzqwgkpagjxw72xgxz52y1ifgz0ckqh8g7cckz7jvyhp0mv"; + url = mirror://gnu/cpio/cpio-2.9.tar.bz2; + sha256 = "01s7f9hg8kgpis96j99hgkiqgdy53pm7qi7bhm3fzx58jfk5z6mv"; }; - # Tests fail on Darwin, see - # <http://lists.gnu.org/archive/html/bug-cpio/2010-07/msg00012.html> for - # details. - doCheck = !stdenv.isDarwin; + patches = [ + # Make it compile on GCC 4.3. + (fetchurl { + name = "cpio-2.9-gnu-inline.patch"; + url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-arch/cpio/files/cpio-2.9-gnu-inline.patch?rev=1.1"; + sha256 = "1167hrq64h9lh3qhgasm2rivfzkkgx6fik92b017qfa0q61ff8c3"; + }) + ]; meta = { homepage = http://www.gnu.org/software/cpio/; - description = "GNU cpio, a program to create or extract from cpio archives"; - - longDescription = - '' GNU cpio copies files into or out of a cpio or tar archive. The - archive can be another file on the disk, a magnetic tape, or a pipe. - - GNU cpio supports the following archive formats: binary, old ASCII, - new ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1 - tar. The tar format is provided for compatability with the tar - program. By default, cpio creates binary format archives, for - compatibility with older cpio programs. When extracting from - archives, cpio automatically recognizes which kind of archive it is - reading and can read archives created on machines with a different - byte-order. - ''; - - license = "GPLv3+"; - - maintainers = [ stdenv.lib.maintainers.ludo ]; - platforms = stdenv.lib.platforms.all; + description = "A program to create or extract from cpio archives"; }; } - -// - -(if stdenv.isLinux - then {} - else { patches = [ ./darwin-fix.patch ]; })) diff --git a/pkgs/tools/archivers/cpio/latest.nix b/pkgs/tools/archivers/cpio/latest.nix new file mode 100644 index 0000000000000..8e14ff178660c --- /dev/null +++ b/pkgs/tools/archivers/cpio/latest.nix @@ -0,0 +1,45 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation ({ + name = "cpio-2.11"; + + src = fetchurl { + url = mirror://gnu/cpio/cpio-2.11.tar.bz2; + sha256 = "1gavgpzqwgkpagjxw72xgxz52y1ifgz0ckqh8g7cckz7jvyhp0mv"; + }; + + # Tests fail on Darwin, see + # <http://lists.gnu.org/archive/html/bug-cpio/2010-07/msg00012.html> for + # details. + doCheck = !stdenv.isDarwin; + + meta = { + homepage = http://www.gnu.org/software/cpio/; + description = "GNU cpio, a program to create or extract from cpio archives"; + + longDescription = + '' GNU cpio copies files into or out of a cpio or tar archive. The + archive can be another file on the disk, a magnetic tape, or a pipe. + + GNU cpio supports the following archive formats: binary, old ASCII, + new ASCII, crc, HPUX binary, HPUX old ASCII, old tar, and POSIX.1 + tar. The tar format is provided for compatability with the tar + program. By default, cpio creates binary format archives, for + compatibility with older cpio programs. When extracting from + archives, cpio automatically recognizes which kind of archive it is + reading and can read archives created on machines with a different + byte-order. + ''; + + license = "GPLv3+"; + + maintainers = [ stdenv.lib.maintainers.ludo ]; + platforms = stdenv.lib.platforms.all; + }; +} + +// + +(if stdenv.isLinux + then {} + else { patches = [ ./darwin-fix.patch ]; })) diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix index 2bd6313202e6a..bb9743e8e5d99 100644 --- a/pkgs/tools/archivers/p7zip/default.nix +++ b/pkgs/tools/archivers/p7zip/default.nix @@ -1,16 +1,17 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -stdenv.mkDerivation { - name = "p7zip-9.04"; +stdenv.mkDerivation rec { + name = "p7zip-9.13"; src = fetchurl { - url = mirror://sourceforge/p7zip/p7zip_9.04_src_all.tar.bz2; - sha256 = "1azr73vlj602hl6siagnqd1rn8sw73lny292jqgspg0lb9wvdyyx"; + url = mirror://sourceforge/p7zip/p7zip_9.13_src_all.tar.bz2; + sha256 = "08yr0cfbjx60r1ia7vhphzvc3gax62xhgsn3vdm7sdmxxai0z77w"; }; - + preConfigure = '' makeFlagsArray=(DEST_HOME=$out) + buildFlags=all3 ''; meta = { |