Bump 20231002-2

pkgs/ananicy-cpp-rules/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20230929073945-59d0914",
-  "rev": "59d0914cfcda21f6e78ac12137a2eac6964883bc",
-  "hash": "sha256-MKxyV0MrMvYuaXWkOKY+hBHDtTnm5HuE9J2ggko4ONA="
+  "version": "unstable-20231002040627-08bc57f",
+  "rev": "08bc57f561bd74dbd06137f3f45fd7d77683a7c4",
+  "hash": "sha256-EpWEarmcJetjLY9PXI/+CUezsN9Ttd8fCHcMLY5fQ98="
 }

pkgs/firefox-nightly/version.json

@@ -1,5 +1,5 @@
 {
   "version": "120.0a1",
-  "rev": "6453cd78e4f187bc198e83900dd9937c3cc6d0fc",
-  "hash": "sha256-OmmtZAVakQ75rRgFbdof7PxHlIS3o09RK8nR3v+bDiI="
+  "rev": "55fc90da3cff35171d66e3dcf280575bef8c17a6",
+  "hash": "sha256-XShLDXpk2wvDxoAezfCpwA+rr7sgxdcJkR/kS0EGF4k="
 }

pkgs/gamescope-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20230929213801-4234385",
-  "rev": "42343857f05be32bc4c33156e235c3ae42e26c63",
-  "hash": "sha256-KWa5IsTFIAdhn1B7WI+3iQnLakGODetWvzWc0d3l7eU="
+  "version": "unstable-20231001030526-c707e15",
+  "rev": "c707e151371b798d19d4119190860cd0e9c41909",
+  "hash": "sha256-dBwBAyeFFU08dLG5xG9xty2EpjwmATnG2frSSSEdP9Y="
 }

pkgs/glib-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20230919215732-41c9c51",
-  "rev": "41c9c51080a8aaf1c24c3d402453725034b8cb77",
-  "hash": "sha256-0JYGp8xyGyfYGTjEL8WhjleJIsF/LuCdiHlVDX8kkss="
+  "version": "unstable-20231002105238-4700e89",
+  "rev": "4700e89f530e3b369fb2cdb57919ab4958e85e8a",
+  "hash": "sha256-1lK9siL6Rvq3ocRHpAZBfWdeLpWKUJMSgwmMN3rOyN0="
 }

pkgs/input-leap-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20230924141414-cd7ab1d",
-  "rev": "cd7ab1d169d4fed0e67c71082a95ae470a9d181d",
-  "hash": "sha256-ZxU9BnZ60uhBSg593bffyJb/lgc5Arn9p+wwsCHlj+M="
+  "version": "unstable-20230930162630-b1d3478",
+  "rev": "b1d347832ef8d4eed66b52ddc859adb6391950bc",
+  "hash": "sha256-r+FuLLceqVZFFIcNtwzwZsWhOPxR55Wfz+xCxf0dl2o="
 }

pkgs/mangohud-git/default.nix

@@ -1,5 +1,36 @@
 { final, prev, gitOverride, nyxUtils, mangohud32_git, ... }:
 
