Merge pull request #223320 from figsoda/auditable
This commit is contained in:
commit
63b9aeed13
|
@ -60,8 +60,6 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "sha256-4liPfNJ2JGniz8Os4Np+XSXCJBHND13XLPWDy3Gc/F8=";
|
||||
|
||||
auditable = true; # TODO: remove when this is the default
|
||||
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
installShellFiles
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
, buildFeatures ? [ ]
|
||||
, checkFeatures ? buildFeatures
|
||||
, useNextest ? false
|
||||
, auditable ? false # TODO: change to true
|
||||
, auditable ? true
|
||||
|
||||
, depsExtraArgs ? {}
|
||||
|
||||
|
|
|
@ -41,8 +41,6 @@ let
|
|||
in
|
||||
|
||||
rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; } (args // {
|
||||
auditable = true; # TODO: remove when this is the default
|
||||
|
||||
nativeBuildInputs = [
|
||||
installShellFiles
|
||||
];
|
||||
|
@ -50,4 +48,8 @@ rustPlatform.buildRustPackage.override { cargo-auditable = bootstrap; } (args //
|
|||
postInstall = ''
|
||||
installManPage cargo-auditable/cargo-auditable.1
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit bootstrap;
|
||||
};
|
||||
})
|
||||
|
|
|
@ -2,10 +2,13 @@
|
|||
, file, curl, pkg-config, python3, openssl, cmake, zlib
|
||||
, installShellFiles, makeWrapper, rustPlatform, rustc
|
||||
, CoreFoundation, Security
|
||||
, auditable ? false # TODO: change to true when this is the default
|
||||
, auditable ? true
|
||||
, cargo-auditable
|
||||
}:
|
||||
|
||||
rustPlatform.buildRustPackage {
|
||||
rustPlatform.buildRustPackage.override {
|
||||
cargo-auditable = cargo-auditable.bootstrap;
|
||||
} {
|
||||
pname = "cargo";
|
||||
inherit (rustc) version src;
|
||||
|
||||
|
|
|
@ -24,8 +24,6 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoHash = "sha256-0HOmItooNsGq6iTIb9M5IPXMwYh2nQ03qfjomkg0d00=";
|
||||
|
||||
auditable = true; # TODO: remove when this is the default
|
||||
|
||||
nativeBuildInputs = [ cargo-c ];
|
||||
|
||||
postBuild = ''
|
||||
|
|
|
@ -23,8 +23,6 @@ rustPlatform.buildRustPackage rec {
|
|||
sha256 = "sha256-TnMPQPXDXLGLJu5PvEMglPidrtxH89P9dj/YmWc5JiQ=";
|
||||
};
|
||||
|
||||
auditable = true; # TODO: remove when this is the default
|
||||
|
||||
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
|
||||
cargoTestFlags = [ "--package" "rust-analyzer" "--package" "proc-macro-srv-cli" ];
|
||||
|
||||
|
|
|
@ -32,8 +32,6 @@ rustPlatform.buildRustPackage rec {
|
|||
};
|
||||
};
|
||||
|
||||
auditable = true; # TODO: remove when this is the default
|
||||
|
||||
nativeBuildInputs = [
|
||||
makeWrapper
|
||||
] ++ lib.optionals stdenv.isLinux [
|
||||
|
|
|
@ -13,8 +13,6 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoHash = "sha256-AstE8KGICgPhqRKlJecrE9iPUUWaOvca6ocWf85IzNo=";
|
||||
|
||||
auditable = true; # TODO: remove when this is the default
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
# skip flaky test
|
||||
|
|
|
@ -13,8 +13,6 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoHash = "sha256-TViBclvCJeoOInTt13B7297JDtRkwvOjIf6AVAbpanU=";
|
||||
|
||||
auditable = true; # TODO: remove when this is the default
|
||||
|
||||
buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
|
||||
|
||||
passthru = {
|
||||
|
|
|
@ -22,8 +22,6 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoSha256 = "1kfdgh8dra4jxgcdb0lln5wwrimz0dpp33bq3h7jgs8ngaq2a9wp";
|
||||
|
||||
auditable = true; # TODO: remove when this is the default
|
||||
|
||||
nativeBuildInputs = [ asciidoctor installShellFiles ]
|
||||
++ lib.optional withPCRE2 pkg-config;
|
||||
buildInputs = lib.optional withPCRE2 pcre2
|
||||
|
|
|
@ -25,8 +25,6 @@ in rustPlatform.buildRustPackage rec {
|
|||
|
||||
cargoHash = "sha256-66mVkoqMl+KNCXWsGUbu8nBrazgHP+5dTaT2Ye0btWY=";
|
||||
|
||||
auditable = true; # TODO: remove when this is the default
|
||||
|
||||
depsBuildBuild = [ pkg-config ];
|
||||
|
||||
nativeBuildInputs = [ cargo-c libgit2 nasm ];
|
||||
|
|
Loading…
Reference in a new issue