Add utility scripts

flake.lock

@@ -20,41 +20,24 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1681932375,
-        "narHash": "sha256-tSXbYmpnKSSWpzOrs27ie8X3I0yqKA6AuCzCYNtwbCU=",
-        "owner": "nixos",
+        "lastModified": 1682258674,
+        "narHash": "sha256-nSqXN+dBgw8+DeE3vBhdHB7C2p+2QBDsA27ZptjJz/Y=",
+        "owner": "lilyinstarlight",
         "repo": "nixpkgs",
-        "rev": "3d302c67ab8647327dba84fbdb443cdbf0e82744",
+        "rev": "47c77aa566f5114b4d759280702b9b910d3c7f0f",
         "type": "github"
       },
       "original": {
-        "owner": "nixos",
-        "ref": "nixos-22.11",
+        "owner": "lilyinstarlight",
+        "ref": "unheck/nodejs",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
-    "pnpm2nix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1676829786,
-        "narHash": "sha256-ywnp/Y20Bv62Vs4v39NezJ4irSg6IJUR+J25hBMu+yA=",
-        "owner": "TheArcaneBrony",
-        "repo": "pnpm2nix",
-        "rev": "65e000773abd988f1f0cb99ff592d7945e7dd349",
-        "type": "github"
-      },
-      "original": {
-        "owner": "TheArcaneBrony",
-        "repo": "pnpm2nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "flake-utils": "flake-utils",
-        "nixpkgs": "nixpkgs",
-        "pnpm2nix": "pnpm2nix"
+        "nixpkgs": "nixpkgs"
       }
     },
     "systems": {

flake.nix

@@ -1,25 +1,29 @@
 {
   description = "Spacebar client, written in React.";
 
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
+  #inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
   inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.pnpm2nix.url = "github:TheArcaneBrony/pnpm2nix";
+  #inputs.pnpm2nix.url = "github:TheArcaneBrony/pnpm2nix";
   #inputs.pnpm2nix.url = "path:/home/root@Rory/git/spacebar/client/pnpm2nix";
-  inputs.pnpm2nix.flake = false;
+  #inputs.pnpm2nix.flake = false;
+  inputs.nixpkgs.url = "github:lilyinstarlight/nixpkgs/unheck/nodejs";
 
-  outputs = { self, nixpkgs, flake-utils, pnpm2nix }:
+  outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachDefaultSystem (system:
 	let
 		pkgs = import nixpkgs {
 			inherit system;
 		};
-		_pnpm2nix = import pnpm2nix { pkgs = nixpkgs.legacyPackages.${system}; };
+		#_pnpm2nix = import pnpm2nix { pkgs = nixpkgs.legacyPackages.${system}; };
 	in rec {
-		packages.default = _pnpm2nix.mkPnpmPackage {
+		#packages.default = _pnpm2nix.mkPnpmPackage {
+		packages.default = pkgs.buildNpmPackage {
+			pname = "spacebar-client-react";
 			src = ./.;
-			buildInputs = with pkgs; [
-
-			];
+			name = "spacebar-client-react";
+			#buildInputs = with pkgs; [ prefetch-npm-deps ];
+			npmDepsHash = "sha256-b/L2pEhqRYVDNg5jYBIahAdbSW4GLgVQEnwziDBprW8=";
+			makeCacheWritable = true;
 		};
 		devShell = pkgs.mkShell {
 			buildInputs = with pkgs; [

flake.template.nix

@@ -0,0 +1,37 @@
+{
+  description = "Spacebar client, written in React.";
+
+  #inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
+  inputs.flake-utils.url = "github:numtide/flake-utils";
+  #inputs.pnpm2nix.url = "github:TheArcaneBrony/pnpm2nix";
+  #inputs.pnpm2nix.url = "path:/home/root@Rory/git/spacebar/client/pnpm2nix";
+  #inputs.pnpm2nix.flake = false;
+  inputs.nixpkgs.url = "github:lilyinstarlight/nixpkgs/unheck/nodejs";
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+	let
+		pkgs = import nixpkgs {
+			inherit system;
+		};
+		#_pnpm2nix = import pnpm2nix { pkgs = nixpkgs.legacyPackages.${system}; };
+	in rec {
+		#packages.default = _pnpm2nix.mkPnpmPackage {
+		packages.default = pkgs.buildNpmPackage {
+			pname = "spacebar-client-react";
+			src = ./.;
+			name = "spacebar-client-react";
+			#buildInputs = with pkgs; [ ];
+			npmDepsHash = "$NPM_HASH";
+			makeCacheWritable = true;
+		};
+		devShell = pkgs.mkShell {
+			buildInputs = with pkgs; [
+				nodejs
+				nodePackages.pnpm
+				nodePackages.typescript
+			];
+		};
+	}
+    );
+}

nix-build-test.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+#nix build --update-input pnpm2nix --debugger --ignore-try
+nix build --debugger --ignore-try --print-out-paths --print-build-logs --http2 "$@"

nix-rebuild-flake.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i "bash -x" -p nodejs nodePackages.ts-node prefetch-npm-deps bash
+rm -rfv package-lock.json
+npm i --save --ignore-scripts
+DEPS_HASH=`prefetch-npm-deps package-lock.json`
+sed 's/$NPM_HASH/'${DEPS_HASH/\//\\\/}'/g' flake.template.nix > flake.nix
+#sha256-5iurI8d2mael4qR/gs4IeZpf5d6+QPBoZ+kvhrwoOIU=