move from npmlock2nix to importNpmLock

flake.lock

@@ -2,39 +2,22 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1686059680,
-        "narHash": "sha256-sp0WlCIeVczzB0G8f8iyRg3IYW7KG31mI66z7HIZwrI=",
+        "lastModified": 1743343851,
+        "narHash": "sha256-CJzC/ep91KqYSrfQM82AMwZ0wLRIl7sLIvBU63os1cA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a558f7ac29f50c4b937fb5c102f587678ae1c9fb",
+        "rev": "c7fbe149cc899821bff6d1c09fa7a8ed31e94fd9",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "ref": "release-23.05",
+        "ref": "release-24.11",
         "type": "indirect"
       }
     },
-    "npmlock2nix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1673447413,
-        "narHash": "sha256-sJM82Sj8yfQYs9axEmGZ9Evzdv/kDcI9sddqJ45frrU=",
-        "owner": "nix-community",
-        "repo": "npmlock2nix",
-        "rev": "9197bbf397d76059a76310523d45df10d2e4ca81",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "npmlock2nix",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "nixpkgs": "nixpkgs",
-        "npmlock2nix": "npmlock2nix",
         "utils": "utils"
       }
     },
@@ -58,11 +41,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1685518550,
-        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,25 +1,17 @@
 {
   inputs = {
-    nixpkgs.url = "nixpkgs/release-23.05";
+    nixpkgs.url = "nixpkgs/release-24.11";
     utils.url = "github:numtide/flake-utils";
-    npmlock2nix = {
-      url = "github:nix-community/npmlock2nix";
-      flake = false;
-    };
   };
 
   outputs = {
     self,
     nixpkgs,
     utils,
-    npmlock2nix,
   }:
     utils.lib.eachDefaultSystem (system: let
       overlays = [
-        (final: prev: {
-          npmlock2nix = prev.callPackage npmlock2nix {};
-        })
-        (import ./overlay.nix)
+        (import ./nix/overlay.nix)
       ];
       pkgs = import nixpkgs {
         inherit system overlays;
@@ -37,6 +29,6 @@
       };
     })
     // {
-      overlays.default = import ./overlay.nix;
+      overlays.default = import ./nix/overlay.nix;
     };
 }

nix/package.nix

@@ -0,0 +1,20 @@
+{
+  buildNpmPackage,
+  importNpmLock,
+  lib,
+}: let
+  src = lib.sources.sourceByRegex (lib.cleanSource ../.) ["package.*" "src(/.*)?" "tsconfig.json" ".*.config.js"];
+in buildNpmPackage {
+  pname = "mapboundaries";
+  version = "0.1.0";
+
+  inherit src;
+
+  npmDeps = importNpmLock {
+    npmRoot = src;
+  };
+
+  npmConfigHook = importNpmLock.npmConfigHook;
+
+  installPhase = "cp -r build $out";
+}

package.nix

@@ -1,13 +0,0 @@
-{
-  npmlock2nix,
-  nodejs_20,
-  lib,
-}: let
-  src = lib.sources.sourceByRegex (lib.cleanSource ./.) ["package.*" "src(/.*)?" "tsconfig.json" ".*.config.js"];
-in
-  npmlock2nix.v2.build {
-    inherit src;
-    installPhase = "cp -r build $out";
-    buildCommands = ["npm run build"];
-    nodejs = nodejs_20;
-  }