Bump 20240616-1 (#759)

Co-authored-by: PedroHLC <root@pedrohlc.com>

pkgs/alacritty-git/version.json

@@ -1,6 +1,6 @@
 {
-  "version": "unstable-20240608122851-64ba0b8",
-  "rev": "64ba0b8e915ad167b6d5cb4395da018e436385d6",
-  "hash": "sha256-oJiUwXyIDgMl8kUn7A/IbGSft7fmb/NNxmWR2oXNi5A=",
-  "cargoHash": "sha256-udwZ/td6EPHZ+fRGEHCqV2gWQfp0xQ1rwSF2cd/Zi98="
+  "version": "unstable-20240616073733-0d4ab7b",
+  "rev": "0d4ab7bca43213d96ddfe40048fc0f922543c6f8",
+  "hash": "sha256-hcsPrbopYBN6ggrIxYaV3MQWDz7LlmGZ+QDKFgT3/0k=",
+  "cargoHash": "sha256-DvXGOoCsA+2mKx5014+abvGW5eGxfVULnCMrtv5WEE4="
 }

pkgs/ananicy-cpp-rules/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20240610183105-8113203",
-  "rev": "81132038997895bf840d39863df478d4350bbd8a",
-  "hash": "sha256-mEBEL6aXbVYVN53u6I+X8wbES5rmHVhQIRK4khc2IuQ="
+  "version": "unstable-20240614083155-e3638eb",
+  "rev": "e3638ebb2320202ede9facfc9657cc8af2098a2d",
+  "hash": "sha256-lIhXeqPJKC3brxVhIK04K9AAU+RqqqOwN/gUevYmaDM="
 }

pkgs/conduwuit-git/cargo.diff → pkgs/conduwuit-git/cargo-lock.diff

@@ -76,27 +76,3 @@ index 5e23859..b36d2a0 100644
  ]
 
  [[package]]
