Skip to content

Commit

Permalink
sync wasm-bindgen version between cargo and nix (#541)
Browse files Browse the repository at this point in the history
`nix flake check` should now work again.
  • Loading branch information
mmarx authored Oct 2, 2024
2 parents 12780b1 + de5683c commit 8e78e06
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
12 changes: 6 additions & 6 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 1 addition & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -26,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.92";
hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=";
cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0=";
};
inherit (channels.nixpkgs-unstable) wasm-bindgen-cli;
})
];

Expand Down
3 changes: 2 additions & 1 deletion nemo-wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ 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"
# 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" ]}

Expand Down

0 comments on commit 8e78e06

Please sign in to comment.