Hello world!
- - diff --git a/checks/trunk-outdated-bindgen/src/main.rs b/checks/trunk-outdated-bindgen/src/main.rs deleted file mode 100644 index 1ad0b817..00000000 --- a/checks/trunk-outdated-bindgen/src/main.rs +++ /dev/null @@ -1,4 +0,0 @@ -fn main() { - console_log::init().unwrap(); - log::debug!("Hi, this can run on the browser"); -} diff --git a/checks/trunk.nix b/checks/trunk.nix index b1568888..a37e2f2a 100644 --- a/checks/trunk.nix +++ b/checks/trunk.nix @@ -39,22 +39,10 @@ let trunkSimpleNoArtifacts = myLibWasm.buildTrunkPackage (defaultArgs // { pname = "trunk-simple-no-artifacts"; }); - - trunkOutdatedBindgen = myLibWasm.buildTrunkPackage { - pname = "trunk-outdated-bindgen"; - src = ./trunk-outdated-bindgen; - doCheck = false; - wasm-bindgen-cli = pkgs.wasm-bindgen-cli.override { - version = "0.2.85"; - hash = "sha256-0pTIzpu7dJM34CXmi83e8UV0E3N2bKJiOMw5WJQ2s/Y="; - cargoHash = "sha256-ZwmoFKmGaf5VvTTXjLyb2714Pu536E/8UxUzxI40ID8="; - }; - }; in runCommand "trunkTests" { } '' test -f ${trunkSimple}/*.wasm test -f ${trunkSimple}/*.css test -f ${trunkSimpleNoArtifacts}/*.wasm - test -f ${trunkOutdatedBindgen}/*.wasm mkdir -p $out '' diff --git a/examples/trunk-workspace/flake.nix b/examples/trunk-workspace/flake.nix index cea69391..7b126b08 100644 --- a/examples/trunk-workspace/flake.nix +++ b/examples/trunk-workspace/flake.nix @@ -4,10 +4,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - # The version of wasm-bindgen-cli needs to match the version in Cargo.lock - # Update this to include the version you need - nixpkgs-for-wasm-bindgen.url = "github:NixOS/nixpkgs/4e6868b1aa3766ab1de169922bb3826143941973"; - crane.url = "github:ipetkov/crane"; flake-utils.url = "github:numtide/flake-utils"; @@ -18,7 +14,7 @@ }; }; - outputs = { self, nixpkgs, crane, flake-utils, rust-overlay, nixpkgs-for-wasm-bindgen, ... }: + outputs = { self, nixpkgs, crane, flake-utils, rust-overlay, ... }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { @@ -33,11 +29,7 @@ # wasm32-unknown-unknown is required for trunk. targets = [ "wasm32-unknown-unknown" ]; }; - craneLib = ((crane.mkLib pkgs).overrideToolchain rustToolchainFor).overrideScope (_final: _prev: { - # The version of wasm-bindgen-cli needs to match the version in Cargo.lock. You - # can unpin this if your nixpkgs commit contains the appropriate wasm-bindgen-cli version - inherit (import nixpkgs-for-wasm-bindgen { inherit system; }) wasm-bindgen-cli; - }); + craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchainFor; # When filtering sources, we want to allow assets other than .rs files unfilteredRoot = ./.; # The original, unfiltered source @@ -107,12 +99,26 @@ myClient = craneLib.buildTrunkPackage (wasmArgs // { pname = "trunk-workspace-client"; cargoArtifacts = cargoArtifactsWasm; - trunkIndexPath = "client/index.html"; + # Trunk expects the current directory to be the crate to compile + preBuild = '' + cd ./client + ''; + # After building, move the `dist` artifacts and restore the working directory + postBuild = '' + mv ./dist .. + cd .. + ''; # The version of wasm-bindgen-cli here must match the one from Cargo.lock. wasm-bindgen-cli = pkgs.wasm-bindgen-cli.override { version = "0.2.93"; hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0="; cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ="; + # When updating to a new version comment out the above two lines and + # uncomment the bottom two lines. Then try to do a build, which will fail + # but will print out the correct value for `hash`. Replace the value and then + # repeat the process but this time the printed value will be for `cargoHash` + # hash = lib.fakeHash; + # cargoHash = lib.fakeHash; }; }); in diff --git a/examples/trunk/flake.nix b/examples/trunk/flake.nix index 2b2de6e2..a31a565c 100644 --- a/examples/trunk/flake.nix +++ b/examples/trunk/flake.nix @@ -4,10 +4,6 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - # The version of wasm-bindgen-cli needs to match the version in Cargo.lock - # Update this to include the version you need - nixpkgs-for-wasm-bindgen.url = "github:NixOS/nixpkgs/4e6868b1aa3766ab1de169922bb3826143941973"; - crane.url = "github:ipetkov/crane"; flake-utils.url = "github:numtide/flake-utils"; @@ -18,7 +14,7 @@ }; }; - outputs = { self, nixpkgs, crane, flake-utils, rust-overlay, nixpkgs-for-wasm-bindgen, ... }: + outputs = { self, nixpkgs, crane, flake-utils, rust-overlay, ... }: flake-utils.lib.eachDefaultSystem (system: let pkgs = import nixpkgs { @@ -33,11 +29,7 @@ # wasm32-unknown-unknown is required for trunk targets = [ "wasm32-unknown-unknown" ]; }; - craneLib = ((crane.mkLib pkgs).overrideToolchain rustToolchainFor).overrideScope (_final: _prev: { - # The version of wasm-bindgen-cli needs to match the version in Cargo.lock. You - # can unpin this if your nixpkgs commit contains the appropriate wasm-bindgen-cli version - inherit (import nixpkgs-for-wasm-bindgen { inherit system; }) wasm-bindgen-cli; - }); + craneLib = (crane.mkLib pkgs).overrideToolchain rustToolchainFor; # When filtering sources, we want to allow assets other than .rs files unfilteredRoot = ./.; # The original, unfiltered source @@ -87,6 +79,12 @@ version = "0.2.93"; hash = "sha256-DDdu5mM3gneraM85pAepBXWn3TMofarVR4NbjMdz3r0="; cargoHash = "sha256-birrg+XABBHHKJxfTKAMSlmTVYLmnmqMDfRnmG6g/YQ="; + # When updating to a new version comment out the above two lines and + # uncomment the bottom two lines. Then try to do a build, which will fail + # but will print out the correct value for `hash`. Replace the value and then + # repeat the process but this time the printed value will be for `cargoHash` + # hash = lib.fakeHash; + # cargoHash = lib.fakeHash; }; }); diff --git a/lib/buildTrunkPackage.nix b/lib/buildTrunkPackage.nix index e2c7d4d6..3bf5ba17 100644 --- a/lib/buildTrunkPackage.nix +++ b/lib/buildTrunkPackage.nix @@ -20,9 +20,9 @@ let buildTrunkPackage { wasm-bindgen-cli = pkgs.wasm-bindgen-cli.override { - version = "0.2.84"; - hash = "sha256-0rK+Yx4/Jy44Fw5VwJ3tG243ZsyOIBBehYU54XP/JGk="; - cargoHash = "sha256-vcpxcRlW1OKoD64owFF6mkxSqmNrvY+y3Ckn5UwEQ50="; + version = "${default-wasm-bindgen-cli.version}"; + hash = "${default-wasm-bindgen-cli.hash or "lib.fakeHash"}"; + cargoHash = "${default-wasm-bindgen-cli.cargoHash or "lib.fakeHash"}"; }; ... } @@ -81,7 +81,7 @@ mkCargoDerivation (args // { echo "TRUNK_TOOLS_WASM_OPT=''${TRUNK_TOOLS_WASM_OPT}" ''; - buildPhaseCargoCommand = args.buildPhaseCommand or '' + buildPhaseCargoCommand = args.buildPhaseCargoCommand or '' local profileArgs="" if [[ "$CARGO_PROFILE" == "release" ]]; then profileArgs="--release${lib.optionalString (lib.versionAtLeast trunk.version "0.21") "=true"}" diff --git a/test/flake.lock b/test/flake.lock index 5e23166f..eada5f1b 100644 --- a/test/flake.lock +++ b/test/flake.lock @@ -102,22 +102,6 @@ "type": "github" } }, - "nixpkgs-for-wasm-bindgen": { - "locked": { - "lastModified": 1691495139, - "narHash": "sha256-+zZIRTtXlA8gN8HPzczphPnB9L+yYpidBmFxKqWQy+A=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4e6868b1aa3766ab1de169922bb3826143941973", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4e6868b1aa3766ab1de169922bb3826143941973", - "type": "github" - } - }, "nixpkgs-latest-release": { "locked": { "lastModified": 1730651795, @@ -142,7 +126,6 @@ "flake-compat": "flake-compat", "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", - "nixpkgs-for-wasm-bindgen": "nixpkgs-for-wasm-bindgen", "nixpkgs-latest-release": "nixpkgs-latest-release", "rust-overlay": "rust-overlay" } diff --git a/test/flake.nix b/test/flake.nix index 79e53970..131564c4 100644 --- a/test/flake.nix +++ b/test/flake.nix @@ -4,10 +4,6 @@ nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-latest-release.url = "github:NixOS/nixpkgs/release-24.05"; - # The version of wasm-bindgen-cli needs to match the version in Cargo.lock - # Update this to include the version you need - nixpkgs-for-wasm-bindgen.url = "github:NixOS/nixpkgs/4e6868b1aa3766ab1de169922bb3826143941973"; - advisory-db = { url = "github:rustsec/advisory-db"; flake = false;