-diff --git a/Cargo.toml b/Cargo.toml
-index 58e84a2..e395cfb 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -419,13 +419,16 @@ features = [
- # we can switch back to upstream if #2956 is merged and backported in the upstream repo.
- [patch.crates-io.tracing-subscriber]
- git = "https://github.com/girlbossceo/tracing"
--branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"
-+rev = "b348dca742af641c47bc390261f60711c2af573c"
- [patch.crates-io.tracing]
- git = "https://github.com/girlbossceo/tracing"
--branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"
-+rev = "b348dca742af641c47bc390261f60711c2af573c"
- [patch.crates-io.tracing-core]
- git = "https://github.com/girlbossceo/tracing"
--branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"
-+rev = "b348dca742af641c47bc390261f60711c2af573c"
-+[patch.crates-io.tracing-log]
-+git = "https://github.com/girlbossceo/tracing"
-+rev = "b348dca742af641c47bc390261f60711c2af573c"
-
- # fixes hyper graceful shutdowns [https://github.com/programatik29/axum-server/issues/114]
- [patch.crates-io.axum-server]

pkgs/conduwuit-git/cargo-toml.diff

@@ -0,0 +1,24 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 58e84a2..e395cfb 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -419,13 +419,16 @@ features = [
+ # we can switch back to upstream if #2956 is merged and backported in the upstream repo.
+ [patch.crates-io.tracing-subscriber]
+ git = "https://github.com/girlbossceo/tracing"
+-branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"
++rev = "b348dca742af641c47bc390261f60711c2af573c"
+ [patch.crates-io.tracing]
+ git = "https://github.com/girlbossceo/tracing"
+-branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"
++rev = "b348dca742af641c47bc390261f60711c2af573c"
+ [patch.crates-io.tracing-core]
+ git = "https://github.com/girlbossceo/tracing"
+-branch = "tracing-subscriber/env-filter-clone-0.1.x-backport"
++rev = "b348dca742af641c47bc390261f60711c2af573c"
++[patch.crates-io.tracing-log]
++git = "https://github.com/girlbossceo/tracing"
++rev = "b348dca742af641c47bc390261f60711c2af573c"
+
+ # fixes hyper graceful shutdowns [https://github.com/programatik29/axum-server/issues/114]
+ [patch.crates-io.axum-server]

pkgs/conduwuit-git/default.nix

@@ -25,8 +25,15 @@ gitOverride {
     outputHashes = conduwuitPins;
   };
 
+  withExtraUpdateCommands = final.writeShellScript "patch-cargo" ''
+    pushd "$_PKG_DIR"
+    ${final.patch}/bin/patch -p1 --batch < ${./cargo-lock.diff}
+    git add Cargo.lock
+    popd
+  '';
+
   postOverride = prevAttrs: {
-    patches = (prevAttrs.patches or [ ]) ++ [ ./cargo.diff ];
+    patches = (prevAttrs.patches or [ ]) ++ [ ./cargo-lock.diff ./cargo-toml.diff ];
     preBuild = "";
     pname = "conduwuit";
     env = prevAttrs.env // {

pkgs/distrobox-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20240613095409-9575b95",
-  "rev": "9575b958f28f2c570ebbc82cd5d85fa2d2a689b8",
-  "hash": "sha256-9tXiFk+G9OpYuMR5zL2d4v3gecronBvIOwkSGRQyK1g="
+  "version": "unstable-20240614135834-2f5e255",
+  "rev": "2f5e255a43457a61f7d37cad231c7095adffa5d5",
+  "hash": "sha256-c2fqkO2MyGebfsnXdsyC1AWtX6Ai3m49xiOw8T3bRWI="
 }

pkgs/gamescope-git/default.nix

@@ -3,14 +3,6 @@
 gitOverride (current: {
   newInputs = with final; {
     openvr = openvr_git;
-    wlroots = wlroots_git.overrideAttrs (_wlrPrev: {
-      src = fetchFromGitHub {
-        owner = "Joshua-Ashton";
-        repo = "wlroots";
-        rev = "a5c9826e6d7d8b504b07d1c02425e6f62b020791";
-        hash = "sha256-G7CvsSRryNCoknWhfoZvkf33967xI51WkemA6ms3vo4=";
-      };
-    });
   };
 
   nyxKey = if isWSI then "gamescope-wsi_git" else "gamescope_git";
@@ -27,8 +19,10 @@ gitOverride (current: {
   withUpdateScript = !isWSI;
 
   postOverride = prevAttrs: {
-    buildInputs = with final; [ seatd xwayland libdecor ] ++ (with xorg; [ xcbutilwm xcbutilerrors ]) ++ prevAttrs.buildInputs;
+    # pulls nixpkgs#319766 ahead
+    patches = nyxUtils.removeByBaseName "use-pkgconfig.patch" prevAttrs.patches;
 
+    # Taints commits in logs for debugging purposes
     postPatch =
       let shortRev = nyxUtils.shorter current.rev; in
       prevAttrs.postPatch + ''

pkgs/gamescope-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20240611014146-9badb5c",
-  "rev": "9badb5cb3d8fd6eb6b2ce46070cbf724cb7ff521",
-  "hash": "sha256-jUz4SLIX1SGlX7TLFWJwWmQ9+M1S3k/OqgmJeBPjY/8="
+  "version": "unstable-20240614164043-fd67152",
+  "rev": "fd67152130240972b72ae8f0e42cc9ba2b4795b8",
+  "hash": "sha256-8yBpO9Nl0cvIUMTkTftNNcLs3INMCvevoP9C8amEulE="
 }

pkgs/jujutsu-git/version.json

@@ -1,6 +1,6 @@
 {
-  "version": "unstable-20240612001457-4cca845",
-  "rev": "4cca84515a1c18a221cb2ee31a036bde60a3db2f",
-  "hash": "sha256-gxzOb6WgtAAyeaSD974i7/haTlagChM1ev0vXJn//bE=",
-  "cargoHash": "sha256-DzIVMbc+jWW2wkA90UvZ1wNhY3m0C9UKYWz0paSYEts="
+  "version": "unstable-20240616033040-ce0c537",
+  "rev": "ce0c53796c54d60bf51cc8d76a9b116c1929baf4",
+  "hash": "sha256-vc1Yx4pE4sk+daRdp/bGsxpmY/Lhvyzgi0X6W7GUS8U=",
+  "cargoHash": "sha256-jSGza2lHuIcDx7O/i9F7Gjmj9LnBTLygmwZasaipMkw="
 }

pkgs/mesa-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20240613102411-fa63450",
-  "rev": "fa634503ce97bbc9a202a780dd5662eb6531aa1c",
-  "hash": "sha256-9snzp2stmd4TRUY2kh46E2+ZZUy5zGVEp3cOnu5jkVM="
+  "version": "unstable-20240615145759-09277c7",
+  "rev": "09277c7ea60f0852f70b195e304f6ff7ac1f393a",
+  "hash": "sha256-BY2YbnL8ygWzj1OsDIky+Ze3bwwo0wFTQM30ti8a7Dc="
 }

pkgs/nss-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20240612154235-e962c44",
-  "rev": "e962c44e20ad2228617f76880ec7b2e8ce0ecf3a",
-  "hash": "sha256-nR52zAaCrukjrjkfSbTd+ejP09wfkWzwaASUA1ccanw="
+  "version": "unstable-20240613214741-8c3f43d",
+  "rev": "8c3f43d95ad88e7e756c2536d8b0d67c99270f42",
+  "hash": "sha256-/Mx+XvLQJTAP21oGkyNwnyuwKU/hzUvne6/L1OilNqo="
 }

pkgs/nyx-generic-git-update/default.nix

@@ -44,6 +44,9 @@ in
   [ "$_LOCAL_REV" == "$_LATEST_REV" ] && exit 0
   _LOCAL_VER=$(jq -r .version "$_VERSION_JSON")
 
+  _NYX_DIR="$PWD"
+  _PKG_DIR=$(dirname "$_VERSION_JSON")
+
   _NIX_PREFETCH_ARGS=(--quiet)
   if [ $HAS_SUBMODULES -eq 1 ]; then
     _NIX_PREFETCH_ARGS+=(--fetch-submodules)
@@ -94,11 +97,14 @@ in
       '.cargoHash = $cargo' \
       "$_VERSION_JSON" | sponge "$_VERSION_JSON"
   elif [ $HAS_CARGO == 'lock' ]; then
-    cp "$_LATEST_PATH/Cargo.lock" "$(dirname "$_VERSION_JSON")/"
-    git add "$(dirname "$_VERSION_JSON")/Cargo.lock"
+    cp "$_LATEST_PATH/Cargo.lock" "$_PKG_DIR/"
+    git add "$_PKG_DIR/Cargo.lock"
   fi
 
   git add $_VERSION_JSON
+
+  [ -n "''${WITH_EXTRA:-}" ] && source "$WITH_EXTRA"
+
   git commit -m "''${_NYX_KEY}: ''${_LOCAL_VER:9} -> ''${_LATEST_VERSION:9}"
 '').overrideAttrs (_prevAttrs: {
   meta = _prevAttrs.meta // { description = "Generic update-script for bleeding-edge GIT Nix derivations."; };

pkgs/openmohaa-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20240611214650-de02c86",
-  "rev": "de02c868a27f3206688a2e474207f397028b704f",
-  "hash": "sha256-IkFVFSlNcVUsxwXGLbP6xVLvQhdgOvnFf3tFpxgCigc="
+  "version": "unstable-20240615143802-f5aadbb",
+  "rev": "f5aadbb788cf2e40f7294d6e8c4975df462a9370",
+  "hash": "sha256-km1b73sY4qK0uVus9/QxNJhin7/wicFkDbCZsCiPojU="
 }

pkgs/qtile-extras-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20240612222044-8dbfae6",
-  "rev": "8dbfae69669c5baac644ad0ea2dd602cc085de09",
-  "hash": "sha256-uvt5EJyOrBt6Da1UlD0U8fDMBxq/MEOOo+BmV8MDsxE="
+  "version": "unstable-20240615151512-df556c5",
+  "rev": "df556c5aeb6ad6e2e38a2b2d426118cb2767fb2b",
+  "hash": "sha256-eBRAsoW37I6bwPusadijUfLCBrQpotr/nl1Z0FJmpRU="
 }

pkgs/qtile-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20240610141013-29695c7",
-  "rev": "29695c71bbea91fd00af447eb8bcfe8830637a03",
-  "hash": "sha256-sMoGLLhRG8fWWHCieS2pJoFZOx7y78zqgnHWckzQ0+g="
+  "version": "unstable-20240615163942-1c6634d",
+  "rev": "1c6634d8141c1dc60b8b6bf65c443677ce474542",
+  "hash": "sha256-W2oj01gS2KBBASUB4lWAEa/fkWtXYXAL3i1hLQ7VZqQ="
 }

pkgs/river-git/build.zig.zon.nix

@@ -0,0 +1,34 @@
+# generated by zon2nix (https://github.com/nix-community/zon2nix)
+
+{ linkFarm, fetchzip }:
+
+linkFarm "zig-packages" [
+  {
+    name = "122014eeb4600a059bdcfe1c864862f17e6d5e4237e3bb7d6818f2a5583f6f4eb843";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.1.0.tar.gz";
+      hash = "sha256-Atfkiyt9v+GWry3xA2Y0Iv6AvwbZ+EHfHLmX0AUEz6Y=";
+    };
+  }
+  {
+    name = "1220714d1cc39c3abb1d9c22a0b838d847ead099cb7d9931821490483f30c022e827";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.17.0.tar.gz";
+      hash = "sha256-C1D2dBn65Z9PmDacpeYbdX574fcOyYi/BJVDUMibkPA=";
+    };
+  }
+  {
+    name = "1220840390382c88caf9b0887f6cebbba3a7d05960b8b2ee6d80567b2950b71e5017";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.1.0.tar.gz";
+      hash = "sha256-xilmsDGWlkfpTiGff+/nb76jx87ANdr4zqYy6rKOBMg=";
+    };
+  }
+  {
+    name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz";
+      hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA=";
+    };
+  }
+]

