diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-04 09:09:21 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-03-04 09:09:21 +0000 |
commit | d4ffc7332c108342946b63eccda341f8ea8a84f8 (patch) | |
tree | e7bd78a6304b482f6e64de581723a79265951acf /pkgs/tools | |
parent | d982e10f3496654b31fce7b57b4ea1ea85a64200 (diff) | |
parent | b0d12859fcfcb75a74a1c54ed118f62103ee23f8 (diff) |
Merge trunk right before reintegrating backups/libpng15@32782
svn path=/nixpkgs/branches/libpng15/; revision=32758
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/archivers/gnutar/default.nix | 14 | ||||
-rw-r--r-- | pkgs/tools/compression/lzop/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 16 |
3 files changed, 23 insertions, 13 deletions
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix index a38c7fcdd1e85..26c20ffc043f9 100644 --- a/pkgs/tools/archivers/gnutar/default.nix +++ b/pkgs/tools/archivers/gnutar/default.nix @@ -1,6 +1,8 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, withMan ? false, help2man ? null}: -stdenv.mkDerivation rec { +assert withMan -> help2man != null; + +stdenv.mkDerivation (rec { name = "gnutar-1.25"; src = fetchurl { @@ -32,4 +34,10 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; }; -} +} // (if withMan then { + buildInputs = [ help2man ]; + postInstall = '' + ensureDir $out/share/man/man1 + help2man $out/bin/tar > $out/share/man/man1/tar.1 + ''; +} else {})) diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix index c15a34ca6f6ef..383b7a0e079c5 100644 --- a/pkgs/tools/compression/lzop/default.nix +++ b/pkgs/tools/compression/lzop/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, lzo}: stdenv.mkDerivation { - name = "lzop-1.02rc1"; + name = "lzop-1.03"; src = fetchurl { - url = http://www.lzop.org/download/lzop-1.02rc1.tar.gz; - sha256 = "1dc32bfd82b130727bcec1de3b8a7cf090b78b3f14981d375ceb862b1e0e6873"; + url = http://www.lzop.org/download/lzop-1.03.tar.gz; + sha256 = "1jdjvc4yjndf7ihmlcsyln2rbnbaxa86q4jskmkmm7ylfy65nhn1"; }; buildInputs = [ lzo ]; diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 7ad69e8353a9d..235f85dc51a45 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -4,12 +4,12 @@ , stateDir ? "/nix/var" }: -stdenv.mkDerivation (rec { - name = "nix-1.0pre31851"; +stdenv.mkDerivation rec { + name = "nix-1.0pre2606_8afd28a"; src = fetchurl { - url = "http://hydra.nixos.org/build/1937677/download/4/${name}.tar.bz2"; - sha256 = "36f07b6b701da74f07d8c8cc43044306e570b6837555ad523701d86e5f567568"; + url = "http://hydra.nixos.org/build/2183656/download/4/${name}.tar.bz2"; + sha256 = "4f21d01563ab9e949e09997ddaa89066c40a13b27e028a6fdffc67b97dd90dcb"; }; buildNativeInputs = [ perl pkgconfig ]; @@ -46,11 +46,13 @@ stdenv.mkDerivation (rec { doCheck = true; + # Hack to get the check to succeed on Darwin. + phases = stdenv.lib.optionalString stdenv.isDarwin + "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases"; + meta = { description = "The Nix Deployment System"; homepage = http://nixos.org/; license = "LGPLv2+"; }; -} // stdenv.lib.optionalAttrs stdenv.isDarwin { - phases = "$prePhases unpackPhase patchPhase $preConfigurePhases configurePhase $preBuildPhases buildPhase $preInstallPhases installPhase checkPhase fixupPhase $preDistPhases distPhase $postPhases"; -}) +} |