From c83c3f7b242a593c51abcd09b2882eefaadeca22 Mon Sep 17 00:00:00 2001 From: Matthias Meissner Date: Wed, 2 Oct 2024 11:22:41 +0200 Subject: [PATCH 1/4] sync wasm-bindgen version between cargo and nix --- flake.nix | 6 +++--- nemo-wasm/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 962907919..2e141ef89 100644 --- a/flake.nix +++ b/flake.nix @@ -27,9 +27,9 @@ rec { rust-overlay.overlays.default (final: prev: { wasm-bindgen-cli = channels.nixpkgs-unstable.wasm-bindgen-cli.override { - version = "0.2.92"; - hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0="; - cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0="; + version = "0.2.93"; + hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0="; + cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ="; }; }) ]; diff --git a/nemo-wasm/Cargo.toml b/nemo-wasm/Cargo.toml index 432406182..101b487ae 100644 --- a/nemo-wasm/Cargo.toml +++ b/nemo-wasm/Cargo.toml @@ -25,7 +25,7 @@ nemo-language-server = { path = "../nemo-language-server", features = [ "js" ], futures = "0.3.21" gloo-utils = { version = "0.1", features = ["serde"] } thiserror = "1.0" -wasm-bindgen = "0.2" +wasm-bindgen = "=0.2.93" wasm-bindgen-futures = "0.4.37" web-sys = { version = "0.3.64", features = [ "Blob", "FileReaderSync", "FileSystemSyncAccessHandle" ]} From 42b7f84c2c4bf0629faaa0c7561f6d3d840200d3 Mon Sep 17 00:00:00 2001 From: Maximilian Marx Date: Wed, 2 Oct 2024 12:47:22 +0200 Subject: [PATCH 2/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs-unstable': 'github:NixOS/nixpkgs/d0e1602ddde669d5beb01aec49d71a51937ed7be' (2024-08-24) → 'github:NixOS/nixpkgs/06cf0e1da4208d3766d898b7fdab6513366d45b9' (2024-09-29) • Updated input 'rust-overlay': 'github:oxalica/rust-overlay/6a1c4915dca7149e7258d8c7f3ac634d8c65f6c6' (2024-08-28) → 'github:oxalica/rust-overlay/02321540b0c8000b36889b1b974d1fec585b25a4' (2024-10-02) --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index bdf38a23f..6f1388b17 100644 --- a/flake.lock +++ b/flake.lock @@ -36,11 +36,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1724479785, - "narHash": "sha256-pP3Azj5d6M5nmG68Fu4JqZmdGt4S4vqI5f8te+E/FTw=", + "lastModified": 1727634051, + "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d0e1602ddde669d5beb01aec49d71a51937ed7be", + "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", "type": "github" }, "original": { @@ -65,11 +65,11 @@ ] }, "locked": { - "lastModified": 1724811750, - "narHash": "sha256-PvhVgQ1rm3gfhK7ts4emprhh/KMkFwXogmgsQ3srR7g=", + "lastModified": 1727836133, + "narHash": "sha256-JE0zciM5IGWvK8J/pE2VldNBf7oyMH5WrU8tZArefbg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "6a1c4915dca7149e7258d8c7f3ac634d8c65f6c6", + "rev": "02321540b0c8000b36889b1b974d1fec585b25a4", "type": "github" }, "original": { From 0af953ad9162cd977851231d2a3fd4945b219ea6 Mon Sep 17 00:00:00 2001 From: Maximilian Marx Date: Wed, 2 Oct 2024 12:52:12 +0200 Subject: [PATCH 3/4] Drop obsolete flake-utils input on rust-overlay Signed-off-by: Maximilian Marx --- flake.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/flake.nix b/flake.nix index 2e141ef89..cd1511d92 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,6 @@ rec { rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "utils/flake-utils"; }; utils.url = "github:gytis-ivaskevicius/flake-utils-plus"; From de5683c22cd92dbca0b719c461f7b2c279dba2af Mon Sep 17 00:00:00 2001 From: Matthias Meissner Date: Wed, 2 Oct 2024 14:39:18 +0200 Subject: [PATCH 4/4] inherit wasm-bindgen from nixpkgs-unstable --- flake.nix | 6 +----- nemo-wasm/Cargo.toml | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index cd1511d92..17ae83afd 100644 --- a/flake.nix +++ b/flake.nix @@ -25,11 +25,7 @@ rec { channels.nixpkgs.overlaysBuilder = channels: [ rust-overlay.overlays.default (final: prev: { - wasm-bindgen-cli = channels.nixpkgs-unstable.wasm-bindgen-cli.override { - version = "0.2.93"; - hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0="; - cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ="; - }; + inherit (channels.nixpkgs-unstable) wasm-bindgen-cli; }) ]; diff --git a/nemo-wasm/Cargo.toml b/nemo-wasm/Cargo.toml index 101b487ae..b4f44a06f 100644 --- a/nemo-wasm/Cargo.toml +++ b/nemo-wasm/Cargo.toml @@ -25,6 +25,7 @@ nemo-language-server = { path = "../nemo-language-server", features = [ "js" ], futures = "0.3.21" gloo-utils = { version = "0.1", features = ["serde"] } thiserror = "1.0" +# NOTE: the version of wasm-bindgen must be kept in sync with flake.nix wasm-bindgen = "=0.2.93" wasm-bindgen-futures = "0.4.37" web-sys = { version = "0.3.64", features = [ "Blob", "FileReaderSync", "FileSystemSyncAccessHandle" ]}