pkgs/river-git/default.nix

@@ -1,4 +1,4 @@
-{ prev, gitOverride, ... }:
+{ final, prev, gitOverride, ... }:
 
 gitOverride {
   nyxKey = "river_git";
@@ -12,4 +12,16 @@ gitOverride {
     fetchSubmodules = true;
   };
   ref = "master";
+
+  withExtraUpdateCommands = final.writeShellScript "bump-zig-zon" ''
+    pushd "$_LATEST_PATH"
+    ${final.zon2nix}/bin/zon2nix > "$_NYX_DIR/$_PKG_DIR/build.zig.zon.nix"
+    popd
+
+    git add "$_PKG_DIR/build.zig.zon.nix"
+  '';
+
+  postOverride = _prevAttrs: {
+    deps = final.callPackage ./build.zig.zon.nix { };
+  };
 }

pkgs/sdl-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20240613063616-bf27269",
-  "rev": "bf27269952742a9cc5db6e0a840fce51996b8675",
-  "hash": "sha256-X3xQL6fy02bd5nDgUUy71qHcJkrRPGteAq1e/bumXf0="
+  "version": "unstable-20240615154244-17af09f",
+  "rev": "17af09f3a99bfea9547a6619f4da3fb0106003c2",
+  "hash": "sha256-BfZHj9k1YrGTB8jHZAdiHyQgVgwaQjflUt4ElAH2FsY="
 }

pkgs/telegram-desktop-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20240607025727-6c0ea0e",
-  "rev": "6c0ea0eb9f666fce471ed32efe0e83d9c62aba48",
-  "hash": "sha256-dlPt87SKP17v9QFiRZSSUtSLVGTGbeo05G/p05l2zVc="
+  "version": "unstable-20240616062738-3d11413",
+  "rev": "3d114131e0d32fb0efed4f3d0d5069bc3928db5b",
+  "hash": "sha256-HM7qdYmVKzmhd4qPpoZeHAvRov++LD2iFta/h02uMjY="
 }

pkgs/tg-owt-git/version.json

@@ -1,5 +1,5 @@
 {
-  "version": "unstable-20231221162300-afd9d5d",
-  "rev": "afd9d5d31798d3eacf9ed6c30601e91d0f1e4d60",
-  "hash": "sha256-/1cghoxmm+6uFEUgCjh1Xhb0CTnd1XAq1M21FruDRek="
+  "version": "unstable-20240615065903-c9cc439",
+  "rev": "c9cc4390ab951f2cbc103ff783a11f398b27660b",
+  "hash": "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="
 }

pkgs/vulkan-versioned/latest.json

@@ -26,19 +26,19 @@
     "hash": "sha256-at3krE0torhjg7G+NkX0/ewc26Sg/1t2xW7wghAAuZo="
   },
   "vulkanHeaders": {
-    "version": "1.3.287",
+    "version": "1.3.288",
     "rev": "v#{version}",
-    "hash": "sha256-56yke1/8Ulln5SBMn1hvRKN3Hu783rQjNhYoTthAMCk="
+    "hash": "sha256-tE4vitfjuCwkShCj7kXptnxEEu285J/WHayACz+t/o4="
   },
   "vulkanLoader": {
-    "version": "1.3.287",
+    "version": "1.3.288",
     "rev": "v#{version}",
-    "hash": "sha256-yhC2jWPvsWSDyC21hO53C/f1S+r8w2byJj23unC/u2o="
+    "hash": "sha256-d/uq8ePcFPUbs2nvUpIBDZgIViCQmZa+lRxva+t0byk="
   },
   "vulkanTools": {
-    "version": "1.3.287",
+    "version": "1.3.288",
     "rev": "v#{version}",
-    "hash": "sha256-JHEfp/jgHpB97Tj5H5zySmd9TO5okQc7+y/Xs4iL/6c=",
+    "hash": "sha256-6+y7fpgUFtoM35RKHQnwpFhedHeJtES4v7XF23BQl04=",
     "badTag": "vulkan-sdk-1.3.280.0"
   },
   "vulkanToolsLunarG": {
@@ -52,14 +52,14 @@
     "hash": "sha256-BhwnfF3f5gRM1dieBVLKzE/dPI5KzaYoAp0H9AXVtW4="
   },
   "vulkanUtilityLibraries": {
-    "version": "1.3.287",
+    "version": "1.3.288",
     "rev": "v#{version}",
-    "hash": "sha256-frZbJgtxXZw5c+yBp8hjJdpTWvnXS0YciQtIjjQXn+Q="
+    "hash": "sha256-ReZG+ifIFGuJTwcvfjQR2NPzo7dWA2rsHz60+pMEwKw="
   },
   "vulkanValidationLayers": {
-    "version": "snapshot-2024wk23",
-    "rev": "#{version}",
-    "hash": "sha256-/id+ggNpGAOMQ8x3IZ11vd1J3VVUB5zPo0BAfg7B4L4=",
+    "version": "1.3.288",
+    "rev": "v#{version}",
+    "hash": "sha256-BnUa+cis3kc9axpazgqFBlhrF93a/R9LFRvhtBvFe/g=",
     "badTag": "snapshot-2024wk20"
   },
   "volk": {

pkgs/yt-dlp-git/version.json

@@ -1,6 +1,6 @@
 {
-  "version": "unstable-20240611230958-add96eb",
-  "rev": "add96eb9f84cfffe85682bf2fb85135746994ee8",
-  "hash": "sha256-2m2CbZQrphcqwmjLInrrAZrnHyDndEGEN6lsUeNmNWg=",
-  "lastModifiedDate": "20240611230958"
+  "version": "unstable-20240615233802-5dbac31",
+  "rev": "5dbac313ae4e3e8521dfe2e1a6a048a98ff4b4fe",
+  "hash": "sha256-qobVtzNIaHb5Qs2MoEXu6xh2ZrT3mEIwaZDsWV+fH+0=",
+  "lastModifiedDate": "20240615233802"
 }