dfw-rs: move to nix-update for src

Author: itazurasuki

flake.nix

@@ -55,9 +55,7 @@
             wadcvt = final.callPackage d2dfPkgs.wadcvt {
               inherit Doom2D-Forever;
             };
-            dfwad = final.callPackage d2dfPkgs.dfwad {
-              src = pins.dfwad.src;
-            };
+            dfwad = final.callPackage d2dfPkgs.dfwad {};
             cctools = osxcross.packages.${system}.cctools;
             macdylibbundler = prev.macdylibbundler.overrideAttrs (prevAttrs: let
               otool = final.writeShellScriptBin "otool" ''

game/buildWad/default.nix

@@ -97,8 +97,8 @@ in {
                      echo "moving $1 to $(dirname $1)/$WITHOUT_EXT";
                      mv "$1" "$(dirname $1)/$WITHOUT_EXT";
                      ' bash {} \;
-          echo "Calling dfwad"
-          dfwad -v -z "${dfwadCompression}" temp/ ${outName}.wad pack
+          echo "Calling ${lib.getExe dfwad}"
+          ${lib.getExe dfwad} -v -z "${dfwadCompression}" temp/ ${outName}.wad pack
         '';
 
       installPhase = ''

game/utils/dfwad.nix

@@ -2,20 +2,24 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
-  src,
 }:
 rustPlatform.buildRustPackage rec {
-  pname = "dfwad";
-  version = "v0.1.0";
-  buildType = "debug";
+  pname = "dfw-rs";
+  version = "0-unstable-2025-07-24";
 
-  inherit src;
+  src = fetchFromGitHub {
+    owner = "Doom2D";
+    repo = "dfw-rs";
+    rev = "872cf4126d94a430fdae20824b421dc0f43dd3d2";
+    sha256 = "sha256-rr6S95NLN5DyJXLrdOWOjFFcrGxy+MMw53HDuJ6PM7k=";
+  };
 
-  cargoHash = "sha256-4G092Kfl0N0FXhgRYBTMT50iZ+eZPMKDrjaift1QDnU=";
+  cargoHash = "sha256-8okZflfFjtLSHmQ8uU4oE1RcPI0n8W/cR23CUa6vc34=";
 
   meta = {
     description = "Manage your DFWADs, extract and create them.";
     homepage = "https://github.com/Doom2D/dfwad";
     license = lib.licenses.unlicense;
+    mainProgram = "dfw-rs";
   };
 }

nvfetcher.toml

@@ -69,10 +69,6 @@ src.git = "https://github.com/chirs241097/fluidsynth-sans-glib"
 fetch.git = "https://github.com/chirs241097/fluidsynth-sans-glib"
 src.branch = "patched"
 
-[dfwad]
-src.git = "https://github.com/Doom2D/dfwad"
-fetch.git = "https://github.com/Doom2D/dfwad"
-
 [miniupnpc]
 src.github_tag = "miniupnp/miniupnp"
 fetch.github = "miniupnp/miniupnp"

pins/generated.json

@@ -62,26 +62,6 @@
         },
         "version": "release-2.8.1"
     },
-    "dfwad": {
-        "cargoLocks": null,
-        "date": "2025-03-05",
-        "extract": null,
-        "name": "dfwad",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "rev": "796f2fdebd21c46e741ef28cecb723b1c35398d5",
-            "sha256": "sha256-uCUVWF/GujuuzO/jBMqohUR75BBaSLYc3xF6UQO7iRY=",
-            "sparseCheckout": [],
-            "type": "git",
-            "url": "https://github.com/Doom2D/dfwad"
-        },
-        "version": "796f2fdebd21c46e741ef28cecb723b1c35398d5"
-    },
     "enet": {
         "cargoLocks": null,
         "date": "2024-11-14",
@@ -411,4 +391,4 @@
         },
         "version": "5.8.1"
     }
-}
+}

pins/generated.nix

@@ -38,20 +38,6 @@
       sha256 = "sha256-6HOTLwGi2oSQChwHE/oNHfZpcMh8xTuwNQSpKS01bwI=";
     };
   };
-  dfwad = {
-    pname = "dfwad";
-    version = "796f2fdebd21c46e741ef28cecb723b1c35398d5";
-    src = fetchgit {
-      url = "https://github.com/Doom2D/dfwad";
-      rev = "796f2fdebd21c46e741ef28cecb723b1c35398d5";
-      fetchSubmodules = false;
-      deepClone = false;
-      leaveDotGit = false;
-      sparseCheckout = [];
-      sha256 = "sha256-uCUVWF/GujuuzO/jBMqohUR75BBaSLYc3xF6UQO7iRY=";
-    };
-    date = "2025-03-05";
-  };
   enet = {
     pname = "enet";
     version = "657eaf97d9d335917c58484a4a4b5e03838ebd8e";