+let
+  # Derived from subprojects/imgui.wrap
+  imgui = rec {
+    version = "1.89.9";
+    src = final.fetchFromGitHub {
+      owner = "ocornut";
+      repo = "imgui";
+      rev = "refs/tags/v${version}";
+      hash = "sha256-0k9jKrJUrG9piHNFQaBBY3zgNIKM23ZA879NY+MNYTU=";
+    };
+    patch = final.fetchurl {
+      url = "https://wrapdb.mesonbuild.com/v2/imgui_${version}-1/get_patch";
+      hash = "sha256-myEpDFl9dr+NTus/n/oCSxHZ6mxh6R1kjMyQtChD1YQ=";
+    };
+  };
+
+  # Derived from subprojects/implot.wrap
+  implot = rec {
+    version = "0.16";
+    src = final.fetchFromGitHub {
+      owner = "epezent";
+      repo = "implot";
+      rev = "refs/tags/v${version}";
+      hash = "sha256-/wkVsgz3wiUVZBCgRl2iDD6GWb+AoHN+u0aeqHHgem0=";
+    };
+    patch = final.fetchurl {
+      url = "https://wrapdb.mesonbuild.com/v2/implot_${version}-1/get_patch";
+      hash = "sha256-HGsUYgZqVFL6UMHaHdR/7YQfKCMpcsgtd48pYpNlaMc=";
+    };
+  };
+in
 gitOverride {
   newInputs = { mangohud32 = mangohud32_git; };
   nyxKey = if final.stdenv.is32bit then "mangohud32_git" else "mangohud_git";
@@ -16,12 +47,27 @@ gitOverride {
 
   postOverrides = [
     (prevAttrs: {
+      buildInputs = prevAttrs.buildInputs ++ [ final.SDL2 ];
       patches = [ ./preload-nix-workaround.patch ] ++
         (nyxUtils.removeByBaseName "preload-nix-workaround.patch"
           (nyxUtils.removeByURL "https://github.com/flightlessmango/MangoHud/commit/3f8f036ee8773ae1af23dd0848b6ab487b5ac7de.patch"
             prevAttrs.patches
           ));
-      postPatch = (prevAttrs.postPatch or "") + ''
+      postUnpack = prevAttrs.postUnpack + ''#
+        (
+          cd "$sourceRoot/subprojects"
+          echo "IMGUI"
+          cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version}
+          echo "IMPLOT"
+          cp -R --no-preserve=mode,ownership ${implot.src} implot-${implot.version}
+        )
+      '';
+      postPatch = prevAttrs.postPatch + ''
+        (
+          cd subprojects
+          unzip ${imgui.patch}
+          unzip ${implot.patch}
+        )
         substituteInPlace src/meson.build \
           --replace "run_command(['git', 'describe', '--tags', '--dirty=+']).stdout().strip()" \
             "'${prevAttrs.version}'"

pkgs/mangohud-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20230927230808-a2c421a",
-  "rev": "a2c421a8d3bad42cfd60403e9aedcc52bdfb0e85",
-  "hash": "sha256-OZZ3V7JrgyN2f1cKzoY8RWM3JiNwCHKxYV4acNlDuhY="
+  "version": "unstable-20231002112923-14da551",
+  "rev": "14da551ae0ec2eca1d3facf8cb156848e7b66a36",
+  "hash": "sha256-6KN2ZPchQqjXzJhVdGQVHOMdAvkZvgxLQHMrDyENB98="
 }

pkgs/mesa-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20230930030121-e7d393b",
-  "rev": "e7d393b1d7b8fd9b39942d4c2e5b32c46ffffff7",
-  "hash": "sha256-YZt8nIy5AmcPiaU3MsBpHdKBGQqzEZAoPYWzhSPkWQg="
+  "version": "unstable-20231002122144-b01e874",
+  "rev": "b01e87423433f6b39d244daee4b59f53baa4a02e",
+  "hash": "sha256-9nJBkmPXqmvxzR2DepCXZPJNQSidRjHyNNK323UQSoc="
 }

pkgs/nss-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20230921141824-bf975c4",
-  "rev": "bf975c4104038722595df747906c199e2039f8fc",
-  "hash": "sha256-ViY5+uolXhl0MJPwga31eKazZ9MdhIvNSHCGUuEtciU="
+  "version": "unstable-20231002120534-abfff7c",
+  "rev": "abfff7c727e3e1d34d6d1ea3fdc5a390ce238e41",
+  "hash": "sha256-lJFpiEX6rGclsQ2vIGeI/2ioUOufvUunedm5UIR5DWI="
 }

pkgs/telegram-desktop-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20230929163821-90fb593",
-  "rev": "90fb59348cc3a228cc39d1df81b57d620d7f3a3d",
-  "hash": "sha256-0f1B2hSorpilOCZy50vxNKSeI0NNDrAOKvxvgOAxTQk="
+  "version": "unstable-20231002121102-a757e07",
+  "rev": "a757e07c3ac8656310edf83c6e6fc36c1520406f",
+  "hash": "sha256-3InNQI1p/C3hZuLtpKziNI5yqp3H/+2k3tZlPc7l/20="
 }

pkgs/vulkan-versioned/default.nix

@@ -1,6 +1,7 @@
 { final
 , prev
 , vulkanVersions
+, nyxUtils
 , ...
 }:
 let
@@ -102,12 +103,20 @@ final.lib.makeScope final.newScope (self:
     key = "vulkanTools";
     owner = "KhronosGroup";
     repo = "Vulkan-Tools";
+    extraAttrs = prevAttrs: {
+      patches = [ ./use-nix-moltenvk.patch ] ++
+        (nyxUtils.removeByBaseName "use-nix-moltenvk.patch" prevAttrs.patches);
+    };
   };
 
   vulkan-tools-lunarg =
     genericOverride {
       origin = prev.vulkan-tools-lunarg;
-      extraInput = { inherit (self) vulkan-validation-layers; }; # broken: vulkan-headers vulkan-loader
+      extraInput =
+        if vulkanVersions.vulkanToolsLunarG.version == "1.3.261.1" then
+          { inherit (self) vulkan-validation-layers; }
+        else
+          { inherit (self) vulkan-headers vulkan-loader vulkan-validation-layers; };
       key = "vulkanToolsLunarG";
       owner = "LunarG";
       repo = "VulkanTools";

pkgs/vulkan-versioned/latest.json

@@ -32,14 +32,14 @@
     "hash": "sha256-GAl5xC7PCGsVHHUhLkIuwj2zlTCgyNWaBjk6I0qDkhQ="
   },
   "vulkanLoader": {
-    "version": "1.3.265",
+    "version": "1.3.266",
     "rev": "v#{version}",
-    "hash": "sha256-fXEvwkLVhbQWThv4eXFOi1Hy0QkAxN6cL3fDl8AdgiI="
+    "hash": "sha256-6iJxI1SwOjN26dyVs6JSYWODZbA25G/M2ZabGLCGRIo="
   },
   "vulkanTools": {
-    "version": "1.3.265",
+    "version": "1.3.266",
     "rev": "v#{version}",
-    "hash": "sha256-q77kwK+1M9SmjtOUMLQj/BBt4ezq8yonalOjAoehZlw="
+    "hash": "sha256-26UVhzpyCP1qQvQNhmqnLiyokcaBnpX06nefMpy62qU="
   },
   "vulkanToolsLunarG": {
     "version": "1.3.261.1",

pkgs/vulkan-versioned/use-nix-moltenvk.patch

@@ -0,0 +1,123 @@
+diff --git a/cube/CMakeLists.txt b/cube/CMakeLists.txt
+index c564646..95078e0 100644
+--- a/cube/CMakeLists.txt
++++ b/cube/CMakeLists.txt
+@@ -210,14 +210,7 @@ else()
+ endif()
+
+ if(APPLE)
+-    # Keep RPATH so fixup_bundle can use it to find libraries
+-    set_target_properties(vkcube PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
+-    install(TARGETS vkcube BUNDLE DESTINATION "cube")
+-    # Fix up the library references to be self-contained within the bundle.
+-    install(CODE "
+-        include(BundleUtilities)
+-        fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/vkcube.app \"\" \"${Vulkan_LIBRARY_DIR}\")
+-        ")
++    install(TARGETS vkcube BUNDLE DESTINATION "Applications")
+ else()
+     install(TARGETS vkcube)
+ endif()
+@@ -254,14 +247,7 @@ else()
+ endif()
+
+ if(APPLE)
+-    # Keep RPATH so fixup_bundle can use it to find libraries
+-    set_target_properties(vkcubepp PROPERTIES INSTALL_RPATH_USE_LINK_PATH TRUE)
+-    install(TARGETS vkcubepp BUNDLE DESTINATION "cube")
+-    # Fix up the library references to be self-contained within the bundle.
+-    install(CODE "
+-        include(BundleUtilities)
+-        fixup_bundle(\${CMAKE_INSTALL_PREFIX}/cube/vkcubepp.app \"\" \"${Vulkan_LIBRARY_DIR}\")
+-        ")
++    install(TARGETS vkcubepp BUNDLE DESTINATION "Applications")
+ else()
+     install(TARGETS vkcubepp)
+ endif()
+diff --git a/cube/macOS/cube/cube.cmake b/cube/macOS/cube/cube.cmake
+index ee98135..6fd71d0 100644
+--- a/cube/macOS/cube/cube.cmake
++++ b/cube/macOS/cube/cube.cmake
+@@ -72,12 +72,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json"
+ # Copy the MoltenVK lib into the bundle.
+ if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
+     add_custom_command(TARGET vkcube POST_BUILD
+-                       COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
++                       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcube.app/Contents/Frameworks
++                       COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib"
+                                ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcube.app/Contents/Frameworks/libMoltenVK.dylib
+                        DEPENDS vulkan)
+ else()
+     add_custom_command(TARGET vkcube POST_BUILD
+-                       COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
++                       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Frameworks
++                       COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib"
+                                ${CMAKE_CURRENT_BINARY_DIR}/vkcube.app/Contents/Frameworks/libMoltenVK.dylib
+                        DEPENDS vulkan)
+ endif()
+diff --git a/cube/macOS/cubepp/cubepp.cmake b/cube/macOS/cubepp/cubepp.cmake
+index 4ff82b6..6248660 100644
+--- a/cube/macOS/cubepp/cubepp.cmake
++++ b/cube/macOS/cubepp/cubepp.cmake
+@@ -74,12 +74,14 @@ set_source_files_properties("${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json"
+ # Copy the MoltenVK lib into the bundle.
+ if(${CMAKE_GENERATOR} MATCHES "^Xcode.*")
+     add_custom_command(TARGET vkcubepp POST_BUILD
+-                       COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
++                       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcubepp.app/Contents/Frameworks
++                       COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib"
+                                ${CMAKE_CURRENT_BINARY_DIR}/$<CONFIG>/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib
+                        DEPENDS vulkan)
+ else()
+     add_custom_command(TARGET vkcubepp POST_BUILD
+-                       COMMAND ${CMAKE_COMMAND} -E copy "${MOLTENVK_DIR}/MoltenVK/dylib/macOS/libMoltenVK.dylib"
++                       COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Frameworks
++                       COMMAND ${CMAKE_COMMAND} -E create_symlink "${MOLTENVK_DIR}/lib/libMoltenVK.dylib"
+                                ${CMAKE_CURRENT_BINARY_DIR}/vkcubepp.app/Contents/Frameworks/libMoltenVK.dylib
+                        DEPENDS vulkan)
+ endif()
+diff --git a/mac_common.cmake b/mac_common.cmake
+index bad3c41..b498906 100644
+--- a/mac_common.cmake
++++ b/mac_common.cmake
+@@ -23,9 +23,8 @@ set(MOLTENVK_DIR ${MOLTENVK_REPO_ROOT})
+ # MoltenVK JSON File
+
+ execute_process(COMMAND mkdir -p ${CMAKE_BINARY_DIR}/staging-json)
+-execute_process(COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*[\\.\\/]*$: \"..\\/..\\/..\\/Frameworks\\/$"
+-                        ${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json
+-                OUTPUT_FILE ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json)
++execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink ${MOLTENVK_DIR}/MoltenVK_icd.json
++                        ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json)
+
+ # ~~~
+ # Modify the ICD JSON file to adjust the library path.
+@@ -36,10 +35,9 @@ execute_process(COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*
+ # ~~~
+ add_custom_target(MoltenVK_icd-staging-json ALL
+                   COMMAND mkdir -p ${CMAKE_BINARY_DIR}/staging-json
+-                  COMMAND sed -e "/\"library_path\":/s$:[[:space:]]*\"[[:space:]]*[\\.\\/]*$: \"..\\/..\\/..\\/Frameworks\\/$"
+-                          ${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json > ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json
+-                  VERBATIM
+-                  DEPENDS "${MOLTENVK_DIR}/MoltenVK/icd/MoltenVK_icd.json")
++                  COMMAND ${CMAKE_COMMAND} -E create_symlink ${MOLTENVK_DIR}/MoltenVK_icd.json
++                          ${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json
++                  DEPENDS "${MOLTENVK_DIR}/MoltenVK_icd.json")
+ set_source_files_properties(${CMAKE_BINARY_DIR}/staging-json/MoltenVK_icd.json PROPERTIES GENERATED TRUE)
+
+ find_library(COCOA NAMES Cocoa)
+diff --git a/vulkaninfo/CMakeLists.txt b/vulkaninfo/CMakeLists.txt
+index 4314864..0852d50 100644
+--- a/vulkaninfo/CMakeLists.txt
++++ b/vulkaninfo/CMakeLists.txt
+@@ -131,9 +131,4 @@ elseif(APPLE)
+     )
+ endif()
+
+-if(APPLE)
+-    install(TARGETS vulkaninfo RUNTIME DESTINATION "vulkaninfo")
+-else()
+-    install(TARGETS vulkaninfo)
+-endif()
+-
++install(TARGETS vulkaninfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

pkgs/yuzu-ea-git/version.json

@@ -1,6 +1,6 @@
 {
-  "version": "unstable-20230929133008-0245268",
-  "rev": "02452680a75484065d85175924be6a763f440aaf",
-  "hash": "sha256-Hey2aml+LZ67+NyDS/krqWUr7BRVnnZQr405xDvdX10=",
-  "lastModified": "1695994208"
+  "version": "unstable-20231002092324-d663a10",
+  "rev": "d663a10fcfbc95933dc8d8e25d8ae65b58d5f040",
+  "hash": "sha256-Yjt+yN+/1v+VQMz6iZet5sQfffsUeiM6i5tJzspIglM=",
+  "lastModified": "1696238604"
 }

shared/utils.nix

@@ -36,7 +36,6 @@ rec {
   drvHash = drv:
     builtins.substring 0 32 (builtins.baseNameOf (builtins.unsafeDiscardStringContext drv.drvPath));
 
-
   # NOTE: Don't use in your system's configuration, this helps in the repo's infra.
   # Finds dependencies in a derivation that are also present in a attrset filled with derivations.
   internalDeps = packages: drv: