diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 16:04:53 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-23 16:04:53 +0200 |
commit | 96cec2a7bdf2482ae58fe04cce5e87a1eec644f9 (patch) | |
tree | ea48b901c9ba0ac2b4a249ae94bd966c4a025001 /pkgs/tools/compression/xz | |
parent | db83d9a35b09a7cc548d9b8b2ad63c1f8ca8ba28 (diff) | |
parent | 084626deecaffcaa017af07eaab00682eff5d6f3 (diff) |
Merge 'staging' into multiple-outputs
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
Diffstat (limited to 'pkgs/tools/compression/xz')
-rw-r--r-- | pkgs/tools/compression/xz/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix index 52e0c61d3c1c..c9b57bc46694 100644 --- a/pkgs/tools/compression/xz/default.nix +++ b/pkgs/tools/compression/xz/default.nix @@ -1,17 +1,20 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "xz-5.0.4"; + name = "xz-5.0.5"; src = fetchurl { url = "http://tukaani.org/xz/${name}.tar.bz2"; - sha256 = "14nf55b47335aakswqk0kqv1qsh4269rnb757dmkkbd1sdhb1naw"; + sha256 = "1404i59bp6rzxya0br1q9njdv32z4sggyfrkjr7vq695hk94hv0n"; }; outputs = [ "out" "dev" "man" "doc" ]; doCheck = true; + # In stdenv-linux, prevent a dependency on bootstrap-tools. + preHook = "unset CONFIG_SHELL"; + meta = { homepage = http://tukaani.org/xz/; description = "XZ, general-purpose data compression software, successor of LZMA"; @@ -30,7 +33,7 @@ stdenv.mkDerivation rec { bzip2. ''; - licenses = [ "GPLv2+" "LGPLv2.1+" ]; + license = [ "GPLv2+" "LGPLv2.1+" ]; maintainers = with stdenv.lib.maintainers; [ sander ]; platforms = stdenv.lib.platforms.all; }; |