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

nix 23.05

Browse source
This commit is contained in:
Robin Appelman 2023-06-01 16:41:10 +02:00
commit a6ae078ff3
3 changed files with 36 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

40
flake.lock generated
View file

@ -2,16 +2,16 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1674902473, "lastModified": 1685625254,
"narHash": "sha256-MdKJeeDTjCtmoVPWLEDg10jgknt6rqTO3c1WeNQtho4=", "narHash": "sha256-Hs+Xg20rRSRneMRNYtYu20l25buQ0zSydsw2fj7XYiI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "548896f4d9f7db2f7205d82727d6c03c86d2f896", "rev": "0461dd66cfd0d74146a737fa511e3957f68bf26a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "release-22.11", "ref": "release-23.05",
"type": "indirect" "type": "indirect"
} }
}, },
@ -49,11 +49,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1674872860, "lastModified": 1685587239,
"narHash": "sha256-IH6FckXyjJ4atdYzIIkBBILucoFmjAqvm+NWqFqcmHg=", "narHash": "sha256-zpOir1AWpWyQscP5dMpqMrCgBzjzH7Wv0FNUsQ0dcS0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "bbc57d7aac4ac1ec0a68ff77a22d03622cc11246", "rev": "acb7e896a73b0cf2c6ffe40b2051eb7f88fc2a10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -62,13 +62,31 @@
"type": "github" "type": "github"
} }
}, },
"utils": { "systems": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1681028828,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1685518550,
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
"type": "github" "type": "github"
}, },
"original": { "original": {

9
flake.nix
View file

@ -1,6 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/release-22.11"; nixpkgs.url = "nixpkgs/release-23.05";
utils.url = "github:numtide/flake-utils"; utils.url = "github:numtide/flake-utils";
rust-overlay = { rust-overlay = {
url = "github:oxalica/rust-overlay"; url = "github:oxalica/rust-overlay";
@ -29,7 +29,7 @@
targets = [ "wasm32-unknown-unknown" ]; targets = [ "wasm32-unknown-unknown" ];
}); });
demo-inspector-wasm = import ./wasm.nix final; demo-inspector-wasm = import ./wasm.nix final;
nodejs = final.nodejs-16_x; nodejs = final.nodejs_20;
node_modules = let node_modules = let
without-local-deps = without-local-deps =
prev.stdenv.mkDerivation { prev.stdenv.mkDerivation {
@ -54,6 +54,7 @@
npmlock2nix-d = npmlock2nix-d =
final.npmlock2nix.v2.node_modules { final.npmlock2nix.v2.node_modules {
src = without-local-deps; src = without-local-deps;
nodejs = final.nodejs;
}; };
with-local-deps = with-local-deps =
@ -77,7 +78,7 @@
cargo-edit cargo-edit
bacon bacon
wasm-pack wasm-pack
nodejs nodejs_20
node2nix node2nix
wasm-bindgen-cli wasm-bindgen-cli
]; ];
@ -93,7 +94,7 @@
src = ./www; src = ./www;
nativeBuildInputs = with pkgs; [nodejs]; nativeBuildInputs = with pkgs; [nodejs_20];
buildPhase = with pkgs; '' buildPhase = with pkgs; ''
cp -r ${node_modules}/node_modules ./node_modules cp -r ${node_modules}/node_modules ./node_modules
npm run build npm run build

5
wasm.nix
View file

@ -13,7 +13,7 @@ pkgs: let
buildInputs = with pkgs; [ openssl ]; buildInputs = with pkgs; [ openssl ];
checkInputs = [ pkgs.nodejs ]; checkInputs = [ pkgs.nodejs_20 ];
# other tests require it to be ran in the wasm-bindgen monorepo # other tests require it to be ran in the wasm-bindgen monorepo
cargoTestFlags = [ "--test=interface-types" ]; cargoTestFlags = [ "--test=interface-types" ];
@ -26,7 +26,8 @@ in pkgs.rustPlatform.buildRustPackage rec {
src = ./wasm; src = ./wasm;
nativeBuildInputs = [pkgs.rust-wasm pkgs.wasm-pack wasm-bindgen-cli]; WASM_PACK_CACHE = "/build/cache";
nativeBuildInputs = [pkgs.rust-wasm pkgs.wasm-pack wasm-bindgen-cli pkgs.binaryen];
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
( (