mirror of
https://codeberg.org/demostf/frontend.git
synced 2026-06-03 10:14:13 +02:00
move from npmlock2nix to importNpmLock
This commit is contained in:
parent
de3a2f6009
commit
0c7e51f94b
3 changed files with 6 additions and 31 deletions
19
flake.lock
generated
19
flake.lock
generated
|
|
@ -72,28 +72,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": {
|
||||
"flakelight": "flakelight",
|
||||
"mill-scale": "mill-scale",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"npmlock2nix": "npmlock2nix"
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
"rust-overlay": {
|
||||
|
|
|
|||
|
|
@ -9,14 +9,9 @@
|
|||
url = "github:icewind1991/mill-scale";
|
||||
inputs.flakelight.follows = "flakelight";
|
||||
};
|
||||
npmlock2nix = {
|
||||
url = "github:nix-community/npmlock2nix";
|
||||
flake = false;
|
||||
};
|
||||
};
|
||||
outputs = {
|
||||
mill-scale,
|
||||
npmlock2nix,
|
||||
...
|
||||
}:
|
||||
mill-scale ./. {
|
||||
|
|
@ -32,9 +27,6 @@
|
|||
./style
|
||||
];
|
||||
withOverlays = [
|
||||
(final: prev: {
|
||||
npmlock2nix = final.callPackage npmlock2nix {};
|
||||
})
|
||||
(final: prev: {
|
||||
nodejs-16_x = final.nodejs;
|
||||
demostf-frontend-toolchain = final.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
npmlock2nix,
|
||||
nodejs_20,
|
||||
importNpmLock,
|
||||
nodejs,
|
||||
lib,
|
||||
}: let
|
||||
inherit (lib.sources) sourceByRegex;
|
||||
in
|
||||
npmlock2nix.v2.node_modules {
|
||||
src = sourceByRegex ../. ["package.*"];
|
||||
nodejs = nodejs_20;
|
||||
importNpmLock.buildNodeModules {
|
||||
inherit nodejs;
|
||||
npmRoot = sourceByRegex ../. ["package.*"];
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue