From 0e8bcf3ce619c9cb6c575973b8851204f601ed41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 13 Dec 2022 21:02:29 -0800 Subject: [PATCH 1/5] rapidfuzz-cpp: 1.10.1 -> 1.10.4 https://github.com/maxbachmann/rapidfuzz-cpp/blob/v1.10.4/CHANGELOG.md --- .../libraries/rapidfuzz-cpp/default.nix | 8 +-- .../dont-fetch-project-options.patch | 58 ------------------- 2 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch diff --git a/pkgs/development/libraries/rapidfuzz-cpp/default.nix b/pkgs/development/libraries/rapidfuzz-cpp/default.nix index 9adfa1a9eb83c..0b2c90f1200ee 100644 --- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix +++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix @@ -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 ]; diff --git a/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch b/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch deleted file mode 100644 index ab88c530d400d..0000000000000 --- a/pkgs/development/libraries/rapidfuzz-cpp/dont-fetch-project-options.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index 5ba4464..ad72319 100644 ---- a/test/CMakeLists.txt -+++ b/test/CMakeLists.txt -@@ -12,39 +12,10 @@ else() - FetchContent_MakeAvailable(Catch2) - endif() - --# include aminya & jason turner's C++ best practices recommended cmake project utilities --include(FetchContent) --FetchContent_Declare(_project_options URL https://github.com/aminya/project_options/archive/refs/tags/v0.20.0.zip) --FetchContent_MakeAvailable(_project_options) --include(${_project_options_SOURCE_DIR}/Index.cmake) -- --project_options( -- # ENABLE_CACHE -- # ENABLE_CONAN -- WARNINGS_AS_ERRORS -- # ENABLE_CPPCHECK -- # ENABLE_CLANG_TIDY -- # ENABLE_INCLUDE_WHAT_YOU_USE -- # ENABLE_COVERAGE -- # ENABLE_PCH -- # PCH_HEADERS -- # ENABLE_DOXYGEN -- # ENABLE_IPO -- # ENABLE_USER_LINKER -- # ENABLE_BUILD_WITH_TIME_TRACE -- # ENABLE_UNITY -- # ENABLE_SANITIZER_ADDRESS -- # ENABLE_SANITIZER_LEAK -- # ENABLE_SANITIZER_UNDEFINED_BEHAVIOR -- # ENABLE_SANITIZER_THREAD -- # ENABLE_SANITIZER_MEMORY -- # CLANG_WARNINGS "-Weverything" --) -- - function(rapidfuzz_add_test test) - add_executable(test_${test} tests-${test}.cpp) - target_link_libraries(test_${test} ${PROJECT_NAME}) -- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings) -+ target_link_libraries(test_${test} Catch2::Catch2WithMain) - add_test(NAME ${test} COMMAND test_${test}) - endfunction() - -diff --git a/test/distance/CMakeLists.txt b/test/distance/CMakeLists.txt -index 2a70054..7a43c88 100644 ---- a/test/distance/CMakeLists.txt -+++ b/test/distance/CMakeLists.txt -@@ -1,7 +1,7 @@ - function(rapidfuzz_add_test test) - add_executable(test_${test} tests-${test}.cpp) - target_link_libraries(test_${test} ${PROJECT_NAME}) -- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings) -+ target_link_libraries(test_${test} Catch2::Catch2WithMain) - add_test(NAME ${test} COMMAND test_${test}) - endfunction() - From d2c7d8ea0eb0400d6f4afb368341cc5a19769d13 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 14 Dec 2022 17:30:04 +0100 Subject: [PATCH 2/5] python310Packages.aioshelly: 5.1.1 -> 5.2.0 Changelog: https://github.com/home-assistant-libs/aioshelly/releases/tag/5.2.0 --- pkgs/development/python-modules/aioshelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 0a779bd7478a7..c1a611505aeac 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "5.1.1"; + version = "5.2.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-6HUykGN0zx97K4372dU1RPncajJt2n20zp2FhrJG1sM="; + hash = "sha256-pa7ijfT/VbXNxwf9RITWxhUVUbimuBEjlU3xnDm3Zzk="; }; propagatedBuildInputs = [ From c6ea583457627722fe5f3bb4fd444fbd8f1c25ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danie=CC=88l=20de=20Kok?= Date: Tue, 13 Dec 2022 11:47:16 +0100 Subject: [PATCH 3/5] python3Packages.wandb: fix build The logging test of `wandb` failed, because another package (`PythonGit`) clutters the logs about not being able to confirm whether we are running in a Cygwin environment. So, simply disable the test. --- pkgs/development/python-modules/wandb/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix index ad1ac6da5dd3d..b649bd16880ac 100644 --- a/pkgs/development/python-modules/wandb/default.nix +++ b/pkgs/development/python-modules/wandb/default.nix @@ -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" From 6e2085617fd9092ea798a51b64193e35af79c3b8 Mon Sep 17 00:00:00 2001 From: Atemu Date: Mon, 12 Dec 2022 17:59:18 +0100 Subject: [PATCH 4/5] buildRustPackage: remove git from nativeBuildInputs Having git in nativeBuildInputs causes thousands of rebuilds when git is touched because every derivation that somehow transiently depends on a rust package will change. See https://github.com/NixOS/nixpkgs/pull/205682 for instance. AFAICT git is unused. Only the fetcher needs git which it has already. Fixes https://github.com/NixOS/nixpkgs/issues/205804 --- pkgs/build-support/rust/build-rust-package/default.nix | 2 -- pkgs/development/compilers/rust/make-rust-platform.nix | 1 - 2 files changed, 3 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 20fb41d0aaa74..dabca88e37722 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -5,7 +5,6 @@ , stdenv , callPackage , cacert -, git , cargoBuildHook , cargoCheckHook , cargoInstallHook @@ -125,7 +124,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg }) ] ++ [ cacert - git cargoBuildHook (if useNextest then cargoNextestHook else cargoCheckHook) cargoInstallHook diff --git a/pkgs/development/compilers/rust/make-rust-platform.nix b/pkgs/development/compilers/rust/make-rust-platform.nix index f61ba57d7b952..ec0ba891c2f37 100644 --- a/pkgs/development/compilers/rust/make-rust-platform.nix +++ b/pkgs/development/compilers/rust/make-rust-platform.nix @@ -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; }; From f3277bcd0dafed0dbcf63b25355510958042ec32 Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 13 Dec 2022 08:18:14 +0100 Subject: [PATCH 5/5] buildRustPackage: move cacert to buildInputs Cacert doesn't have any binary parts; it does not make sense to have it in nativeBuildInputs. Its home sould be buildInputs. It probably shouldn't be in there either as I can't imagine it being a general requirement for rust packages and any package that depends on cacert should do so explicitly. I don't have the experience with the rust packages set to know whether that's the case, so let's err on the side of caution. --- pkgs/build-support/rust/build-rust-package/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index dabca88e37722..f1bb6e2e08d99 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -123,7 +123,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg inherit cargo-auditable; }) ] ++ [ - cacert cargoBuildHook (if useNextest then cargoNextestHook else cargoCheckHook) cargoInstallHook @@ -132,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;