From c83b06672b7cf47b342493eb94eb7ce7e119f419 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 27 Sep 2024 07:11:05 +0000 Subject: [PATCH 1/3] [create-pull-request] automated change (#92) Co-authored-by: guillemcordoba --- nix/fixtures/module-repo/Cargo.lock | 30 ++++++++++++++--------------- nix/reference-happ/Cargo.lock | 30 ++++++++++++++--------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/nix/fixtures/module-repo/Cargo.lock b/nix/fixtures/module-repo/Cargo.lock index 0203dde..a62908c 100644 --- a/nix/fixtures/module-repo/Cargo.lock +++ b/nix/fixtures/module-repo/Cargo.lock @@ -470,14 +470,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "automap" @@ -1018,7 +1018,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "cfg-if 1.0.0", "libc", "scopeguard", @@ -1721,9 +1721,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -2094,7 +2094,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" dependencies = [ "ahash 0.3.8", - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -3275,7 +3275,7 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "hashbrown 0.12.3", "serde", ] @@ -4012,7 +4012,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "scopeguard", ] @@ -4091,7 +4091,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "rawpointer", ] @@ -4141,7 +4141,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -4150,7 +4150,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -4515,7 +4515,7 @@ version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "num-integer", "num-traits", ] @@ -4537,7 +4537,7 @@ version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "libm", ] @@ -6373,7 +6373,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] diff --git a/nix/reference-happ/Cargo.lock b/nix/reference-happ/Cargo.lock index 6bacaad..a8d111f 100644 --- a/nix/reference-happ/Cargo.lock +++ b/nix/reference-happ/Cargo.lock @@ -470,14 +470,14 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "automap" @@ -1018,7 +1018,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "cfg-if 1.0.0", "libc", "scopeguard", @@ -1721,9 +1721,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide", @@ -2094,7 +2094,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" dependencies = [ "ahash 0.3.8", - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -3275,7 +3275,7 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "hashbrown 0.12.3", "serde", ] @@ -4012,7 +4012,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "scopeguard", ] @@ -4091,7 +4091,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "rawpointer", ] @@ -4141,7 +4141,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -4150,7 +4150,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] @@ -4493,7 +4493,7 @@ version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "num-integer", "num-traits", ] @@ -4515,7 +4515,7 @@ version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", "libm", ] @@ -6351,7 +6351,7 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.3.0", + "autocfg 1.4.0", ] [[package]] From 15d1a442b72aecb3285ce8c5fd924a80fa33c026 Mon Sep 17 00:00:00 2001 From: "guillem.cordoba" Date: Fri, 27 Sep 2024 12:22:57 +0200 Subject: [PATCH 2/3] Fixed align cross platform --- flake.nix | 4 +++- nix/zome.nix | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 47c6881..29a5754 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,9 @@ rec { deterministicCraneLib = let rustToolchain = inputs.holonix.outputs.packages."x86_64-linux".rust; - in (inputs.crane.mkLib pkgs).overrideToolchain rustToolchain; + in (inputs.crane.mkLib inputs.nixpkgs.outputs.legacyPackages.${ + "x86_64-linux" + }).overrideToolchain rustToolchain; craneLib = (inputs.crane.mkLib pkgs).overrideToolchain inputs'.holonix.packages.rust; diff --git a/nix/zome.nix b/nix/zome.nix index 9600c45..ba7116e 100644 --- a/nix/zome.nix +++ b/nix/zome.nix @@ -97,9 +97,8 @@ let wasm = deterministicCraneLib.buildPackage (buildPackageCommonArgs // { inherit cargoArtifacts; }); - in runCommandLocal "${crate}-deterministic" { - meta = { holochainPackageType = "zome"; }; - } " cp ${wasm}/lib/${crate}.wasm $out \n"; + in runCommandLocal "${crate}-deterministic" { } + " cp ${wasm}/lib/${crate}.wasm $out \n"; debug = runCommandNoCC "${crate}-debug" { } '' cp ${wasm}/lib/${crate}.wasm $out From af1cb7df94f8623d2a184e5567747c4476577275 Mon Sep 17 00:00:00 2001 From: "guillem.cordoba" Date: Fri, 27 Sep 2024 12:55:06 +0200 Subject: [PATCH 3/3] Fixed go in aarch64-darwin --- flake.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 29a5754..0f141a9 100644 --- a/flake.nix +++ b/flake.nix @@ -42,15 +42,18 @@ rec { pkgs.darwin.apple_sdk.frameworks.AppKit pkgs.darwin.apple_sdk.frameworks.WebKit - (pkgs.darwin.apple_sdk_11_0.stdenv.mkDerivation { - name = "go"; - nativeBuildInputs = with pkgs; [ makeBinaryWrapper go ]; - dontBuild = true; - dontUnpack = true; - installPhase = '' - makeWrapper ${pkgs.go}/bin/go $out/bin/go - ''; - }) + (if pkgs.system == "x86_64-darwin" then + (pkgs.darwin.apple_sdk_11_0.stdenv.mkDerivation { + name = "go"; + nativeBuildInputs = with pkgs; [ makeBinaryWrapper go ]; + dontBuild = true; + dontUnpack = true; + installPhase = '' + makeWrapper ${pkgs.go}/bin/go $out/bin/go + ''; + }) + else + pkgs.go) ]); builders = { rustZome = { crateCargoToml, workspacePath, cargoArtifacts ? null