From d33a09f8e59648d6a6ecad5ebce35b531253d9a9 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Sun, 31 May 2026 14:16:18 +0200 Subject: [PATCH] 26.05 --- flake.lock | 34 +++++++++++++++++----------------- flake.nix | 2 +- nix/package.nix | 4 ++-- nix/wasm.nix | 6 +++--- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 1b6ef4f..6c2ce80 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "crane": { "locked": { - "lastModified": 1748970125, - "narHash": "sha256-UDyigbDGv8fvs9aS95yzFfOKkEjx1LO3PL3DsKopohA=", + "lastModified": 1774313767, + "narHash": "sha256-hy0XTQND6avzGEUFrJtYBBpFa/POiiaGBr2vpU6Y9tY=", "owner": "ipetkov", "repo": "crane", - "rev": "323b5746d89e04b22554b061522dfce9e4c49b18", + "rev": "3d9df76e29656c679c744968b17fbaf28f0e923d", "type": "github" }, "original": { @@ -22,11 +22,11 @@ ] }, "locked": { - "lastModified": 1750683087, - "narHash": "sha256-CkmobghX9K9soC4DoorFo/vlWXxpf8xuZyoCsOnWzqM=", + "lastModified": 1779722240, + "narHash": "sha256-cX1d9V5JHTytsSdH8RrgyU4fFdm4oooRuKBcJuiyI4U=", "owner": "nix-community", "repo": "flakelight", - "rev": "aa93e0e1ecdccc70c7a185f60c562effbfe3c8d9", + "rev": "6908ac68dd682d1cb22fdb9391b890798f083a48", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1751058017, - "narHash": "sha256-Pa6Nnkp9sW7ufONQE9jvIDb1rUQUjVsAVZRGU9R3xp0=", + "lastModified": 1776692281, + "narHash": "sha256-DCCSbpTUDqRiHsTS/sIgCTwa1r4gsJlWSFE6difdWxk=", "ref": "refs/heads/main", - "rev": "8907224f8770afd89894b4c927d86c9c249d5593", - "revCount": 54, + "rev": "d1d0e0bb5b0acebed06ccced9cc27f82aafab058", + "revCount": 71, "type": "git", "url": "https://codeberg.org/icewind/mill-scale.git" }, @@ -59,16 +59,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750838302, - "narHash": "sha256-aVkL3/yu50oQzi2YuKo0ceiCypVZpZXYd2P2p1FMJM4=", + "lastModified": 1780051219, + "narHash": "sha256-WnxzG4x47uCgjz+uD+vOzbF+Qid+hKyYdJWbduA9w7g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7284e2decc982b81a296ab35aa46e804baaa1cfe", + "rev": "e8e446a361172fe838243958325845d0b845c5e5", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-25.05", + "ref": "nixos-26.05", "type": "indirect" } }, @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1750214276, - "narHash": "sha256-1kniuhH70q4TAC/xIvjFYH46aHiLrbIlcr6fdrRwO1A=", + "lastModified": 1774535687, + "narHash": "sha256-dpKS/8+uB0EoI4mCrpio+xs8Xxry6ZhLLwV8VIbbfrs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f9b2b2b1327ff6beab4662b8ea41689e0a57b8d4", + "rev": "75900435aa883f84b038316864b3f60956681523", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d7c48cc..52cc8ac 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,6 @@ { inputs = { - nixpkgs.url = "nixpkgs/nixos-25.05"; + nixpkgs.url = "nixpkgs/nixos-26.05"; flakelight = { url = "github:nix-community/flakelight"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nix/package.nix b/nix/package.nix index 838c1bd..884e4ff 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -1,6 +1,6 @@ { stdenv, - nodejs_20, + nodejs, demo-inspector-node-modules, }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { src = ../www; - nativeBuildInputs = [nodejs_20]; + nativeBuildInputs = [nodejs]; buildPhase = '' cp -r ${demo-inspector-node-modules}/node_modules ./node_modules npm run build diff --git a/nix/wasm.nix b/nix/wasm.nix index b04b44b..605dc5e 100644 --- a/nix/wasm.nix +++ b/nix/wasm.nix @@ -1,6 +1,6 @@ { rustPlatform, - nodejs_20, + nodejs, pkg-config, openssl, fetchCrate, @@ -24,7 +24,7 @@ buildInputs = [openssl]; - checkInputs = [nodejs_20]; + checkInputs = [nodejs]; dontCargoCheck = true; }; @@ -32,7 +32,7 @@ targets = ["wasm32-unknown-unknown"]; }; in - rustPlatform.buildRustPackage rec { + rustPlatform.buildRustPackage { name = "demo-inspector-wasm"; version = "0.1.0";