diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-06-29 07:47:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-06-29 07:47:04 +0200 |
| commit | 3afa2460386b1472128e302d1db13dba54e68e12 (patch) | |
| tree | 1bc0a79319449f29cbd5a1715c0135db1bed9337 /pkgs/tools/misc | |
| parent | d9036a02b5c5ef31e18e913ce7e2eb56999d311e (diff) | |
| parent | f4792cdc0cffc0d1843f5d8bb3e458546646f67c (diff) | |
| download | nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.gz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.bz2 nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.lz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.xz nixlib-3afa2460386b1472128e302d1db13dba54e68e12.tar.zst nixlib-3afa2460386b1472128e302d1db13dba54e68e12.zip | |
Merge branch 'staging'
This includes a security update of expat.
Diffstat (limited to 'pkgs/tools/misc')
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/misc/file/default.nix | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 1ad4f473e9d0..4ed43a189882 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -3,6 +3,7 @@ , selinuxSupport? false, libselinux ? null, libsepol ? null , autoconf, automake114x, texinfo , withPrefix ? false +, singleBinary ? true # you can also pass "symlinks", for example }: assert aclSupport -> acl != null; @@ -30,7 +31,10 @@ let outputs = [ "out" "info" ]; nativeBuildInputs = [ perl xz.bin ]; - configureFlags = optionalString stdenv.isSunOS "ac_cv_func_inotify_init=no"; + configureFlags = + optional (singleBinary != false) + ("--enable-single-binary" + optionalString (isString singleBinary) "=${singleBinary}") + ++ optional stdenv.isSunOS "ac_cv_func_inotify_init=no"; buildInputs = [ gmp ] ++ optional aclSupport acl diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix index 749bf59fde96..b1e9990ea7d4 100644 --- a/pkgs/tools/misc/file/default.nix +++ b/pkgs/tools/misc/file/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, zlib }: stdenv.mkDerivation rec { - name = "file-5.25"; + name = "file-5.28"; buildInputs = [ zlib ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "ftp://ftp.astron.com/pub/file/${name}.tar.gz" "http://distfiles.macports.org/file/${name}.tar.gz" ]; - sha256 = "1jhfi5mivdnqvry5la5q919l503ahwdwbf3hjhiv97znccakhd9p"; + sha256 = "04p0w9ggqq6cqvwhyni0flji1z0rwrz896hmhkxd2mc6dca5xjqf"; }; meta = { |