Merge master into staging-nixos

This commit is contained in:
nixpkgs-ci[bot]
2026-01-14 06:08:29 +00:00
committed by GitHub
66 changed files with 124 additions and 375 deletions
@@ -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'"
-2
View File
@@ -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";
+1 -1
View File
@@ -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
-2
View File
@@ -17,8 +17,6 @@ python3.pkgs.buildPythonApplication rec {
hash = "sha256-3h3QtBDKswTDL7zNM2C4VWiGCqknm/bxhP9sw4ieIcQ=";
};
disabled = python3.pythonOlder "3.6";
build-system = with python3.pkgs; [
setuptools
];
+2 -2
View File
@@ -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 = [
+3 -3
View File
@@ -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
+3 -3
View File
@@ -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 = [
@@ -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";
};
})
-1
View File
@@ -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";
-2
View File
@@ -9,8 +9,6 @@ python3Packages.buildPythonApplication rec {
version = "1.3.4";
pyproject = true;
disabled = python3Packages.pythonOlder "3.5";
src = fetchFromGitHub {
owner = "buildinspace";
repo = "peru";
+3 -3
View File
@@ -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 ];
-4
View File
@@ -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;
+4 -4
View File
@@ -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 = [
-2
View File
@@ -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";
+3 -3
View File
@@ -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 =
@@ -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 = [
-2
View File
@@ -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";
+2 -2
View File
@@ -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 ];
-2
View File
@@ -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";
+3 -3
View File
@@ -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"
+3 -3
View File
@@ -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 ];
-1
View File
@@ -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";
@@ -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;
@@ -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";
}
@@ -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";
}
@@ -104,9 +104,9 @@
major = "3";
minor = "15";
patch = "0";
suffix = "a3";
suffix = "a4";
};
hash = "sha256-arAs2sJFBXeYd7sdkYlDLWfpDd8qm4t7Nz6tVKwHtgc=";
hash = "sha256-oKUh1cSAuJl52hrvzil1DrFYEowBeHKOv+91EcIbTnc=";
inherit passthruFun;
};
@@ -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";
@@ -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";
};
}
@@ -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";
@@ -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";
@@ -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;
@@ -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 = ''
@@ -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
};
}
@@ -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;
@@ -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 = {
@@ -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";
@@ -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 ];
};
}
@@ -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)
@@ -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;
@@ -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 = {
@@ -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 = [
@@ -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
@@ -21,8 +21,6 @@ buildPythonPackage rec {
version = "2.7.3";
pyproject = true;
disabled = pythonOlder "3.6.2";
__darwinAllowLocalNetworking = true;
src = fetchFromGitHub {
@@ -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
@@ -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
@@ -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 ];
}
@@ -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";
@@ -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)
@@ -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 ];
@@ -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
@@ -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";
@@ -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;
};
}
@@ -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 = [ ];
};
}
@@ -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 = ''
@@ -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
@@ -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 = [ ];
};
}
@@ -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 = [ ];
};
}
@@ -1,45 +0,0 @@
{
lib,
buildPythonPackage,
fetchPypi,
pythonOlder,
isPy3k,
isPyPy,
unittestCheckHook,
pythonAtLeast,
}:
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 = 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;
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;
};
}
@@ -27,7 +27,6 @@
libkrb5,
libxml2,
libxslt,
python2,
stdenv,
which,
libiconv,
@@ -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'
+1
View File
@@ -1144,6 +1144,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
-2
View File
@@ -9020,8 +9020,6 @@ with pkgs;
mullvad
;
mullvad-closest = with python3Packages; toPythonApplication mullvad-closest;
napalm =
with python3Packages;
toPythonApplication (
+1
View File
@@ -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
+1
View File
@@ -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
-2
View File
@@ -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 { };
-10
View File
@@ -23,12 +23,8 @@ 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 { };
hypothesis = callPackage ../development/python2-modules/hypothesis { };
importlib-metadata = callPackage ../development/python2-modules/importlib-metadata { };
@@ -78,14 +74,8 @@ 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 { };
typing = callPackage ../development/python2-modules/typing { };
six = super.six.overridePythonAttrs (_: {
doCheck = false; # circular dependency with pytest
});