rebase?

.gitignore

@@ -18,4 +18,5 @@ build
 *.log.ansi
 *.tmp
 tmp/
-dump/
+dump/
+result

flake.nix

@@ -3,7 +3,6 @@
 
   inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
-  #inputs.nixpkgs.url = "github:lilyinstarlight/nixpkgs/unheck/nodejs";
 
   outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachSystem flake-utils.lib.allSystems (system:
@@ -17,8 +16,7 @@
 			src = ./.;
 			name = "spacebar-server-ts";
 			nativeBuildInputs = with pkgs; [ python3 ];
-			npmDepsHash = "sha256-WYPSYfKHK2Cq02lOl8w8A1TUSnliw06Kq4YocuuIfms=";
-			#dontNpmBuild = true;
+			npmDepsHash = "";
 			makeCacheWritable = true;
 			postPatch = ''
 				substituteInPlace package.json --replace 'npx patch-package' '${pkgs.nodePackages.patch-package}/bin/patch-package'

nix-rebuild-flake.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i "bash -x" -p bash
-DEPS_HASH=`nix run github:lilyinstarlight/nixpkgs/unheck/nodejs#prefetch-npm-deps -- package-lock.json`
+DEPS_HASH=`nix run nixpkgs#prefetch-npm-deps -- package-lock.json`
 sed 's/$NPM_HASH/'${DEPS_HASH/\//\\\/}'/g' flake.template.nix > flake.nix

package.json

@@ -65,7 +65,6 @@
 		"typescript": "^4.9.4"
 	},
 	"dependencies": {
-		"express": "^4.18.1",
 		"@aws-sdk/client-s3": "^3.178.0",
 		"@sentry/integrations": "^7.17.2",
 		"@sentry/node": "^7.17.2",
@@ -79,6 +78,7 @@
 		"cookie-parser": "^1.4.6",
 		"dotenv": "^16.0.2",
 		"exif-be-gone": "^1.3.1",
+		"express": "^4.18.1",
 		"fast-zlib": "^2.0.1",
 		"fido2-lib": "^3.3.5",
 		"file-type": "16.5",
@@ -98,6 +98,7 @@
 		"node-fetch": "^2.6.7",
 		"node-os-utils": "^1.3.7",
 		"nodemailer": "^6.9.0",
+		"pg": "^8.11.3",
 		"picocolors": "^1.0.0",
 		"probe-image-size": "^7.2.3",
 		"proxy-agent": "^5.0.0",