Update unsup

catgirl-v · Feb 18, 2025 · a8faf38 · a8faf38
1 parent 4e5aa73
commit a8faf38
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/bootstrap/patches/com.unascribed.unsup.json b/bootstrap/patches/com.unascribed.unsup.json
@@ -2,10 +2,10 @@
 	"formatVersion": 1,
 	"name": "unsup",
 	"uid": "com.unascribed.unsup",
-	"version": "1.0-rc2",
+	"version": "1.1-pre3",
 	"+agents": [
 		{
-			"name": "com.unascribed:unsup:1.0-rc2",
+			"name": "com.unascribed:unsup:1.1-pre3",
 			"url": "https://repo.sleeping.town"
 		}
 	]

diff --git a/nix/pi/pissfactory/nixpkgs-package.nix b/nix/pi/pissfactory/nixpkgs-package.nix
@@ -72,6 +72,7 @@ lib.makeScope newScope (
       {
         difficulty ? "normal",
         forgeServer,
+        unsup,
         stdenvNoCC,
         fetchFromGitHub,
         nodejs,
@@ -142,7 +143,8 @@ lib.makeScope newScope (
             # `packwiz init` tries to go online so we have to do this
             substitute ${escapeStorePath ../../../packwiz/pack.toml.in} pack.toml \
               --subst-var-by mc_version "$(jq -r '.minecraft.version' "$src/manifest.json")" \
-              --subst-var-by forge_version "$(jq -r '.minecraft.modLoaders[0].id | sub("^forge-"; "")' "$src/manifest.json")"
+              --subst-var-by forge_version "$(jq -r '.minecraft.modLoaders[0].id | sub("^forge-"; "")' "$src/manifest.json")" \
+              --subst-var-by unsup_version ${escapeShellArg unsup.version}
             : > index.toml
             python3 ${escapeStorePath ../../../packwiz/gen_pw_mods.py} ${escapeStorePath ../../../mods.json}
             substitute ${escapeStorePath ../../../packwiz/forge-installer.pw.toml.in} forge-installer.pw.toml \
@@ -194,15 +196,17 @@ lib.makeScope newScope (
 
     unsup = callPackage (
       { fetchurl }:
-      fetchurl (
-        let
-          version = "1.0-rc2";
-        in
-        {
-          url = "https://git.sleeping.town/unascribed/unsup/releases/download/v${version}/unsup-${version}.jar";
-          hash = "sha256-h+SpjMvvpGAlHO1YY+mPqoyrvxoDX0CoKl+9jA3L9fw=";
-        }
-      )
+      let
+        manifest = fromJSON (readFile ../../../bootstrap/patches/com.unascribed.unsup.json);
+        inherit (manifest) version;
+      in
+      fetchurl {
+        url = "https://git.sleeping.town/unascribed/unsup/releases/download/v${version}/unsup-${version}.jar";
+        hash = "sha256-4c7c7ubHNhznwBLeocKBleGLlFKOOjNgH1ZSFZhWumc=";
+        passthru = {
+          inherit version;
+        };
+      }
     ) { };
 
     runServer = callPackage (

diff --git a/packwiz/pack.toml.in b/packwiz/pack.toml.in
@@ -11,3 +11,4 @@ hash = "dummy"
 [versions]
 forge = "@forge_version@"
 minecraft = "@mc_version@"
+unsup = "@unsup_version@"