diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index d367775d60c2..f7a0ba9e4ba9 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -99,13 +99,14 @@ The following is an example: hypothesis, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pytest"; version = "3.3.1"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; + hash = "sha256-z4Q23FnYaVNG/NOrKW3kZCXsqwDWQJbOvnn7Ueyy65M="; }; @@ -130,7 +131,7 @@ buildPythonPackage rec { nativeCheckInputs = [ hypothesis ]; meta = { - changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}"; + changelog = "https://github.com/pytest-dev/pytest/releases/tag/${finalAttrs.version}"; description = "Framework for writing tests"; homepage = "https://github.com/pytest-dev/pytest"; license = lib.licenses.mit; @@ -140,7 +141,7 @@ buildPythonPackage rec { lsix ]; }; -} +}) ``` The `buildPythonPackage` mainly does four things: @@ -304,13 +305,13 @@ specifying an interpreter version), like this: fetchPypi, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "luigi"; version = "2.7.9"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-Pe229rT0aHwA98s+nTHQMEFKZPo/yw6sot8MivFDvAw="; }; @@ -324,7 +325,7 @@ python3Packages.buildPythonApplication rec { meta = { # ... }; -} +}) ``` This is then added to `pkgs/by-name` just as any other application would be. @@ -928,13 +929,13 @@ building Python libraries is [`buildPythonPackage`](#buildpythonpackage-function setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "toolz"; version = "0.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; @@ -950,12 +951,12 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}"; + changelog = "https://github.com/pytoolz/toolz/releases/tag/${finalAttrs.version}"; homepage = "https://github.com/pytoolz/toolz"; description = "List processing tools and functional utilities"; license = lib.licenses.bsd3; }; -} +}) ``` What happens here? The function [`buildPythonPackage`](#buildpythonpackage-function) is called and as argument @@ -985,13 +986,13 @@ with import { }; ( let - my_toolz = python313.pkgs.buildPythonPackage rec { + my_toolz = python313.pkgs.buildPythonPackage (finalAttrs: { pname = "toolz"; version = "0.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; @@ -1005,7 +1006,7 @@ with import { }; description = "List processing tools and functional utilities"; # [...] }; - }; + }); in python313.withPackages ( @@ -1062,13 +1063,13 @@ order to build [`datashape`](https://github.com/blaze/datashape). pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "datashape"; version = "0.4.7"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-FLLvdm1MllKrgTGC6Gb0k0deZeVYvtCCLji/B7uhong="; }; @@ -1083,12 +1084,12 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook ]; meta = { - changelog = "https://github.com/blaze/datashape/releases/tag/${version}"; + changelog = "https://github.com/blaze/datashape/releases/tag/${finalAttrs.version}"; homepage = "https://github.com/ContinuumIO/datashape"; description = "Data description language"; license = lib.licenses.bsd2; }; -} +}) ``` We can see several runtime dependencies, `numpy`, `multipledispatch`, and @@ -1111,13 +1112,13 @@ when building the bindings and are therefore added as [`buildInputs`](#var-stden libxslt, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "lxml"; version = "3.4.4"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-s9NiusRxFydHzaNRMjjxFcvWxfi45jGb9ql6eJJyQJk="; }; @@ -1137,13 +1138,13 @@ buildPythonPackage rec { ]; meta = { - changelog = "https://github.com/lxml/lxml/releases/tag/lxml-${version}"; + changelog = "https://github.com/lxml/lxml/releases/tag/lxml-${finalAttrs.version}"; description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = "https://lxml.de"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ sjourdois ]; }; -} +}) ``` In this example `lxml` and Nix are able to work out exactly where the relevant @@ -1173,13 +1174,13 @@ therefore we have to set `LDFLAGS` and `CFLAGS`. scipy, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pyfftw"; version = "0.9.2"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-9ru2r6kwhUCaskiFoaPNuJCfCVoUL01J40byvRt4kHQ="; }; @@ -1207,7 +1208,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "pyfftw" ]; meta = { - changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${version}"; + changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${finalAttrs.version}"; description = "Pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; homepage = "http://hgomersall.github.com/pyFFTW"; license = with lib.licenses; [ @@ -1215,7 +1216,7 @@ buildPythonPackage rec { bsd3 ]; }; -} +}) ``` Note also the line [`doCheck = false;`](#var-stdenv-doCheck), we explicitly disabled running the test-suite. @@ -1609,13 +1610,13 @@ We first create a function that builds `toolz` in `~/path/to/toolz/release.nix` setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "toolz"; version = "0.10.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-CP3V73yWSArRHBLUct4hrNMjWZlvaaUlkpm1QP66RWA="; }; @@ -1627,7 +1628,7 @@ buildPythonPackage rec { description = "List processing tools and functional utilities"; license = lib.licenses.bsd3; }; -} +}) ``` It takes an argument [`buildPythonPackage`](#buildpythonpackage-function). We now call this function using diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 9a4721506038..259614e37fb4 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -36,20 +36,20 @@ let hash = { - x86_64-linux = "sha256-20ydDfHFhy3BNxC9bHG1JTgybFY9zxxc81EApOVh3wk="; - x86_64-darwin = "sha256-iGa94habd8rVLP0XQ3LZguTAmIk0odjfMD7LlU+0uBY="; - aarch64-linux = "sha256-3ma0m+uBuQlGTidRFbI0AcwGcvW8ebnJnnrhAuS6dEc="; - aarch64-darwin = "sha256-MWowHy95l8IA+XcAFg2FZJoal8ig2aZpWjzFRHnHbIk="; - armv7l-linux = "sha256-KiAnrpb0ShOalIB4+vKEPe5AHr3rU4sgbeZRUTEZaZs="; + x86_64-linux = "sha256-qYthiZlioD6fWCyDPfg7Yfo5PqCHzcenk8NjgobLW7c="; + x86_64-darwin = "sha256-zwvdrstg6UtoG8EE87VXjDORT3zEbbKCFdAP0wPsD9s="; + aarch64-linux = "sha256-7DBRwwdQm06nyxRMR3wOH+4DqlnPvXGL/rMdq7jpxTw="; + aarch64-darwin = "sha256-YXmTzpsRSwdtbmoQLDRcJ5hcDURZnrkh5p8e8rYnA0Y="; + armv7l-linux = "sha256-VQ4/Ae4qeZYCFAJcTh8h8BWM15u8QEAfyJpkFx+1Xc8="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.108.0"; + version = "1.108.1"; # This is used for VS Code - Remote SSH test - rev = "94e8ae2b28cb5cc932b86e1070569c4463565c37"; + rev = "585eba7c0c34fd6b30faac7c62a42050bfbc0086"; in callPackage ./generic.nix { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -82,7 +82,7 @@ callPackage ./generic.nix { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-VvwZaE1T5FTh/KJdLj9Br51VBMcYcyh4SgZILLS5hwQ="; + hash = "sha256-YilQLV1vQ1vHLa9pztvDIsaRz1CKzxcjT/INETrJy1I="; }; stdenv = stdenvNoCC; }; diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 4121c73a52c8..91738c9f925a 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,10 +1,10 @@ { "chromium": { - "version": "144.0.7559.59", + "version": "144.0.7559.96", "chromedriver": { - "version": "144.0.7559.60", - "hash_darwin": "sha256-t7iNI8tGDo5BMUGtgqIQ/9uk7LYxp5IdWrP/8KMe2YY=", - "hash_darwin_aarch64": "sha256-g5dieRsXshJ//Nta/dOkO87JsIgV8DW1SAVlc/Sxxz0=" + "version": "144.0.7559.97", + "hash_darwin": "sha256-0jenwhaxPdE7oDC/nNnByObDRwpeMr7kfTE5WDvtjGc=", + "hash_darwin_aarch64": "sha256-iXERqm2wo/J930n/0zsZp7UgJxsgGoJgNn7Bbc2lBPc=" }, "deps": { "depot_tools": { @@ -21,8 +21,8 @@ "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "cd1d73dd77daadf4581dc29ca73482fc241e079d", - "hash": "sha256-K/dmiy5u+XJIpS6AOTaXDLVYp5qAtfUbfSbGCpt9Cv8=", + "rev": "d7b80622cfab91c265741194e7942eefd2d21811", + "hash": "sha256-Cz3iDS0raJHRh+byrs7GYp6sck54mJq7yzsjLUWDWqA=", "recompress": true }, "src/third_party/clang-format/script": { @@ -132,8 +132,8 @@ }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "a8d1e554a9bd35b0418ba7fd6b0bc005250a7703", - "hash": "sha256-GJuT3rqNxvKkRTMvoMi8/QYda0y0RTkZLhb5v9QkwGA=" + "rev": "9e0e116de6735ab113349675d31a23c121254fe0", + "hash": "sha256-MsUmRx5fQYWbkPJ/JvaoT//qjPYy5xxZXIa3t5LDxSY=" }, "src/third_party/dawn/third_party/glfw": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -257,8 +257,8 @@ }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "d5efa4236f8676254c9f39ccfef18bd633de5fd3", - "hash": "sha256-BmwsvTjgYQayFnyT9EfFzpCfbgdTt9xZlsUba0uJelg=" + "rev": "a3064782146fc247c488d44c1ad3496b29d55ec4", + "hash": "sha256-vLkWH/EiDHxl/dz4soKybQF1hgud/7MlnDhVPicYJGY=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -807,8 +807,8 @@ }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "ad25f9ae50a53bee50f459bfee25fb1e6f64adc3", - "hash": "sha256-vyOtnPA3tAeorNOGTDuAnwJ/UtpjeO8z+RSjx9RIFFc=" + "rev": "6c2c296f23a5487ccb2536cf7c90d01f35d03077", + "hash": "sha256-gBzwGvl/tqj4Z6acdLN326I80kBLEk+Nn8oN6D193o4=" } } }, diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index cc382f892cf1..139e9e13ec2e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1400,13 +1400,13 @@ "vendorHash": null }, "ubiquiti-community_unifi": { - "hash": "sha256-IqsQRVgAB1PUqYJ0JPig6oq7FKJuS/a2NCgTCxX9+cg=", + "hash": "sha256-G1f33xKPhM2tj/FRZ7thRkwkh5rIDYZHCfjoUu50Cr0=", "homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi", "owner": "ubiquiti-community", "repo": "terraform-provider-unifi", - "rev": "v0.41.3", + "rev": "v0.41.8", "spdx": "MPL-2.0", - "vendorHash": "sha256-iqwdSzyVZE5CitzXc8rWn2zO3v+VvuDNeS0ll0V6MtU=" + "vendorHash": "sha256-Hoj204a7ZxZJM+L0l2WqR3kUhht+4qEWFqH3BjC/Qkk=" }, "ucloud_ucloud": { "hash": "sha256-mPTejWXREIBjEZVb660bUUnyj3z7hgfKPrUsSVvMx7A=", diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix index 1541a5e49875..650d258eef6a 100644 --- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix +++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-tarpaulin"; - version = "0.35.0"; + version = "0.35.1"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; tag = finalAttrs.version; - hash = "sha256-GwIrJksPACw9yIa9apLDxtC/70VhQBRUmfy88OK+0jA="; + hash = "sha256-l4Sn9EkIphBSEUfuRPhCRPtNENiGyP7lQcN4lx2Osks="; }; - cargoHash = "sha256-iI2GfNNPxs1lKtjxNsKCVlXbrATlrnbJr7iHXZJ65rE="; + cargoHash = "sha256-lHYYDdlm+axyuGY2ulPmuLhVu6p5u6JAf2x6Xcpo8Dc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix index 4f6105b986e3..4788ff4c2e85 100644 --- a/pkgs/by-name/ha/harbor-cli/package.nix +++ b/pkgs/by-name/ha/harbor-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "harbor-cli"; - version = "0.0.15"; + version = "0.0.16"; src = fetchFromGitHub { owner = "goharbor"; repo = "harbor-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-cUSFCSqM6eyEtc3RFCeq1R0jVn6MULtKZspsNZE7cGU="; + hash = "sha256-ZlpOBYUQ6J3RsFHkoPo9Y039DpBlJTWRCkXFyLKXshU="; }; - vendorHash = "sha256-Ublu+vYIrXNniF78ldNmtVBT7zzG87uLCI6JRKSxeF0="; + vendorHash = "sha256-qTaXIkZ1g7jsPV4IkduIS6REIhs9JJcS2mOg3V77DTg="; excludedPackages = [ "dagger" diff --git a/pkgs/by-name/li/lief/package.nix b/pkgs/by-name/li/lief/package.nix index 47ab507c0f64..56948b0bd675 100644 --- a/pkgs/by-name/li/lief/package.nix +++ b/pkgs/by-name/li/lief/package.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "LIEF_PYTHON_API" true) (lib.cmakeBool "LIEF_EXAMPLES" false) (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) + (lib.cmakeFeature "Python_EXECUTABLE" pyEnv.interpreter) ]; postBuild = '' @@ -68,6 +69,8 @@ stdenv.mkDerivation (finalAttrs: { pythonImportsCheck = [ "lief" ]; + strictDeps = true; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/ma/mathematica/package.nix b/pkgs/by-name/ma/mathematica/package.nix index 0e11ca609d8a..e0bdd7b0f1ce 100644 --- a/pkgs/by-name/ma/mathematica/package.nix +++ b/pkgs/by-name/ma/mathematica/package.nix @@ -77,6 +77,7 @@ callPackage ./generic.nix { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ rafaelrc + sandarukasa ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix index c201b54d4cae..b0857f17b8d4 100644 --- a/pkgs/by-name/py/pyrefly/package.nix +++ b/pkgs/by-name/py/pyrefly/package.nix @@ -10,17 +10,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "pyrefly"; - version = "0.48.0"; + version = "0.49.0"; src = fetchFromGitHub { owner = "facebook"; repo = "pyrefly"; tag = finalAttrs.version; - hash = "sha256-n/Nlz1eTC29JyTGJvGUpO4BF22tZBh3ZsMdPUPy874M="; + hash = "sha256-r0KNzXZA02J9fYUI0oEoH188OemVzambC+GKlQaq5oU="; }; buildAndTestSubdir = "pyrefly"; - cargoHash = "sha256-mLK32ar+7N4r2MQWfa6G5yql8xseck9VYR4gF/1dSnM="; + cargoHash = "sha256-nL703jB01JI7LILJKl4FiaRHNyjxNluZpQmJCTTzVdY="; buildInputs = [ rust-jemalloc-sys ]; diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix index 8a6a567294f9..d3775a585561 100644 --- a/pkgs/by-name/st/stevenblack-blocklist/package.nix +++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix @@ -6,13 +6,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "stevenblack-blocklist"; - version = "3.16.51"; + version = "3.16.52"; src = fetchFromGitHub { owner = "StevenBlack"; repo = "hosts"; tag = finalAttrs.version; - hash = "sha256-wnwFyhvsfKIJyxL94ZTnJv8rYVoevwCwcYOssnWWHsE="; + hash = "sha256-zZg5tYQT4bq5+cUjnziRvsd4FdpfK+Ow5toajnofaxA="; }; outputs = [ diff --git a/pkgs/by-name/ze/zensical/package.nix b/pkgs/by-name/ze/zensical/package.nix index 742106fc41b0..84aad5d3295a 100644 --- a/pkgs/by-name/ze/zensical/package.nix +++ b/pkgs/by-name/ze/zensical/package.nix @@ -8,7 +8,7 @@ python3Packages.buildPythonApplication rec { pname = "zensical"; - version = "0.0.16"; + version = "0.0.17"; pyproject = true; # We fetch from PyPi, because GitHub repo does not contain all sources. @@ -16,12 +16,12 @@ python3Packages.buildPythonApplication rec { # We could combine sources, but then nix-update won't work. src = fetchPypi { inherit pname version; - hash = "sha256-C3WduiRUGXvb8bEz3E6mToIC5nVwNqbrqtfkXsCgnbg="; + hash = "sha256-kAAYNUTY6XXPgeH44sSWPyiMfz9DaQLooQ3K9G5oCeI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-ksFmYf9Yu+xlQw3tSa1mwdWlOhyK4hqtEZq4dULL4Fs="; + hash = "sha256-i+9A1EFmG2hmq4WHOX9fVNqklupxFzX22Eewyg4sie0="; }; nativeBuildInputs = with rustPlatform; [ diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix deleted file mode 100644 index b2413d2f9359..000000000000 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ - lib, - buildPythonPackage, - pythonAtLeast, - python, - fetchPypi, - setuptools, - pkgs, -}: - -buildPythonPackage rec { - pname = "bsddb3"; - version = "6.2.9"; - pyproject = true; - - src = fetchPypi { - inherit pname version; - sha256 = "70d05ec8dc568f42e70fc919a442e0daadc2a905a1cfb7ca77f549d49d6e7801"; - }; - - build-system = [ setuptools ]; - - buildInputs = [ pkgs.db ]; - - # See : https://github.com/NixOS/nixpkgs/pull/311198#discussion_r1599257522 - # More details here : https://www.jcea.es/programacion/pybsddb.htm - disabled = pythonAtLeast "3.10"; - - # Path to database need to be set. - # Somehow the setup.py flag is not propagated. - #setupPyBuildFlags = [ "--berkeley-db=${pkgs.db}" ]; - # We can also use a variable - preConfigure = '' - export BERKELEYDB_DIR=${pkgs.db.dev}; - ''; - - postPatch = '' - substituteInPlace test3.py \ - --replace-fail "from distutils.util import get_platform" "from sysconfig import get_platform" \ - --replace-fail "sys.config[0:3]" "sys.implementation.cache_tag" - ''; - - checkPhase = '' - ${python.interpreter} test.py - ''; - - meta = { - description = "Python bindings for Oracle Berkeley DB"; - homepage = "https://www.jcea.es/programacion/pybsddb.htm"; - license = with lib.licenses; [ agpl3Only ]; # License changed from bsd3 to agpl3 since 6.x - maintainers = [ ]; - }; -} diff --git a/pkgs/development/python-modules/plopp/default.nix b/pkgs/development/python-modules/plopp/default.nix index 95eabf349b2e..0971ed49002a 100644 --- a/pkgs/development/python-modules/plopp/default.nix +++ b/pkgs/development/python-modules/plopp/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, # build-system setuptools, @@ -33,7 +34,7 @@ fetchurl, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "plopp"; version = "25.11.0"; pyproject = true; @@ -41,7 +42,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "scipp"; repo = "plopp"; - tag = version; + tag = finalAttrs.version; hash = "sha256-3vmHRPjv7iUd6ky7XzfdChpAI++ELh6vwmtELK7dwaE="; }; @@ -73,6 +74,11 @@ buildPythonPackage rec { xarray ]; + disabledTests = lib.optionals (pythonAtLeast "3.14") [ + # RuntimeError: There is no current event loop in thread 'MainThread' + "test_move_cut" + ]; + env = { # See: https://github.com/scipp/plopp/blob/25.05.0/src/plopp/data/examples.py PLOPP_DATA_DIR = @@ -114,4 +120,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ doronbehar ]; }; -} +}) diff --git a/pkgs/development/python-modules/ruamel-yaml-string/default.nix b/pkgs/development/python-modules/ruamel-yaml-string/default.nix index 3b5a65d0acf7..769109c74723 100644 --- a/pkgs/development/python-modules/ruamel-yaml-string/default.nix +++ b/pkgs/development/python-modules/ruamel-yaml-string/default.nix @@ -1,18 +1,22 @@ { lib, buildPythonPackage, + pythonAtLeast, fetchPypi, setuptools, ruamel-yaml, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "ruamel-yaml-string"; version = "0.1.1"; pyproject = true; + # ImportError: cannot import name 'Str' from 'ast' + disabled = pythonAtLeast "3.14"; + src = fetchPypi { - inherit version; + inherit (finalAttrs) version; pname = "ruamel.yaml.string"; hash = "sha256-enrtzAVdRcAE04t1b1hHTr77EGhR9M5WzlhBVwl4Q1A="; }; @@ -29,4 +33,4 @@ buildPythonPackage rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fbeffa ]; }; -} +}) diff --git a/pkgs/development/python-modules/simple-parsing/default.nix b/pkgs/development/python-modules/simple-parsing/default.nix index c82f5434b786..ed6f60301656 100644 --- a/pkgs/development/python-modules/simple-parsing/default.nix +++ b/pkgs/development/python-modules/simple-parsing/default.nix @@ -2,10 +2,11 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, # build-system - poetry-core, - poetry-dynamic-versioning, + hatchling, + uv-dynamic-versioning, # dependencies docstring-parser, @@ -25,21 +26,21 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "simple-parsing"; - version = "0.1.7"; + version = "0.1.8"; pyproject = true; src = fetchFromGitHub { owner = "lebrice"; repo = "SimpleParsing"; - tag = "v${version}"; - hash = "sha256-wHk3osr5CNmA/g9ipLy1dgvJoMy1zE/BAGD9ZATE+tc="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Nsr+I+BoVxockRGQAjG+ushRQ4CtWgkHrg5aVorSrvw="; }; build-system = [ - poetry-core - poetry-dynamic-versioning + hatchling + uv-dynamic-versioning ]; dependencies = [ @@ -81,13 +82,22 @@ buildPythonPackage rec { "test_running_example_outputs_expected_without_arg" "test_subgroup_partial_with_nested_field" "test_weird_docstring_with_field_like" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # AssertionError ("usagepython314mpytesthmixed..." != "usagepython314mpytesthmixed") + "test_each_type_is_used_correctly" + "test_issue_46" + "test_issue_46_solution2" + + # TypeError: dest= is required for options like '---------' + "test_pass_invalid_value_to_add_config_path_arg" ]; meta = { description = "Simple, Elegant, Typed Argument Parsing with argparse"; - changelog = "https://github.com/lebrice/SimpleParsing/releases/tag/v${version}"; + changelog = "https://github.com/lebrice/SimpleParsing/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/lebrice/SimpleParsing"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; }; -} +}) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix index 8228cfce1828..1f55aa5921a4 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/vacuum-card/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "vacuum-card"; - version = "2.11.3"; + version = "2.11.6"; src = fetchFromGitHub { owner = "denysdovhan"; repo = "vacuum-card"; rev = "v${version}"; - hash = "sha256-3FhlcZVI1M8Ci2C/exwYvlHUBXlGAIFT/1jL6Dl72Ns="; + hash = "sha256-RBKg92QpfPcrvP1TDOPM8PfjS3NyHwl4By36o4B8yUE="; }; - npmDepsHash = "sha256-eTFwW/vo+h7Dz7cow2A06M6cc1Ha9eSmDTXEI8WzCdk="; + npmDepsHash = "sha256-/M9TRM/wYN0jHigCoE9UVFspxGh5bpCrZvzo42DXgLo="; installPhase = '' runHook preInstall diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix index 87351e481677..1524571859eb 100644 --- a/pkgs/tools/package-management/nix/common-meson.nix +++ b/pkgs/tools/package-management/nix/common-meson.nix @@ -59,10 +59,7 @@ assert (hash == null) -> (src != null); xz, enableDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, enableStatic ? stdenv.hostPlatform.isStatic, - withAWS ? - lib.meta.availableOn stdenv.hostPlatform aws-c-common - && !enableStatic - && (stdenv.hostPlatform.isLinux || stdenv.hostPlatform.isDarwin), + withAWS ? lib.meta.availableOn stdenv.hostPlatform aws-c-common, aws-c-common, aws-sdk-cpp, withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp, diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix index 11aee41a57cf..6c5978bfd7e8 100644 --- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix +++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix @@ -25,9 +25,7 @@ withAWS ? # Default is this way because there have been issues building this dependency - stdenv.hostPlatform == stdenv.buildPlatform - && (stdenv.isLinux || stdenv.isDarwin) - && lib.meta.availableOn stdenv.hostPlatform aws-c-common, + lib.meta.availableOn stdenv.hostPlatform aws-c-common, }: mkMesonLibrary (finalAttrs: { diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 98ac4465a8c0..756c28ec3492 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -88,6 +88,7 @@ mapAliases { bkcharts = throw "'bkcharts' has been removed as the upstream repository was archived in 2018"; # added 2025-08-26 BlinkStick = throw "'BlinkStick' has been renamed to/replaced by 'blinkstick'"; # Converted to throw 2025-10-29 bsblan = throw "'bsblan' has been renamed to/replaced by 'python-bsblan'"; # Converted to throw 2025-10-29 + bsddb3 = throw "'bsddb3' has been removed because it was deprecated in favor of 'berkeleydb'"; # added 2026-01-20 bt_proximity = throw "'bt_proximity' has been renamed to/replaced by 'bt-proximity'"; # Converted to throw 2025-10-29 btchip = throw "'btchip' has been renamed to/replaced by 'btchip-python'"; # Converted to throw 2025-10-29 BTrees = throw "'BTrees' has been renamed to/replaced by 'btrees'"; # Converted to throw 2025-10-29 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c3f88ad90b30..ac13a6908621 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2285,8 +2285,6 @@ self: super: with self; { brunt = callPackage ../development/python-modules/brunt { }; - bsddb3 = callPackage ../development/python-modules/bsddb3 { }; - bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; bson = callPackage ../development/python-modules/bson { };