Rebase and update inputs

spacebarchat · Jun 3, 2023 · 9e99df8 · 9e99df8
1 parent d801304
commit 9e99df8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,9 +1,9 @@
 {
   description = "Spacebar server, written in Typescript.";
 
-  #inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
+  inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
   inputs.flake-utils.url = "github:numtide/flake-utils";
-  inputs.nixpkgs.url = "github:lilyinstarlight/nixpkgs/unheck/nodejs";
+  #inputs.nixpkgs.url = "github:lilyinstarlight/nixpkgs/unheck/nodejs";
 
   outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachSystem flake-utils.lib.allSystems (system:
@@ -14,11 +14,11 @@
 	in rec {
 		packages.default = pkgs.buildNpmPackage {
 			pname = "spacebar-server-ts";
-			meta.mainProgram = "start-bundle";
 			src = ./.;
 			name = "spacebar-server-ts";
 			nativeBuildInputs = with pkgs; [ python3 ];
 			npmDepsHash = "sha256-WYPSYfKHK2Cq02lOl8w8A1TUSnliw06Kq4YocuuIfms=";
+			#dontNpmBuild = true;
 			makeCacheWritable = true;
 			postPatch = ''
 				substituteInPlace package.json --replace 'npx patch-package' '${pkgs.nodePackages.patch-package}/bin/patch-package'

diff --git a/flake.template.nix b/flake.template.nix
@@ -1,9 +1,8 @@
 {
   description = "Spacebar server, written in Typescript.";
 
-  #inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
+  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: