Fix CI

Author: dpwiz

.github/workflows/ci.yml

@@ -263,6 +263,7 @@ jobs:
     - run: nix-build --arg compiler '${{ matrix.ghc }}' -A vulkan
     - run: nix-build --arg compiler '${{ matrix.ghc }}' -A VulkanMemoryAllocator
     - run: nix-build --arg compiler '${{ matrix.ghc }}' -A vulkan-utils
+    - run: nix-build --arg compiler '${{ matrix.ghc }}' -A vulkan-utils-spirv
     - run: nix-build --arg compiler '${{ matrix.ghc }}' -A openxr
     - run: nix-build --arg compiler '${{ matrix.ghc }}' ./nix/haskell-packages.nix --arg openxrNoVulkan true -A openxr
     - run: nix-build --arg compiler '${{ matrix.ghc }}' -A vulkan-examples
@@ -328,7 +329,8 @@ jobs:
         sudo apt-get install fd-find
     - name: Check scripts with shellcheck
       run: |
-        fdfind .sh$ . \
+        fdfind '\.sh$' . \
+          --type f \
           --exclude VulkanMemoryAllocator/VulkanMemoryAllocator \
           --exclude generate-new/Vulkan-Docs \
           --exclude generate-new/OpenXR-Docs \

default.nix

@@ -21,7 +21,7 @@ let
       (pkgs.haskell.lib.dontCheck vulkan)
       (pkgs.haskell.lib.dontCheck VulkanMemoryAllocator)
     ] else
-      [ vulkan vulkan-utils vulkan-init-sdl2 vulkan-init-glfw VulkanMemoryAllocator vulkan-examples openxr ]
+      [ vulkan vulkan-utils vulkan-utils-spirv vulkan-init-sdl2 vulkan-init-glfw VulkanMemoryAllocator vulkan-examples openxr ]
       ++ pkgs.lib.optional (p.ghc.version == generator-ghc-version) generate-new;
 
 in if forShell then

nix/haskell-packages.nix

@@ -53,6 +53,13 @@ let
         modifier = drv: addExtraLibrary pkgs.vulkan-headers (mod drv);
         returnShellEnv = false;
       };
+      vulkan-utils-spirv = self.developPackage {
+        name = "vulkan-utils-spirv";
+        root = gitignore ../utils-spirv;
+        # tests compile GLSL fixtures with the glslang quasiquoters
+        modifier = drv: addBuildTools [ pkgs.glslang ] (mod drv);
+        returnShellEnv = false;
+      };
       vulkan-init-sdl2 = self.developPackage {
         name = "vulkan-init-sdl2";
         root = gitignore ../utils-init/vulkan-init-sdl2;
@@ -116,6 +123,42 @@ let
 
       binary-orphans = addBuildDepend self.OneTuple super.binary-orphans;
 
+      #
+      # Dependencies for vulkan-utils-spirv, absent or too old in nixpkgs
+      #
+      # dontCheck: hedgehog property gives up on discards
+      geomancy = dontCheck (self.callHackageDirect {
+        pkg = "geomancy";
+        ver = "0.3.0.1";
+        sha256 = "0c0mm70hg1zv6di4y8z2j7a8xbrdxccqqv2v826jis7cyfznppgp";
+      } { });
+      gl-block = self.callHackageDirect {
+        pkg = "gl-block";
+        ver = "1.1";
+        sha256 = "0d6gi2hi96r7yzwg7vmrz936d2wmn88qs09pqhzk1ph7qwjbaqx0";
+      } { };
+      spirv-enum = self.callHackageDirect {
+        pkg = "spirv-enum";
+        ver = "1.104.350.0";
+        sha256 = "0pmj7a0sqvx2nlk7fl1yqlljxdrf91l0rzaa42fwjb39qg9hxzcf";
+      } { };
+      spirv-reflect-ffi = self.callHackageDirect {
+        pkg = "spirv-reflect-ffi";
+        ver = "0.4";
+        sha256 = "1861z86hb5pdi2x9fagl9yqrsxvkcm0pr11il5mklhs99xzkh49x";
+      } { };
+      spirv-reflect-types = self.callHackageDirect {
+        pkg = "spirv-reflect-types";
+        ver = "0.4";
+        sha256 = "1v5bip44jmzmcnlhjf8ckx8zz05f7fsx4d2idlkqs6q09zd7cb6n";
+      } { };
+      # dontCheck: test suite wants base >= 4.18
+      webcolor-labels = dontCheck (self.callHackageDirect {
+        pkg = "webcolor-labels";
+        ver = "0.1.0.0";
+        sha256 = "1cwjz31xiya9wmy0h0srn4f6brd4xh4hi0rh5ry80vkwqz7f3fhm";
+      } { });
+
       #
       # Overrides for generate
       #