From 3db8656e35cbaee20d75556fde4b925016dcc494 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 7 Jan 2026 06:55:50 +0100 Subject: [PATCH 01/57] ocamlPackages.landmarks-ppx: disable tests for OCaml < 5.1 --- pkgs/development/ocaml-modules/landmarks-ppx/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/landmarks-ppx/default.nix b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix index 724d8c10c73e..4d70169e2c4f 100644 --- a/pkgs/development/ocaml-modules/landmarks-ppx/default.nix +++ b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix @@ -8,14 +8,13 @@ buildDunePackage { pname = "landmarks-ppx"; - minimalOCamlVersion = "4.08"; inherit (landmarks) src version; buildInputs = [ ppxlib ]; propagatedBuildInputs = [ landmarks ]; - doCheck = lib.versionAtLeast ocaml.version "4.08" && lib.versionOlder ocaml.version "5.0"; + doCheck = lib.versionAtLeast ocaml.version "5.1"; meta = landmarks.meta // { description = "Preprocessor instrumenting code using the landmarks library"; From 1a440e3d533ff767b13e62d504630f1eca4fceec Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 7 Jan 2026 06:55:55 +0100 Subject: [PATCH 02/57] ocaml-ng.ocamlPackages_4_13.ocaml-lsp: mark as broken --- pkgs/development/ocaml-modules/ocaml-lsp/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index fe4d5e5fa1aa..83ca1daffd9e 100644 --- a/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -85,5 +85,6 @@ buildDunePackage rec { meta = lsp.meta // { description = "OCaml Language Server Protocol implementation"; mainProgram = "ocamllsp"; + broken = lib.versions.majorMinor ocaml.version == "4.13"; }; } From 0822fae62129767a79f238b293e06dce5e0e735c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 7 Jan 2026 06:56:00 +0100 Subject: [PATCH 03/57] =?UTF-8?q?ocamlPackages.ppxlib:=200.33.0=20?= =?UTF-8?q?=E2=86=92=200.34.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/by-name/fl/flow/package.nix | 2 +- pkgs/development/ocaml-modules/ppxlib/default.nix | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flow/package.nix b/pkgs/by-name/fl/flow/package.nix index 2ba10797e23c..281a2fb80862 100644 --- a/pkgs/by-name/fl/flow/package.nix +++ b/pkgs/by-name/fl/flow/package.nix @@ -10,7 +10,7 @@ let ocamlPackages = ocaml-ng.ocamlPackages.overrideScope ( self: super: { - ppxlib = super.ppxlib.override { version = "0.33.0"; }; + ppxlib = super.ppxlib.override { version = "0.34.0"; }; } ); in diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix index 76aabf9f8194..0d5d2dfb7c15 100644 --- a/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -11,7 +11,7 @@ if lib.versionAtLeast ocaml.version "5.03" then if lib.versionAtLeast ocaml.version "5.04" then "0.37.0" else "0.36.2" else - "0.33.0" + "0.34.0" else "0.24.0" else @@ -91,6 +91,9 @@ let sha256 = "sha256-/6RO9VHyO3XiHb1pijAxBDE4Gq8UC5/kuBwucKLSxjo="; min_version = "4.07"; }; + "0.34.0" = { + sha256 = "sha256-132XFloVjXrla3wDh80E6ZJ9fn55fKEDn/tbsXpmYac="; + }; "0.36.2" = { sha256 = "sha256-yHVgB9jKwTeahGEUYQDB1hHH327MGpoKqb3ewNbk5xs="; min_version = "4.08"; From 242ff6e0ef930373fb7ba6226514743d7ddab0f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jan 2026 07:32:39 +0000 Subject: [PATCH 04/57] ruffle: 0.2.0-nightly-2026-01-06 -> 0.2.0-nightly-2026-01-12 --- pkgs/by-name/ru/ruffle/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix index d494c6a4041e..6de2426703e0 100644 --- a/pkgs/by-name/ru/ruffle/package.nix +++ b/pkgs/by-name/ru/ruffle/package.nix @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ruffle"; - version = "0.2.0-nightly-2026-01-06"; + version = "0.2.0-nightly-2026-01-12"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = "ruffle"; tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version; - hash = "sha256-y2aSoeSbIVnuRd6oahJVtBqr2Uz9IpVGXxasukL3XcE="; + hash = "sha256-hEfxvRcjxj3ND/qM8WQQVTgOLR7Rf0P9Wfhyx38kxY4="; }; postPatch = @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "OpenH264Version(${major}, ${minor}, ${patch})" ''; - cargoHash = "sha256-6sK2KxAWY/neePfZy1sWcddKCwsu5d2COTotFn6uSv0="; + cargoHash = "sha256-MY+K/KZP2xxewoh413+mjjPj+40gq2GhzdMKteJhRLc="; cargoBuildFlags = lib.optional withRuffleTools "--workspace"; env = From 94daad7afb32362be2f1649db37f9f0504e1adb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jan 2026 11:15:48 +0000 Subject: [PATCH 05/57] positron-bin: 2025.12.2-5 -> 2026.01.0-147 --- pkgs/by-name/po/positron-bin/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix index 295df2009c6a..b05500495092 100644 --- a/pkgs/by-name/po/positron-bin/package.nix +++ b/pkgs/by-name/po/positron-bin/package.nix @@ -22,7 +22,7 @@ }: let pname = "positron-bin"; - version = "2025.12.2-5"; + version = "2026.01.0-147"; in stdenv.mkDerivation { inherit version pname; @@ -31,17 +31,17 @@ stdenv.mkDerivation { if stdenv.hostPlatform.isDarwin then fetchurl { url = "https://cdn.posit.co/positron/releases/mac/universal/Positron-${version}-universal.dmg"; - hash = "sha256-V4akD75XoycUu3wcWIRr4pRkR/QZu5zpsgjpftj6YlU="; + hash = "sha256-/SBJWQLOq4nEHd0HvwII9HuaSDenkcxGmIqDqTJsfug="; } else if stdenv.hostPlatform.system == "aarch64-linux" then fetchurl { url = "https://cdn.posit.co/positron/releases/deb/arm64/Positron-${version}-arm64.deb"; - hash = "sha256-zbG4dZlcrlHNMWUMBvHOIUnNQ0nXR9OTbDSboPkyACg="; + hash = "sha256-u8JrIlSUIynZlZ0o+Z8wWltIDz8/vq0CynPiLSZ6M14="; } else fetchurl { url = "https://cdn.posit.co/positron/releases/deb/x86_64/Positron-${version}-x64.deb"; - hash = "sha256-IQIBz4g5H6bOcmEI0FAWqEEK02zZKKUy3LeySeGbWUo="; + hash = "sha256-eJJ+qcfj2yDKG2uItdtgoT5+VaeXc2/yfKP5TeSuk70="; }; buildInputs = [ From 43f1db14739695c2bfe238777475927f3b254819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 13 Jan 2026 05:23:45 -0800 Subject: [PATCH 06/57] python3Packages.nbconvert: remove superfluous pythonOlder --- pkgs/development/python-modules/nbconvert/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/nbconvert/default.nix b/pkgs/development/python-modules/nbconvert/default.nix index 3b4b4b33aed1..e46dcae1ee8e 100644 --- a/pkgs/development/python-modules/nbconvert/default.nix +++ b/pkgs/development/python-modules/nbconvert/default.nix @@ -2,7 +2,6 @@ lib, fetchurl, buildPythonPackage, - pythonOlder, fetchPypi, hatchling, beautifulsoup4, @@ -18,7 +17,6 @@ pandocfilters, pygments, traitlets, - importlib-metadata, flaky, ipykernel, ipywidgets, @@ -70,8 +68,7 @@ buildPythonPackage rec { pygments traitlets ] - ++ bleach.optional-dependencies.css - ++ lib.optionals (pythonOlder "3.10") [ importlib-metadata ]; + ++ bleach.optional-dependencies.css; preCheck = '' export HOME=$(mktemp -d) From 83df79efc6751de79f1a21b615a3adfc543f50b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 13 Jan 2026 05:28:14 -0800 Subject: [PATCH 07/57] poetry: remove superfluous pythonOlder --- pkgs/by-name/po/poetry/unwrapped.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/by-name/po/poetry/unwrapped.nix b/pkgs/by-name/po/poetry/unwrapped.nix index 9cee03056d55..6cb9a0cda505 100644 --- a/pkgs/by-name/po/poetry/unwrapped.nix +++ b/pkgs/by-name/po/poetry/unwrapped.nix @@ -27,7 +27,6 @@ virtualenv, xattr, tomli, - importlib-metadata, deepdiff, pytestCheckHook, httpretty, @@ -88,9 +87,6 @@ buildPythonPackage rec { ++ lib.optionals (pythonOlder "3.11") [ tomli ] - ++ lib.optionals (pythonOlder "3.10") [ - importlib-metadata - ] ++ cachecontrol.optional-dependencies.filecache ++ pbs-installer.optional-dependencies.download ++ pbs-installer.optional-dependencies.install; From 4ee14d2120519e18b3a8c15268d58232c8448920 Mon Sep 17 00:00:00 2001 From: "Adam C. Stephens" Date: Sat, 10 Jan 2026 22:20:57 -0500 Subject: [PATCH 08/57] beamPackages.elixir_1_20: init at 1.20.0-rc.1 Changelog: https://github.com/elixir-lang/elixir/releases/tag/v1.20.0-rc.1 --- pkgs/development/beam-modules/default.nix | 5 +++++ pkgs/development/interpreters/elixir/1.19.nix | 2 +- pkgs/development/interpreters/elixir/1.20.nix | 7 +++++++ pkgs/top-level/beam-packages.nix | 1 + 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/interpreters/elixir/1.20.nix diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix index b2c6e263134a..0bcee85e7fcc 100644 --- a/pkgs/development/beam-modules/default.nix +++ b/pkgs/development/beam-modules/default.nix @@ -48,6 +48,11 @@ let # BEAM-based languages. elixir = elixir_1_18; + elixir_1_20 = callPackage ../interpreters/elixir/1.20.nix { + inherit erlang; + debugInfo = true; + }; + elixir_1_19 = callPackage ../interpreters/elixir/1.19.nix { inherit erlang; debugInfo = true; diff --git a/pkgs/development/interpreters/elixir/1.19.nix b/pkgs/development/interpreters/elixir/1.19.nix index 9444d4958a01..48694f1dc661 100644 --- a/pkgs/development/interpreters/elixir/1.19.nix +++ b/pkgs/development/interpreters/elixir/1.19.nix @@ -1,7 +1,7 @@ import ./generic-builder.nix { version = "1.19.5"; hash = "sha256-ph7zu0F5q+/QZcsVIwpdU1icN84Rn3nIVpnRelpRIMQ="; - # https://hexdocs.pm/elixir/1.19.0-rc.1/compatibility-and-deprecations.html#between-elixir-and-erlang-otp + # https://hexdocs.pm/elixir/1.19.5/compatibility-and-deprecations.html#between-elixir-and-erlang-otp minimumOTPVersion = "26"; maximumOTPVersion = "28"; } diff --git a/pkgs/development/interpreters/elixir/1.20.nix b/pkgs/development/interpreters/elixir/1.20.nix new file mode 100644 index 000000000000..861aea892bbe --- /dev/null +++ b/pkgs/development/interpreters/elixir/1.20.nix @@ -0,0 +1,7 @@ +import ./generic-builder.nix { + version = "1.20.0-rc.1"; + hash = "sha256-FuTZHDI8ZNe6SHjiaPDZh21Ah7ek4kHqlYVvx0ybqI4="; + # https://hexdocs.pm/elixir/1.20.0-rc.1/compatibility-and-deprecations.html#between-elixir-and-erlang-otp + minimumOTPVersion = "26"; + maximumOTPVersion = "28"; +} diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix index fecf5d78208b..b4df907bb50d 100644 --- a/pkgs/top-level/beam-packages.nix +++ b/pkgs/top-level/beam-packages.nix @@ -51,6 +51,7 @@ in # `beam.packages.erlang_27.elixir`. inherit (self.packages.erlang) elixir + elixir_1_20 elixir_1_19 elixir_1_18 elixir_1_17 From 683c8aeea8557927c11782cfbe7f6daeee8fa0c0 Mon Sep 17 00:00:00 2001 From: isabel Date: Tue, 13 Jan 2026 18:46:36 +0000 Subject: [PATCH 09/57] mullvad-compass: init at 0.0.3 --- pkgs/by-name/mu/mullvad-compass/package.nix | 36 +++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/mu/mullvad-compass/package.nix diff --git a/pkgs/by-name/mu/mullvad-compass/package.nix b/pkgs/by-name/mu/mullvad-compass/package.nix new file mode 100644 index 000000000000..6888e00ed773 --- /dev/null +++ b/pkgs/by-name/mu/mullvad-compass/package.nix @@ -0,0 +1,36 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: +buildGoModule (finalAttrs: { + pname = "mullvad-compass"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "Ch00k"; + repo = "mullvad-compass"; + tag = finalAttrs.version; + hash = "sha256-OhaXabjkimeMXty6msqDJVvnWXu8G6jWz/E2x7ZYrDI="; + }; + + vendorHash = "sha256-gEdtoJjCa0nVyi7T4zzv6xUDTQCYFi4ANFaqXGeqcsI="; + + ldflags = [ + "-s" + "-w" + "-X main.Version=${finalAttrs.version}" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + meta = { + description = "Find the best Mullvad VPN server to connect to"; + homepage = "https://github.com/Ch00k/mullvad-compass"; + license = lib.licenses.unlicense; + maintainers = with lib.maintainers; [ isabelroses ]; + mainProgram = "mullvad-compass"; + }; +}) From 5ece4e374b3b6549bf68a17e85ca404d39ede78c Mon Sep 17 00:00:00 2001 From: isabel Date: Tue, 13 Jan 2026 18:55:31 +0000 Subject: [PATCH 10/57] mullvad-closest: drop --- .../mullvad-closest/default.nix | 44 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 5 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 pkgs/development/python-modules/mullvad-closest/default.nix diff --git a/pkgs/development/python-modules/mullvad-closest/default.nix b/pkgs/development/python-modules/mullvad-closest/default.nix deleted file mode 100644 index 83d249fe55d8..000000000000 --- a/pkgs/development/python-modules/mullvad-closest/default.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - buildPythonPackage, - setuptools, - click, - geopy, - ping3, - requests, - tabulate, - fetchFromGitHub, -}: - -buildPythonPackage { - pname = "mullvad-closest"; - version = "unstable-2023-07-09"; - pyproject = true; - - src = fetchFromGitHub { - owner = "Ch00k"; - repo = "mullvad-closest"; - rev = "894d2075a520fcad238256725245030374693a16"; - hash = "sha256-scJiYjEmnDDElE5rHdPbnnuNjjRB0/X3vNGLoi2MAmo="; - }; - - nativeBuildInputs = [ setuptools ]; - - propagatedBuildInputs = [ - click - geopy - ping3 - requests - tabulate - ]; - - pythonImportsCheck = [ "mullvad_closest" ]; - - meta = { - description = "Find Mullvad servers with the lowest latency at your location"; - mainProgram = "mullvad-closest"; - homepage = "https://github.com/Ch00k/mullvad-closest"; - license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ siraben ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9f7e1174d736..a55bffa7e50b 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1143,6 +1143,7 @@ mapAliases { mrxvt = throw "'mrxvt' has been removed due to lack of maintainence upstream"; # Added 2025-09-25 msgpack = throw "msgpack has been split into msgpack-c and msgpack-cxx"; # Added 2025-09-14 msp430NewlibCross = throw "'msp430NewlibCross' has been renamed to/replaced by 'msp430Newlib'"; # Converted to throw 2025-10-27 + mullvad-closest = throw "'mullvad-closest' has been removed as it was unmaintained. Consider using 'mullvad-compass' instead."; # Added 2026-01-13 multipass = throw "multipass was dropped since it was unmaintained."; # Added 2025-11-29 mumps_par = throw "'mumps_par' has been renamed to/replaced by 'mumps-mpi'"; # Converted to throw 2025-10-27 mustache-tcl = throw "'mustache-tcl' has been renamed to/replaced by 'tclPackages.mustache-tcl'"; # Converted to throw 2025-10-27 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba7e94ee8088..d19765190c6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9020,8 +9020,6 @@ with pkgs; mullvad ; - mullvad-closest = with python3Packages; toPythonApplication mullvad-closest; - napalm = with python3Packages; toPythonApplication ( diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0378e92e1de0..55eb3d572c60 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -276,6 +276,7 @@ mapAliases { mne-python = throw "'mne-python' has been renamed to/replaced by 'mne'"; # Converted to throw 2025-10-29 mpris-server = throw "mpris-server was removed because it is unused"; # added 2025-10-31 msldap-bad = throw "'msldap-bad' has been renamed to/replaced by 'badldap'"; # added 2025-11-06 + mullvad-closest = throw "'mullvad-closest' has been removed as it was unmaintained. Consider using 'mullvad-compass' instead."; # Added 2026-01-13 multi_key_dict = throw "'multi_key_dict' has been renamed to/replaced by 'multi-key-dict'"; # Converted to throw 2025-10-29 mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25 net2grid = throw "'net2grid' has been renamed to/replaced by 'gridnet'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a2bbbc404c6b..0577d750f7fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10110,8 +10110,6 @@ self: super: with self; { mullvad-api = callPackage ../development/python-modules/mullvad-api { }; - mullvad-closest = callPackage ../development/python-modules/mullvad-closest { }; - mulpyplexer = callPackage ../development/python-modules/mulpyplexer { }; multi-key-dict = callPackage ../development/python-modules/multi-key-dict { }; From a7d1b2567eec066eaf3dc7493a94ad74f2c1e508 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jan 2026 19:08:01 +0000 Subject: [PATCH 11/57] unstructured-api: 0.0.89 -> 0.0.92 --- pkgs/by-name/un/unstructured-api/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/un/unstructured-api/package.nix b/pkgs/by-name/un/unstructured-api/package.nix index 28cef6409579..0528753a0d9e 100644 --- a/pkgs/by-name/un/unstructured-api/package.nix +++ b/pkgs/by-name/un/unstructured-api/package.nix @@ -144,7 +144,7 @@ let ++ google-api-core.optional-dependencies.grpc ++ unstructured.optional-dependencies.all-docs ); - version = "0.0.89"; + version = "0.0.92"; unstructured_api_nltk_data = python3.pkgs.nltk.dataDir (d: [ d.punkt d.averaged-perceptron-tagger @@ -158,7 +158,7 @@ stdenvNoCC.mkDerivation { owner = "Unstructured-IO"; repo = "unstructured-api"; rev = version; - hash = "sha256-FxWOR13wZwowZny2t4Frwl+cLMv+6nkHxQm9Xc4Y9Kw="; + hash = "sha256-kPPgLb6J0vg2bpFl85N+sVrapnozS/7pCcqG0xHYcMY="; }; nativeBuildInputs = [ makeWrapper ]; From a098cc916de30f8544ffe2769931fb1c611d97d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jan 2026 20:50:06 +0000 Subject: [PATCH 12/57] libdaq: 3.0.23 -> 3.0.24 --- pkgs/by-name/li/libdaq/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/li/libdaq/package.nix b/pkgs/by-name/li/libdaq/package.nix index 3ecb104cab49..b48f6f2cb33c 100644 --- a/pkgs/by-name/li/libdaq/package.nix +++ b/pkgs/by-name/li/libdaq/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdaq"; - version = "3.0.23"; + version = "3.0.24"; src = fetchFromGitHub { owner = "snort3"; repo = "libdaq"; tag = "v${finalAttrs.version}"; - hash = "sha256-P57eH301oOSY43LyryFar1aoPcDrd+WNxTResWGOD/I="; + hash = "sha256-LIdELWQZ76bA0GZne0IMr+GHisUksBYXwzSqVB5nMsA="; }; nativeBuildInputs = [ From 13c735b4df78a54b1ed6e197f0e446ff0ba8fcaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Jan 2026 21:24:13 +0000 Subject: [PATCH 13/57] phpactor: 2025.12.21.0 -> 2025.12.21.1 --- pkgs/by-name/ph/phpactor/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 90d1703f3da5..8100858acd00 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -7,16 +7,16 @@ }: php.buildComposerProject2 (finalAttrs: { pname = "phpactor"; - version = "2025.12.21.0"; + version = "2025.12.21.1"; src = fetchFromGitHub { owner = "phpactor"; repo = "phpactor"; tag = finalAttrs.version; - hash = "sha256-wMyHkkN15kd2Q9BN3H2gJ3iNlRodric2DqWiWLU1Fj0="; + hash = "sha256-9hkYU/Mhxl49tIZa3Vyj3kXftNIgZXUlH1T6/4obM7I="; }; - vendorHash = "sha256-T4YiYL2RBpmLluk5rm4hkpD96wXKmrlX/1pzHRb//68="; + vendorHash = "sha256-XsybPL391WGHztWPaZAN1l2hWQMQ0tklZ9yjkKjGzsI="; nativeBuildInputs = [ installShellFiles ]; From 58363f061cd223239971483979072aa1bf72a1bd Mon Sep 17 00:00:00 2001 From: Michael Daniels Date: Tue, 13 Jan 2026 18:14:06 -0500 Subject: [PATCH 14/57] python3Packages.vina: change 'format = "pyproject"' to 'pyproject = true' --- .../science/chemistry/autodock-vina/python-bindings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix b/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix index 2b57a7d3f89b..53fc0a0d6b51 100644 --- a/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix +++ b/pkgs/applications/science/chemistry/autodock-vina/python-bindings.nix @@ -19,7 +19,7 @@ buildPythonPackage { meta ; - format = "pyproject"; + pyproject = true; sourceRoot = "${autodock-vina.src.name}/build/python"; @@ -29,7 +29,7 @@ buildPythonPackage { substituteInPlace setup.py \ --replace "python_requires='>=3.5.*'" "python_requires='>=3.5'" - # setupPyBuildFlags are not applied with `format = "pyproject"` + # setupPyBuildFlags are not applied with `pyproject = true` substituteInPlace setup.py \ --replace "= locate_boost()" "= '${lib.getDev boost}/include', '${boost}/lib'" From d7c2557a41723df3646df08b71b19a1d76aa03f6 Mon Sep 17 00:00:00 2001 From: Benjamin Sparks Date: Tue, 13 Jan 2026 18:11:41 +0100 Subject: [PATCH 15/57] shaka-packager: fix GCC15 build Requires adding cstdlib includes wherever plain uintN_t types are used --- pkgs/by-name/sh/shaka-packager/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/sh/shaka-packager/package.nix b/pkgs/by-name/sh/shaka-packager/package.nix index da252b4bf5f8..d574b87c96ee 100644 --- a/pkgs/by-name/sh/shaka-packager/package.nix +++ b/pkgs/by-name/sh/shaka-packager/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchFromGitHub, testers, cmake, @@ -46,6 +47,15 @@ stdenv.mkDerivation (finalAttrs: { # The last step is necessary to keep the patch size to a minimum, otherwise we'd have # to add the namespace identifiers everywhere a dependency is used. ./0002-Unvendor-dependencies.patch + # GCC15 build fixes + # Taken from https://github.com/shaka-project/shaka-packager/pull/1506, + # but excludes the changes to the shell script as we do not use it. + (fetchpatch { + name = "GCC15-cstdint-includes"; + url = "https://github.com/shaka-project/shaka-packager/commit/b1c79e50521b8725117dfe0a45fe44c2f2dbd4fb.patch"; + excludes = [ "packager/testing/test_dockers.sh" ]; + hash = "sha256-8dBQ+eENZKFB9ONjmPBlxy8P/iinyeUS8zhlxz6rnQ4="; + }) ]; nativeBuildInputs = [ From 68d4902f019b40ca78d62ddb17f159e87d6330ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Jan 2026 00:02:27 +0000 Subject: [PATCH 16/57] python3Packages.textual: 7.0.0 -> 7.2.0 --- pkgs/development/python-modules/textual/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix index 1d784e75e6d0..2e7b2d7f13fb 100644 --- a/pkgs/development/python-modules/textual/default.nix +++ b/pkgs/development/python-modules/textual/default.nix @@ -37,14 +37,14 @@ buildPythonPackage rec { pname = "textual"; - version = "7.0.0"; + version = "7.2.0"; pyproject = true; src = fetchFromGitHub { owner = "Textualize"; repo = "textual"; tag = "v${version}"; - hash = "sha256-wXv3Q0/q5U75D/XE6oR8bsUKZhGbP+a8DhNrU6klYjA="; + hash = "sha256-/BVrglVfGW2InkC0IKHOKZTP33tfqxGuXYQXWJVHmxw="; }; build-system = [ poetry-core ]; From 45c0a651beef7217c28128bda6d4687eb5ec44ba Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 14 Jan 2026 00:04:13 +0000 Subject: [PATCH 17/57] python3Packages.cleanlab: 2.8.0 -> 2.9.0 Diff: https://github.com/cleanlab/cleanlab/compare/v2.8.0...v2.9.0 Changelog: https://github.com/cleanlab/cleanlab/releases/tag/v2.9.0 --- pkgs/development/python-modules/cleanlab/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cleanlab/default.nix b/pkgs/development/python-modules/cleanlab/default.nix index e263c99526e4..827db22fe93c 100644 --- a/pkgs/development/python-modules/cleanlab/default.nix +++ b/pkgs/development/python-modules/cleanlab/default.nix @@ -32,14 +32,14 @@ buildPythonPackage (finalAttrs: { pname = "cleanlab"; - version = "2.8.0"; + version = "2.9.0"; pyproject = true; src = fetchFromGitHub { owner = "cleanlab"; repo = "cleanlab"; tag = "v${finalAttrs.version}"; - hash = "sha256-sgDQJy0iNxs3bIVuqV7LVEFC0jjlWvnqFzKr7ZDGmPo="; + hash = "sha256-0H4JTAc2tCtIFklGciXQ+TCWOiJ6kRkqcycJNeIpero="; }; postPatch = '' From 134faf38acbce019c764d44d900d4b917a6a6808 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Thu, 25 Dec 2025 02:02:00 +0100 Subject: [PATCH 18/57] python313Packages.hikari: 2.4.1 -> 2.5.0 Co-Authored-by: SkohTV --- pkgs/development/python-modules/hikari/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/hikari/default.nix b/pkgs/development/python-modules/hikari/default.nix index 588a03a97892..be1c47043ecd 100644 --- a/pkgs/development/python-modules/hikari/default.nix +++ b/pkgs/development/python-modules/hikari/default.nix @@ -17,14 +17,14 @@ }: buildPythonPackage (finalAttrs: { pname = "hikari"; - version = "2.4.1"; + version = "2.5.0"; pyproject = true; src = fetchFromGitHub { owner = "hikari-py"; repo = "hikari"; tag = finalAttrs.version; - hash = "sha256-lkJICN5uXFIKUZwxZI82FSYZLWFa7Cb6tDs6wV9DsY0="; + hash = "sha256-dOYaGWxhLefWIhaaIPM80cpYtcB/ywibFBzWDr3hKsw="; # The git commit is part of the `hikari.__git_sha1__` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -66,9 +66,6 @@ buildPythonPackage (finalAttrs: { postPatch = '' substituteInPlace hikari/_about.py \ --replace-fail "__git_sha1__: typing.Final[str] = \"HEAD\"" "__git_sha1__: typing.Final[str] = \"$(cat $src/COMMIT)\"" - # XXX: Remove once pytest-asyncio is updated to 0.24+ - substituteInPlace pyproject.toml \ - --replace-fail "asyncio_default_fixture_loop_scope = \"func\"" "" ''; meta = { From 4bbe4042c639ac3126f16c519fdc9897b7aac6d0 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 14 Jan 2026 01:27:40 +0100 Subject: [PATCH 19/57] python313Packages.hikari-crescent: disable bot tests --- pkgs/development/python-modules/hikari-crescent/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/hikari-crescent/default.nix b/pkgs/development/python-modules/hikari-crescent/default.nix index 2f876df33965..595b68c9427c 100644 --- a/pkgs/development/python-modules/hikari-crescent/default.nix +++ b/pkgs/development/python-modules/hikari-crescent/default.nix @@ -43,6 +43,8 @@ buildPythonPackage (finalAttrs: { disabledTests = [ "test_handle_resp" ]; + disabledTestPaths = [ "tests/test_bot/test_bot.py" ]; + meta = { description = "Command handler for Hikari that keeps your project neat and tidy"; license = lib.licenses.mit; From c06e838d6529ecf2ec11dccea09801b1502ec9f5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 14 Jan 2026 01:38:58 +0100 Subject: [PATCH 20/57] python315: 3.15.0a3 -> 3.15.0a4 https://docs.python.org/3.15/whatsnew/changelog.html#python-3-15-0-alpha-4 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 9c5dc4671b56..9c0e0e79cd85 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -104,9 +104,9 @@ major = "3"; minor = "15"; patch = "0"; - suffix = "a3"; + suffix = "a4"; }; - hash = "sha256-arAs2sJFBXeYd7sdkYlDLWfpDd8qm4t7Nz6tVKwHtgc="; + hash = "sha256-oKUh1cSAuJl52hrvzil1DrFYEowBeHKOv+91EcIbTnc="; inherit passthruFun; }; From 5a8aaa351288ab94a4c1f9cf98055f190287baa3 Mon Sep 17 00:00:00 2001 From: SkohTV Date: Tue, 13 Jan 2026 19:41:01 -0500 Subject: [PATCH 21/57] python3Packages.pdoc: 15.0.4 -> 16.0.0 --- pkgs/development/python-modules/pdoc/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pdoc/default.nix b/pkgs/development/python-modules/pdoc/default.nix index b727df097ee3..f25dc9f1b358 100644 --- a/pkgs/development/python-modules/pdoc/default.nix +++ b/pkgs/development/python-modules/pdoc/default.nix @@ -10,11 +10,13 @@ pytestCheckHook, hypothesis, nix-update-script, + markdown2, + pydantic, }: buildPythonPackage rec { pname = "pdoc"; - version = "15.0.4"; + version = "16.0.0"; pyproject = true; @@ -22,7 +24,7 @@ buildPythonPackage rec { owner = "mitmproxy"; repo = "pdoc"; tag = "v${version}"; - hash = "sha256-l0aaQbjxAMcTZZwDN6g8A7bjSsl6yP2FoAnwTYkKYH8="; + hash = "sha256-9amp6CWYIcniVfdlmPKYuRFR7B5JJtuMlOoDxpfvvJA="; }; build-system = [ setuptools ]; @@ -31,6 +33,8 @@ buildPythonPackage rec { jinja2 pygments markupsafe + markdown2 + pydantic ]; nativeCheckInputs = [ From d29b0fe9f1db11c186373e189c3c6b0c2a85eba0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Jan 2026 01:18:26 +0000 Subject: [PATCH 22/57] lockbook: 25.12.15 -> 26.1.13 --- pkgs/by-name/lo/lockbook/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix index 582640cbb85a..a67682ed5f74 100644 --- a/pkgs/by-name/lo/lockbook/package.nix +++ b/pkgs/by-name/lo/lockbook/package.nix @@ -12,16 +12,16 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook"; - version = "25.12.15"; + version = "26.1.13"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-bpT8xJST/VJvXIqrukv3OM3xD2zvX5ZqzmLG1BKzXyU="; + hash = "sha256-1+56xdfrRpjhb536vC8kwZ+fyGpQ38wPH7clkApIOUs="; }; - cargoHash = "sha256-tcaLIE4Sn1+C9KIqm3f4ycf/FZtO8QQxCg5mof+TH0I="; + cargoHash = "sha256-JCWBG8jt8IxMaUfZaC+YnDfYSmpH/Jm1sqvEcHI8aA0="; doCheck = false; # there are no cli tests cargoBuildFlags = [ From 64efaa60cea2ea3de5e852701dfe09bfdf1ca66a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Jan 2026 01:19:19 +0000 Subject: [PATCH 23/57] lockbook-desktop: 25.12.15 -> 26.1.13 --- pkgs/by-name/lo/lockbook-desktop/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index c8bd8167ecbc..c2a80b042118 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "lockbook-desktop"; - version = "25.12.15"; + version = "26.1.13"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = version; - hash = "sha256-bpT8xJST/VJvXIqrukv3OM3xD2zvX5ZqzmLG1BKzXyU="; + hash = "sha256-1+56xdfrRpjhb536vC8kwZ+fyGpQ38wPH7clkApIOUs="; }; - cargoHash = "sha256-tcaLIE4Sn1+C9KIqm3f4ycf/FZtO8QQxCg5mof+TH0I="; + cargoHash = "sha256-JCWBG8jt8IxMaUfZaC+YnDfYSmpH/Jm1sqvEcHI8aA0="; nativeBuildInputs = [ pkg-config From 31bd1b9ef1a40207860c8d1a047ab93c8fa8ca84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:40:48 +0100 Subject: [PATCH 24/57] peru: remove superfluous pythonOlder --- pkgs/by-name/pe/peru/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/pe/peru/package.nix b/pkgs/by-name/pe/peru/package.nix index 1fb1543b5e34..1c632f013ed9 100644 --- a/pkgs/by-name/pe/peru/package.nix +++ b/pkgs/by-name/pe/peru/package.nix @@ -9,8 +9,6 @@ python3Packages.buildPythonApplication rec { version = "1.3.4"; pyproject = true; - disabled = python3Packages.pythonOlder "3.5"; - src = fetchFromGitHub { owner = "buildinspace"; repo = "peru"; From d225e8652276ad283359deba3eee70149a41d420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:42:03 +0100 Subject: [PATCH 25/57] python3Packages.pathlib2: remove superfluous pythonOlder --- pkgs/development/python-modules/pathlib2/default.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/development/python-modules/pathlib2/default.nix b/pkgs/development/python-modules/pathlib2/default.nix index afb3a3af3a58..f922218f9142 100644 --- a/pkgs/development/python-modules/pathlib2/default.nix +++ b/pkgs/development/python-modules/pathlib2/default.nix @@ -3,9 +3,6 @@ buildPythonPackage, fetchPypi, six, - pythonOlder, - scandir ? null, - typing, }: buildPythonPackage rec { @@ -20,10 +17,6 @@ buildPythonPackage rec { propagatedBuildInputs = [ six - ] - ++ lib.optionals (pythonOlder "3.5") [ - scandir - typing ]; meta = { From 9b319988ce105b17690b75a91e46e2b491a55683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:42:50 +0100 Subject: [PATCH 26/57] python3Packages.remctl: remove superfluous pythonOlder --- pkgs/development/python-modules/remctl/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/remctl/default.nix b/pkgs/development/python-modules/remctl/default.nix index 3475943d4269..908334b1cfe1 100644 --- a/pkgs/development/python-modules/remctl/default.nix +++ b/pkgs/development/python-modules/remctl/default.nix @@ -1,9 +1,6 @@ { - lib, buildPythonPackage, - pythonOlder, remctl-c, # remctl from pkgs, not from pythonPackages - typing, }: buildPythonPackage { @@ -17,6 +14,4 @@ buildPythonPackage { setSourceRoot = "sourceRoot=$(echo */python)"; buildInputs = [ remctl-c ]; - - propagatedBuildInputs = lib.optionals (pythonOlder "3.5") [ typing ]; } From de26fa9c92177c8ccd1ea527ac594d9df6a46789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:43:15 +0100 Subject: [PATCH 27/57] python3Packages.uranium: remove superfluous pythonOlder --- pkgs/development/python-modules/uranium/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/uranium/default.nix b/pkgs/development/python-modules/uranium/default.nix index 96ce10f8da79..91bd77e10dc2 100644 --- a/pkgs/development/python-modules/uranium/default.nix +++ b/pkgs/development/python-modules/uranium/default.nix @@ -12,7 +12,6 @@ cryptography, doxygen, gettext, - pythonOlder, }: buildPythonPackage rec { @@ -27,8 +26,6 @@ buildPythonPackage rec { hash = "sha256-SE9xqrloPXIRTJiiqUdRKFmb4c0OjmJK5CMn6VXMFmk="; }; - disabled = pythonOlder "3.5.0"; - buildInputs = [ python gettext From c4a789f33722e3d3830d1120b4f699bb1191c4bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:49:34 +0100 Subject: [PATCH 28/57] alerta: remove superfluous pythonOlder --- pkgs/by-name/al/alerta/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/al/alerta/package.nix b/pkgs/by-name/al/alerta/package.nix index 5211f0bb37fe..aa6d71e48641 100644 --- a/pkgs/by-name/al/alerta/package.nix +++ b/pkgs/by-name/al/alerta/package.nix @@ -25,8 +25,6 @@ python3.pkgs.buildPythonApplication rec { doCheck = false; - disabled = python3.pythonOlder "3.6"; - meta = { homepage = "https://alerta.io"; description = "Alerta Monitoring System command-line interface"; From 1c5ddc9d34785167d12f4e77a893a41ca9d2d4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:50:16 +0100 Subject: [PATCH 29/57] gorilla-cli: remove superfluous pythonOlder --- pkgs/by-name/go/gorilla-cli/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/go/gorilla-cli/package.nix b/pkgs/by-name/go/gorilla-cli/package.nix index 55686538c4ad..589f33e292e7 100644 --- a/pkgs/by-name/go/gorilla-cli/package.nix +++ b/pkgs/by-name/go/gorilla-cli/package.nix @@ -17,8 +17,6 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-3h3QtBDKswTDL7zNM2C4VWiGCqknm/bxhP9sw4ieIcQ="; }; - disabled = python3.pythonOlder "3.6"; - build-system = with python3.pkgs; [ setuptools ]; From e7e75b8037af053da0b97034680f063a1f47c17a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:50:31 +0100 Subject: [PATCH 30/57] nimbo: remove superfluous pythonOlder --- pkgs/by-name/ni/nimbo/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/ni/nimbo/package.nix b/pkgs/by-name/ni/nimbo/package.nix index 42d2a9bd8d00..661db2d69d89 100644 --- a/pkgs/by-name/ni/nimbo/package.nix +++ b/pkgs/by-name/ni/nimbo/package.nix @@ -11,7 +11,6 @@ python3.pkgs.buildPythonApplication rec { pname = "nimbo"; version = "0.3.0"; format = "setuptools"; - disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = "nimbo-sh"; From a8d8d927bcadd1ea8436ae7e7498676b42eb74ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:50:41 +0100 Subject: [PATCH 31/57] pylode: remove superfluous pythonOlder --- pkgs/by-name/py/pylode/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/py/pylode/package.nix b/pkgs/by-name/py/pylode/package.nix index 7356f3b5b987..099007f6a661 100644 --- a/pkgs/by-name/py/pylode/package.nix +++ b/pkgs/by-name/py/pylode/package.nix @@ -9,8 +9,6 @@ python3.pkgs.buildPythonApplication rec { version = "2.13.3"; pyproject = true; - disabled = python3.pythonOlder "3.6"; - src = fetchFromGitHub { owner = "RDFLib"; repo = "pylode"; From be1cc6c3015cde9dacc7e156a516f88c89e86bb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:50:58 +0100 Subject: [PATCH 32/57] shot-scraper: remove superfluous pythonOlder --- pkgs/by-name/sh/shot-scraper/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/sh/shot-scraper/package.nix b/pkgs/by-name/sh/shot-scraper/package.nix index 5052334b68ed..4818f015a263 100644 --- a/pkgs/by-name/sh/shot-scraper/package.nix +++ b/pkgs/by-name/sh/shot-scraper/package.nix @@ -9,8 +9,6 @@ python3.pkgs.buildPythonApplication rec { version = "1.8"; pyproject = true; - disabled = python3.pkgs.pythonOlder "3.6"; - src = fetchFromGitHub { owner = "simonw"; repo = "shot-scraper"; From e425bc40c724efc62d03698eb44985c3f10b615e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:51:15 +0100 Subject: [PATCH 33/57] usbrip: remove superfluous pythonOlder --- pkgs/by-name/us/usbrip/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/us/usbrip/package.nix b/pkgs/by-name/us/usbrip/package.nix index 9ec88c6d4cad..11e25d1053b6 100644 --- a/pkgs/by-name/us/usbrip/package.nix +++ b/pkgs/by-name/us/usbrip/package.nix @@ -9,8 +9,6 @@ python3.pkgs.buildPythonApplication { version = "0-unstable-2021-07-02"; pyproject = true; - disabled = python3.pythonOlder "3.6"; - src = fetchFromGitHub { owner = "snovvcrash"; repo = "usbrip"; From 4f7943758323b7f5dadf253ca6ca1002f5431722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:51:30 +0100 Subject: [PATCH 34/57] xxh: remove superfluous pythonOlder --- pkgs/by-name/xx/xxh/package.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/by-name/xx/xxh/package.nix b/pkgs/by-name/xx/xxh/package.nix index e9a9b4da45c1..70e6e5b5e098 100644 --- a/pkgs/by-name/xx/xxh/package.nix +++ b/pkgs/by-name/xx/xxh/package.nix @@ -9,7 +9,6 @@ python3.pkgs.buildPythonApplication rec { pname = "xxh"; version = "0.8.14"; pyproject = true; - disabled = python3.pkgs.pythonOlder "3.6"; src = fetchFromGitHub { owner = "xxh"; From f6afe94e92bc2bad7313c901275e7e8817af454b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:52:00 +0100 Subject: [PATCH 35/57] python3Packages.augmax: remove superfluous pythonOlder --- pkgs/development/python-modules/augmax/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/augmax/default.nix b/pkgs/development/python-modules/augmax/default.nix index 2ddb285b7061..9573bd29a870 100644 --- a/pkgs/development/python-modules/augmax/default.nix +++ b/pkgs/development/python-modules/augmax/default.nix @@ -5,7 +5,6 @@ jax, jaxlib, lib, - pythonOlder, setuptools, }: @@ -14,8 +13,6 @@ buildPythonPackage rec { version = "0.3.3"; pyproject = true; - disbaled = pythonOlder "3.6"; - src = fetchFromGitHub { owner = "khdlr"; repo = "augmax"; From 28be0557659f391f6bf95d2eebec65815c99ccee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:52:47 +0100 Subject: [PATCH 36/57] python3Packages.bwapy: remove superfluous pythonOlder --- pkgs/development/python-modules/bwapy/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bwapy/default.nix b/pkgs/development/python-modules/bwapy/default.nix index 11b27dcfd2c5..6de156ff9d2e 100644 --- a/pkgs/development/python-modules/bwapy/default.nix +++ b/pkgs/development/python-modules/bwapy/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, pythonAtLeast, - pythonOlder, fetchPypi, bwa, cffi, @@ -15,7 +14,7 @@ buildPythonPackage rec { format = "setuptools"; # uses the removed imp module - disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; From 54c52cd27db98393610c49edc516b88d9311e5d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:53:08 +0100 Subject: [PATCH 37/57] python3Packages.future-fstrings: remove superfluous pythonOlder --- pkgs/development/python-modules/future-fstrings/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/future-fstrings/default.nix b/pkgs/development/python-modules/future-fstrings/default.nix index 6e2782b698ee..949532f3a24a 100644 --- a/pkgs/development/python-modules/future-fstrings/default.nix +++ b/pkgs/development/python-modules/future-fstrings/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, }: buildPythonPackage rec { @@ -25,6 +24,5 @@ buildPythonPackage rec { mainProgram = "future-fstrings-show"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ nyanloutre ]; - broken = pythonOlder "3.6"; # dependency tokenize-rt not packaged }; } From 097215d9fa09a2b13289932311b2eb1807b6a167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:53:25 +0100 Subject: [PATCH 38/57] python3Packages.irctokens: remove superfluous pythonOlder --- pkgs/development/python-modules/irctokens/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/irctokens/default.nix b/pkgs/development/python-modules/irctokens/default.nix index 4155ef180a28..ac9afc7274ff 100644 --- a/pkgs/development/python-modules/irctokens/default.nix +++ b/pkgs/development/python-modules/irctokens/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, setuptools, pyyaml, unittestCheckHook, @@ -13,8 +12,6 @@ buildPythonPackage rec { version = "2.0.2"; pyproject = true; - disabled = pythonOlder "3.6"; # f-strings - src = fetchFromGitHub { owner = "jesopo"; repo = "irctokens"; From 88ec798854079613afa8bce330348ec40e3507a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:53:40 +0100 Subject: [PATCH 39/57] python3Packages.pandas-datareader: remove superfluous pythonOlder --- pkgs/development/python-modules/pandas-datareader/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pandas-datareader/default.nix b/pkgs/development/python-modules/pandas-datareader/default.nix index aaf21fa3b025..08c97850568a 100644 --- a/pkgs/development/python-modules/pandas-datareader/default.nix +++ b/pkgs/development/python-modules/pandas-datareader/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, pythonAtLeast, fetchPypi, setuptools, @@ -15,7 +14,7 @@ buildPythonPackage rec { version = "0.10.0"; pyproject = true; - disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; From 64ca2f48dd2d04ef34604f5c9c3e969f0e87f6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:54:00 +0100 Subject: [PATCH 40/57] python3Packages.preprocess-cancellation: remove superfluous pythonOlder --- .../python-modules/preprocess-cancellation/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/preprocess-cancellation/default.nix b/pkgs/development/python-modules/preprocess-cancellation/default.nix index 3c21dd84ec48..f19608992fe0 100644 --- a/pkgs/development/python-modules/preprocess-cancellation/default.nix +++ b/pkgs/development/python-modules/preprocess-cancellation/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchFromGitHub, poetry-core, shapely, @@ -11,7 +10,6 @@ buildPythonPackage rec { pname = "preprocess-cancellation"; version = "0.2.1"; - disabled = pythonOlder "3.6"; # >= 3.6 pyproject = true; # No tests in PyPI From 2e7ee782c13a92dd905d765507292222c2188922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:54:22 +0100 Subject: [PATCH 41/57] python3Packages.python-socks: remove superfluous pythonOlder --- pkgs/development/python-modules/python-socks/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/python-socks/default.nix b/pkgs/development/python-modules/python-socks/default.nix index 022aca1ca197..3e844a037dc9 100644 --- a/pkgs/development/python-modules/python-socks/default.nix +++ b/pkgs/development/python-modules/python-socks/default.nix @@ -21,8 +21,6 @@ buildPythonPackage rec { version = "2.7.3"; pyproject = true; - disabled = pythonOlder "3.6.2"; - __darwinAllowLocalNetworking = true; src = fetchFromGitHub { From e8af6bcadbbfcbc93e20dcb563de223b0eac3940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:55:29 +0100 Subject: [PATCH 42/57] python3Packages.pytomlpp: remove superfluous pythonOlder --- pkgs/development/python-modules/pytomlpp/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytomlpp/default.nix b/pkgs/development/python-modules/pytomlpp/default.nix index 02cd9bc95a61..4866d8469ee5 100644 --- a/pkgs/development/python-modules/pytomlpp/default.nix +++ b/pkgs/development/python-modules/pytomlpp/default.nix @@ -2,7 +2,6 @@ lib, buildPythonPackage, fetchFromGitHub, - pythonOlder, pybind11, pytestCheckHook, python-dateutil, @@ -40,8 +39,7 @@ buildPythonPackage rec { matplotlib ]; - # pelican requires > 2.7 - doCheck = !pythonOlder "3.6"; + doCheck = true; disabledTests = [ # incompatible with pytest7 From 3f267a07bee302f9aa4718ea3d9eea051bb6a0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:56:58 +0100 Subject: [PATCH 43/57] python3Packages.pytz-deprecation-shim: remove superfluous pythonOlder and pythonAtLeast --- .../python-modules/pytz-deprecation-shim/default.nix | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix index dc52cab267e7..d9258a6ebc82 100644 --- a/pkgs/development/python-modules/pytz-deprecation-shim/default.nix +++ b/pkgs/development/python-modules/pytz-deprecation-shim/default.nix @@ -2,9 +2,6 @@ lib, buildPythonPackage, fetchPypi, - pythonAtLeast, - pythonOlder, - python-dateutil, setuptools, tzdata, hypothesis, @@ -26,9 +23,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = - (lib.optionals (pythonOlder "3.6") [ python-dateutil ]) - ++ (lib.optionals (pythonAtLeast "3.6") [ tzdata ]); + propagatedBuildInputs = [ tzdata ]; nativeCheckInputs = [ hypothesis From 9aabff24ab5c13fcc175358df8ad3764e8ca8c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:58:48 +0100 Subject: [PATCH 44/57] python3Packages.skybellpy: remove superfluous pythonOlder --- pkgs/development/python-modules/skybellpy/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/skybellpy/default.nix b/pkgs/development/python-modules/skybellpy/default.nix index 767e020d9be3..76e58efe547a 100644 --- a/pkgs/development/python-modules/skybellpy/default.nix +++ b/pkgs/development/python-modules/skybellpy/default.nix @@ -7,7 +7,6 @@ pytest-timeout, pytestCheckHook, pythonAtLeast, - pythonOlder, requests, requests-mock, setuptools, @@ -19,7 +18,7 @@ buildPythonPackage rec { pyproject = true; # Still uses distrutils, https://github.com/MisterWil/skybellpy/issues/22 - disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "MisterWil"; From 9a8bb68edfa225fe84602b85bbba972119428907 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:59:11 +0100 Subject: [PATCH 45/57] python3Packages.tensorflow: remove superfluous pythonOlder --- pkgs/development/python-modules/tensorflow/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow/default.nix b/pkgs/development/python-modules/tensorflow/default.nix index 370ad401586f..d4d8e8fa85c5 100644 --- a/pkgs/development/python-modules/tensorflow/default.nix +++ b/pkgs/development/python-modules/tensorflow/default.nix @@ -13,7 +13,6 @@ # Python deps buildPythonPackage, pythonAtLeast, - pythonOlder, python, # Python libraries numpy, @@ -132,7 +131,7 @@ let } ]; - withTensorboard = (pythonOlder "3.6") || tensorboardSupport; + withTensorboard = tensorboardSupport; cudaComponents = with cudaPackages; [ (cuda_nvcc.__spliced.buildHost or cuda_nvcc) From c35313e3e84d30ef1c872aa9cfaa675f19ad3f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 02:59:25 +0100 Subject: [PATCH 46/57] python3Packages.vmprof: remove superfluous pythonOlder --- pkgs/development/python-modules/vmprof/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vmprof/default.nix b/pkgs/development/python-modules/vmprof/default.nix index 181a319b8321..7a5d69e3a6fb 100644 --- a/pkgs/development/python-modules/vmprof/default.nix +++ b/pkgs/development/python-modules/vmprof/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, pythonAtLeast, fetchFromGitHub, setuptools, @@ -18,7 +17,7 @@ buildPythonPackage rec { version = "0.4.17"; pyproject = true; - disabled = pythonOlder "3.6" || pythonAtLeast "3.12"; + disabled = pythonAtLeast "3.12"; src = fetchFromGitHub { owner = "vmprof"; From ebbf76a40749db3bfe50bd2e96fb15901b178397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 03:04:22 +0100 Subject: [PATCH 47/57] python2Packages.pytest: remove superfluous pythonOlder --- pkgs/development/python2-modules/pytest/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python2-modules/pytest/default.nix b/pkgs/development/python2-modules/pytest/default.nix index 21a1967e837c..3adb0a7d4aad 100644 --- a/pkgs/development/python2-modules/pytest/default.nix +++ b/pkgs/development/python2-modules/pytest/default.nix @@ -1,7 +1,6 @@ { lib, buildPythonPackage, - pythonOlder, fetchPypi, attrs, hypothesis, @@ -16,7 +15,6 @@ atomicwrites, mock, writeText, - pathlib2, wcwidth, packaging, isPyPy, @@ -52,8 +50,7 @@ buildPythonPackage rec { wcwidth packaging ] - ++ lib.optionals (!isPy3k) [ funcsigs ] - ++ lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + ++ lib.optionals (!isPy3k) [ funcsigs ]; doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 checkPhase = '' From 70f39947e184ab14e7e45a1f3712c27b4d51f2dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Wed, 14 Jan 2026 03:06:34 +0100 Subject: [PATCH 48/57] python2Packages.typing: remove superfluous pythonOlder and pythonAtLeast --- pkgs/development/python2-modules/typing/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/python2-modules/typing/default.nix b/pkgs/development/python2-modules/typing/default.nix index 5cc48c6b12e8..66104f8dc24d 100644 --- a/pkgs/development/python2-modules/typing/default.nix +++ b/pkgs/development/python2-modules/typing/default.nix @@ -2,11 +2,8 @@ lib, buildPythonPackage, fetchPypi, - pythonOlder, isPy3k, - isPyPy, unittestCheckHook, - pythonAtLeast, }: let @@ -23,12 +20,7 @@ buildPythonPackage rec { sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; }; - disabled = pythonAtLeast "3.5"; - - # Error for Python3.6: ImportError: cannot import name 'ann_module' - # See https://github.com/python/typing/pull/280 - # Also, don't bother on PyPy: AssertionError: TypeError not raised - doCheck = pythonOlder "3.6" && !isPyPy; + disabled = true; nativeCheckInputs = [ unittestCheckHook ]; From 56ea067617a7816ddff712095dd68fdf94fbbbf6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Jan 2026 02:57:29 +0000 Subject: [PATCH 49/57] wakatime-cli: 1.132.1 -> 1.137.0 --- pkgs/by-name/wa/wakatime-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wa/wakatime-cli/package.nix b/pkgs/by-name/wa/wakatime-cli/package.nix index dac991f313f1..a75340dbdfc4 100644 --- a/pkgs/by-name/wa/wakatime-cli/package.nix +++ b/pkgs/by-name/wa/wakatime-cli/package.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "wakatime-cli"; - version = "1.132.1"; + version = "1.137.0"; src = fetchFromGitHub { owner = "wakatime"; repo = "wakatime-cli"; tag = "v${version}"; - hash = "sha256-VdCuQ8Wv/tMo/pZ1NzqA4y1kru78KQJfJ7mE2rWsmCQ="; + hash = "sha256-k749C9TLmNv5jDuAQcMzxb2FksEuZbZcr8R6y0u96nc="; }; - vendorHash = "sha256-yy8y+qjaaaYThTWsuoO3R+mXT6baDqiRKNEGi7mKW64="; + vendorHash = "sha256-oCSIXon2/G42wXfaQqr3z0IiiNt7fkYui5X2MxhJagg="; ldflags = [ "-s" From 33923b86da83c6132c162691707a094dc60ced5a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Jan 2026 03:20:50 +0000 Subject: [PATCH 50/57] wdt: 1.27.1612021-unstable-2026-01-05 -> 1.27.1612021-unstable-2026-01-12 --- pkgs/by-name/wd/wdt/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wd/wdt/package.nix b/pkgs/by-name/wd/wdt/package.nix index 920af5280348..3f07dc405180 100644 --- a/pkgs/by-name/wd/wdt/package.nix +++ b/pkgs/by-name/wd/wdt/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation { pname = "wdt"; - version = "1.27.1612021-unstable-2026-01-05"; + version = "1.27.1612021-unstable-2026-01-12"; src = fetchFromGitHub { owner = "facebook"; repo = "wdt"; - rev = "a09a9bb72a55789ca686d7242b1095f27e820da7"; - sha256 = "sha256-6mJ4qC+ggghJX+MTVIqEQK0Gm7Fgp49i9OT8xAJfsr8="; + rev = "024eafc69a7aa764a08162be842a89a98459e61a"; + sha256 = "sha256-v0LCik5XgmUSPnBduKxhfCYy4rAalId5skEC8u3Jzq8="; }; nativeBuildInputs = [ cmake ]; From 19816aeeb1c1c8d2390cc9e71883831cb432f7a8 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 14 Jan 2026 03:45:56 +0100 Subject: [PATCH 51/57] python2Packages.typing: drop --- .../python2-modules/typing/default.nix | 37 ------------------- pkgs/top-level/python2-packages.nix | 2 - 2 files changed, 39 deletions(-) delete mode 100644 pkgs/development/python2-modules/typing/default.nix diff --git a/pkgs/development/python2-modules/typing/default.nix b/pkgs/development/python2-modules/typing/default.nix deleted file mode 100644 index 66104f8dc24d..000000000000 --- a/pkgs/development/python2-modules/typing/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy3k, - unittestCheckHook, -}: - -let - testDir = if isPy3k then "src" else "python2"; - -in -buildPythonPackage rec { - pname = "typing"; - version = "3.10.0.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "13b4ad211f54ddbf93e5901a9967b1e07720c1d1b78d596ac6a439641aa1b130"; - }; - - disabled = true; - - nativeCheckInputs = [ unittestCheckHook ]; - - unittestFlagsArray = [ - "-s" - testDir - ]; - - meta = { - description = "Backport of typing module to Python versions older than 3.5"; - homepage = "https://docs.python.org/3/library/typing.html"; - license = lib.licenses.psfl; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index fb9632c100d0..d1d1f9929dc0 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -84,8 +84,6 @@ with super; setuptools-scm = callPackage ../development/python2-modules/setuptools-scm { }; - typing = callPackage ../development/python2-modules/typing { }; - six = super.six.overridePythonAttrs (_: { doCheck = false; # circular dependency with pytest }); From 7b46a2bdd21ae6d3fbd2caa13f5eabfc207e556e Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 14 Jan 2026 04:12:03 +0100 Subject: [PATCH 52/57] python2Packages.enum: drop --- .../python2-modules/enum/default.nix | 28 ------------------- pkgs/top-level/python2-packages.nix | 2 -- 2 files changed, 30 deletions(-) delete mode 100644 pkgs/development/python2-modules/enum/default.nix diff --git a/pkgs/development/python2-modules/enum/default.nix b/pkgs/development/python2-modules/enum/default.nix deleted file mode 100644 index 332fbc71f1d1..000000000000 --- a/pkgs/development/python2-modules/enum/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy3k, - isPyPy, -}: - -buildPythonPackage rec { - pname = "enum"; - version = "0.4.7"; - format = "setuptools"; - disabled = isPy3k; - - src = fetchPypi { - inherit pname version; - sha256 = "001iq0yqs9f5bslvl793bhkcs71k5km9kv8yrj5h0lfsgrcg6z4c"; - }; - - doCheck = !isPyPy; - - meta = { - homepage = "https://pypi.python.org/pypi/enum/"; - description = "Robust enumerated type support in Python"; - license = lib.licenses.gpl2; - }; - -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index d1d1f9929dc0..b7f71728c1b2 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -23,8 +23,6 @@ with super; coverage = callPackage ../development/python2-modules/coverage { }; - enum = callPackage ../development/python2-modules/enum { }; - filelock = callPackage ../development/python2-modules/filelock { }; futures = callPackage ../development/python2-modules/futures { }; From 46bbd4592b1245e782fea3bf8945f2f8630e2508 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 14 Jan 2026 04:12:14 +0100 Subject: [PATCH 53/57] python2Packages.futures: drop --- .../python2-modules/futures/default.nix | 35 ------------------- pkgs/top-level/python2-packages.nix | 2 -- 2 files changed, 37 deletions(-) delete mode 100644 pkgs/development/python2-modules/futures/default.nix diff --git a/pkgs/development/python2-modules/futures/default.nix b/pkgs/development/python2-modules/futures/default.nix deleted file mode 100644 index ac1b6ff2f9eb..000000000000 --- a/pkgs/development/python2-modules/futures/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - isPy3k, - python, - stdenv, -}: - -buildPythonPackage rec { - pname = "futures"; - version = "3.3.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "7e033af76a5e35f58e56da7a91e687706faf4e7bdfb2cbc3f2cca6b9bcda9794"; - }; - - # This module is for backporting functionality to Python 2.x, it's builtin in py3k - disabled = isPy3k; - - checkPhase = '' - ${python.interpreter} test_futures.py - ''; - - doCheck = !stdenv.hostPlatform.isDarwin; - - meta = { - description = "Backport of the concurrent.futures package from Python 3.2"; - homepage = "https://github.com/agronholm/pythonfutures"; - license = lib.licenses.bsd2; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index b7f71728c1b2..801777d049b8 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -25,8 +25,6 @@ with super; filelock = callPackage ../development/python2-modules/filelock { }; - futures = callPackage ../development/python2-modules/futures { }; - hypothesis = callPackage ../development/python2-modules/hypothesis { }; importlib-metadata = callPackage ../development/python2-modules/importlib-metadata { }; From e3dd84b6883d085bf9b1f232297cdfffb2c5c22b Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 14 Jan 2026 04:12:33 +0100 Subject: [PATCH 54/57] python2Packages.scandir: drop --- .../scandir/add-aarch64-darwin-dirent.patch | 28 ----------------- .../python2-modules/scandir/default.nix | 30 ------------------- pkgs/top-level/python2-packages.nix | 2 -- 3 files changed, 60 deletions(-) delete mode 100644 pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch delete mode 100644 pkgs/development/python2-modules/scandir/default.nix diff --git a/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch b/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch deleted file mode 100644 index 1b35a0b950ce..000000000000 --- a/pkgs/development/python2-modules/scandir/add-aarch64-darwin-dirent.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/scandir.py b/scandir.py -index 3f602fb..40af3e5 100644 ---- a/scandir.py -+++ b/scandir.py -@@ -23,6 +23,7 @@ from os import listdir, lstat, stat, strerror - from os.path import join, islink - from stat import S_IFDIR, S_IFLNK, S_IFREG - import collections -+import platform - import sys - - try: -@@ -432,6 +433,15 @@ elif sys.platform.startswith(('linux', 'darwin', 'sunos5')) or 'bsd' in sys.plat - ('__d_padding', ctypes.c_uint8 * 4), - ('d_name', ctypes.c_char * 256), - ) -+ elif 'darwin' in sys.platform and 'arm64' in platform.machine(): -+ _fields_ = ( -+ ('d_ino', ctypes.c_uint64), -+ ('d_off', ctypes.c_uint64), -+ ('d_reclen', ctypes.c_uint16), -+ ('d_namlen', ctypes.c_uint16), -+ ('d_type', ctypes.c_uint8), -+ ('d_name', ctypes.c_char * 1024), -+ ) - else: - _fields_ = ( - ('d_ino', ctypes.c_uint32), # must be uint32, not ulong diff --git a/pkgs/development/python2-modules/scandir/default.nix b/pkgs/development/python2-modules/scandir/default.nix deleted file mode 100644 index 1558114f2309..000000000000 --- a/pkgs/development/python2-modules/scandir/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - python, - buildPythonPackage, - fetchPypi, -}: - -buildPythonPackage rec { - pname = "scandir"; - version = "1.10.0"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "1bkqwmf056pkchf05ywbnf659wqlp6lljcdb0y88wr9f0vv32ijd"; - }; - - patches = [ - ./add-aarch64-darwin-dirent.patch - ]; - - checkPhase = "${python.interpreter} test/run_tests.py"; - - meta = { - description = "Better directory iterator and faster os.walk()"; - homepage = "https://github.com/benhoyt/scandir"; - license = lib.licenses.gpl3; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 801777d049b8..36c1b6250795 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -74,8 +74,6 @@ with super; rpm = disabled super.rpm; - scandir = callPackage ../development/python2-modules/scandir { }; - setuptools = callPackage ../development/python2-modules/setuptools { }; setuptools-scm = callPackage ../development/python2-modules/setuptools-scm { }; From bdedefce606c2683382411d835d0824885ccb2ad Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 14 Jan 2026 04:12:43 +0100 Subject: [PATCH 55/57] python2Packages.setuptools-scm: drop --- .../setuptools-scm/default.nix | 30 ------------------- pkgs/top-level/python2-packages.nix | 2 -- 2 files changed, 32 deletions(-) delete mode 100644 pkgs/development/python2-modules/setuptools-scm/default.nix diff --git a/pkgs/development/python2-modules/setuptools-scm/default.nix b/pkgs/development/python2-modules/setuptools-scm/default.nix deleted file mode 100644 index 46056a8b6ff5..000000000000 --- a/pkgs/development/python2-modules/setuptools-scm/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - toml, -}: - -buildPythonPackage rec { - pname = "setuptools_scm"; - version = "5.0.2"; - format = "setuptools"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-g6DO3TRJ45RjB4EaTHudicS1/UZKL7XuzNCluxWK5cg="; - }; - - propagatedBuildInputs = [ toml ]; - - # Requires pytest, circular dependency - doCheck = false; - pythonImportsCheck = [ "setuptools_scm" ]; - - meta = { - homepage = "https://github.com/pypa/setuptools_scm/"; - description = "Handles managing your python package versions in scm metadata"; - license = lib.licenses.mit; - maintainers = [ ]; - }; -} diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 36c1b6250795..ebfdbb802acb 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -76,8 +76,6 @@ with super; setuptools = callPackage ../development/python2-modules/setuptools { }; - setuptools-scm = callPackage ../development/python2-modules/setuptools-scm { }; - six = super.six.overridePythonAttrs (_: { doCheck = false; # circular dependency with pytest }); From 5220843d3d1011ac8dffe551d226371e301d1457 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Jan 2026 03:40:27 +0000 Subject: [PATCH 56/57] home-assistant-custom-components.nest_protect: 0.4.2b0 -> 0.4.2 --- .../home-assistant/custom-components/nest_protect/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix b/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix index 3f57589feaec..7dd9d4aa268c 100644 --- a/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix +++ b/pkgs/servers/home-assistant/custom-components/nest_protect/package.nix @@ -6,13 +6,13 @@ buildHomeAssistantComponent rec { owner = "iMicknl"; domain = "nest_protect"; - version = "0.4.2b0"; + version = "0.4.2"; src = fetchFromGitHub { inherit owner; repo = "ha-nest-protect"; tag = "v${version}"; - hash = "sha256-CQVAvx7iRCRHw8YXDmsWaF6fhddx3OfSLjq218+ob6I="; + hash = "sha256-3ydysyhXi2ucExNGH3S5HIUN7iUIC4ysjuXKDyqq/hs="; }; # AttributeError: 'async_generator' object has no attribute 'data' From 7800b4f16c8fa2658b92dde15b442b8867977ed7 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Wed, 14 Jan 2026 06:09:50 +0100 Subject: [PATCH 57/57] gem-config: remove python2 argument --- pkgs/development/ruby-modules/gem-config/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index bebf5ede6bec..f745ce99235f 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -27,7 +27,6 @@ libkrb5, libxml2, libxslt, - python2, stdenv, which, libiconv,