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

move from npmlock2nix to importNpmLock

Browse source
This commit is contained in:
Robin Appelman 2025-03-30 16:01:15 +02:00
commit 0c7e51f94b
3 changed files with 6 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

19
flake.lock generated
View file

@ -72,28 +72,11 @@
"type": "indirect" "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": { "root": {
"inputs": { "inputs": {
"flakelight": "flakelight", "flakelight": "flakelight",
"mill-scale": "mill-scale", "mill-scale": "mill-scale",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"npmlock2nix": "npmlock2nix"
} }
}, },
"rust-overlay": { "rust-overlay": {

8
flake.nix
View file

@ -9,14 +9,9 @@
url = "github:icewind1991/mill-scale"; url = "github:icewind1991/mill-scale";
inputs.flakelight.follows = "flakelight"; inputs.flakelight.follows = "flakelight";
}; };
npmlock2nix = {
url = "github:nix-community/npmlock2nix";
flake = false;
};
}; };
outputs = { outputs = {
mill-scale, mill-scale,
npmlock2nix,
... ...
}: }:
mill-scale ./. { mill-scale ./. {
@ -32,9 +27,6 @@
./style ./style
]; ];
withOverlays = [ withOverlays = [
(final: prev: {
npmlock2nix = final.callPackage npmlock2nix {};
})
(final: prev: { (final: prev: {
nodejs-16_x = final.nodejs; nodejs-16_x = final.nodejs;
demostf-frontend-toolchain = final.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml; demostf-frontend-toolchain = final.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;

10
nix/node_modules.nix
View file

@ -1,11 +1,11 @@
{ {
npmlock2nix, importNpmLock,
nodejs_20, nodejs,
lib, lib,
}: let }: let
inherit (lib.sources) sourceByRegex; inherit (lib.sources) sourceByRegex;
in in
npmlock2nix.v2.node_modules { importNpmLock.buildNodeModules {
src = sourceByRegex ../. ["package.*"]; inherit nodejs;
nodejs = nodejs_20; npmRoot = sourceByRegex ../. ["package.*"];
} }