From a1f4cf8eca350c9678785861efce18f07d812346 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Fri, 21 Nov 2025 14:18:14 +0100
Subject: [PATCH] Nix: move patch-package to devDependencies, drop usage of
 npx, drop patchPhase

---
 flake.nix         |  17 ++++++-----------
 hashes.json       |   2 +-
 package-lock.json | Bin 348026 -> 355586 bytes
 package.json      |   3 ++-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/flake.nix b/flake.nix
index a2da7949..461b49bb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,22 +43,16 @@
               license = licenses.agpl3Plus;
               platforms = platforms.all;
               mainProgram = "start-bundle";
+              maintainers = with maintainers; [ RorySys ]; # lol.
             };
 
             src = ./.;
-            nativeBuildInputs = with pkgs; [
-              python3
-              nodePackages.patch-package
-              jq
-            ];
             npmDepsHash = hashesFile.npmDepsHash;
             npmBuildScript = "build:src";
             makeCacheWritable = true;
-            postPatch = ''
-              echo "Patching postinstall to use OS-provided patch-package"
-              jq -r '.scripts["postinstall"] = "patch-package"' package.json > package.tmp.json
-              mv package.tmp.json package.json
-            '';
+            nativeBuildInputs = with pkgs; [
+              python3
+            ];
             installPhase = ''
               runHook preInstall
               # set -x
@@ -118,7 +112,7 @@
 
         containers.docker = pkgs.dockerTools.buildLayeredImage {
           name = "spacebar-server-ts";
-          tag = "latest";
+          tag = self.packages.${system}.default.version;
           contents = [ self.packages.${system}.default ];
           config = {
             Cmd = [ "${self.outputs.packages.${system}.default}/bin/start-bundle" ];
@@ -145,6 +139,7 @@
         pkgs.lib.recursiveUpdate (pkgs.lib.attrsets.unionOfDisjoint { } self.packages) {
           x86_64-linux = {
             spacebar-server-tests = self.packages.x86_64-linux.default.passthru.tests;
+            docker-image = self.containers.x86_64-linux.docker;
           };
         };
     };
diff --git a/hashes.json b/hashes.json
index 0dc4ff93..3d95c360 100644
--- a/hashes.json
+++ b/hashes.json
@@ -1,3 +1,3 @@
 {
-  "npmDepsHash": "sha256-45XGoErD/Lm0QunatMHZnUtrlpcmYmlwUyUGhwjrBHU="
+  "npmDepsHash": "sha256-v3RAXTGnVkLK2KpQLHfT9BBh27L9f/N9F1MMAUghkV4="
 }
diff --git a/package-lock.json b/package-lock.json
index e43c18b00ce9f888fd6d3950cab024820582c415..c1942619a8616c338f5a0145826850f2e396f6f5 100644
GIT binary patch
delta 3281
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

delta 129
zcmV-{0Dk|1+7<eq6|h?ggL(<KdI<qz^0yQH0g7d}N@N1xnzgY5MiRHI6a$tRm)kW1
zI=6o<16ww?m}LWX3AcZ616mN5z=H!2w>*ObQ31DyhXbSrw}FoXZ+o{t3<UQCw+0gg
jS01;AHUxQ*w>rrL`7*a_{RE;qw_-U3$tt&wWd(Ex8&5KF

diff --git a/package.json b/package.json
index a1d2f554..01a705db 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
 	"description": "A Spacebar server written in Node.js",
 	"scripts": {
 		"prepare": "husky install",
-		"postinstall": "npx patch-package",
+		"postinstall": "patch-package",
 		"start": "node --enable-source-maps dist/bundle/start.js",
 		"start:api": "node --enable-source-maps dist/api/start.js",
 		"start:cdn": "node --enable-source-maps dist/cdn/start.js",
@@ -65,6 +65,7 @@
 		"eslint": "^9.39.1",
 		"globals": "^16.5.0",
 		"husky": "^9.1.7",
+		"patch-package": "^8.0.1",
 		"prettier": "^3.6.2",
 		"pretty-quick": "^4.2.2",
 		"ts-node": "^10.9.2",