Skip to content

buildRustPackage: remove git from nativeBuildInputs #205809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Atemu wants to merge 5 commits into from
Closed

buildRustPackage: remove git from nativeBuildInputs #205809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0e8bcf3
rapidfuzz-cpp: 1.10.1 -> 1.10.4
dotlambda Dec 14, 2022
d2c7d8e
python310Packages.aioshelly: 5.1.1 -> 5.2.0
fabaff Dec 14, 2022
c6ea583
python3Packages.wandb: fix build
danieldk Dec 13, 2022
6e20856
buildRustPackage: remove git from nativeBuildInputs
Atemu Dec 12, 2022
f3277bc
buildRustPackage: move cacert to buildInputs
Atemu Dec 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions pkgs/build-support/rust/build-rust-package/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
, stdenv
, callPackage
, cacert
, git
, cargoBuildHook
, cargoCheckHook
, cargoInstallHook
Expand Down Expand Up @@ -124,8 +123,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
inherit cargo-auditable;
})
] ++ [
cacert
git
cargoBuildHook
(if useNextest then cargoNextestHook else cargoCheckHook)
cargoInstallHook
Expand All @@ -134,6 +131,7 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg
];

buildInputs = buildInputs
++ [ cacert ] # FIXME Is this actually needed?
++ lib.optionals stdenv.hostPlatform.isMinGW [ windows.pthreads ];

patches = cargoPatches ++ patches;
Expand Down
1 change: 0 additions & 1 deletion pkgs/development/compilers/rust/make-rust-platform.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ rec {
};

buildRustPackage = callPackage ../../../build-support/rust/build-rust-package {
git = buildPackages.gitMinimal;
inherit stdenv cargoBuildHook cargoCheckHook cargoInstallHook cargoNextestHook cargoSetupHook
fetchCargoTarball importCargoLock rustc;
};
Expand Down
8 changes: 2 additions & 6 deletions pkgs/development/libraries/rapidfuzz-cpp/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,15 @@

stdenv.mkDerivation rec {
pname = "rapidfuzz-cpp";
version = "1.10.1";
version = "1.10.4";

src = fetchFromGitHub {
owner = "maxbachmann";
repo = "rapidfuzz-cpp";
rev = "v${version}";
hash = "sha256-c9ESzsDcoUw5XAEZDHdG8jazjI5Oyqic1gaT0qGQsbI=";
hash = "sha256-I7MdeLs+J5a57ypgUJIW0/pSFPzK4nZA4ZrVRdKX7J4=";
};

patches = [
./dont-fetch-project-options.patch
];

nativeBuildInputs = [
cmake
];
Expand Down
58 changes: 0 additions & 58 deletions pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions pkgs/development/python-modules/aioshelly/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

buildPythonPackage rec {
pname = "aioshelly";
version = "5.1.1";
version = "5.2.0";
format = "setuptools";

disabled = pythonOlder "3.9";
Expand All @@ -18,7 +18,7 @@ buildPythonPackage rec {
owner = "home-assistant-libs";
repo = pname;
rev = "refs/tags/${version}";
hash = "sha256-6HUykGN0zx97K4372dU1RPncajJt2n20zp2FhrJG1sM=";
hash = "sha256-pa7ijfT/VbXNxwf9RITWxhUVUbimuBEjlU3xnDm3Zzk=";
};

propagatedBuildInputs = [
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/python-modules/wandb/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ buildPythonPackage rec {
"tests/unit_tests_old/test_footer.py"
"tests/unit_tests_old/test_internal_api.py"
"tests/unit_tests_old/test_keras.py"
"tests/unit_tests_old/test_logging.py"
"tests/unit_tests_old/test_metric_internal.py"
"tests/unit_tests_old/test_public_api.py"
"tests/unit_tests_old/test_report_api.py"
Expand Down