public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.

Browse Source 
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
This commit is contained in:
Eelco Dolstra
2012-01-18 20:53:01 +00:00
parent c556a6ea46
commit d4d7931a62
70 changed files with 117 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/misc/coreutils/default.nix
View File

@@ -1,7 +1,6 @@
{ stdenv, fetchurl, perl, gmp ? null
, aclSupport ? false, acl ? null
, selinuxSupport? false, libselinux ? null, libsepol ? null
, xz
}:
assert aclSupport -> acl != null;
@@ -15,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "176lgw810xw84c6fz5xwhydxggkndmzggl0pxqzldbjf85vv6zl3";
};
buildNativeInputs = [ perl xz ];
buildNativeInputs = [ perl ];
buildInputs = [ gmp ]
++ stdenv.lib.optional aclSupport acl
++ stdenv.lib.optional selinuxSupport libselinux

4
pkgs/tools/misc/grub/1.9x.nix
View File

@@ -1,4 +1,4 @@
{ fetchurl, stdenv, xz, flex, bison, gettext, ncurses, libusb, freetype, qemu
{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu
, EFIsupport ? false }:
let
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sha256 = "06q2a7bg1mbsms604a89fkdnwrc1jg9hr2mmfdmg3il39j6i827k";
};
buildNativeInputs = [ xz flex bison ];
buildNativeInputs = [ flex bison ];
buildInputs = [ ncurses libusb freetype gettext ]
++ stdenv.lib.optional doCheck qemu;

3
pkgs/tools/misc/parted/2.3.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline
, utillinux, xz, enableStatic ? false, hurd ? null }:
, utillinux, enableStatic ? false, hurd ? null }:
stdenv.mkDerivation rec {
name = "parted-2.3";
@@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "0sabj81nawcjm8ww34lxg65ka8crv3w2ab4crh8ypw5agg681836";
};
buildNativeInputs = [ xz ];
buildInputs = [ libuuid ]
++ stdenv.lib.optional (readline != null) readline
++ stdenv.lib.optional (gettext != null) gettext

3
pkgs/tools/misc/parted/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchurl, devicemapper, libuuid, gettext, readline
, utillinux, xz, check, enableStatic ? false, hurd ? null }:
, utillinux, check, enableStatic ? false, hurd ? null }:
stdenv.mkDerivation rec {
name = "parted-3.0";
@@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
sha256 = "054ybvjkj1mbm4mpn1rl12jzhvqg37b0xwwr4ly1zisvzrjhi11a";
};
buildNativeInputs = [ xz ];
buildInputs = [ libuuid ]
++ stdenv.lib.optional (readline != null) readline
++ stdenv.lib.optional (gettext != null) gettext

4
pkgs/tools/misc/system-config-printer/default.nix
View File

@@ -1,7 +1,7 @@
{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto
, makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl
, pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups
, xz, pythonPackages
, pythonPackages
, withGUI ? true
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
buildInputs =
[ xz intltool pkgconfig glib udev libusb cups xmlto
[ intltool pkgconfig glib udev libusb cups xmlto
libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils
pythonPackages.python pythonPackages.wrapPython
];