From 18a4f8fd6a3a77a4fee3747f41da1328e1134884 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 5 Jun 2023 14:31:38 -0400 Subject: [PATCH 1/4] cargo-workspaces: unset verifyCargoDeps --- pkgs/development/tools/rust/cargo-workspaces/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-workspaces/default.nix b/pkgs/development/tools/rust/cargo-workspaces/default.nix index ed0eec126d8c..f473dc5a1279 100644 --- a/pkgs/development/tools/rust/cargo-workspaces/default.nix +++ b/pkgs/development/tools/rust/cargo-workspaces/default.nix @@ -5,7 +5,6 @@ , openssl , zlib , stdenv -, darwin , libssh2 , libgit2 , IOKit @@ -25,7 +24,6 @@ rustPlatform.buildRustPackage rec { }; cargoSha256 = "sha256-wUVNsUx7JS5icjxbz3CV1lNUvuuL+gTL2QzuE+030WU="; - verifyCargoDeps = true; # needed to get libssh2/libgit2 to link properly LIBGIT2_SYS_USE_PKG_CONFIG = true; From 5f0f7b822b037406d16498e23edee0d785a73d77 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 5 Jun 2023 14:32:09 -0400 Subject: [PATCH 2/4] elmPackages.elm-test-rs: unset verifyCargoDeps --- pkgs/development/compilers/elm/packages/elm-test-rs.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/compilers/elm/packages/elm-test-rs.nix b/pkgs/development/compilers/elm/packages/elm-test-rs.nix index 09d453b00f83..5e2a5502b211 100644 --- a/pkgs/development/compilers/elm/packages/elm-test-rs.nix +++ b/pkgs/development/compilers/elm/packages/elm-test-rs.nix @@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec { ]); cargoSha256 = "sha256:1dpdlzv96kpc25yf5jgsz9qldghyw35x382qpxhkadkn5dryzjvd"; - verifyCargoDeps = true; # Tests perform networking and therefore can't work in sandbox doCheck = false; From ac9053b0205e9085991b7cfcdc40637c35d262e7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 5 Jun 2023 14:33:17 -0400 Subject: [PATCH 3/4] solana: unset verifyCargoDeps --- pkgs/applications/blockchains/solana/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/blockchains/solana/default.nix b/pkgs/applications/blockchains/solana/default.nix index b21e945b1aed..698bc697d697 100644 --- a/pkgs/applications/blockchains/solana/default.nix +++ b/pkgs/applications/blockchains/solana/default.nix @@ -60,7 +60,6 @@ rustPlatform.buildRustPackage rec { }; strictDeps = true; - verifyCargoDeps = true; cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs; # Even tho the tests work, a shit ton of them try to connect to a local RPC From 25762896dc4fa20b3a3753cff07f7db16788219b Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 5 Jun 2023 14:33:55 -0400 Subject: [PATCH 4/4] solana-validator: unset verifyCargoDeps, remove unused parameters --- pkgs/applications/blockchains/solana-validator/default.nix | 6 ------ pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/applications/blockchains/solana-validator/default.nix b/pkgs/applications/blockchains/solana-validator/default.nix index c0d7926129d2..897968e25063 100644 --- a/pkgs/applications/blockchains/solana-validator/default.nix +++ b/pkgs/applications/blockchains/solana-validator/default.nix @@ -4,15 +4,10 @@ , fetchFromGitHub , lib , rustPlatform -, IOKit -, Security -, AppKit , pkg-config , udev , zlib , protobuf -, clang -, llvm , openssl , libclang , rustfmt @@ -63,7 +58,6 @@ rustPlatform.buildRustPackage rec { # partly inspired by https://github.com/obsidiansystems/solana-bridges/blob/develop/default.nix#L29 inherit cargoSha256; - verifyCargoDeps = true; cargoBuildFlags = builtins.map (n: "--bin=${n}") solanaPkgs; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c7ad7578f5d..13883f1fb104 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36050,9 +36050,7 @@ with pkgs; solana-cli = callPackage ../applications/blockchains/solana { }; - solana-validator = callPackage ../applications/blockchains/solana-validator { - inherit (darwin.apple_sdk.frameworks) IOKit Security AppKit; - }; + solana-validator = callPackage ../applications/blockchains/solana-validator { }; snarkos = callPackage ../applications/blockchains/snarkos { inherit (darwin.apple_sdk.frameworks) Security;