Fix: Actually fix nvfetcher

Forgot that I also needed to update the GIT_TAG filtering in here
PassiveLemon · Feb 11, 2025 · 3391154 · 3391154
1 parent 201954f
commit 3391154
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 32 deletions.
diff --git a/_sources/generated.json b/_sources/generated.json
@@ -192,7 +192,7 @@
     },
     "opencomposite-git": {
         "cargoLocks": null,
-        "date": "2025-01-23",
+        "date": "2025-02-08",
         "extract": null,
         "name": "opencomposite-git",
         "passthru": null,
@@ -202,13 +202,13 @@
             "fetchSubmodules": true,
             "leaveDotGit": false,
             "name": null,
-            "rev": "d37c9e7a4bc41f2b636282064eb39efb9e50d48b",
-            "sha256": "sha256-Bc+lQdQeiojaHjglj7gZhXB5BMho0vb/HErfh50pcmA=",
+            "rev": "175e3b3a5408ff120bd21036faa703deb57159fc",
+            "sha256": "sha256-kwu8eM/rQBcZfs91loh7QAB46a01F9n5Xm1DmMd53MQ=",
             "sparseCheckout": [],
             "type": "git",
             "url": "https://gitlab.com/znixian/OpenOVR.git"
         },
-        "version": "d37c9e7a4bc41f2b636282064eb39efb9e50d48b"
+        "version": "175e3b3a5408ff120bd21036faa703deb57159fc"
     },
     "picom": {
         "cargoLocks": null,
@@ -394,7 +394,7 @@
     },
     "wayvr-dashboard-git": {
         "cargoLocks": null,
-        "date": "2025-02-07",
+        "date": "2025-02-10",
         "extract": null,
         "name": "wayvr-dashboard-git",
         "passthru": null,
@@ -406,12 +406,12 @@
             "name": null,
             "owner": "olekolek1000",
             "repo": "wayvr-dashboard",
-            "rev": "cbb2cdbc3b912232ce3944aad259c96efb563f53",
-            "sha256": "sha256-+Krh9Ec1LhQxi7+uK9biOftlRJHqcAbearv8RAouy70=",
+            "rev": "a927e7a20268c521e508c4a9521b12530f6e8422",
+            "sha256": "sha256-lcL+igZdZB5GM2bZTZaR0sRy78Jx4kv58P+dBhrN7Ac=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "cbb2cdbc3b912232ce3944aad259c96efb563f53"
+        "version": "a927e7a20268c521e508c4a9521b12530f6e8422"
     },
     "webfisher": {
         "cargoLocks": null,
@@ -469,16 +469,16 @@
             "name": null,
             "owner": "WiVRn",
             "repo": "WiVRn",
-            "rev": "v0.22",
-            "sha256": "sha256-i/CG+zD64cwnu0z1BRkRn7Wm67KszE+wZ5geeAvrvMY=",
+            "rev": "v0.23",
+            "sha256": "sha256-Ae25yLlkZ958gXr8nyWPv27leVLF5enljXAkCx+fDSk=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "v0.22"
+        "version": "v0.23"
     },
     "wivrn-git": {
         "cargoLocks": null,
-        "date": "2025-02-07",
+        "date": "2025-02-09",
         "extract": null,
         "name": "wivrn-git",
         "passthru": null,
@@ -490,12 +490,12 @@
             "name": null,
             "owner": "WiVRn",
             "repo": "WiVRn",
-            "rev": "22186f00437de6e546f7e6f03e7405f63afbd535",
-            "sha256": "sha256-1ua5EUNhAA77xsY6r3+bivO81wFcaxBH2pE04AFlo/w=",
+            "rev": "e4a866f368144b5cab9ad0663486e663d3dfedef",
+            "sha256": "sha256-Iv4UC4nhyP1quFELL7ojqVLD6fnDqOF3goB8ntHH0Hs=",
             "sparseCheckout": [],
             "type": "github"
         },
-        "version": "22186f00437de6e546f7e6f03e7405f63afbd535"
+        "version": "e4a866f368144b5cab9ad0663486e663d3dfedef"
     },
     "wivrn-git-monado": {
         "cargoLocks": null,
@@ -529,13 +529,13 @@
             "fetchSubmodules": false,
             "leaveDotGit": false,
             "name": null,
-            "rev": "aa2b0f9f1d638becd6bb9ca3c357ac2561a36b07",
-            "sha256": "sha256-yfHtkMvX/gyVG0UgpSB6KjSDdCym6Reb9LRb3OortaI=",
+            "rev": "848a24aa106758fd6c7afcab6d95880c57dbe450",
+            "sha256": "sha256-+rax9/CG/3y8rLYwGqoWJa4FxH+Z3eREiwhuxDOUzLs=",
             "sparseCheckout": [],
             "type": "git",
             "url": "https://gitlab.freedesktop.org/monado/monado.git"
         },
-        "version": "aa2b0f9f1d638becd6bb9ca3c357ac2561a36b07"
+        "version": "848a24aa106758fd6c7afcab6d95880c57dbe450"
     },
     "wlx-overlay-s": {
         "cargoLocks": {

diff --git a/_sources/generated.nix b/_sources/generated.nix
@@ -111,17 +111,17 @@
   };
   opencomposite-git = {
     pname = "opencomposite-git";
-    version = "d37c9e7a4bc41f2b636282064eb39efb9e50d48b";
+    version = "175e3b3a5408ff120bd21036faa703deb57159fc";
     src = fetchgit {
       url = "https://gitlab.com/znixian/OpenOVR.git";
-      rev = "d37c9e7a4bc41f2b636282064eb39efb9e50d48b";
+      rev = "175e3b3a5408ff120bd21036faa703deb57159fc";
       fetchSubmodules = true;
       deepClone = false;
       leaveDotGit = false;
       sparseCheckout = [ ];
-      sha256 = "sha256-Bc+lQdQeiojaHjglj7gZhXB5BMho0vb/HErfh50pcmA=";
+      sha256 = "sha256-kwu8eM/rQBcZfs91loh7QAB46a01F9n5Xm1DmMd53MQ=";
     };
-    date = "2025-01-23";
+    date = "2025-02-08";
   };
   picom = {
     pname = "picom";
@@ -225,15 +225,15 @@
   };
   wayvr-dashboard-git = {
     pname = "wayvr-dashboard-git";
-    version = "cbb2cdbc3b912232ce3944aad259c96efb563f53";
+    version = "a927e7a20268c521e508c4a9521b12530f6e8422";
     src = fetchFromGitHub {
       owner = "olekolek1000";
       repo = "wayvr-dashboard";
-      rev = "cbb2cdbc3b912232ce3944aad259c96efb563f53";
+      rev = "a927e7a20268c521e508c4a9521b12530f6e8422";
       fetchSubmodules = false;
-      sha256 = "sha256-+Krh9Ec1LhQxi7+uK9biOftlRJHqcAbearv8RAouy70=";
+      sha256 = "sha256-lcL+igZdZB5GM2bZTZaR0sRy78Jx4kv58P+dBhrN7Ac=";
     };
-    date = "2025-02-07";
+    date = "2025-02-10";
   };
   webfisher = {
     pname = "webfisher";
@@ -271,15 +271,15 @@
   };
   wivrn-git = {
     pname = "wivrn-git";
-    version = "22186f00437de6e546f7e6f03e7405f63afbd535";
+    version = "e4a866f368144b5cab9ad0663486e663d3dfedef";
     src = fetchFromGitHub {
       owner = "WiVRn";
       repo = "WiVRn";
-      rev = "22186f00437de6e546f7e6f03e7405f63afbd535";
+      rev = "e4a866f368144b5cab9ad0663486e663d3dfedef";
       fetchSubmodules = false;
-      sha256 = "sha256-1ua5EUNhAA77xsY6r3+bivO81wFcaxBH2pE04AFlo/w=";
+      sha256 = "sha256-Iv4UC4nhyP1quFELL7ojqVLD6fnDqOF3goB8ntHH0Hs=";
     };
-    date = "2025-02-07";
+    date = "2025-02-09";
   };
   wivrn-git-monado = {
     pname = "wivrn-git-monado";

diff --git a/nvfetcher.toml b/nvfetcher.toml
@@ -102,7 +102,7 @@ src.github = "WiVRn/WiVRn"
 fetch.github = "WiVRn/WiVRn"
 
 [wivrn-monado]
-src.cmd = "curl https://api.github.com/repos/WiVRn/WiVRn/releases/latest | jq -r \".tag_name\" | xargs -I {} curl https://raw.githubusercontent.com/WiVRn/WiVRn/{}/CMakeLists.txt | grep GIT_TAG | awk '{print $2}'"
+src.cmd = "curl https://api.github.com/repos/WiVRn/WiVRn/releases/latest | jq -r \".tag_name\" | xargs -I {} curl https://raw.githubusercontent.com/WiVRn/WiVRn/{}/CMakeLists.txt | sed -n '/FetchContent_Declare(monado/,/)/p' | grep GIT_TAG | awk '{print $2}'"
 fetch.git = "https://gitlab.freedesktop.org/monado/monado.git"
 
 [wivrn-git]
@@ -111,7 +111,7 @@ fetch.github = "WiVRn/WiVRn"
 
 [wivrn-git-monado]
 src.webpage = "https://github.com/WiVRn/WiVRn/blob/master/CMakeLists.txt"
-src.regex = "GIT_TAG\\s*(\\w+)"
+src.regex = "FetchContent_Declare\\(monado[\\s\\S]*?GIT_TAG (\\w+)[\\s\\S]*?\\)"
 fetch.git = "https://gitlab.freedesktop.org/monado/monado.git"
 
 [wlx-overlay-s]