Merge pull request #346 from expipiplus1/vma-bump

VulkanMemoryAllocator/VulkanMemoryAllocator.cabal

@@ -5,7 +5,7 @@ cabal-version: 2.2
 -- see: https://github.com/sol/hpack
 
 name:           VulkanMemoryAllocator
-version:        0.7.3
+version:        0.7.4
 synopsis:       Bindings to the VulkanMemoryAllocator library
 category:       Graphics
 homepage:       https://github.com/expipiplus1/vulkan#readme

VulkanMemoryAllocator/changelog.md

@@ -2,6 +2,9 @@
 
 ## WIP
 
+## [0.7.4] - 2021-11-08
+- Bump VMA, documentation changes
+
 ## [0.7.3] - 2021-11-03
 - Bump VMA, Adds virtual allocation functionality
 

VulkanMemoryAllocator/package.yaml

@@ -1,5 +1,5 @@
 name: VulkanMemoryAllocator
-version: "0.7.3"
+version: "0.7.4"
 synopsis: Bindings to the VulkanMemoryAllocator library
 category: Graphics
 maintainer: Ellie Hermaszewska <[email protected]>

VulkanMemoryAllocator/src/VulkanMemoryAllocator.hs

@@ -3178,15 +3178,21 @@ data VulkanFunctions = VulkanFunctions
     vkDestroyImage :: PFN_vkDestroyImage
   , 
     vkCmdCopyBuffer :: PFN_vkCmdCopyBuffer
-  , -- No documentation found for Nested "VmaVulkanFunctions" "vkGetBufferMemoryRequirements2KHR"
+  , -- | Fetch \"vkGetBufferMemoryRequirements2\" on Vulkan >= 1.1, fetch
+    -- \"vkGetBufferMemoryRequirements2KHR\" when using
+    -- VK_KHR_dedicated_allocation extension.
     vkGetBufferMemoryRequirements2KHR :: PFN_vkGetBufferMemoryRequirements2KHR
-  , -- No documentation found for Nested "VmaVulkanFunctions" "vkGetImageMemoryRequirements2KHR"
+  , -- | Fetch \"vkGetImageMemoryRequirements 2\" on Vulkan >= 1.1, fetch
+    -- \"vkGetImageMemoryRequirements2KHR\" when using
+    -- VK_KHR_dedicated_allocation extension.
     vkGetImageMemoryRequirements2KHR :: PFN_vkGetImageMemoryRequirements2KHR
-  , -- No documentation found for Nested "VmaVulkanFunctions" "vkBindBufferMemory2KHR"
+  , -- | Fetch \"vkBindBufferMemory2\" on Vulkan >= 1.1, fetch
+    -- \"vkBindBufferMemory2KHR\" when using VK_KHR_bind_memory2 extension.
     vkBindBufferMemory2KHR :: PFN_vkBindBufferMemory2KHR
-  , -- No documentation found for Nested "VmaVulkanFunctions" "vkBindImageMemory2KHR"
+  , -- | Fetch \"vkBindImageMemory2\" on Vulkan >= 1.1, fetch
+    -- \"vkBindImageMemory2KHR\" when using VK_KHR_bind_memory2 extension.
     vkBindImageMemory2KHR :: PFN_vkBindImageMemory2KHR
-  , -- No documentation found for Nested "VmaVulkanFunctions" "vkGetPhysicalDeviceMemoryProperties2KHR"
+  , 
     vkGetPhysicalDeviceMemoryProperties2KHR :: PFN_vkGetPhysicalDeviceMemoryProperties2KHR
   }
   deriving (Typeable, Eq)

nix/haskell-packages.nix

@@ -3,7 +3,7 @@
 , safeVulkanFFI ? false, safeOpenXrFFI ? false, buildProfiling ? false
 , buildInstrumented ? false, openxrNoVulkan ? false }:
 
-with pkgs.haskell.lib;
+with pkgs.haskell.lib.compose;
 
 let
   gitignore = pkgs.nix-gitignore.gitignoreSourcePure ../.gitignore;
@@ -50,22 +50,21 @@ let
       vulkan-utils = self.developPackage {
         name = "vulkan-utils";
         root = gitignore ../utils;
-        modifier = drv: addExtraLibrary (mod drv) pkgs.vulkan-headers;
+        modifier = drv: addExtraLibrary pkgs.vulkan-headers (mod drv);
         returnShellEnv = false;
       };
       VulkanMemoryAllocator = self.developPackage {
         name = "VukanMemoryAllocator";
         root = gitignore ../VulkanMemoryAllocator;
-        modifier = drv: addExtraLibrary (mod drv) pkgs.vulkan-headers;
+        modifier = drv: addExtraLibrary pkgs.vulkan-headers (mod drv);
         returnShellEnv = false;
       };
       vulkan-examples = self.developPackage {
         name = "vulkan-examples";
         root = gitignore ../examples;
         modifier = drv:
-          addExtraLibrary
-          (addBuildTools (mod drv) [ pkgs.glslang pkgs.shaderc ])
-          pkgs.renderdoc;
+          addExtraLibrary pkgs.renderdoc
+          (addBuildTools [ pkgs.glslang pkgs.shaderc ] (mod drv));
         returnShellEnv = false;
         cabal2nixOptions = "--flag=renderdoc";
       };
