diff options
author | figsoda <figsoda@pm.me> | 2023-03-27 19:32:02 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-27 19:32:02 -0400 |
commit | 63b9aeed13863510d0d599d09d8b76e15038f130 (patch) | |
tree | cddeded590d2e80525431fec4cf14303028509bb | |
parent | 6a5df2f25597f6083bc56683aa81bf7518def2d2 (diff) | |
parent | 201d4b7c5c106affaba32a3b0138aa81b1a8b037 (diff) | |
download | nixlib-63b9aeed13863510d0d599d09d8b76e15038f130.tar nixlib-63b9aeed13863510d0d599d09d8b76e15038f130.tar.gz nixlib-63b9aeed13863510d0d599d09d8b76e15038f130.tar.bz2 nixlib-63b9aeed13863510d0d599d09d8b76e15038f130.tar.lz nixlib-63b9aeed13863510d0d599d09d8b76e15038f130.tar.xz nixlib-63b9aeed13863510d0d599d09d8b76e15038f130.tar.zst nixlib-63b9aeed13863510d0d599d09d8b76e15038f130.zip |
Merge pull request #223320 from figsoda/auditable
-rw-r--r-- | pkgs/applications/terminal-emulators/alacritty/default.nix | 2 | ||||
-rw-r--r-- | pkgs/build-support/rust/build-rust-package/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/cargo-auditable.nix | 6 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/cargo.nix | 7 | ||||
-rw-r--r-- | pkgs/development/libraries/libimagequant/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/tools/rust/rust-analyzer/default.nix | 2 | ||||
-rw-r--r-- | pkgs/games/jumpy/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/misc/fd/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/mdbook/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/text/ripgrep/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/video/rav1e/default.nix | 2 |
11 files changed, 10 insertions, 21 deletions
diff --git a/pkgs/applications/terminal-emulators/alacritty/default.nix b/pkgs/applications/terminal-emulators/alacritty/default.nix index ae1bc591989d..f88a944fdb6c 100644 --- a/pkgs/applications/terminal-emulators/alacritty/default.nix +++ b/pkgs/applications/terminal-emulators/alacritty/default.nix @@ -60,8 +60,6 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-4liPfNJ2JGniz8Os4Np+XSXCJBHND13XLPWDy3Gc/F8="; - auditable = true; # TODO: remove when this is the default - nativeBuildInputs = [ cmake installShellFiles diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 2c5d4ae10003..a1bddeb6c49d 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -45,7 +45,7 @@ , buildFeatures ? [ ] , checkFeatures ? buildFeatures , useNextest ? false -, auditable ? false # TODO: change to true +, auditable ? true , depsExtraArgs ? {} diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix index 1745ae266c28..34549e1982ed 100644 --- a/pkgs/development/compilers/rust/cargo-auditable.nix +++ b/pkgs/development/compilers/rust/cargo-auditable.nix @@ -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; + }; }) diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix index eb3dc238a9ab..b5b462978f4c 100644 --- a/pkgs/development/compilers/rust/cargo.nix +++ b/pkgs/development/compilers/rust/cargo.nix @@ -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; diff --git a/pkgs/development/libraries/libimagequant/default.nix b/pkgs/development/libraries/libimagequant/default.nix index 8fb334e2a4d5..43e4b447ae78 100644 --- a/pkgs/development/libraries/libimagequant/default.nix +++ b/pkgs/development/libraries/libimagequant/default.nix @@ -24,8 +24,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-0HOmItooNsGq6iTIb9M5IPXMwYh2nQ03qfjomkg0d00="; - auditable = true; # TODO: remove when this is the default - nativeBuildInputs = [ cargo-c ]; postBuild = '' diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index f37475d454eb..7f40ff1faee3 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -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" ]; diff --git a/pkgs/games/jumpy/default.nix b/pkgs/games/jumpy/default.nix index 09013892d591..edd71b39b07b 100644 --- a/pkgs/games/jumpy/default.nix +++ b/pkgs/games/jumpy/default.nix @@ -32,8 +32,6 @@ rustPlatform.buildRustPackage rec { }; }; - auditable = true; # TODO: remove when this is the default - nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isLinux [ diff --git a/pkgs/tools/misc/fd/default.nix b/pkgs/tools/misc/fd/default.nix index 38055706004b..b18454514914 100644 --- a/pkgs/tools/misc/fd/default.nix +++ b/pkgs/tools/misc/fd/default.nix @@ -13,8 +13,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-AstE8KGICgPhqRKlJecrE9iPUUWaOvca6ocWf85IzNo="; - auditable = true; # TODO: remove when this is the default - nativeBuildInputs = [ installShellFiles ]; # skip flaky test diff --git a/pkgs/tools/text/mdbook/default.nix b/pkgs/tools/text/mdbook/default.nix index 155cca613a7b..39926cded4bc 100644 --- a/pkgs/tools/text/mdbook/default.nix +++ b/pkgs/tools/text/mdbook/default.nix @@ -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 = { diff --git a/pkgs/tools/text/ripgrep/default.nix b/pkgs/tools/text/ripgrep/default.nix index be989994dbff..022f8bd25bb7 100644 --- a/pkgs/tools/text/ripgrep/default.nix +++ b/pkgs/tools/text/ripgrep/default.nix @@ -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 diff --git a/pkgs/tools/video/rav1e/default.nix b/pkgs/tools/video/rav1e/default.nix index 938a686f8473..244aed92f813 100644 --- a/pkgs/tools/video/rav1e/default.nix +++ b/pkgs/tools/video/rav1e/default.nix @@ -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 ]; |