diff --git a/flake.lock b/flake.lock index 9dfe9b344..126832bed 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1682258674, - "narHash": "sha256-nSqXN+dBgw8+DeE3vBhdHB7C2p+2QBDsA27ZptjJz/Y=", - "owner": "lilyinstarlight", + "lastModified": 1685655444, + "narHash": "sha256-6EujQNAeaUkWvpEZZcVF8qSfQrNVWFNNGbUJxv/A5a8=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "47c77aa566f5114b4d759280702b9b910d3c7f0f", + "rev": "e635192892f5abbc2289eaac3a73cdb249abaefd", "type": "github" }, "original": { - "owner": "lilyinstarlight", - "ref": "unheck/nodejs", + "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index ececb54d9..0fc5d342f 100644 --- 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 index ff88af789..9f3d033d5 100644 --- 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: