diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-10-15 13:57:28 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-10-15 13:59:18 +0200 |
commit | 3ee33f35f88ee8558b27f0f3cc6eb0259b312724 (patch) | |
tree | ec4f6b2feb817cbbc2a580db7a97ecc0b299f4ee /pkgs/top-level | |
parent | 5a21efdcdf7c3f4349192036e661247e2cd07916 (diff) | |
parent | 75e419173959f3e96a6569268f310e80f4f836b4 (diff) | |
download | nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.gz nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.bz2 nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.lz nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.xz nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.tar.zst nixlib-3ee33f35f88ee8558b27f0f3cc6eb0259b312724.zip |
Merge branch 'staging'
Contains security fixes in X server and X libs. On Hydra, the amount to rebuild on master is now higher than on staging; the comparison looks OK.
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b595c943114..66248545aa81 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8662,7 +8662,7 @@ with pkgs; icu58 = callPackage ../development/libraries/icu/58.nix { }; icu59 = callPackage ../development/libraries/icu/59.nix { }; - icu = icu58; + icu = icu59; id3lib = callPackage ../development/libraries/id3lib { }; @@ -9819,8 +9819,8 @@ with pkgs; # through /run/opengl-driver*, which is overriden according to config.grsecurity # grsecEnabled = true; # no more support in nixpkgs ATM - # llvm-4.0.0 won't pass tests on aarch64 - llvmPackages = if system == "aarch64-linux" then llvmPackages_39 else llvmPackages_4; + # llvm-4.0.0 and 5.0.0 won't pass tests on aarch64 + llvmPackages = if system == "aarch64-linux" then llvmPackages_39 else llvmPackages_5; }); mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); @@ -10852,6 +10852,7 @@ with pkgs; v8 = callPackage ../development/libraries/v8 { inherit (python2Packages) python gyp; cctools = darwin.cctools; + icu = icu58; # v8-5.4.232 fails against icu4c-59.1 }; v8_static = lowPrio (self.v8.override { static = true; }); @@ -11479,7 +11480,7 @@ with pkgs; fingerd_bsd = callPackage ../servers/fingerd/bsd-fingerd { }; firebird = callPackage ../servers/firebird { icu = null; stdenv = overrideCC stdenv gcc5; }; - firebirdSuper = callPackage ../servers/firebird { superServer = true; stdenv = overrideCC stdenv gcc5; }; + firebirdSuper = callPackage ../servers/firebird { icu = icu58; superServer = true; stdenv = overrideCC stdenv gcc5; }; fleet = callPackage ../servers/fleet { }; @@ -15360,6 +15361,7 @@ with pkgs; harfbuzz = harfbuzz.override { withIcu = true; withGraphite2 = true; }; + icu = icu58; # checking whether g++ supports C++14 or C++11... configure: error: no stdenv = overrideCC stdenv gcc5; }); @@ -19095,7 +19097,9 @@ with pkgs; }; openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; - mailcore2 = callPackage ../development/libraries/mailcore2 { }; + mailcore2 = callPackage ../development/libraries/mailcore2 { + icu = icu58; + }; martyr = callPackage ../development/libraries/martyr { }; |