diff --git a/flake.nix b/flake.nix index 3403601..4f6e52e 100644 --- a/flake.nix +++ b/flake.nix @@ -41,7 +41,7 @@ overlays = [ (import inputs.rust-overlay) ]; }; - rustToolchain = pkgs.rust-bin.nightly."2024-01-29".minimal.override { + rustToolchain = pkgs.rust-bin.stable."1.74.1".minimal.override { # Set the build targets supported by the toolchain, # wasm32-unknown-unknown is required for trunk. targets = [ "wasm32-unknown-unknown" ]; diff --git a/nix/fixture/Cargo.toml b/nix/fixture/Cargo.toml index dd7a423..35ad88d 100644 --- a/nix/fixture/Cargo.toml +++ b/nix/fixture/Cargo.toml @@ -1,4 +1,4 @@ -cargo-features = ["trim-paths"] +# cargo-features = ["trim-paths"] [workspace] members = ["zome"] @@ -12,5 +12,5 @@ serde = "1" [profile.release] opt-level = "z" -trim-paths = true -remap-debuginfo = true +# trim-paths = true +# remap-debuginfo = true diff --git a/nix/fixture/flake.lock b/nix/fixture/flake.lock index b8f83f5..5e66b5f 100644 --- a/nix/fixture/flake.lock +++ b/nix/fixture/flake.lock @@ -540,7 +540,7 @@ }, "locked": { "lastModified": 0, - "narHash": "sha256-ySoYxlwP6GAHADzlk9Z+VyswRq9zDdkmW3BQiw9kPhc=", + "narHash": "sha256-HkZkvxvNeC+n0Pzjgyb/Wn8hx3ed03iWRhoGunCQbd4=", "path": "../..", "type": "path" }, @@ -777,11 +777,11 @@ ] }, "locked": { - "lastModified": 1709706781, - "narHash": "sha256-wBnOinfR47XONjpkj114N1BmWqfJqOFgGbsLq7JIoKc=", + "lastModified": 1709731345, + "narHash": "sha256-YNMiQJRbnBdTQ/Q26M5zp+j2DGtpmaI/VWPVJxc4G7k=", "owner": "holochain", "repo": "holochain", - "rev": "532163f8d0aee621642a08ec80bcfd659297a3d9", + "rev": "3c3d2d73819e97cb9f5487d853f75a9954850f1e", "type": "github" }, "original": { @@ -1545,11 +1545,11 @@ }, "locked": { "dir": "versions/weekly", - "lastModified": 1709706781, - "narHash": "sha256-wBnOinfR47XONjpkj114N1BmWqfJqOFgGbsLq7JIoKc=", + "lastModified": 1709731345, + "narHash": "sha256-YNMiQJRbnBdTQ/Q26M5zp+j2DGtpmaI/VWPVJxc4G7k=", "owner": "holochain", "repo": "holochain", - "rev": "532163f8d0aee621642a08ec80bcfd659297a3d9", + "rev": "3c3d2d73819e97cb9f5487d853f75a9954850f1e", "type": "github" }, "original": { diff --git a/nix/zome.nix b/nix/zome.nix index b8f96d9..30ca4b7 100644 --- a/nix/zome.nix +++ b/nix/zome.nix @@ -19,7 +19,7 @@ let doCheck = false; src = craneLib.cleanCargoSource (craneLib.path workspacePath); CARGO_BUILD_TARGET = "wasm32-unknown-unknown"; - CARGO_BUILD_RUSTFLAGS = ""; + # CARGO_BUILD_RUSTFLAGS = ""; }; wasmDeps = craneLib.buildDepsOnly (commonArgs // {