dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #236130 from figsoda/verify-cargo-deps

Browse Source 
treewide: unset verifyCargoDeps
This commit is contained in:
Nick Cao 2023-06-06 20:27:48 -06:00 committed by GitHub
commit c123fb09be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/blockchains/solana-validator/default.nix
View File

@ -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;

1
pkgs/applications/blockchains/solana/default.nix
View File

@ -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

1
pkgs/development/compilers/elm/packages/elm-test-rs.nix
View File

@ -17,7 +17,6 @@ rustPlatform.buildRustPackage rec {
]);
cargoSha256 = "sha256:1dpdlzv96kpc25yf5jgsz9qldghyw35x382qpxhkadkn5dryzjvd";
verifyCargoDeps = true;
# Tests perform networking and therefore can't work in sandbox
doCheck = false;

2
pkgs/development/tools/rust/cargo-workspaces/default.nix
View File

@ -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;

4
pkgs/top-level/all-packages.nix
View File

@ -36046,9 +36046,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;