about summary refs log tree commit diff
path: root/pkgs/tools/misc/coreutils
diff options
context:
space:
mode:
authorDanny Wilson <danny@prime.vc>2013-02-20 09:18:26 +0000
committerDanny Wilson <danny@onlinetouch.nl>2013-02-28 20:04:01 +0100
commitcf42601f92c400b81c0db4b0c932075290811cc7 (patch)
tree18bbb470783a28cf3a93e11a70642f710be82699 /pkgs/tools/misc/coreutils
parentd505b8c49032118f7d11d669d2641c2c81a78bcb (diff)
downloadnixlib-cf42601f92c400b81c0db4b0c932075290811cc7.tar
nixlib-cf42601f92c400b81c0db4b0c932075290811cc7.tar.gz
nixlib-cf42601f92c400b81c0db4b0c932075290811cc7.tar.bz2
nixlib-cf42601f92c400b81c0db4b0c932075290811cc7.tar.lz
nixlib-cf42601f92c400b81c0db4b0c932075290811cc7.tar.xz
nixlib-cf42601f92c400b81c0db4b0c932075290811cc7.tar.zst
nixlib-cf42601f92c400b81c0db4b0c932075290811cc7.zip
Coreutils update and Illumos compatibility fixes.
- GNU Coreutils 8.21
- Add is64Bit checks to stdenv for Solaris.
- Fix OpenSSL Illumos build.
Diffstat (limited to 'pkgs/tools/misc/coreutils')
-rw-r--r--pkgs/tools/misc/coreutils/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 9fd1d86ff82a..733c4218d831 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -6,12 +6,12 @@
 assert aclSupport -> acl != null;
 assert selinuxSupport -> libselinux != null && libsepol != null;
 
-stdenv.mkDerivation rec {
-  name = "coreutils-8.20";
+stdenv.mkDerivation (rec {
+  name = "coreutils-8.21";
 
   src = fetchurl {
     url = "mirror://gnu/coreutils/${name}.tar.xz";
-    sha256 = "1cly97xdy3v4nbbx631k43smqw0nnpn651kkprs0yyl2cj3pkjyv";
+    sha256 = "064f512185iysqqcvhnhaf3bfmzrvcgs7n405qsyp99zmfyl9amd";
   };
 
   nativeBuildInputs = [ perl ];
@@ -67,4 +67,8 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
-
+  # May have some issues with root compilation because the bootstrap tool
+  # cannot be used as a login shell for now.
+// stdenv.lib.optionalAttrs (stdenv.system == "armv7l-linux" || stdenv.isSunOS) {
+  FORCE_UNSAFE_CONFIGURE = 1;
+})