From ffa369a57d1c9d9e3919a87c5e397d9e1a7d3303 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 28 Jan 2020 22:25:05 -0800 Subject: [PATCH 1/6] vulkan-headers: 1.1.144.0 -> 1.2.131.1 (cherry picked from commit 8985abb3c6656b0bff1ec168b72fe8170b1aa87d) --- pkgs/development/libraries/vulkan-headers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/vulkan-headers/default.nix b/pkgs/development/libraries/vulkan-headers/default.nix index 4ea8d69a498b..ee6e58fab287 100644 --- a/pkgs/development/libraries/vulkan-headers/default.nix +++ b/pkgs/development/libraries/vulkan-headers/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { pname = "vulkan-headers"; - version = "1.1.114.0"; + version = "1.2.131.1"; nativeBuildInputs = [ cmake ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-Headers"; rev = "sdk-${version}"; - sha256 = "0fdvh26nxibylh32lj8b62d9nf9j25xa0il9zg362wmr2zgm8gka"; + sha256 = "1yf42c2cnhx1y4wkxsdl6g653xl2vvamhpkldz6jb4ca5wk03gxf"; }; meta = with stdenv.lib; { From 3a746e2d4afd3637922a6ba220b6a3e92d16b6d5 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 28 Jan 2020 22:27:09 -0800 Subject: [PATCH 2/6] vulkan-loader: 1.1.144.0 -> 1.2.131.2 (cherry picked from commit eb250b9a00179df46fcc8a6bde602bf4a79fc928) --- pkgs/development/libraries/vulkan-loader/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 3cdf8f08651f..c12c3ca640ba 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,20 +1,15 @@ { stdenv, fetchFromGitHub, cmake, python3, vulkan-headers, pkgconfig , xlibsWrapper, libxcb, libXrandr, libXext, wayland, addOpenGLRunpath }: -let - version = "1.1.114.0"; -in - -assert version == vulkan-headers.version; -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "vulkan-loader"; - inherit version; + version = "1.2.131.2"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Loader"; rev = "sdk-${version}"; - sha256 = "08nibkbjf3g32qyp5bpdvj7i0zdv5ds1n5y52z8pvyzkpiz7s6ww"; + sha256 = "12n4mxc6db89258k8i47ql1zna7k94lkwv7lpxg39nm8ypa1ywrv"; }; nativeBuildInputs = [ pkgconfig ]; From b927b88eeadf458f137df2ffdc5168c04ec2c8ec Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 28 Jan 2020 22:32:22 -0800 Subject: [PATCH 3/6] glslang: 7.11.3214 -> 8.13.3559 (cherry picked from commit 533e7c229688001b2c9f59929758dc331615ba25) --- pkgs/development/compilers/glslang/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix index 161e57b54792..b9d6866cc432 100644 --- a/pkgs/development/compilers/glslang/default.nix +++ b/pkgs/development/compilers/glslang/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "glslang"; - version = "7.11.3214"; + version = "8.13.3559"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; rev = version; - sha256 = "0dqjga0lcza006fhac26zp2plbq4gx8a6nsmrwkqlzji6lw1jins"; + sha256 = "0waamlh2vqh1k40m169294xdlm0iqjkx2vis4qyxfki0r0cnsmnk"; }; # These get set at all-packages, keep onto them for child drvs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 447e5fee395d..6be00c3a5a82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8299,16 +8299,16 @@ in src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "26c1b8878315a7a5c188df45e0bc236bb222b698"; - sha256 = "1q76vaqwxf4q2l4rd7j2p2jqgcqpys0m235drzx0drkn2qd50n1b"; + rev = "5c019b5923c1f6bf00a3ac28114ec4a7b1faa0e2"; + sha256 = "17a0kiyb7zjsg7ws12diip84vds1ajl98ni9c2wria6ymcvbvsvz"; }; }); spirv-headers = spirv-headers.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "2434b89345a50c018c84f42a310b0fad4f3fd94f"; - sha256 = "1m902q1alm0rbh69zlskkx4n453xijijp9mf3wzwphi2j36gygwm"; + rev = "204cd131c42b90d129073719f2766293ce35c081"; + sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2"; }; }); }; From d775ca1040e45ca85e3149f832c647a6e7518c1e Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 28 Jan 2020 23:06:27 -0800 Subject: [PATCH 4/6] vulkan-validation-layers: 1.1.114.0 -> 1.2.131.2 (cherry picked from commit d73c83fca540f82d2d862d3102e3f1f3b2343ea8) --- .../tools/vulkan-validation-layers/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 36d018682df9..5d807d13a9ea 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchFromGitHub, cmake, writeText, python3 , vulkan-headers, vulkan-loader, glslang -, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland, spirv-headers }: +, pkgconfig, xlibsWrapper, libxcb, libXrandr, wayland }: stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; - version = "1.1.114.0"; + version = "1.2.131.2"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "sdk-${version}"; - sha256 = "0f8dlrjw1nz2adhzi4sbvljys4h0dyiwafdihsdyrg3xncgffks4"; + sha256 = "1sz0388cr018ldx6ziplvk4v3zbg44pww77kv6kv5wxl69plwfcn"; }; nativeBuildInputs = [ pkgconfig cmake python3 ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6be00c3a5a82..85a01f884b08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14588,24 +14588,24 @@ in src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "aa9e8f538041db3055ea443080e0ccc315fa114f"; - sha256 = "1nbii0xa5zgs36dmpvzpli1jbzb9ijr7bkgvzmlpcjrjsl02cnbk"; + rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6"; + sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv"; }; }); spirv-headers = spirv-tools.overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "45c2cc37276d69e5b257507d97fd90d2a5684ccc"; - sha256 = "1jrzazv5j8nsn8hz5vc43vz4msps05d65wdy9spfg2hg36r1s2pm"; + rev = "204cd131c42b90d129073719f2766293ce35c081"; + sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2"; }; }); }).overrideAttrs (_: { src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "333d1c95792692205472c457d7bec915a94c8000"; - sha256 = "04srq1zcilhs7p1xz7wcnrncjxqskhfnqggisvxw5f774gk01ks6"; + rev = "4fc7a33910fb8e40b970d160e1b38ab3f67fe0f3"; + sha256 = "1dghz8zl774dx2xpa4dv8xhxirbylgyn6kx18ib4qirna1njp0zg"; }; }); }; From 990fdb4464797a2ccaa3c6f4498f7506201b9ed2 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 28 Jan 2020 23:06:46 -0800 Subject: [PATCH 5/6] shaderc: 2019.0 -> 2019.1 (cherry picked from commit 3b9d71af2c7dd24e8ef1adf61f86d1b5df55c0b9) --- pkgs/development/compilers/shaderc/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/shaderc/default.nix b/pkgs/development/compilers/shaderc/default.nix index 82cccc3befc3..e7308973d5c6 100644 --- a/pkgs/development/compilers/shaderc/default.nix +++ b/pkgs/development/compilers/shaderc/default.nix @@ -8,24 +8,24 @@ let glslang = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; - rev = "d3692c701b1265955221aa0d6ebc656bc4442b2a"; - sha256 = "11cvwbzlpr4zrcmmyd9h0kbfhmhr6r696ydmn0yp1jrixby4bmji"; + rev = "3ed344dd784ecbbc5855e613786f3a1238823e56"; + sha256 = "00s2arfvw78d9k9fmangqlkvkmkpqzrin3g91vfab4wr8srb09dx"; }; spirv-tools = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Tools"; - rev = "08cc49ec59c3ff4d6bd4bb4f2097ede35e802158"; - sha256 = "1xhgcppx02fp3nr7654mr3qrgy1fxlxdyl87jhmn3k9jf24gmmmz"; + rev = "323a81fc5e30e43a04e5e22af4cba98ca2a161e6"; + sha256 = "1kwyh95l02w3v1ra55c836wayzw8d0m14ab7wf0ynhhyp3k2p9hv"; }; spirv-headers = fetchFromGitHub { owner = "KhronosGroup"; repo = "SPIRV-Headers"; - rev = "8b911bd2ba37677037b38c9bd286c7c05701bcda"; - sha256 = "0qdnj34bkagszyvci6ifpqd7iqvybhmqzvc9lvqnls44qg90aqh2"; + rev = "204cd131c42b90d129073719f2766293ce35c081"; + sha256 = "1gp0mlbfccqnalaix97jxsa5i337xyzyr55wgssapy56p0q04wv2"; }; in stdenv.mkDerivation rec { pname = "shaderc"; - version = "2019.0"; + version = "2019.1"; outputs = [ "out" "lib" "bin" "dev" "static" ]; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { owner = "google"; repo = "shaderc"; rev = "v${version}"; - sha256 = "1l5mmyxhzsbp0a6y2d86i8jmf46c6bjgjkdgkr5l8hmhflmm7gi2"; + sha256 = "0x514rpignnb4vvl7wmijfakqc59986knjw3dh1zx0ah42xa7x37"; }; patchPhase = '' From b85b1e23cd25449d33f5a850404486369686aa1c Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Tue, 28 Jan 2020 23:11:09 -0800 Subject: [PATCH 6/6] vulkan-tools: 1.1.114.0 -> 1.2.131.1 (cherry picked from commit ad1934b4653ff761e4f2ffd0ba89484f3db6989f) --- pkgs/tools/graphics/vulkan-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index 5851e4a2d46a..f61835ac81f8 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools"; - version = "1.1.114.0"; + version = "1.2.131.1"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "Vulkan-Tools"; rev = "sdk-${version}"; - sha256 = "1d4fcy11gk21x7r7vywdcc1dy9j1d2j78hvd5vfh3vy9fnahx107"; + sha256 = "0ws47ansrr8cq4qjf6k4q0ygm9wwd3w7mhwqcl1qxms8lh5vmhfq"; }; nativeBuildInputs = [ cmake pkgconfig ];