diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 80d272221f31..8b22273ebd87 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11785,12 +11785,6 @@ githubId = 4599384; name = "Jack Baldry"; }; - jdehaas = { - email = "qqlq@nullptr.club"; - github = "jeroendehaas"; - githubId = 117874; - name = "Jeroen de Haas"; - }; jdelStrother = { email = "me@delstrother.com"; github = "jdelStrother"; @@ -14409,12 +14403,11 @@ name = "Leiser Fernández Gallo"; }; leixb = { - email = "abone9999+nixpkgs@gmail.com"; + email = "abone9999@gmail.com"; matrix = "@leix_b:matrix.org"; github = "Leixb"; githubId = 17183803; name = "Aleix Boné"; - keys = [ { fingerprint = "63D3 F436 EDE8 7E1F 1292 24AF FC03 5BB2 BB28 E15D"; } ]; }; lejonet = { email = "daniel@kuehn.se"; diff --git a/nixos/tests/evcc.nix b/nixos/tests/evcc.nix index b9896687c2b6..589c8b55843c 100644 --- a/nixos/tests/evcc.nix +++ b/nixos/tests/evcc.nix @@ -57,19 +57,19 @@ in type = "custom"; status = { source = "script"; - cmd = "/bin/sh -c 'echo charger status A'"; + cmd = "/bin/sh -c 'echo A'"; }; enabled = { source = "script"; - cmd = "/bin/sh -c 'echo charger enabled state false'"; + cmd = "/bin/sh -c 'echo false'"; }; enable = { source = "script"; - cmd = "/bin/sh -c 'echo set charger enabled state true'"; + cmd = "/bin/sh -c 'echo true'"; }; maxcurrent = { source = "script"; - cmd = "/bin/sh -c 'echo set charger max current 7200'"; + cmd = "/bin/sh -c 'echo 7200'"; }; } ]; diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index bdad64a1ebc8..fb21a68824fe 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -9,20 +9,20 @@ }: let - version = "2025.9.1"; + version = "2025.9.3"; product = if proEdition then { productName = "pro"; productDesktop = "Burp Suite Professional Edition"; - hash = "sha256-24XijVTFmDshv7TYDW05igUOWfJeHT7z8F8fTCBONoM="; + hash = "sha256-gLcSx+AZdHW+LP4kPez1KVamTrp7IfGMF/caHDKAxK4="; } else { productName = "community"; productDesktop = "Burp Suite Community Edition"; - hash = "sha256-z65+1erFeO3ZOJRGZ+vdbDxfNpo36eIp6yQskItBl1A="; + hash = "sha256-LmlmQ6UaIFMGFIFI9r7i9LV81ZcisuNygJo3/oUaWSM="; }; src = fetchurl { diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix index a5feb501bb21..92aaba102610 100644 --- a/pkgs/by-name/cp/cpp-utilities/package.nix +++ b/pkgs/by-name/cp/cpp-utilities/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.30.0"; + version = "5.31.0"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-cBr9Vw0UnC2+x/VSvL8u5hsvgk5RdY/3/KCUFQy24rg="; + sha256 = "sha256-UjF1b1LCPwrUzqVZNbtX+5eFAzc6NgLyBzTcNHNlkvs="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix index fa399bd51d45..8558132a7f25 100644 --- a/pkgs/by-name/en/enzyme/package.nix +++ b/pkgs/by-name/en/enzyme/package.nix @@ -7,13 +7,13 @@ }: llvmPackages.stdenv.mkDerivation rec { pname = "enzyme"; - version = "0.0.196"; + version = "0.0.201"; src = fetchFromGitHub { owner = "EnzymeAD"; repo = "Enzyme"; rev = "v${version}"; - hash = "sha256-Jrp1DjwMzi8+ZWJVwhZ4SH2phLvrYfY6+29n//z9bUg="; + hash = "sha256-TUGWQImDtXOOkEt20719OheKlPgWjEVdqTh/ET/c1cs="; }; postPatch = '' diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index ba1087404b22..927b9c5839b3 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,16 +17,16 @@ }: let - version = "0.207.6"; + version = "0.208.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-BbX3SXvf6JtWdC5S6jDqBVawMEPtwHBA2IfR5G5ybqA="; + hash = "sha256-l7whf2NhvPHZOfXy4PdZq8ZyAKaiLuBlX9s7ffJQoWg="; }; - vendorHash = "sha256-ieaDJZmYPxG79Pz/9NRTEhtAQZOqAwwDMa0FAs+PWEA="; + vendorHash = "sha256-qp7kSh6pOecXa2qAmKXdJAgAZ4O3pnX0/nMUhwR2cFA="; commonMeta = with lib; { license = licenses.mit; @@ -52,7 +52,7 @@ buildGo125Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-GB57pXfWo1lduVDPPw7TBM8qgCmTxPDxKQyD4ZZJnjE="; + hash = "sha256-q+ft9dzs/M+ZYCQy/OnqTmpgKXxrD5cfaqrvsxh730w="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 1fea83763ece..2c40adfc6276 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -10,7 +10,6 @@ frigate, nixosTests, fetchpatch, - protobuf_21, }: let @@ -41,7 +40,7 @@ let }); onnxruntime = super.onnxruntime.override (old: { onnxruntime = old.onnxruntime.override (old: { - protobuf = protobuf_21; + withFullProtobuf = true; }); }); }; diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 69097113fae4..7322555c2f38 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -11,13 +11,13 @@ buildNpmPackage rec { pname = "ghostfolio"; - version = "2.199.0"; + version = "2.202.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = version; - hash = "sha256-O21eeTKWwyD029ZuQBKpOE6Y+f9ufSfe70KjxjXQh9M="; + hash = "sha256-VBIdNxdAzrlxbNl1p/yv/LUcJhqfD90oZjOsMPKOTDU="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -27,7 +27,7 @@ buildNpmPackage rec { ''; }; - npmDepsHash = "sha256-Bo8w+9TySugwAPfUqZHGKBe0hKwvOQIisfA3QENN//s="; + npmDepsHash = "sha256-JBes89JG9l+qsrT9g+Rwefe6X7fieQEor5sHpbCEK9Q="; nativeBuildInputs = [ prisma diff --git a/pkgs/by-name/hi/hired/package.nix b/pkgs/by-name/hi/hired/package.nix new file mode 100644 index 000000000000..27130e655563 --- /dev/null +++ b/pkgs/by-name/hi/hired/package.nix @@ -0,0 +1,49 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + pkg-config, + oniguruma, +}: + +rustPlatform.buildRustPackage rec { + pname = "hired"; + version = "0.14.3"; + + src = fetchFromGitHub { + owner = "sidju"; + repo = "hired"; + tag = version; + hash = "sha256-A1iz34CSc6GWo6FvkGwIgUwMmYaIzwdCzZFACFSZ9qI="; + fetchSubmodules = true; + }; + + cargoHash = "sha256-nWc3vcqYbJnjYLjKyZQBFR7tSaPaSu0+TvOIBAKKtnQ="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + oniguruma + ]; + + env = { + RUSTONIG_SYSTEM_LIBONIG = true; + }; + + enableParallelBuilding = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Modern take on ed, the standard Unix editor"; + homepage = "https://github.com/sidju/hired"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ShamrockLee ]; + mainProgram = "hired"; + }; +} diff --git a/pkgs/by-name/je/jetuml/package.nix b/pkgs/by-name/je/jetuml/package.nix index e67cba6d2496..d8958de00373 100644 --- a/pkgs/by-name/je/jetuml/package.nix +++ b/pkgs/by-name/je/jetuml/package.nix @@ -53,8 +53,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { ${jdkWithFX}/lib/openjdk/bin/jar xf $src jet.png magick jet.png -resize 128x128 jet128.png magick jet.png -resize 48x48 jet48.png - install -Dm444 jet48.png $out/share/icons/hicolor/48x48/jet.png - install -Dm444 jet128.png $out/share/icons/hicolor/128x128/jet.png + install -Dm444 jet48.png $out/share/icons/hicolor/48x48/apps/jet.png + install -Dm444 jet128.png $out/share/icons/hicolor/128x128/apps/jet.png install -Dm444 $src $out/share/java/JetUML-${finalAttrs.version}.jar diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix index 3190d4f92171..928ceee0abcf 100644 --- a/pkgs/by-name/mo/monkeysAudio/package.nix +++ b/pkgs/by-name/mo/monkeysAudio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "11.38"; + version = "11.53"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-/pZeZFyv04Feocm9KfLfItd/z0i3rK7pPf8Jm9jd2c8="; + hash = "sha256-g1I63K67upEL0in1NceayLDTQgmx4LAHd0eA0MYEp44="; stripRoot = false; }; diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix index 3d2a2952e70c..f490fba48285 100644 --- a/pkgs/by-name/mu/muffet/package.nix +++ b/pkgs/by-name/mu/muffet/package.nix @@ -2,27 +2,32 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "muffet"; version = "2.11.0"; src = fetchFromGitHub { owner = "raviqqe"; repo = "muffet"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-GfRR+9PdfY63Pzv2XZenKs8XXAKRr9qMzcHOVhl+hv4="; }; vendorHash = "sha256-oidOSV8y0VwTabipe7XwurUAra9F65nkTXslwXJ94Jw="; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + meta = { description = "Website link checker which scrapes and inspects all pages in a website recursively"; homepage = "https://github.com/raviqqe/muffet"; - changelog = "https://github.com/raviqqe/muffet/releases/tag/v${version}"; + changelog = "https://github.com/raviqqe/muffet/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ figsoda ]; mainProgram = "muffet"; }; -} +}) diff --git a/pkgs/by-name/nn/nncp/package.nix b/pkgs/by-name/nn/nncp/package.nix index 8860b501afe3..28a7609bc8da 100644 --- a/pkgs/by-name/nn/nncp/package.nix +++ b/pkgs/by-name/nn/nncp/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nncp"; - version = "8.11.0"; + version = "8.12.1"; outputs = [ "out" "doc" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "http://www.nncpgo.org/download/nncp-${finalAttrs.version}.tar.xz"; - hash = "sha256-7EEUvNkYSqh4HzjbqjqgQlXfu6nDU2v3WWnma8M0r/I="; + hash = "sha256-yTwndQ43aBCned7iKPZm70zCC3zMapf2GXtornjiZos="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - ./bin/build + ./build runHook postBuild ''; diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix index 2964c8a1ac37..9bd15499960e 100644 --- a/pkgs/by-name/on/onnxruntime/package.nix +++ b/pkgs/by-name/on/onnxruntime/package.nix @@ -23,6 +23,7 @@ pythonSupport ? true, cudaSupport ? config.cudaSupport, ncclSupport ? config.cudaSupport, + withFullProtobuf ? false, cudaPackages ? { }, }@inputs: @@ -195,7 +196,7 @@ effectiveStdenv.mkDerivation rec { (lib.cmakeFeature "ONNX_CUSTOM_PROTOC_EXECUTABLE" (lib.getExe protobuf)) (lib.cmakeBool "onnxruntime_BUILD_SHARED_LIB" true) (lib.cmakeBool "onnxruntime_BUILD_UNIT_TESTS" doCheck) - (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" false) + (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf) (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport) (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport)) (lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8")) diff --git a/pkgs/by-name/op/opencollada-blender/cmake4-compat.patch b/pkgs/by-name/op/opencollada-blender/cmake4-compat.patch new file mode 100644 index 000000000000..c586a589534a --- /dev/null +++ b/pkgs/by-name/op/opencollada-blender/cmake4-compat.patch @@ -0,0 +1,26 @@ +From f036950f1ccc3ebdfe2fdc0a52d35a4620252901 Mon Sep 17 00:00:00 2001 +From: Grimmauld +Date: Sat, 27 Sep 2025 11:43:21 +0200 +Subject: [PATCH] Build: update cmake minimum version to 3.10 + +cmake ABI compatibility with cmake <3.5 has been removed in cmake 4. +Compatibility with cmake <3.10 is deprecated and soon to be removed. +Thus set 3.10 minimum version. This is available in the vast majority +of current linux distributions, as well as other platforms. +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 95abbe213..2d14b2552 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -18,7 +18,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) + endif() + endif() + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required(VERSION 3.10) + + + #----------------------------------------------------------------------------- diff --git a/pkgs/by-name/op/opencollada-blender/package.nix b/pkgs/by-name/op/opencollada-blender/package.nix index 1fa9ebb2703b..01042195cd9a 100644 --- a/pkgs/by-name/op/opencollada-blender/package.nix +++ b/pkgs/by-name/op/opencollada-blender/package.nix @@ -1,5 +1,6 @@ { cmake, + dos2unix, fetchFromGitHub, lib, libxml2, @@ -19,9 +20,20 @@ stdenv.mkDerivation { sha256 = "sha256-ctr+GjDzxOJxBfaMwjwayPkAOcF+FMsP1X72QCOwvTY="; }; + # Fix freaky dos-style CLRF things + prePatch = '' + dos2unix CMakeLists.txt + ''; + + patches = [ + # https://github.com/aras-p/OpenCOLLADA/pull/1 + ./cmake4-compat.patch + ]; + nativeBuildInputs = [ cmake pkg-config + dos2unix ]; propagatedBuildInputs = [ @@ -31,7 +43,7 @@ stdenv.mkDerivation { meta = { description = "Library for handling the COLLADA file format"; - homepage = "https://github.com/KhronosGroup/OpenCOLLADA/"; + homepage = "https://github.com/aras-p/OpenCOLLADA"; maintainers = [ lib.maintainers.amarshall ]; platforms = lib.platforms.unix; license = lib.licenses.mit; diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix index 3707b4520d8a..eb2ebac90e52 100644 --- a/pkgs/by-name/sn/snx-rs/package.nix +++ b/pkgs/by-name/sn/snx-rs/package.nix @@ -14,13 +14,13 @@ }: rustPlatform.buildRustPackage rec { pname = "snx-rs"; - version = "4.8.0"; + version = "4.8.1"; src = fetchFromGitHub { owner = "ancwrd1"; repo = "snx-rs"; tag = "v${version}"; - hash = "sha256-D2WVmu+vECabVdnJtc7ihlj83Z/2m6kD8KZ9ot9dCRE="; + hash = "sha256-/ntw1AuOqTy9s1jY+6UIDqZWtmjr1DVRQur/h0LkkXI="; }; passthru.updateScript = nix-update-script { }; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec { versionCheckHook ]; - cargoHash = "sha256-+rTpuAe+6YdgCQr/+zJMaSYo4T+3Fkma0PSVjnsxAfg="; + cargoHash = "sha256-lLYQ+N5P8p4jiJCo6UyXvXeDT9JRlzIk8VH6UKlqvX0="; doInstallCheck = true; versionCheckProgram = "${placeholder "out"}/bin/snx-rs"; diff --git a/pkgs/by-name/ti/timg/package.nix b/pkgs/by-name/ti/timg/package.nix index bc9206b1af25..ffe8b6cdb6b4 100644 --- a/pkgs/by-name/ti/timg/package.nix +++ b/pkgs/by-name/ti/timg/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "timg"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "hzeller"; repo = "timg"; tag = "v${finalAttrs.version}"; - hash = "sha256-UiQ8CW0mxjjQM6XLN0FL2v7ccYq2EmIy/3pm+yKQh8w="; + hash = "sha256-FdaO+UAKjmLKgVZ3AYGQ9VJQj9s48Ihr8TlZ4at5I3c="; }; buildInputs = [ diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix index 445a7453d89d..2bd4318e40d3 100644 --- a/pkgs/by-name/vu/vue-language-server/package.nix +++ b/pkgs/by-name/vu/vue-language-server/package.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { ''; preInstall = '' - CI=true pnpm prune --prod find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + # https://github.com/pnpm/pnpm/issues/3645 diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix index c1495c60eab2..ca7657878884 100644 --- a/pkgs/by-name/xe/xemu/package.nix +++ b/pkgs/by-name/xe/xemu/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "xemu"; - version = "0.8.98"; + version = "0.8.105"; src = fetchFromGitHub { owner = "xemu-project"; repo = "xemu"; tag = "v${finalAttrs.version}"; - hash = "sha256-kqNZFRkLZ7MiniV2kg+FJ6E4Ms/8+pQLHe8MvhZYC0I="; + hash = "sha256-1Gp/XGPCIT8qeW1YPI+mh6P0avHHFXtOGcXEEkGT12w="; nativeBuildInputs = [ git diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix index ed928af31cb5..a88e41c95873 100644 --- a/pkgs/development/libraries/fmt/default.nix +++ b/pkgs/development/libraries/fmt/default.nix @@ -62,7 +62,7 @@ let homepage = "https://fmt.dev/"; changelog = "https://github.com/fmtlib/fmt/blob/${version}/ChangeLog.rst"; downloadPage = "https://github.com/fmtlib/fmt/"; - maintainers = [ maintainers.jdehaas ]; + maintainers = [ ]; license = licenses.mit; platforms = platforms.all; }; diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index f1e07e9d6397..c33658cc59b7 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.18.1"; + version = "6.18.2"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-GFLNZgY6Q3+4lsFYznbiVhDqU8ALzVRLO02qmyZrnKw="; + hash = "sha256-SwKXON16a9qmI+FrTA1OH0zIqf5rfAWbGOhCpCIHgr4="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/amazon-ion/default.nix b/pkgs/development/python-modules/amazon-ion/default.nix index a7569cd5d06a..0d4a9bd1578b 100644 --- a/pkgs/development/python-modules/amazon-ion/default.nix +++ b/pkgs/development/python-modules/amazon-ion/default.nix @@ -6,7 +6,7 @@ fetchFromGitHub, jsonconversion, pytestCheckHook, - pythonOlder, + pytest_7, setuptools, six, tabulate, @@ -17,8 +17,6 @@ buildPythonPackage rec { version = "0.13.0"; pyproject = true; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "amazon-ion"; repo = "ion-python"; @@ -33,9 +31,9 @@ buildPythonPackage rec { --replace "'pytest-runner'," "" ''; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ jsonconversion six ]; @@ -43,7 +41,7 @@ buildPythonPackage rec { nativeCheckInputs = [ cbor2 docopt - pytestCheckHook + (pytestCheckHook.override { pytest = pytest_7; }) tabulate ]; diff --git a/pkgs/development/python-modules/asyncpraw/default.nix b/pkgs/development/python-modules/asyncpraw/default.nix index 5435eb099e46..0126f99cc91e 100644 --- a/pkgs/development/python-modules/asyncpraw/default.nix +++ b/pkgs/development/python-modules/asyncpraw/default.nix @@ -9,7 +9,7 @@ flit-core, mock, pytestCheckHook, - pytest-asyncio, + pytest-asyncio_0, pytest-vcr, pythonOlder, requests-toolbelt, @@ -49,7 +49,7 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pytest-asyncio + pytest-asyncio_0 pytest-vcr vcrpy requests-toolbelt diff --git a/pkgs/development/python-modules/asyncprawcore/default.nix b/pkgs/development/python-modules/asyncprawcore/default.nix index 133d74aefb7c..bc8c34f86a01 100644 --- a/pkgs/development/python-modules/asyncprawcore/default.nix +++ b/pkgs/development/python-modules/asyncprawcore/default.nix @@ -6,9 +6,8 @@ flit-core, mock, pytestCheckHook, - pytest-asyncio, + pytest-asyncio_0, pytest-vcr, - pythonOlder, requests, requests-toolbelt, testfixtures, @@ -21,8 +20,6 @@ buildPythonPackage rec { version = "2.4.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "praw-dev"; repo = "asyncprawcore"; @@ -30,9 +27,9 @@ buildPythonPackage rec { hash = "sha256-FDQdtnNjsbiEp9BUYdQFMC/hkyJDhCh2WHhQWSQwrFY="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + dependencies = [ requests aiohttp yarl @@ -43,7 +40,7 @@ buildPythonPackage rec { mock requests-toolbelt pytestCheckHook - pytest-asyncio + pytest-asyncio_0 pytest-vcr vcrpy ]; diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix index 6e77e4b1d1b2..f208334661a6 100644 --- a/pkgs/development/python-modules/asyncua/default.nix +++ b/pkgs/development/python-modules/asyncua/default.nix @@ -6,6 +6,7 @@ buildPythonPackage, cryptography, fetchFromGitHub, + hatchling, pyopenssl, pytest-asyncio_0_21, pytest-mock, @@ -14,7 +15,6 @@ pythonAtLeast, pythonOlder, pytz, - setuptools, sortedcontainers, typing-extensions, }: @@ -41,7 +41,7 @@ buildPythonPackage rec { --replace-fail "tools/" "$out/bin/" ''; - build-system = [ setuptools ]; + build-system = [ hatchling ]; dependencies = [ aiofiles diff --git a/pkgs/development/python-modules/awswrangler/default.nix b/pkgs/development/python-modules/awswrangler/default.nix index ef33e99adc91..1f73e157b64f 100644 --- a/pkgs/development/python-modules/awswrangler/default.nix +++ b/pkgs/development/python-modules/awswrangler/default.nix @@ -1,41 +1,38 @@ { - sparqlwrapper, + lib, boto3, buildPythonPackage, fetchFromGitHub, gremlinpython, + hatchling, jsonpath-ng, - lib, moto, openpyxl, opensearch-py, pandas, pg8000, - poetry-core, progressbar2, pyarrow, pymysql, pyodbc, pyparsing, pytestCheckHook, - pythonOlder, redshift-connector, requests-aws4auth, setuptools, + sparqlwrapper, }: buildPythonPackage rec { pname = "awswrangler"; - version = "3.12.1"; + version = "3.13.0"; pyproject = true; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-pandas"; tag = version; - hash = "sha256-N4IqeAfW4PqgQcBFaFK/Ugbcsz8pLiFzkBr9SRm7AOs="; + hash = "sha256-MkoJpztVjwZbGcJTdnLRF7ZtIFd0qGoz/cksEoqLe4w="; }; pythonRelaxDeps = [ @@ -43,7 +40,7 @@ buildPythonPackage rec { "pyarrow" ]; - build-system = [ poetry-core ]; + build-system = [ hatchling ]; dependencies = [ boto3 diff --git a/pkgs/development/python-modules/binsync/default.nix b/pkgs/development/python-modules/binsync/default.nix index 7883e9b5ed42..3f6c999a6668 100644 --- a/pkgs/development/python-modules/binsync/default.nix +++ b/pkgs/development/python-modules/binsync/default.nix @@ -14,6 +14,7 @@ sortedcontainers, toml, tqdm, + wordfreq, }: buildPythonPackage rec { @@ -39,6 +40,7 @@ buildPythonPackage rec { sortedcontainers toml tqdm + wordfreq ]; optional-dependencies = { @@ -52,7 +54,7 @@ buildPythonPackage rec { ]; disabledTestPaths = [ - # Test tries to import angrmanagement + # Test tries to import angr-management "tests/test_angr_gui.py" ]; diff --git a/pkgs/development/python-modules/celery-redbeat/default.nix b/pkgs/development/python-modules/celery-redbeat/default.nix index c8d04153df73..cd5be7937ee2 100644 --- a/pkgs/development/python-modules/celery-redbeat/default.nix +++ b/pkgs/development/python-modules/celery-redbeat/default.nix @@ -1,48 +1,64 @@ { lib, buildPythonPackage, - fetchFromGitHub, - python-dateutil, celery, - redis, - tenacity, - pytestCheckHook, - pytz, + cron-descriptor, + django-timezone-field, + django, fakeredis, + fetchFromGitHub, mock, + pytestCheckHook, + python-crontab, + python-dateutil, + pytz, + setuptools, }: buildPythonPackage rec { pname = "celery-redbeat"; - version = "2.3.3"; - format = "setuptools"; + version = "2.8.1"; + pyproject = true; src = fetchFromGitHub { - owner = "sibson"; - repo = "redbeat"; + owner = "celery"; + repo = "django-celery-beat"; tag = "v${version}"; - hash = "sha256-bptEAOVxuwj9Y7LyBhtMU22Z1uCiJ4O4BZT2ytqQI80="; + hash = "sha256-pakOpch5r2ug0UDSqEU34qr4Tz1/mkuFiHW+IOUuGcc="; }; - propagatedBuildInputs = [ + postPatch = '' + # Hack the custom dependency resolution in setup.py to avoid pulling in pip + substituteInPlace setup.py \ + --replace-fail "install_requires=reqs('default.txt') + reqs('runtime.txt')," "install_requires=[]," + ''; + + build-system = [ setuptools ]; + + dependencies = [ celery + cron-descriptor + django + django-timezone-field + python-crontab python-dateutil - redis - tenacity ]; nativeCheckInputs = [ - fakeredis mock pytestCheckHook pytz ]; - pythonImportsCheck = [ "redbeat" ]; + pythonImportsCheck = [ "django_celery_beat" ]; + + # Tests require additional work + doCheck = false; meta = with lib; { description = "Database-backed Periodic Tasks"; homepage = "https://github.com/celery/django-celery-beat"; + changelog = "https://github.com/celery/django-celery-beat/releases/tag/${src.tag}"; license = licenses.bsd3; maintainers = with maintainers; [ onny ]; }; diff --git a/pkgs/development/python-modules/control/default.nix b/pkgs/development/python-modules/control/default.nix index 16bb10a94ea0..4f766f00fcbd 100644 --- a/pkgs/development/python-modules/control/default.nix +++ b/pkgs/development/python-modules/control/default.nix @@ -1,15 +1,16 @@ { lib, - fetchFromGitHub, buildPythonPackage, - numpy, - scipy, - matplotlib, - setuptools, - setuptools-scm, cvxopt, + fetchFromGitHub, + matplotlib, + numpy, + numpydoc, pytest-timeout, pytestCheckHook, + scipy, + setuptools-scm, + setuptools, }: buildPythonPackage rec { @@ -41,17 +42,23 @@ buildPythonPackage rec { cvxopt = [ cvxopt ]; }; - pythonImportsCheck = [ "control" ]; - nativeCheckInputs = [ - cvxopt + numpydoc pytest-timeout pytestCheckHook + ] + ++ lib.flatten (builtins.attrValues optional-dependencies); + + pythonImportsCheck = [ "control" ]; + + disabledTestPaths = [ + # Don't test the docs + "doc/test_sphinxdocs.py" ]; meta = { - changelog = "https://github.com/python-control/python-control/releases/tag/${src.tag}"; description = "Python Control Systems Library"; + changelog = "https://github.com/python-control/python-control/releases/tag/${src.tag}"; homepage = "https://github.com/python-control/python-control"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ Peter3579 ]; diff --git a/pkgs/development/python-modules/flickrapi/default.nix b/pkgs/development/python-modules/flickrapi/default.nix index 9bbd11bd65b6..973e1c51827e 100644 --- a/pkgs/development/python-modules/flickrapi/default.nix +++ b/pkgs/development/python-modules/flickrapi/default.nix @@ -63,6 +63,7 @@ buildPythonPackage rec { "test_walk" "test_xmlnode_format" "test_xmlnode_format_error" + "test_upload" ]; pythonImportsCheck = [ "flickrapi" ]; diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix index b591a368133f..f7aeeb5972a2 100644 --- a/pkgs/development/python-modules/gdsfactory/default.nix +++ b/pkgs/development/python-modules/gdsfactory/default.nix @@ -46,14 +46,14 @@ }: buildPythonPackage rec { pname = "gdsfactory"; - version = "9.12.0"; + version = "9.17.0"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "gdsfactory"; tag = "v${version}"; - hash = "sha256-en976F8BjMK8Ku1QXz4MIxTs+mswVBascmGguPXeEbI="; + hash = "sha256-1C7Cva5FZsYLpfF3EZt0RFaWRcYdUdid6Oz9iQHeTqo="; }; build-system = [ flit-core ]; diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index 93f8a3a14784..a1aa7438c423 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -214,5 +214,7 @@ buildPythonPackage rec { changelog = "https://github.com/keras-team/keras/releases/tag/v${version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; + # Not yet released for tensorflow >= 2.20.0 + broken = lib.versionAtLeast tensorflow.version "2.20"; }; } diff --git a/pkgs/development/python-modules/kfactory/default.nix b/pkgs/development/python-modules/kfactory/default.nix index a164a03d5ccb..1d4bde2fd9fc 100644 --- a/pkgs/development/python-modules/kfactory/default.nix +++ b/pkgs/development/python-modules/kfactory/default.nix @@ -10,18 +10,20 @@ # dependencies aenum, cachetools, - gitpython, klayout, loguru, numpy, - pydantic, + pydantic-extra-types, pydantic-settings, + pydantic, + pygit2, + rapidfuzz, rectangle-packer, requests, - ruamel-yaml, ruamel-yaml-string, + ruamel-yaml, scipy, - tomli, + semver, toolz, typer, @@ -31,14 +33,14 @@ buildPythonPackage rec { pname = "kfactory"; - version = "1.12.1"; + version = "1.14.3"; pyproject = true; src = fetchFromGitHub { owner = "gdsfactory"; repo = "kfactory"; tag = "v${version}"; - hash = "sha256-C7ner1jkMCHI8/sRiw82l+THhAIWhwJuZ/ctJ9V76Us="; + hash = "sha256-dwJqKl6o2w8fxcNMQAvt5dI1k89yoy/PiIH9eo3JQbA="; }; build-system = [ @@ -49,18 +51,20 @@ buildPythonPackage rec { dependencies = [ aenum cachetools - gitpython klayout loguru numpy pydantic + pydantic-extra-types pydantic-settings + pygit2 + rapidfuzz rectangle-packer requests ruamel-yaml ruamel-yaml-string scipy - tomli + semver toolz typer ]; @@ -72,6 +76,8 @@ buildPythonPackage rec { disabledTestPaths = [ # https://github.com/gdsfactory/kfactory/issues/511 "tests/test_pdk.py" + # NameError + "tests/test_session.py" ]; meta = { diff --git a/pkgs/development/python-modules/libbs/default.nix b/pkgs/development/python-modules/libbs/default.nix index b69b2c3ddde6..96eed62a0ebe 100644 --- a/pkgs/development/python-modules/libbs/default.nix +++ b/pkgs/development/python-modules/libbs/default.nix @@ -7,6 +7,7 @@ jfx-bridge, networkx, platformdirs, + ply, prompt-toolkit, psutil, pycparser, @@ -18,6 +19,15 @@ writableTmpDirAsHomeHook, }: +let + # Binary files from https://github.com/binsync/bs-artifacts (only used for testing and only here) + binaries = fetchFromGitHub { + owner = "binsync"; + repo = "bs-artifacts"; + rev = "514c2d6ef1875435c9d137bb5d99b6fc74063817"; + hash = "sha256-P7+BTJgdC9W8cC/7xQduFYllF+0ds1dSlm59/BFvZ2g="; + }; +in buildPythonPackage rec { pname = "libbs"; version = "2.15.4"; @@ -38,6 +48,7 @@ buildPythonPackage rec { jfx-bridge networkx platformdirs + ply prompt-toolkit psutil pycparser @@ -51,6 +62,14 @@ buildPythonPackage rec { writableTmpDirAsHomeHook ]; + # Place test binaries in place + preCheck = '' + export HOME=$TMPDIR + mkdir -p $HOME/bs-artifacts/binaries + cp -r ${binaries} $HOME/bs-artifacts/binaries + export TEST_BINARIES_DIR=$HOME/bs-artifacts/binaries + ''; + pythonImportsCheck = [ "libbs" ]; disabledTests = [ diff --git a/pkgs/development/python-modules/mkdocstrings/default.nix b/pkgs/development/python-modules/mkdocstrings/default.nix index 071370db4f7d..b180498bd6c8 100644 --- a/pkgs/development/python-modules/mkdocstrings/default.nix +++ b/pkgs/development/python-modules/mkdocstrings/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "mkdocstrings"; - version = "0.30.0"; + version = "0.30.1"; pyproject = true; src = fetchFromGitHub { owner = "mkdocstrings"; repo = "mkdocstrings"; tag = version; - hash = "sha256-tJErux/90zXaV0ViGJOQKMf1yYCxMhH1nMrQlXlHw/Y="; + hash = "sha256-BfqxL35prq+pvD21w0BOJx/ls8og+LjtGdOAZlHYGVE="; }; postPatch = '' diff --git a/pkgs/development/python-modules/outlines/default.nix b/pkgs/development/python-modules/outlines/default.nix index e9162d6bf51b..dc5721df96f6 100644 --- a/pkgs/development/python-modules/outlines/default.nix +++ b/pkgs/development/python-modules/outlines/default.nix @@ -95,6 +95,11 @@ buildPythonPackage rec { tensorflow ]; + pytestFlagsArray = [ + # FutureWarning: functools.partial will be a method descriptor in future Python versions; wrap it in enum.member() if you want to preserve the old behavior + "-Wignore::FutureWarning" + ]; + disabledTests = [ # Try to dowload models from Hugging Face Hub "test_application_callable_call" diff --git a/pkgs/development/python-modules/parquet/default.nix b/pkgs/development/python-modules/parquet/default.nix index 5c01bd16752e..fe45aab74aa6 100644 --- a/pkgs/development/python-modules/parquet/default.nix +++ b/pkgs/development/python-modules/parquet/default.nix @@ -48,12 +48,17 @@ buildPythonPackage rec { "testFromExample" ]; - pythonImportsCheck = [ "thriftpy2" ]; + disabledTestPaths = [ + # Test is outdated + "test/test_read_support.py" + ]; + + pythonImportsCheck = [ "parquet" ]; meta = with lib; { description = "Python implementation of the parquet columnar file format"; homepage = "https://github.com/jcrobak/parquet-python"; - changelog = "https://github.com/jcrobak/parquet-python/releases/tag/v${version}"; + changelog = "https://github.com/jcrobak/parquet-python/releases/tag/${src.tag}"; license = licenses.bsd2; maintainers = with maintainers; [ fab ]; mainProgram = "parquet"; diff --git a/pkgs/development/python-modules/switchbot-api/default.nix b/pkgs/development/python-modules/switchbot-api/default.nix index 94812f6f638d..5d2a4daccbf3 100644 --- a/pkgs/development/python-modules/switchbot-api/default.nix +++ b/pkgs/development/python-modules/switchbot-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "switchbot-api"; - version = "2.7.0"; + version = "2.8.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "SeraphicCorp"; repo = "py-switchbot-api"; tag = "v${version}"; - hash = "sha256-uGaM/pzO9HuLJjXdhdrCfbTxMvYxF4OgFo/m5R2jm5s="; + hash = "sha256-xalIVkmzflUVkw/DFOLas6T/jUXSs3gZhEa3IJWtEaw="; }; build-system = [ poetry-core ]; diff --git a/pkgs/development/python-modules/tensorflow/binary-hashes.nix b/pkgs/development/python-modules/tensorflow/binary-hashes.nix index dd536885ace8..023a69666d53 100644 --- a/pkgs/development/python-modules/tensorflow/binary-hashes.nix +++ b/pkgs/development/python-modules/tensorflow/binary-hashes.nix @@ -1,72 +1,88 @@ { - version = "2.19.0"; + version = "2.20.0"; version_jetson = "2.16.1+nv24.08"; x86_64-linux_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow_cpu-2.19.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "13xvghhqjlq5l6gnnlkslqyk7iwy2lbhblz70pa0wrsvdiwp9k86"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1nxmm37miz0kzq8g2zc5f9w5vaiz0m75g2q97v19f0pnpl4q1kwh"; }; x86_64-linux_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow_cpu-2.19.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0lgjy7frlh5ax97pc5x2cdq560ybizjrdxms57rcx8r9x8wskrff"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "10y5s4bd1s4yk9qx71ap743l8l17axvj5lk49f4fwhq584wg4ghs"; }; x86_64-linux_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow_cpu-2.19.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "0l8wgqjhp0srqs4rkij881nxifdzaxkin237wfjqh8h1wdd312ck"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1077zld9n53w72sbvzll2ic1f05liy2jrbfhnlm98vi55nz6nxfg"; }; x86_64-linux_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow_cpu-2.19.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1wxpgzs3d0wblvvg02267j0bw9b8j4dlfspfmp6r8hd6dk9bx78b"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "19yn5ligcazva59bgw7v6pdl2wp7xz9i9qf4jpnr9041hm0j5af7"; + }; + x86_64-linux_313 = { + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow_cpu-2.20.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1db4gipi9x05r4fbdj98p3bk6pz0zq25xi15c97ch3p1wn8pfvns"; }; x86_64-linux_39_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "14vgkx1wjf0jiali4lm3x8n6z29m8vdhjva4yvabzc9b1s1757w4"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1hwfakj3b5w0lc641bqqcnxhdd47037998aqs57valzw7mc5rsqd"; }; x86_64-linux_310_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1s1myi67iqhjxvfvjv8pl26hxjcgya9k1r1hblh8hm0h933xdql3"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "07jr5bpvmxd3yjw3v2jd9i3jswlsfxr26604r16ka38f04x7zgbs"; }; x86_64-linux_311_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1r4ghr51h2bb7dj8q6wydgnvzw0f48b6kkygl6gq0yf9d9w4f1rr"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "17i2z37jrji8rk11pspmlkd8r297x3an3gj5i7g86ic21zyrj528"; }; x86_64-linux_312_gpu = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; - sha256 = "1xm66mwrdxrqs9i68dlahqrd5imgibcz5f3i4ksyg4yp9icjd2z2"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "1v2jkhglfrh4by86nri7zq4shi2gl920rilw3r5xbq17ql5mn9i5"; + }; + x86_64-linux_313_gpu = { + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl"; + sha256 = "0wkklfh0ny4y4lzac540v8g745b5adyzp29bi2cmmxr606dp58sz"; }; aarch64-linux_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "121amcj78mkkvs2fclc7z669q45x4sa7x6vlzggrm09b0nr7zf4w"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "1pzbi2calx0crx8f0ff1kbibn1j5wwjbvpp9rsmqxja9j9sk7g18"; }; aarch64-linux_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "0p4fjsal8kfizcz456lbbqg2i35ljxhdqij7vhsfbvismqy2jf9b"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "1sms3c4mxy892gaa066nx4xa6m28rhigdav6bc9bgj7mjhyjk802"; }; aarch64-linux_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "1670dv3kbmxiz4v0ivmkbiiiaa1sbc2x841z6kmy03mcb3wkybf9"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "1mfflmpmywqihd1mdwcq6jnzgsv2khkf68z2dckc01fbxz46i59y"; }; aarch64-linux_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; - sha256 = "020kppmgmv4hnz3dqmam01gq95s69xjn6zn6k25l08zf6fyvzx0h"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "13q71s5gjb405s48maqz4sckwx971lwj5sg1bz2gyaz2s0yzpyrb"; + }; + aarch64-linux_313 = { + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl"; + sha256 = "09nrnffmqdfr9zy5l1li0727b02drlz4p2dlfx4ss7kzl02qxj27"; }; aarch64-linux_310_jetson = { url = "https://developer.download.nvidia.com/compute/redist/jp/v61/tensorflow/tensorflow-2.16.1+nv24.08-cp310-cp310-linux_aarch64.whl"; sha256 = "0z18zdcjc2dingl94kivhd5cpzbvkjp9j12q57acjppp4hyd6g7f"; }; aarch64-darwin_39 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp39-cp39-macosx_12_0_arm64.whl"; - sha256 = "02fb702d2wmdgrjq8jj46bp51sh1l9j4q9z231x151z2i3sdn5dd"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp39-cp39-macosx_12_0_arm64.whl"; + sha256 = "0g3qg53l8pfna5r964s08das8jsijbg81snb8ny3z79034dvsv56"; }; aarch64-darwin_310 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp310-cp310-macosx_12_0_arm64.whl"; - sha256 = "0d6anjqkm5vq22awxhcwivjdshnlzmby80by3icyjcihbkr08mn9"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp310-cp310-macosx_12_0_arm64.whl"; + sha256 = "0msk3aw06q46n4ng8i5cs79r6bhmmvqcam78pdav42hkypw6kwg5"; }; aarch64-darwin_311 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp311-cp311-macosx_12_0_arm64.whl"; - sha256 = "05f12garj6ad4vcxxpi0vihps4gh9y30bffp2qy1k36qi8kn5m38"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp311-cp311-macosx_12_0_arm64.whl"; + sha256 = "1visqvq280k4cgmg6hwphfkq54p8kdrnnsi4baw0jp83qlb415jz"; }; aarch64-darwin_312 = { - url = "https://storage.googleapis.com/tensorflow/versions/2.19.0/tensorflow-2.19.0-cp312-cp312-macosx_12_0_arm64.whl"; - sha256 = "1bibid6mrgmjra291pmb7b5sf49f8jpi3n8x8mdwjhfmxfz1c6c2"; + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp312-cp312-macosx_12_0_arm64.whl"; + sha256 = "13vcl3wcgaid8f2rdzvzmkfbdl3hhkh7qlwdy88apmrg4gq25caj"; + }; + aarch64-darwin_313 = { + url = "https://storage.googleapis.com/tensorflow/versions/2.20.0/tensorflow-2.20.0-cp313-cp313-macosx_12_0_arm64.whl"; + sha256 = "19g8kk7f7ylx1y7awpc3afw7hp50sid2ka0jd9fdmh1q7dhhnzqr"; }; } diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 5e6fe4326ff5..85055efe84e3 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -605,7 +605,7 @@ in buildPythonPackage { __structuredAttrs = true; inherit version pname format; - disabled = pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.13"; src = bazel-build.python; @@ -613,7 +613,7 @@ buildPythonPackage { # - Drop tensorflow-io dependency until we get it to build # - Relax flatbuffers and gast version requirements # - The purpose of python3Packages.libclang is not clear at the moment and we don't have it packaged yet - # - keras and tensorlow-io-gcs-filesystem will be considered as optional for now. + # - keras will be considered as optional for now. postPatch = '' sed -i setup.py \ -e '/tensorflow-io-gcs-filesystem/,+1d' \ @@ -621,7 +621,6 @@ buildPythonPackage { -e "s/'gast[^']*',/'gast',/" \ -e "/'libclang[^']*',/d" \ -e "/'keras[^']*')\?,/d" \ - -e "/'tensorflow-io-gcs-filesystem[^']*',/d" \ -e "s/'protobuf[^']*',/'protobuf',/" \ ''; diff --git a/pkgs/development/python-modules/tensorflow/prefetcher.sh b/pkgs/development/python-modules/tensorflow/prefetcher.sh index 9bdf9bf3930e..c80ed6fe646c 100755 --- a/pkgs/development/python-modules/tensorflow/prefetcher.sh +++ b/pkgs/development/python-modules/tensorflow/prefetcher.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -version="2.19.0" +version="2.20.0" version_jetson="2.16.1+nv24.08" bucket="https://storage.googleapis.com/tensorflow/versions/${version}" @@ -8,25 +8,29 @@ bucket_jetson="https://developer.download.nvidia.com/compute/redist/jp/v61/tenso # List of binary wheels for Tensorflow. The most recent versions can be found # on the following page: -# https://www.tensorflow.org/install/pip?lang=python3#package-location +# https://www.tensorflow.org/install/pip?lang=python3#package_location url_and_key_list=( "x86_64-linux_39 $bucket/tensorflow_cpu-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_310 $bucket/tensorflow_cpu-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_311 $bucket/tensorflow_cpu-${version}-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_312 $bucket/tensorflow_cpu-${version}-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" +"x86_64-linux_313 $bucket/tensorflow_cpu-${version}-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_39_gpu $bucket/tensorflow-${version}-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_310_gpu $bucket/tensorflow-${version}-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_311_gpu $bucket/tensorflow-${version}-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "x86_64-linux_312_gpu $bucket/tensorflow-${version}-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" +"x86_64-linux_313_gpu $bucket/tensorflow-${version}-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl" "aarch64-linux_39 $bucket/tensorflow-${version}-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux_310 $bucket/tensorflow-${version}-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux_311 $bucket/tensorflow-${version}-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux_312 $bucket/tensorflow-${version}-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" +"aarch64-linux_313 $bucket/tensorflow-${version}-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" "aarch64-linux_310_jetson $bucket_jetson/tensorflow-${version_jetson}-cp310-cp310-linux_aarch64.whl" "aarch64-darwin_39 $bucket/tensorflow-${version}-cp39-cp39-macosx_12_0_arm64.whl" "aarch64-darwin_310 $bucket/tensorflow-${version}-cp310-cp310-macosx_12_0_arm64.whl" "aarch64-darwin_311 $bucket/tensorflow-${version}-cp311-cp311-macosx_12_0_arm64.whl" "aarch64-darwin_312 $bucket/tensorflow-${version}-cp312-cp312-macosx_12_0_arm64.whl" +"aarch64-darwin_313 $bucket/tensorflow-${version}-cp313-cp313-macosx_12_0_arm64.whl" ) hashfile=binary-hashes.nix diff --git a/pkgs/development/python-modules/tf-keras/default.nix b/pkgs/development/python-modules/tf-keras/default.nix index 4643ea82ef4c..e4dbdc919934 100644 --- a/pkgs/development/python-modules/tf-keras/default.nix +++ b/pkgs/development/python-modules/tf-keras/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "tf-keras"; - version = "2.19.0"; + version = "2.20.1"; pyproject = true; src = fetchPypi { pname = "tf_keras"; inherit version; - hash = "sha256-sJpAfYekVxzh6MqYXPxoSD49Y7JRil15qXrZLLZNvpw="; + hash = "sha256-iEvlk4+wsrU7FYPBritmDvhyFTd8KbW2p3/SIbRyrq8="; }; build-system = [ diff --git a/pkgs/development/python-modules/tree-sitter-sql/default.nix b/pkgs/development/python-modules/tree-sitter-sql/default.nix index d5df98fa4906..91d83cdd43fb 100644 --- a/pkgs/development/python-modules/tree-sitter-sql/default.nix +++ b/pkgs/development/python-modules/tree-sitter-sql/default.nix @@ -12,14 +12,14 @@ }: buildPythonPackage rec { pname = "tree-sitter-sql"; - version = "0.3.8"; + version = "0.3.10"; pyproject = true; src = fetchFromGitHub { owner = "DerekStride"; repo = "tree-sitter-sql"; tag = "v${version}"; - hash = "sha256-8gdbbz187sV8I+PJHubFyyQwGUqvo05Yw1DX7rOK4DI="; + hash = "sha256-vPPlDdLkenLG8uH26fzMOS3oxClCLSIKa6zhmDbnC/A="; }; postUnpack = '' @@ -53,6 +53,7 @@ buildPythonPackage rec { meta = { description = "Sql grammar for tree-sitter"; homepage = "https://github.com/DerekStride/tree-sitter-sql"; + changelog = "https://github.com/DerekStride/tree-sitter-sql/releases/tag/${src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pcboy ]; }; diff --git a/pkgs/development/python-modules/types-lxml/default.nix b/pkgs/development/python-modules/types-lxml/default.nix index 02e93cd4cd46..dc497d82fe53 100644 --- a/pkgs/development/python-modules/types-lxml/default.nix +++ b/pkgs/development/python-modules/types-lxml/default.nix @@ -73,6 +73,11 @@ buildPythonPackage rec { disabledTests = [ "test_single_ns_all_tag_2" "test_default_ns" + # Tests require network access + "TestRelaxNGInput" + "TestXmldtdid" + "TestIddict" + "TestParseid" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/types-regex/default.nix b/pkgs/development/python-modules/types-regex/default.nix index 5925a5b27e56..669d7361fca4 100644 --- a/pkgs/development/python-modules/types-regex/default.nix +++ b/pkgs/development/python-modules/types-regex/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "types-regex"; - version = "2025.9.1.20250903"; + version = "2025.9.18.20250921"; pyproject = true; src = fetchPypi { pname = "types_regex"; inherit version; - hash = "sha256-IwEW9ktcCLBhCdlQCG5V/ICbiipdE+gCGKx880+arIQ="; + hash = "sha256-4XAMIbHDEpDkpt1iWE7R8dadcE7RZ2toqO2i0dJCDD8="; }; build-system = [