demostf/inspector
1
0
Fork 0
mirror of https://codeberg.org/demostf/inspector.git synced 2026-06-03 18:14:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

move from npmlock2nix to importNpmLock

Browse source
This commit is contained in:
Robin Appelman 2025-03-30 17:06:44 +02:00
commit f42df09863
3 changed files with 18 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1733157473, "lastModified": 1743346844,
"narHash": "sha256-rfg19HAHOMW4zwkqWkPdTjdHyVwo/zaJXmvRqtqis9M=", "narHash": "sha256-GFFXotsFqOR6TMmOiYexauMgzRZsuDHYKl3wcOT8CI0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "88b018ad401e040c0a33420077d86b20aea177c7", "rev": "fcaa66107edbe214f7bf9713d7706609c7b83471",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -15,27 +15,9 @@
"type": "indirect" "type": "indirect"
} }
}, },
"npmlock2nix": {
"flake": false,
"locked": {
"lastModified": 1705787129,
"narHash": "sha256-qJc3ffjHVXUdZqytKcDK9XZ2b3BQ1RdYfZFuYgxbrn4=",
"owner": "icewind1991",
"repo": "npmlock2nix",
"rev": "d80d5c4c3c779ed55abace6cd24e7d959eea4574",
"type": "github"
},
"original": {
"owner": "icewind1991",
"ref": "local-packages",
"repo": "npmlock2nix",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"npmlock2nix": "npmlock2nix",
"rust-overlay": "rust-overlay", "rust-overlay": "rust-overlay",
"utils": "utils" "utils": "utils"
} }
@ -47,11 +29,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733106880, "lastModified": 1743302122,
"narHash": "sha256-aJmAIjZfWfPSWSExwrYBLRgXVvgF5LP1vaeUGOOIQ98=", "narHash": "sha256-VWyaUfBY49kjN29N140INa9LEW0YIgAr+OEJRdbKfnQ=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "e66c0d43abf5bdefb664c3583ca8994983c332ae", "rev": "15c2a7930e04efc87be3ebf1b5d06232e635e24b",
"type": "github" "type": "github"
}, },
"original": { "original": {

10
flake.nix
View file

@ -5,11 +5,6 @@
rust-overlay = { rust-overlay = {
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "utils";
};
npmlock2nix = {
url = "github:icewind1991/npmlock2nix/local-packages";
flake = false;
}; };
}; };
@ -18,15 +13,10 @@
nixpkgs, nixpkgs,
utils, utils,
rust-overlay, rust-overlay,
npmlock2nix,
}: }:
utils.lib.eachDefaultSystem (system: let utils.lib.eachDefaultSystem (system: let
overlays = [ overlays = [
(import rust-overlay) (import rust-overlay)
(final: prev: {
nodejs-16_x = final.nodejs;
npmlock2nix = import npmlock2nix {pkgs = final;};
})
(import ./overlay.nix) (import ./overlay.nix)
]; ];
pkgs = import nixpkgs { pkgs = import nixpkgs {

20
modules.nix
View file

@ -1,12 +1,16 @@
{ {
npmlock2nix, importNpmLock,
nodejs_20,
demo-inspector-wasm, demo-inspector-wasm,
}: nodejs,
npmlock2nix.v2.node_modules { }: importNpmLock.buildNodeModules {
src = ./www; npmRoot = ./www;
nodejs = nodejs_20; derivationArgs = {
localPackages = { npmDeps = importNpmLock {
"demo-inspector" = demo-inspector-wasm; npmRoot = ./www;
packageSourceOverrides = {
"node_modules/demo-inspector" = demo-inspector-wasm;
};
};
}; };
inherit nodejs;
} }