git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108526 from prusnak/glslang

glslang: 8.13.3743 -> 11.1.0

commit0565ddec3fd48be1c7cf3c5ae941c990f9e652a3 authorSandro <sandro.jaeckel@gmail.com> dateThu 7 Jan 2021, 11:55 (6 years ago) parentb8cf76531bd596
1 file changed+10−9
pkgs/development/compilers/glslang/default.nix+10−9
pkgs/development/compilers/glslang/default.nix+10−9
@@ -1,4 +1,5 @@
1−{ stdenv, fetchFromGitHub
1+{ stdenv
2+, fetchFromGitHub
23, bison
34, cmake
45, jq
@@ -10,7 +11,7 @@
1011}:
1112# glslang requires custom versions of spirv-tools and spirb-headers.
1213# The exact versions are taken from:
13−# https://github.com/KhronosGroup/glslang/blob/master/known_good.json
14+# https://github.com/KhronosGroup/glslang/blob/${version}/known_good.json
1415
1516let
1617 localSpirv-tools = if argSpirv-tools == null
@@ -18,8 +19,8 @@ let
1819 src = fetchFromGitHub {
1920 owner = "KhronosGroup";
2021 repo = "SPIRV-Tools";
21− rev = "fd8e130510a6b002b28eee5885a9505040a9bdc9";
22− sha256 = "00b7xgyrcb2qq63pp3cnw5q1xqx2d9rfn65lai6n6r89s1vh3vg6";
22+ rev = "b27b1afd12d05bf238ac7368bb49de73cd620a8e";
23+ sha256 = "0v26ws6qx23jn4dcpsq6rqmdxgyxpl5pcvfm90wb3nz6iqbqx294";
2324 };
2425 })
2526 else argSpirv-tools;
@@ -29,8 +30,8 @@ let
2930 src = fetchFromGitHub {
3031 owner = "KhronosGroup";
3132 repo = "SPIRV-Headers";
32− rev = "f8bf11a0253a32375c32cad92c841237b96696c0";
33− sha256 = "1znwjy02dl9rshqzl87rqsv9mfczw7gvwfhcirbl81idahgp4p6l";
33+ rev = "f027d53ded7e230e008d37c8b47ede7cd308e19d";
34+ sha256 = "12gp2mqcar6jj57jw9isfr62yn72kmvdcl0zga4gvrlyfhnf582q";
3435 };
3536 })
3637 else argSpirv-headers;
@@ -38,13 +39,13 @@ in
3839
3940stdenv.mkDerivation rec {
4041 pname = "glslang";
41− version = "8.13.3743";
42+ version = "11.1.0";
4243
4344 src = fetchFromGitHub {
4445 owner = "KhronosGroup";
4546 repo = "glslang";
4647 rev = version;
47− sha256 = "0d20wfpp2fmbnz1hnsjr9xc62lxpj86ik2qyviqbni0pqj212cry";
48+ sha256 = "1j81pghy7whyr8ygk7lx6g6qph61rky7fkkc8xp87c7n695a48rw";
4849 };
4950
5051 # These get set at all-packages, keep onto them for child drvs
@@ -75,7 +76,7 @@ stdenv.mkDerivation rec {
7576 inherit (src.meta) homepage;
7677 description = "Khronos reference front-end for GLSL and ESSL";
7778 license = licenses.asl20;
78− platforms = platforms.linux;
79+ platforms = platforms.unix;
7980 maintainers = [ maintainers.ralith ];
8081 };
8182}