b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #223320 from figsoda/auditable

Browse source
This commit is contained in:
figsoda 2023-03-27 19:32:02 -04:00 committed by GitHub
parent 6a5df2f255 201d4b7c5c
commit 63b9aeed13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 10 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/terminal-emulators/alacritty/default.nix
View file

@ -60,8 +60,6 @@ rustPlatform.buildRustPackage rec {
cargoSha256 = "sha256-4liPfNJ2JGniz8Os4Np+XSXCJBHND13XLPWDy3Gc/F8=";
auditable = true; # TODO: remove when this is the default
nativeBuildInputs = [
cmake
installShellFiles

2
pkgs/build-support/rust/build-rust-package/default.nix
View file

@ -45,7 +45,7 @@
, buildFeatures ? [ ]
, checkFeatures ? buildFeatures
, useNextest ? false
, auditable ? false # TODO: change to true
, auditable ? true
, depsExtraArgs ? {}

6
pkgs/development/compilers/rust/cargo-auditable.nix
View file

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

7
pkgs/development/compilers/rust/cargo.nix
View file

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

2
pkgs/development/libraries/libimagequant/default.nix
View file

@ -24,8 +24,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-0HOmItooNsGq6iTIb9M5IPXMwYh2nQ03qfjomkg0d00=";
auditable = true; # TODO: remove when this is the default
nativeBuildInputs = [ cargo-c ];
postBuild = ''

2
pkgs/development/tools/rust/rust-analyzer/default.nix
View file

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

2
pkgs/games/jumpy/default.nix
View file

@ -32,8 +32,6 @@ rustPlatform.buildRustPackage rec {
};
};
auditable = true; # TODO: remove when this is the default
nativeBuildInputs = [
makeWrapper
] ++ lib.optionals stdenv.isLinux [

2
pkgs/tools/misc/fd/default.nix
View file

@ -13,8 +13,6 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-AstE8KGICgPhqRKlJecrE9iPUUWaOvca6ocWf85IzNo=";
auditable = true; # TODO: remove when this is the default
nativeBuildInputs = [ installShellFiles ];
# skip flaky test

2
pkgs/tools/text/mdbook/default.nix
View file

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

2
pkgs/tools/text/ripgrep/default.nix
View file

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

2
pkgs/tools/video/rav1e/default.nix
View file

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