@@ -92,40 +91,28 @@ let
       # Overrides for examples
       #
       # profiling
-      eventlog2html = markUnbroken (doJailbreak (appendPatch
-        (overrideSrc super.eventlog2html {
-          src = pkgs.fetchFromGitHub {
-            owner = "BinderDavid";
-            repo = "eventlog2html";
-            rev =
-              "9abc05ed94fef094b3ac54d57e00664c793b5923"; # switch-to-ghc-events-0.13
-            sha256 = "0h1527zxdmail35526nn47zawsaafvsby7p50qg54wq023zazxlj";
-          };
-        }) (pkgs.fetchpatch {
-          url = "https://github.com/mpickering/eventlog2html/pull/129.patch";
-          name = "vega.patch";
-          sha256 = "1lnbdscngb5g5b6ys0xhp7izdfkz6j3llnpirbfxck3sy3ssxph5";
-        })));
-      hs-speedscope = doJailbreak (markUnbroken
-        (overrideSrc super.hs-speedscope {
-          src = pkgs.fetchFromGitHub {
-            owner = "mpickering";
-            repo = "hs-speedscope";
-            rev = "9e28b303993b79f3d943ccb89b148cb9a4fb6ca5";
-            sha256 = "105zk9w5lpn0m866m8y0lhrw2x6kym2f2ryjc56zxqzfr9b76jdn";
-          };
-        }));
-      hvega = doJailbreak (self.callHackageDirect {
-        pkg = "hvega";
-        ver = "0.6.0.0";
-        sha256 = "1bkwp8zlb1248w95ksw71iksgd3xfw1pnb9klv8xxsqay542970a";
-      } { });
+      eventlog2html = markUnbroken (overrideSrc {
+        src = pkgs.fetchFromGitHub {
+          owner = "expipiplus1";
+          repo = "eventlog2html";
+          rev = "3612e7000cfbb1498349c331b5adaa2d17f02206"; # ellie-size
+          sha256 = "0s2wxqwmaldqyz9yz52wxy0dla9pahqlpq6cx4pm4c744ggmpswd";
+        };
+      } super.eventlog2html);
+      hs-speedscope = markUnbroken (addBuildDepend self.machines (overrideSrc {
+        src = pkgs.fetchFromGitHub {
+          owner = "mpickering";
+          repo = "hs-speedscope";
+          rev = "5a77aeb163e07dc63769d4e0a659e5821cdee527";
+          sha256 = "0q9kdlxhm37f260v4ydmznwmmsaa4w9mq3fh2iivj792y6ybmp5j";
+        };
+      } super.hs-speedscope));
 
       #
       # Overrides for generate
       #
-      pandoc = appendPatch super.pandoc
-        ../generate-new/patches/pandoc-haddock-tables.patch;
+      pandoc = appendPatch ../generate-new/patches/pandoc-haddock-tables.patch
+        super.pandoc;
     } // pkgs.lib.optionalAttrs hoogle {
       ghc = super.ghc // { withPackages = super.ghc.withHoogle; };
       ghcWithPackages = self.ghc.withPackages;

nix/nixpkgs.nix

@@ -1,8 +1,8 @@
 let
   nixpkgsSrc = builtins.fetchTarball {
     url =
-      "https://github.com/nixos/nixpkgs/archive/3478ac5c5ba30b841cb8096d314c01fa553b19a3.tar.gz"; # refs/heads/haskell-updates
-    sha256 = "0n19dfpwsidyk2vpyi0b42rmqrphsdhvyklr732s3zgxfhxj4plm";
+      "https://github.com/nixos/nixpkgs/archive/17e2591d9b216634ab501293efa2ba4c55ff6bc9.tar.gz"; # refs/heads/haskell-updates
+    sha256 = "151fkb184mng86dgpyr327by2fr8cr46cqr3wnghmhsgmc5yfz3b";
   };
 
 in import nixpkgsSrc { }

nix/release.nix

@@ -1,6 +1,6 @@
 { pkgs ? import ./nixpkgs.nix, compiler ? null }:
 
-with pkgs.haskell.lib;
+with pkgs.haskell.lib.compose;
 with pkgs.lib;
 
 let