From 2ebd32ab0ce07386eb14ac3f4cd0c690872a72bf Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Tue, 26 Jun 2018 20:30:48 -0700
Subject: [PATCH] glslang: 2018-02-05 -> 2018-06-21

---
 pkgs/development/compilers/glslang/default.nix |  8 +++-----
 pkgs/development/tools/spirv-tools/default.nix | 10 +++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/glslang/default.nix b/pkgs/development/compilers/glslang/default.nix
index ca1e2f54df93..cc27d19781fe 100644
--- a/pkgs/development/compilers/glslang/default.nix
+++ b/pkgs/development/compilers/glslang/default.nix
@@ -2,15 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "glslang-git-${version}";
-  version = "2018-02-05";
+  version = "2018-06-21";
 
-  # `vulkan-loader` requires a specific version of `glslang` as specified in
-  # `<vulkan-loader-repo>/external_revisions/glslang_revision`.
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
-    rev = "2651ccaec8";
-    sha256 = "0x5x5i07n9g809rzf5jgw70mmwck31ishdmxnmi0wxx737jjqwaq";
+    rev = "ef1f899b5d64a9628023f1bb129198674cba2b97";
+    sha256 = "052w6rahmy1wlphv533wz8nyn82icky28lprvl8w3acfq3831zg6";
   };
 
   buildInputs = [ cmake bison jq ] ++ spirv-tools.buildInputs;
diff --git a/pkgs/development/tools/spirv-tools/default.nix b/pkgs/development/tools/spirv-tools/default.nix
index 35e0d276101b..cada8353866c 100644
--- a/pkgs/development/tools/spirv-tools/default.nix
+++ b/pkgs/development/tools/spirv-tools/default.nix
@@ -7,14 +7,14 @@ spirv_sources = {
   tools = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Tools";
-    rev = "9e19fc0f31ceaf1f6bc907dbf17dcfded85f2ce8";
-    sha256 = "1zpwznq0fyvkzs5h9nnkr7g6svr0w8z6zx62xgnss17c2a5cz0lk";
+    rev = "f2c93c6e124836797311facb8449f9a0b76fefc2";
+    sha256 = "03w5xk2hjijj1rfbx5dw3lhy7vb9zrssfcwvp09q47f77vkgl105";
   };
   headers = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
-    rev = "ce309203d7eceaf908bea8862c27f3e0749f7d00";
-    sha256 = "1sv1iy2d46sg7r3xy591db6fn9h78wd079yvfa87vwmwsdkhiqhm";
+    rev = "12f8de9f04327336b699b1b80aa390ae7f9ddbf4";
+    sha256 = "0fswk5ndvkmy64har3dmhpkv09zmvb0p4knbqc4fdl4qiggz0fvf";
   };
 };
 
@@ -22,7 +22,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "spirv-tools-${version}";
-  version = "2018-02-05";
+  version = "2018-06-06";
 
   src = spirv_sources.tools;
   patchPhase = ''ln -sv ${spirv_sources.headers} external/spirv-headers'';