From bc4673bb95c58fe87d5cc83aa98097e4c9b76870 Mon Sep 17 00:00:00 2001
From: slush97 <slusheliott@gmail.com>
Date: Tue, 6 Oct 2026 20:12:25 -0700
Subject: [PATCH] chore: bump vpkmerge to v0.20.1

Picks up the soul-container/urn import fix (Slush97/vpkmerge#51). Valve
reworked the stock soul container to ship four LOD meshes and the importer
only replaced the first, so imported soul containers and spirit urns showed
as the stock gold orb past a few steps. Updates the fetch pin and sha256s
plus the Nix flake input and cargoHash, which had stayed at v0.19.1 when
the pin moved to v0.20.0.
---
 flake.lock                 | 8 ++++----
 flake.nix                  | 2 +-
 nix/vpkmerge.nix           | 4 ++--
 scripts/fetch-vpkmerge.mjs | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/flake.lock b/flake.lock
index f9cfdb28..deaace3b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,16 +42,16 @@
     "vpkmerge": {
       "flake": false,
       "locked": {
-        "lastModified": 1790470205,
-        "narHash": "sha256-OwR1p2DHoDPxYaStdsnXRUH7L0g+bwWBE1UNPrrOwlA=",
+        "lastModified": 1791342180,
+        "narHash": "sha256-psqA9exe88RibdvvASIxKUFWlBNd10ElQ+jiS6sUBvA=",
         "owner": "Slush97",
         "repo": "vpkmerge",
-        "rev": "9b1a3a57be8b3339be9d140a990fd599ce1c4f4b",
+        "rev": "1660b9ff7e64f674087350c77c2087a97842cf5e",
         "type": "github"
       },
       "original": {
         "owner": "Slush97",
-        "ref": "v0.19.1",
+        "ref": "v0.20.1",
         "repo": "vpkmerge",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index c85b611b..e59ce33a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,7 +12,7 @@
     # Rust CLI the app shells out to for VPK merge/split. Keep the ref in
     # sync with VPKMERGE_VERSION in scripts/fetch-vpkmerge.mjs.
     vpkmerge = {
-      url = "github:Slush97/vpkmerge?ref=v0.19.1";
+      url = "github:Slush97/vpkmerge?ref=v0.20.1";
       flake = false;
     };
   };
diff --git a/nix/vpkmerge.nix b/nix/vpkmerge.nix
index 3b750f24..6a69e57e 100644
--- a/nix/vpkmerge.nix
+++ b/nix/vpkmerge.nix
@@ -10,10 +10,10 @@
 
 rustPlatform.buildRustPackage {
   pname = "vpkmerge";
-  version = "0.19.1";
+  version = "0.20.1";
   inherit src;
 
-  cargoHash = "sha256-zrTeSBjgZtzFXkKVlctf4yHR4G+39rFJIWh4sRp/ra0=";
+  cargoHash = "sha256-DrEVHvqtD4jtOhAHhzajxuU/Na0rztO/sPnGYMROffM=";
 
   buildAndTestSubdir = "vpkmerge-cli";
 
diff --git a/scripts/fetch-vpkmerge.mjs b/scripts/fetch-vpkmerge.mjs
index ce71d560..77f0c45f 100644
--- a/scripts/fetch-vpkmerge.mjs
+++ b/scripts/fetch-vpkmerge.mjs
@@ -16,12 +16,12 @@ import { fileURLToPath } from 'node:url';
 import { get as httpsGet } from 'node:https';
 import { pipeline } from 'node:stream/promises';
 
-const VPKMERGE_VERSION = 'v0.20.0';
+const VPKMERGE_VERSION = 'v0.20.1';
 
 const ASSETS = {
-    'linux-x64':  { name: 'vpkmerge-linux-x86_64',      sha256: '2687f033d55da43c4b7db418404c44688bbe90b19585b2948c78412dff7d3e1d' },
-    'darwin-arm64': { name: 'vpkmerge-macos-aarch64',    sha256: '72d75afdafc30aa80dd3c5a4fcafce9efe0fbbb6185d59d250606a6e276e3e6e' },
-    'win32-x64':  { name: 'vpkmerge-windows-x86_64.exe', sha256: 'b7a6e400f6bab1e876444bf2dbc411b9fc62b05e3885d2385bcb0aed7b5430cc' },
+    'linux-x64':  { name: 'vpkmerge-linux-x86_64',      sha256: '1fb26f831559401f4b121992282e7c319b5a668f55addd73c4fd9fd6d743c139' },
+    'darwin-arm64': { name: 'vpkmerge-macos-aarch64',    sha256: '5998c31da842ffcdba6bb0efe96e4f4a6a124445efda13795357c9598a9cbdc5' },
+    'win32-x64':  { name: 'vpkmerge-windows-x86_64.exe', sha256: '8ec9484379555367f99bcf7bf874b91af148266552a96c560d069b94bc94f617' },
 };
 
 const here = dirname(fileURLToPath(import.meta.url));