diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 20fb41d0aaa74..f1bb6e2e08d99 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 @@ -124,8 +123,6 @@ stdenv.mkDerivation ((removeAttrs args [ "depsExtraArgs" "cargoUpdateHook" "carg inherit cargo-auditable; }) ] ++ [ - cacert - git cargoBuildHook (if useNextest then cargoNextestHook else cargoCheckHook) cargoInstallHook @@ -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; 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; }; 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() - 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 = [ 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"