diff options
| author | Will Dietz <github@wdtz.org> | 2018-04-03 08:45:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-03 08:45:31 -0500 |
| commit | 97145012565cd4ef9c8c16a426c3ea505ad0ca52 (patch) | |
| tree | 9eb41f21d4fdeb017298a21cd163fd7220462f97 /pkgs | |
| parent | 08b299abeae8b787b90fb5c367020f08a6c6d095 (diff) | |
| parent | 1d16384bb68e471e51ad2204b9628ce66e943802 (diff) | |
| download | nixpkgs-97145012565cd4ef9c8c16a426c3ea505ad0ca52.tar nixpkgs-97145012565cd4ef9c8c16a426c3ea505ad0ca52.tar.gz nixpkgs-97145012565cd4ef9c8c16a426c3ea505ad0ca52.tar.bz2 nixpkgs-97145012565cd4ef9c8c16a426c3ea505ad0ca52.tar.lz nixpkgs-97145012565cd4ef9c8c16a426c3ea505ad0ca52.tar.xz nixpkgs-97145012565cd4ef9c8c16a426c3ea505ad0ca52.tar.zst nixpkgs-97145012565cd4ef9c8c16a426c3ea505ad0ca52.zip | |
Merge pull request #38385 from dtzWill/update/mesa-17.3.7
mesa: 17.3.6 -> 17.3.7, use llvm6
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 984c11d55b9..c325bb9e1d5 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -67,7 +67,7 @@ let in let - version = "17.3.6"; + version = "17.3.7"; branch = head (splitString "." version); in @@ -81,7 +81,7 @@ let self = stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz" ]; - sha256 = "e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8"; + sha256 = "07mcfyksspr4xp7fhhdgjhxm0182jhyav11shpzahrdsix591585"; }; prePatch = "patchShebangs ."; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4c68fc15c7..da3f5d9076c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10520,6 +10520,7 @@ with pkgs; # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity # grsecEnabled = true; # no more support in nixpkgs ATM + llvmPackages = llvmPackages_6; }; mesa_glu = callPackage ../development/libraries/mesa-glu { }; |