diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-09-24 20:56:11 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-09-24 20:56:11 +0200 |
| commit | cb9a846762a9dd0983e3eed0832c20f2e7b049f1 (patch) | |
| tree | 1aa4b778435b1f68b78837320b3ad0d8791a4462 /pkgs/tools | |
| parent | 2a1c656c54aad3ac0634cb5d6eadd733c8cdbbe3 (diff) | |
| parent | 73282c8cc2cdc866c26fd280d6ba061e6a2870f5 (diff) | |
| download | nixlib-cb9a846762a9dd0983e3eed0832c20f2e7b049f1.tar nixlib-cb9a846762a9dd0983e3eed0832c20f2e7b049f1.tar.gz nixlib-cb9a846762a9dd0983e3eed0832c20f2e7b049f1.tar.bz2 nixlib-cb9a846762a9dd0983e3eed0832c20f2e7b049f1.tar.lz nixlib-cb9a846762a9dd0983e3eed0832c20f2e7b049f1.tar.xz nixlib-cb9a846762a9dd0983e3eed0832c20f2e7b049f1.tar.zst nixlib-cb9a846762a9dd0983e3eed0832c20f2e7b049f1.zip | |
Merge older staging
Hydra looks OK; not finished yet but already has more successes than on master.
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/coreutils/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/networking/unbound/default.nix | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index c3f4863fe6f5..9a422a96d703 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -76,8 +76,6 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = optionalString selinuxSupport "-lsepol"; FORCE_UNSAFE_CONFIGURE = optionalString hostPlatform.isSunOS "1"; - makeFlags = optionalString hostPlatform.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0"; - # Works around a bug with 8.26: # Makefile:3440: *** Recursive variable 'INSTALL' references itself (eventually). Stop. preInstall = optionalString (hostPlatform != buildPlatform) '' diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index a65ccb0541c8..cb462a2cedd2 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unbound-${version}"; - version = "1.6.5"; + version = "1.6.6"; src = fetchurl { url = "http://unbound.net/downloads/${name}.tar.gz"; - sha256 = "0khhrj11yhh6a0h578w29yw2j7yzvaqkr4p44jzjapq1549am5z2"; + sha256 = "145kska9a63yf32y3jg91y5ikcmsb7qvbcm7a8k6fgh96gf18awp"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB |