fix: vpkmerge and grimorie are using nvfetch now

_sources/generated.json

@@ -81,6 +81,27 @@
         },
         "version": "v3.2.0"
     },
+    "grimoire": {
+        "cargoLock": null,
+        "date": null,
+        "extract": null,
+        "name": "grimoire",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "Slush97",
+            "repo": "grimoire",
+            "rev": "v1.14.2",
+            "sha256": "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=",
+            "sparseCheckout": [],
+            "type": "github"
+        },
+        "version": "v1.14.2"
+    },
     "neovide": {
         "cargoLock": {
             "Cargo.lock": [
@@ -188,5 +209,31 @@
             "type": "github"
         },
         "version": "v5"
+    },
+    "vpkmerge": {
+        "cargoLock": {
+            "Cargo.lock": [
+                "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock",
+                {}
+            ]
+        },
+        "date": null,
+        "extract": null,
+        "name": "vpkmerge",
+        "passthru": null,
+        "pinned": false,
+        "src": {
+            "deepClone": false,
+            "fetchSubmodules": false,
+            "leaveDotGit": false,
+            "name": null,
+            "owner": "Slush97",
+            "repo": "vpkmerge",
+            "rev": "v0.7.0",
+            "sha256": "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f/H8=",
+            "sparseCheckout": [],
+            "type": "github"
+        },
+        "version": "v0.7.0"
     }
 }

_sources/generated.nix

@@ -56,6 +56,17 @@
       sha256 = "sha256-MFnW9cXFzqmdtC31r8cRcihV3NjGAC6+2/DnNVMheCI=";
     };
   };
+  grimoire = {
+    pname = "grimoire";
+    version = "v1.14.2";
+    src = fetchFromGitHub {
+      owner = "Slush97";
+      repo = "grimoire";
+      rev = "v1.14.2";
+      fetchSubmodules = false;
+      sha256 = "sha256-iRZF06kjmJJJOeiUpWm8T2REO/FSdpwc73dOXu6Xs9w=";
+    };
+  };
   neovide = {
     pname = "neovide";
     version = "8c48a699e201aa5559227a96d879b2f57192b354";
@@ -123,4 +134,21 @@
       sha256 = "sha256-w+0SKR0A/hcFU6iFEOgyG+vWwgAWF8h9D0/X7GSFm7w=";
     };
   };
+  vpkmerge = {
+    pname = "vpkmerge";
+    version = "v0.7.0";
+    src = fetchFromGitHub {
+      owner = "Slush97";
+      repo = "vpkmerge";
+      rev = "v0.7.0";
+      fetchSubmodules = false;
+      sha256 = "sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f/H8=";
+    };
+    cargoLock."Cargo.lock" = {
+      lockFile = ./. + "/sha256-CaNyzN8kRtzKwIUAe1or6ZhcaZNeGCKNCkRUTK2f_H8=/Cargo.lock";
+      outputHashes = {
+        
+      };
+    };
+  };
 }

nvfetcher.toml

@@ -36,3 +36,16 @@ src.git = "https://github.com/neovide/neovide.git"
 src.git_branch = "nightly"
 fetch.git = "https://github.com/neovide/neovide.git"
 cargo_lock = ["Cargo.lock"]
+
+[grimoire]
+src.github = "Slush97/grimoire"
+fetch.github = "Slush97/grimoire"
+
+# [grimoire-social]
+# src.github = "Slush97/grimoire-social"
+# fetch.github = "Slush97/grimoire-social"
+
+[vpkmerge]
+src.github = "Slush97/vpkmerge"
+fetch.github = "Slush97/vpkmerge"
+cargo_lock = ["Cargo.lock"]

pkgs/by-name/gr/grimorie/package.nix

@@ -11,17 +11,22 @@
   pkg-config,
   makeWrapper,
   electron_39,
+  vpkmerge,
   sqlite,
+  callPackage,
 }: let
   version = "1.13.1";
+  sources = callPackage ../../../../_sources/generated.nix {};
 
-  src = fetchFromGitHub {
-    owner = "Slush97";
-    repo = "grimoire";
-    rev = "v${version}";
-    hash = "sha256-GSl0whxFtw6tHKBLB3yOulpQGAw8Hqn+2ipj+1zQHLY=";
-  };
+  src = sources.grimoire.src;
+  # src = fetchFromGitHub {
+  #   owner = "Slush97";
+  #   repo = "grimoire";
+  #   rev = "v${version}";
+  #   hash = "sha256-GSl0whxFtw6tHKBLB3yOulpQGAw8Hqn+2ipj+1zQHLY=";
+  # };
 
+  # grimoire-social-src = sources.grimoire-social.src;
   grimoire-social-src = fetchFromGitHub {
     owner = "Slush97";
     repo = "grimoire-social";
@@ -33,13 +38,13 @@
     pname = "grimoire";
     inherit version src;
     fetcherVersion = 2;
-    hash = "sha256-iFxXEb5iKRM0Bp+YrQZhsGXHa0pfPMWQDah/SUBJVBE=";
-  };
-
-  vpkmerge-bin = fetchurl {
-    url = "https://github.com/Slush97/vpkmerge/releases/download/v0.4.0/vpkmerge-linux-x86_64";
-    sha256 = "6860a989335afec0aa19544cf30cbebac9dc6b88af3f3a8d9c3340a6435fa045";
+    hash = "sha256-ARJihXqqSVpzrA7qLGUFoQRW0ydgcIAunZJeFB3WN5s=";
   };
+  # Put into its own flake
+  # vpkmerge-bin = fetchurl {
+  #   url = "https://github.com/Slush97/vpkmerge/releases/download/v0.4.0/vpkmerge-linux-x86_64";
+  #   sha256 = "6860a989335afec0aa19544cf30cbebac9dc6b88af3f3a8d9c3340a6435fa045";
+  # };
 in
   stdenv.mkDerivation {
     pname = "grimoire";
@@ -70,7 +75,7 @@ in
       chmod -R u+w ../grimoire-social
 
       mkdir -p resources/vpkmerge
-      cp ${vpkmerge-bin} resources/vpkmerge/vpkmerge-linux-x86_64
+      cp ${vpkmerge}/bin/vpkmerge resources/vpkmerge/vpkmerge-linux-x86_64
       chmod +x resources/vpkmerge/vpkmerge-linux-x86_64
     '';