diff --git a/ci/OWNERS b/ci/OWNERS index 2c0f70b41ec2..66055144f662 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -21,7 +21,7 @@ /ci/OWNERS @infinisil @philiptaron # Development support -/.editorconfig @Mic92 @zowoq +/.editorconfig @Mic92 /shell.nix @infinisil @NixOS/Security # Libraries @@ -219,10 +219,10 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @Artturin @Ericson2314 @lo /pkgs/development/r-modules @jbedo # Rust -/pkgs/development/compilers/rust @alyssais @Mic92 @zowoq @winterqt -/pkgs/build-support/rust @zowoq @winterqt +/pkgs/development/compilers/rust @alyssais @Mic92 @winterqt +/pkgs/build-support/rust @winterqt /pkgs/build-support/rust/fetch-cargo-vendor* @TomaSajt -/doc/languages-frameworks/rust.section.md @zowoq @winterqt +/doc/languages-frameworks/rust.section.md @winterqt # Tcl /pkgs/development/interpreters/tcl @fgaz diff --git a/doc/release-notes/rl-2605.section.md b/doc/release-notes/rl-2605.section.md index 56a6c2504141..6ed35140cb2a 100644 --- a/doc/release-notes/rl-2605.section.md +++ b/doc/release-notes/rl-2605.section.md @@ -410,6 +410,8 @@ gnuradioMinimal.override { - `fetchFromSavannah` is now deprecated and is expected to be fully removed in a future release. From now on, use `fetchgit` or a Savannah releases mirror when applicable. +- Using nested lists in build/runtime inputs in `mkDerivation` is now deprecated. + ### Additions and Improvements {#sec-nixpkgs-release-26.05-lib-additions-improvements} - The builder `php.buildComposerProject2` for PHP applications has been improved for better reliability and stability. diff --git a/nixos/tests/jool.nix b/nixos/tests/jool.nix index 76076cba6a63..06e8547a1ce8 100644 --- a/nixos/tests/jool.nix +++ b/nixos/tests/jool.nix @@ -306,8 +306,8 @@ in client.succeed("curl --fail -s http://[64:ff9b::203.0.113.16] | grep -q IPv4!") with subtest("Router BIB entries are correctly populated"): - router.succeed("jool bib display | grep -q 'Dynamic TCP.*2001:db8::8'") - router.succeed("jool bib display | grep -q 'Static TCP.*2001:db8::9'") + router.succeed("jool bib display --numeric | grep -q 'Dynamic TCP.*2001:db8::8'") + router.succeed("jool bib display --numeric | grep -q 'Static TCP.*2001:db8::9'") with subtest("WAN server can reach the LAN server"): homeserver.wait_for_open_port(80) diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 0f0486ea7c2b..b5f7c628cc37 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -1,8 +1,11 @@ { lib, pythonPackages, - fetchPypi, + fetchFromGitHub, + fetchNpmDeps, mopidy, + nodejs, + npmHooks, }: pythonPackages.buildPythonApplication (finalAttrs: { @@ -10,12 +13,33 @@ pythonPackages.buildPythonApplication (finalAttrs: { version = "3.70.0"; pyproject = true; - src = fetchPypi { - pname = "mopidy_iris"; - inherit (finalAttrs) version; - hash = "sha256-md/1blTTtjiAAb/jiLE2EfiSlIUwEga8U7OiuKa466k="; + src = fetchFromGitHub { + owner = "jaedb"; + repo = "Iris"; + tag = finalAttrs.version; + hash = "sha256-Fc0LktN8pCRnrvk9uudXu10J3XfrRbdGlcDKXFNQzmQ="; }; + postPatch = '' + # turn off Google Analytics per default + substituteInPlace src/js/store/index.js \ + --replace-fail 'allow_reporting: true' 'allow_reporting: false' + ''; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) src; + hash = "sha256-aQHq80SLaOPOANYV+aDTWC/bxfc1it5iDeRJ8L5iuEU="; + }; + + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; + + preBuild = '' + npm run prod + ''; + build-system = [ pythonPackages.setuptools ]; diff --git a/pkgs/applications/misc/makehuman/default.nix b/pkgs/applications/misc/makehuman/default.nix index 51f27c3d7c10..309d0a84771a 100644 --- a/pkgs/applications/misc/makehuman/default.nix +++ b/pkgs/applications/misc/makehuman/default.nix @@ -55,9 +55,7 @@ stdenv.mkDerivation rec { qtbase ]; - propagatedBuildInputs = [ - pydeps - ]; + propagatedBuildInputs = pydeps; finalSource = "${pname}-final"; diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9898ca53dee6..0f566310a4c4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -73,13 +73,13 @@ "vendorHash": "sha256-FHBpTYSmVivoqz+Eaa/r5y1f/saIx4l6mjOtZhxZVRw=" }, "auth0_auth0": { - "hash": "sha256-4TNKFlWt6Hda/N/H50Aq2IEMGYsLs9R+GG9e9uLQqG4=", + "hash": "sha256-9Kar2oz09oqucIz6x1ZEEbXFAuE/8OH6DTDz4Jk1lpo=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.45.0", + "rev": "v1.46.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-EyKOxwayr10RbOBDu+8Yp4FILPwCN6yu+VJq6jgeQCo=" + "vendorHash": "sha256-9Imtc2/rxcJBMch/i7iRyjYFlNeHaCL+KyJr3WzINHs=" }, "aviatrixsystems_aviatrix": { "hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=", @@ -190,6 +190,15 @@ "spdx": "MPL-2.0", "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, + "clevercloud_clevercloud": { + "hash": "sha256-rCeKsS60qvckrgGX2B2OkkZHy6vDXd9ChmKgP2JextE=", + "homepage": "https://registry.terraform.io/providers/clevercloud/clevercloud", + "owner": "CleverCloud", + "repo": "terraform-provider-clevercloud", + "rev": "v2.0.1", + "spdx": "Apache-2.0", + "vendorHash": "sha256-b27UcoNuaX3PxNlJLdU9njCl5JymBQhxD6rq8yT3gi4=" + }, "cloudamqp_cloudamqp": { "hash": "sha256-LAQ5MVZe4OSIJb7X6gdx1lPmgAEKZIm/7lL/93NTP6I=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", @@ -310,11 +319,11 @@ "vendorHash": null }, "digitalocean_digitalocean": { - "hash": "sha256-LmG3NpDkGgaQRworjC+CEhXxMO1lPbgOVhFTiObNkCA=", + "hash": "sha256-HGPoP6vJ7fVgFrqL92ZeO8Kno6bSGhcsHjqZipo0XoY=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.85.1", + "rev": "v2.86.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -472,11 +481,11 @@ "vendorHash": "sha256-874QpqIFFhzIGJZ8nKGcUe9qEpR9jQkx4nl75Cpqpww=" }, "grafana_grafana": { - "hash": "sha256-M29iRplTonmxOXeQYAdij+ttfGYiOCLN/v6YvYN9k7w=", + "hash": "sha256-/Qad6cDOL+XdhCWOWFdjwbzEa8VQoFTjILjvcuoT7Ow=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v4.35.0", + "rev": "v4.36.0", "spdx": "MPL-2.0", "vendorHash": "sha256-VEAtUCVZ3nJ1jfDYkkek+VQ1LjNQgRstRNtsM05ebZo=" }, @@ -508,13 +517,13 @@ "vendorHash": "sha256-fsGCKGgH2XM3Eq3rluKs3bODhmXUYEHLWskn+P58emA=" }, "hashicorp_awscc": { - "hash": "sha256-x1IcDODMayfVCZYz4kVf809Up0ictjJ0AzM0rA2z3Ks=", + "hash": "sha256-OC57nzpz8l+26/oBXVCFUMNK+gMlgpEK35uIyG1sFOo=", "homepage": "https://registry.terraform.io/providers/hashicorp/awscc", "owner": "hashicorp", "repo": "terraform-provider-awscc", - "rev": "v1.83.0", + "rev": "v1.84.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-jLJECrwL9JoWz2FSfTM/yQGzBg3gsrGtGpiZFRYwbII=" + "vendorHash": "sha256-ryLMz2eh5LO0e6OLJJUoMbM+U53uDTq9sHNcnSuuWt4=" }, "hashicorp_azuread": { "hash": "sha256-BkQwLkGu8Xmb4laoXOLDbSPyya5v8HBBNIya5hUBlV8=", @@ -634,13 +643,13 @@ "vendorHash": "sha256-xjOOvg1gUxQHUuIHGR0ltsvIpRAPq4PW0XPYUjIGvpE=" }, "hashicorp_null": { - "hash": "sha256-hPAcFWkeK1vjl1Cg/d7FaZpPhyU3pkU6VBIwxX2gEvA=", + "hash": "sha256-4fykdwledpBBrvfXtHlX1Nvd9L2LwHSYReFTAejqp84=", "homepage": "https://registry.terraform.io/providers/hashicorp/null", "owner": "hashicorp", "repo": "terraform-provider-null", - "rev": "v3.2.4", + "rev": "v3.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-ssmAveYUVI8z/1UWNeaMX0qdUewowCHNufJIFMirdVg=" + "vendorHash": "sha256-eomOKb1chviENE53S3L+MOGqqWg0ByTei5Q2xqn8Nko=" }, "hashicorp_random": { "hash": "sha256-Y5p9/H3g85AYr/FVWO6zLaeHIGo7iGvMV6eHTGO0ehI=", @@ -842,13 +851,13 @@ "vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM=" }, "linode_linode": { - "hash": "sha256-prYSxbzRCrB3IDpctEUBLIHpV2iwHHILDlCceRVdIvw=", + "hash": "sha256-FUOVV0gyUMb7VnZkK0ua92IHOUJ4wmnkbjh0fSQ9vGc=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v3.12.0", + "rev": "v3.13.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-4PQGnRL+z3EgVsTbKLXCBYwbzhd57tPije8RMJNrkKs=" + "vendorHash": "sha256-6wWNt0TDqqwtRFMCLH81WQ55XLEn4dHx+prM0DA+e4U=" }, "loafoe_htpasswd": { "hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=", diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 1a2a01727179..6026917dedbe 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -113,10 +113,10 @@ python3.pkgs.buildPythonApplication rec { sqlalchemy emoji httpx - httpx.optional-dependencies.socks h2 truststore ] + ++ httpx.optional-dependencies.socks ++ lib.optionals enableE2E [ pycrypto python-gnupg diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix index c8f0e8f9552b..2ab9a7ad7180 100644 --- a/pkgs/by-name/_1/_1password-cli/package.nix +++ b/pkgs/by-name/_1/_1password-cli/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation { versionCheckHook ] ++ lib.optional stdenv.hostPlatform.isLinux autoPatchelfHook - ++ lib.optional stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xar cpio ]; diff --git a/pkgs/by-name/an/annotation-mono/package.nix b/pkgs/by-name/an/annotation-mono/package.nix index 23cb7cd7211c..f4f9982202e6 100644 --- a/pkgs/by-name/an/annotation-mono/package.nix +++ b/pkgs/by-name/an/annotation-mono/package.nix @@ -5,11 +5,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "annotation-mono"; - version = "0.2"; + version = "0.4"; src = fetchzip { url = "https://github.com/qwerasd205/AnnotationMono/releases/download/v${finalAttrs.version}/AnnotationMono_v${finalAttrs.version}.zip"; - hash = "sha256-81BcPYE4C9kuetiCzgGPl59WO4QkBML7dwAkD1DCCZo="; + hash = "sha256-6DEYTYAENNY/5oD9us9f7VtPae/it7qrFC3/UT1J+Qg="; stripRoot = false; }; diff --git a/pkgs/by-name/an/ant/package.nix b/pkgs/by-name/an/ant/package.nix index 490faa1d12bb..a175bb2c6628 100644 --- a/pkgs/by-name/an/ant/package.nix +++ b/pkgs/by-name/an/ant/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ant"; - version = "1.10.15"; + version = "1.10.17"; nativeBuildInputs = [ makeWrapper ]; src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${finalAttrs.version}-bin.tar.bz2"; - hash = "sha256-h/SNGLoRwRVojDfvl1g+xv+J6mAz+J2BimckjaRxDEs="; + hash = "sha256-UhD8nXfpa/X0Y5KH8pgm2oXlSlQuCkCUY7FkK8PKruc="; }; installPhase = '' diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix index e3acde7e1a3d..01a20b3b9ccb 100644 --- a/pkgs/by-name/aw/aws-sam-cli/package.nix +++ b/pkgs/by-name/aw/aws-sam-cli/package.nix @@ -67,22 +67,25 @@ python3.pkgs.buildPythonApplication rec { tzlocal watchdog ] - ++ (with python3.pkgs.boto3-stubs.optional-dependencies; [ - apigateway - cloudformation - ecr - iam - kinesis - lambda - s3 - schemas - secretsmanager - signer - sqs - stepfunctions - sts - xray - ]); + ++ ( + with python3.pkgs.boto3-stubs.optional-dependencies; + lib.concatLists [ + apigateway + cloudformation + ecr + iam + kinesis + lambda + s3 + schemas + secretsmanager + signer + sqs + stepfunctions + sts + xray + ] + ); patches = [ # Remove after aws-sam-cli > 1.154.0 diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 3070840aac38..49fdb388ae4f 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -40,7 +40,7 @@ buildNpmPackage rec { docify pkg-config ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ clang_20 ]; # clang_21 breaks keytar + ++ lib.optional stdenv.hostPlatform.isDarwin clang_20; # clang_21 breaks keytar buildInputs = [ libsecret ]; diff --git a/pkgs/by-name/br/browsr/package.nix b/pkgs/by-name/br/browsr/package.nix index db45c39c6d68..a3b2fa3ca73e 100644 --- a/pkgs/by-name/br/browsr/package.nix +++ b/pkgs/by-name/br/browsr/package.nix @@ -46,7 +46,7 @@ python3Packages.buildPythonApplication (finalAttrs: { textual textual-universal-directorytree ] - ++ lib.attrVals extras finalAttrs.passthru.optional-dependencies; + ++ lib.flatten (lib.attrVals extras finalAttrs.passthru.optional-dependencies); optional-dependencies = with python3Packages; { all = [ diff --git a/pkgs/by-name/ca/caja-with-extensions/package.nix b/pkgs/by-name/ca/caja-with-extensions/package.nix index 43034921a6de..d9374778cb86 100644 --- a/pkgs/by-name/ca/caja-with-extensions/package.nix +++ b/pkgs/by-name/ca/caja-with-extensions/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ]; buildInputs = - lib.forEach selectedExtensions (x: x.buildInputs) + lib.concatMap (x: x.buildInputs) selectedExtensions ++ selectedExtensions ++ [ caja ] ++ caja.buildInputs; diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index a5beb4b2932d..074ca6e45e8e 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "cdncheck"; - version = "1.2.34"; + version = "1.2.36"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${finalAttrs.version}"; - hash = "sha256-iCv9v8ItMbozaJpNPW7zunjeszZbQxyjUvB7Kx1Dj1E="; + hash = "sha256-hDcGf7orlVsIOd0iROikrlXcBVsU5n9IHzfkWejXUGg="; }; vendorHash = "sha256-aolS1mhIM8/fOeHeLQgiS8z/zO++U+36Th7wNpKlkFU="; diff --git a/pkgs/by-name/cd/cdxgen/package.nix b/pkgs/by-name/cd/cdxgen/package.nix index 24a15b7a8cb4..2f5f1e410631 100644 --- a/pkgs/by-name/cd/cdxgen/package.nix +++ b/pkgs/by-name/cd/cdxgen/package.nix @@ -30,9 +30,7 @@ stdenv.mkDerivation (finalAttrs: { pnpm_10 python3 # required for sqlite3 bindings ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ - cctools.libtool - ]; + ++ lib.optional stdenv.hostPlatform.isDarwin cctools.libtool; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index 590904c3e6f6..605590609ca0 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ buildGoModule (finalAttrs: { pname = "cnspec"; - version = "13.8.2"; + version = "13.9.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${finalAttrs.version}"; - hash = "sha256-z7Peg7UQnMhWHazDrHabDQ0Y2QlyTjA7XzuwVA8fdak="; + hash = "sha256-pAiHfizC5GZwmGz3vWjYkj7YSimoOaWvmAOL2ERke0Q="; }; proxyVendor = true; - vendorHash = "sha256-F6EpksIF8aNcQEchp08DBa5ZwUFU3YusTkNBT1VjfFw="; + vendorHash = "sha256-6dNZEf8boh6sRRmVh4UhpwUvcCwUtMDqwmrOs8R+sck="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/by-name/et/etesync-dav/package.nix b/pkgs/by-name/et/etesync-dav/package.nix index 046b650bbce4..8d02f6f709b4 100644 --- a/pkgs/by-name/et/etesync-dav/package.nix +++ b/pkgs/by-name/et/etesync-dav/package.nix @@ -27,17 +27,19 @@ python3Packages.buildPythonApplication (finalAttrs: { pythonRelaxDeps = [ "radicale" ]; - dependencies = with python3Packages; [ - appdirs - etebase - etesync - flask - flask-wtf - msgpack - (python3Packages.toPythonModule (radicale.override { python3 = python; })) - requests - requests.optional-dependencies.socks - ]; + dependencies = + with python3Packages; + [ + appdirs + etebase + etesync + flask + flask-wtf + msgpack + (python3Packages.toPythonModule (radicale.override { python3 = python; })) + requests + ] + ++ requests.optional-dependencies.socks; doCheck = false; diff --git a/pkgs/by-name/fa/fastnlo-toolkit/package.nix b/pkgs/by-name/fa/fastnlo-toolkit/package.nix index d717e9208d54..926e0a89db62 100644 --- a/pkgs/by-name/fa/fastnlo-toolkit/package.nix +++ b/pkgs/by-name/fa/fastnlo-toolkit/package.nix @@ -48,13 +48,11 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional withPython python ++ lib.optional (withPython && python.isPy3k) ncurses; - propagatedNativeBuildInputs = lib.optional withPython [ swig ]; + propagatedNativeBuildInputs = lib.optional withPython swig; propagatedBuildInputs = [ zlib ] - ++ lib.optional withPython [ - python.pkgs.distutils - ]; + ++ lib.optional withPython python.pkgs.distutils; preConfigure = '' substituteInPlace ./fastnlotoolkit/Makefile.in \ diff --git a/pkgs/by-name/gi/git-hound/package.nix b/pkgs/by-name/gi/git-hound/package.nix index 0a70fdbaea84..d71b4c94dc8a 100644 --- a/pkgs/by-name/gi/git-hound/package.nix +++ b/pkgs/by-name/gi/git-hound/package.nix @@ -7,27 +7,19 @@ buildGoModule (finalAttrs: { pname = "git-hound"; - version = "1.7.2"; + version = "3.2"; src = fetchFromGitHub { owner = "tillson"; repo = "git-hound"; - rev = "v${finalAttrs.version}"; - hash = "sha256-W+rYDyRIw4jWWO4UZkUHFq/D/7ZXM+y5vdbclk6S0ro="; + tag = "v${finalAttrs.version}"; + hash = "sha256-zd9ttx3U2XtXhsqe3sT8oCUeFmFg5k519TPntCFf+0s="; }; - patches = [ - # https://github.com/tillson/git-hound/pull/66 - (fetchpatch { - url = "https://github.com/tillson/git-hound/commit/cd8aa19401cfdec9e4d76c1f6eb4d85928ec4b03.patch"; - hash = "sha256-EkdR2KkxxlMLNtKFGpxsQ/msJT5NcMF7irIUcU2WWJY="; - }) - ]; - # tests fail outside of nix doCheck = false; - vendorHash = "sha256-8teIa083oMXm0SjzMP+mGOVAel1Hbsp3TSMhdvqVbQs="; + vendorHash = "sha256-AgVNfYLs1myhOjIgylcchWKbFwW9qSsYqzqRxRHvKQ0="; meta = { description = "Reconnaissance tool for GitHub code search"; @@ -37,7 +29,8 @@ buildGoModule (finalAttrs: { and a unique result scoring system. ''; homepage = "https://github.com/tillson/git-hound"; - license = with lib.licenses; [ mit ]; + changelog = "https://github.com/tillson/git-hound/releases/tag/v${finalAttrs.src.tag}"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "git-hound"; }; diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index 58bf5b3fb145..ada0206dc4dc 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "github-mcp-server"; - version = "0.33.0"; + version = "1.0.3"; src = fetchFromGitHub { owner = "github"; repo = "github-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-FNSwZTz0RDP/BH2k66SBridiAZwAtuKsZaQgb/2jScA="; + hash = "sha256-atda50YVT577YabcHRO/xQU68DUFpwPS2GAWScSUaKg="; }; - vendorHash = "sha256-q21hnMnWOzfg7BGDl4KM1I3v0wwS5sSxzLA++L6jO4s="; + vendorHash = "sha256-fVNMtCpodsr1Z9E21osHb+e63ZQqFKYwi4fz4OsTJe0="; ldflags = [ "-s" diff --git a/pkgs/by-name/gn/gnome-panel/wrapper.nix b/pkgs/by-name/gn/gnome-panel/wrapper.nix index cb7f6d5d160d..ec517b53f81f 100644 --- a/pkgs/by-name/gn/gnome-panel/wrapper.nix +++ b/pkgs/by-name/gn/gnome-panel/wrapper.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { ]; buildInputs = - selectedPanelModulePackages ++ lib.forEach selectedPanelModulePackages (x: x.buildInputs or [ ]); + selectedPanelModulePackages ++ lib.concatMap (x: x.buildInputs or [ ]) selectedPanelModulePackages; dontUnpack = true; dontConfigure = true; diff --git a/pkgs/by-name/gr/grap/package.nix b/pkgs/by-name/gr/grap/package.nix index 3115c362ac7f..d131123dad15 100644 --- a/pkgs/by-name/gr/grap/package.nix +++ b/pkgs/by-name/gr/grap/package.nix @@ -38,9 +38,9 @@ python3Packages.buildPythonApplication rec { ]; buildInputs = [ - boost183.all libseccomp - ]; + ] + ++ boost183.all; strictDeps = true; diff --git a/pkgs/by-name/gr/groonga/package.nix b/pkgs/by-name/gr/groonga/package.nix index c6d882d4feee..2c995d07f11f 100644 --- a/pkgs/by-name/gr/groonga/package.nix +++ b/pkgs/by-name/gr/groonga/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals lz4Support [ lz4 ] - ++ lib.optional zlibSupport [ + ++ lib.optionals zlibSupport [ zlib ] ++ lib.optionals suggestSupport [ diff --git a/pkgs/by-name/is/isrcsubmit/package.nix b/pkgs/by-name/is/isrcsubmit/package.nix index d157d9aafc7c..873d97f391ff 100644 --- a/pkgs/by-name/is/isrcsubmit/package.nix +++ b/pkgs/by-name/is/isrcsubmit/package.nix @@ -35,9 +35,7 @@ python3Packages.buildPythonApplication { musicbrainzngs discid ] - ++ lib.optional withKeyring [ - keyring - ]; + ++ lib.optional withKeyring keyring; pythonImportsCheck = [ "isrcsubmit" ]; diff --git a/pkgs/by-name/ji/jinja2-cli/package.nix b/pkgs/by-name/ji/jinja2-cli/package.nix index a5ed8fcf1b77..04995502c270 100644 --- a/pkgs/by-name/ji/jinja2-cli/package.nix +++ b/pkgs/by-name/ji/jinja2-cli/package.nix @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication rec { [ jinja2 ] - ++ lib.attrVals extras optional-dependencies; + ++ lib.flatten (lib.attrVals extras optional-dependencies); pythonImportsCheck = [ "jinja2cli" ]; diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix index bd7436c32c5c..d96b64028c4d 100644 --- a/pkgs/by-name/ki/kitsas/package.nix +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -32,9 +32,7 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtsvg qt6.qtwebengine ] - ++ lib.optional stdenv.hostPlatform.isLinux [ - qt6.qtwayland - ]; + ++ lib.optional stdenv.hostPlatform.isLinux qt6.qtwayland; # We use a separate build-dir as otherwise ld seems to get confused between # directory and executable name on buildPhase. diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index e62fd0f91a55..8c74b38a637f 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: { icu78 simdjson ] - ++ lib.optional stdenv.hostPlatform.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ libpulseaudio.dev qt6Packages.qtwayland ]; diff --git a/pkgs/by-name/li/libass/package.nix b/pkgs/by-name/li/libass/package.nix index d3dc3d6053dc..61b8611327f0 100644 --- a/pkgs/by-name/li/libass/package.nix +++ b/pkgs/by-name/li/libass/package.nix @@ -45,9 +45,8 @@ stdenv.mkDerivation (finalAttrs: { harfbuzz ] ++ lib.optional fontconfigSupport fontconfig - ++ lib.optional stdenv.hostPlatform.isDarwin [ - libiconv - ]; + # TODO: remove dep after branchoff (in darwin stdenv) + ++ lib.optional stdenv.hostPlatform.isDarwin libiconv.out; meta = { description = "Portable ASS/SSA subtitle renderer"; diff --git a/pkgs/by-name/lu/lug-helper/package.nix b/pkgs/by-name/lu/lug-helper/package.nix index 77b73c7532a2..97199f86fff5 100644 --- a/pkgs/by-name/lu/lug-helper/package.nix +++ b/pkgs/by-name/lu/lug-helper/package.nix @@ -16,12 +16,12 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "lug-helper"; - version = "4.9"; + version = "4.13"; src = fetchFromGitHub { owner = "starcitizen-lug"; repo = "lug-helper"; tag = "v${finalAttrs.version}"; - hash = "sha256-5JkVx8wlErNcdOA0oHnNxtwFyEyuJ1XRS/JeACK7bJg="; + hash = "sha256-+hhipbw6tZmjpX+eUFQqRl4WXV4t56yJDrx4HtJ8AXc="; }; buildInputs = [ diff --git a/pkgs/by-name/mc/mcrl2/package.nix b/pkgs/by-name/mc/mcrl2/package.nix index eda177c67e3d..b849cbe89097 100644 --- a/pkgs/by-name/mc/mcrl2/package.nix +++ b/pkgs/by-name/mc/mcrl2/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { qt6.qtbase boost ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ makeWrapper ]; + ++ lib.optional stdenv.hostPlatform.isDarwin makeWrapper; dontWrapQtApps = true; diff --git a/pkgs/by-name/md/mdwatch/package.nix b/pkgs/by-name/md/mdwatch/package.nix index 8a95807213b5..b1d94ac0b8ce 100644 --- a/pkgs/by-name/md/mdwatch/package.nix +++ b/pkgs/by-name/md/mdwatch/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdwatch"; - version = "0.2.0"; + version = "0.2.2"; src = fetchFromGitHub { owner = "vimlinuz"; repo = "mdwatch"; tag = "v${finalAttrs.version}"; - hash = "sha256-snmyfhOkCTnRsBcKcTTij5caA2NmSA1Csp3+D6BJcw4="; + hash = "sha256-Oz0vBg+jfB24WT3n5v/7clCk37YaRBPnpfNQth0kxio="; }; - cargoHash = "sha256-CAXHIOC0K062zXNnAD1IW2Sb5Mnpc91A1Lamhc3+NLQ="; + cargoHash = "sha256-dMZpDuyKtheKRcBvVsHjVpJEnQRf92E2fb6JRH2fXO4="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix index d48f3b3b436d..99a6e03c8abe 100644 --- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix +++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix @@ -91,7 +91,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmConfigHook pnpm_10 ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper xcbuild ]; diff --git a/pkgs/by-name/mq/mqtt-exporter/package.nix b/pkgs/by-name/mq/mqtt-exporter/package.nix index b7ee6ca176fb..cee141656e8b 100644 --- a/pkgs/by-name/mq/mqtt-exporter/package.nix +++ b/pkgs/by-name/mq/mqtt-exporter/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "mqtt-exporter"; - version = "1.11.2"; + version = "1.12.1"; pyproject = true; src = fetchFromGitHub { owner = "kpetremann"; repo = "mqtt-exporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-pWXdd82K1BhUKHGVGpTRW4f/Xa9nf0Ww/l2pxdw/Jw8="; + hash = "sha256-cCVbvO1+69zIxbGGW7p3YTbDQgSU41uVR7M3jOHaqO8="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 23610a242dd2..64b316f8d7c8 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -177,7 +177,7 @@ python.pkgs.buildPythonApplication rec { pytestCheckHook ] ++ lib.concatAttrValues optional-dependencies - ++ (map (provider: providerPackages.${provider} python.pkgs) [ + ++ (lib.concatMap (provider: providerPackages.${provider} python.pkgs) [ "audible" "dlna" "jellyfin" diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index 6a57b725baef..84491ae199d9 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper dart-sass ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools xcbuild ]; diff --git a/pkgs/by-name/ni/nix-unit/package.nix b/pkgs/by-name/ni/nix-unit/package.nix index 5d6e811ac2a1..0007f3ff469e 100644 --- a/pkgs/by-name/ni/nix-unit/package.nix +++ b/pkgs/by-name/ni/nix-unit/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { # nlohmann_json can be only discovered via cmake files cmake ] - ++ lib.optional stdenv.cc.isClang [ clang-tools ]; + ++ lib.optional stdenv.cc.isClang clang-tools; postInstall = '' wrapProgram "$out/bin/nix-unit" --prefix PATH : ${difftastic}/bin diff --git a/pkgs/by-name/no/novops/package.nix b/pkgs/by-name/no/novops/package.nix index 582b31f11fbc..670d7a992255 100644 --- a/pkgs/by-name/no/novops/package.nix +++ b/pkgs/by-name/no/novops/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl # required for openssl-sys ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; diff --git a/pkgs/by-name/ob/obsidian/package.nix b/pkgs/by-name/ob/obsidian/package.nix index 5cc67d1997b6..bbffdfba295e 100644 --- a/pkgs/by-name/ob/obsidian/package.nix +++ b/pkgs/by-name/ob/obsidian/package.nix @@ -37,17 +37,28 @@ let ]; }; - filename = - if stdenv.hostPlatform.isDarwin then "Obsidian-${version}.dmg" else "obsidian-${version}.tar.gz"; - src = fetchurl { - url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/${filename}"; - hash = - if stdenv.hostPlatform.isDarwin then - "sha256-O4XBO0zlVRLobhcKfNKklOLbaVrIiMBgHhU8uFt3iBs=" - else - "sha256-/L4IsRHZwf2wm5wIlSsG4cgpxiFj66JYTEtOyFm+B50="; + srcs = rec { + x86_64-linux = fetchurl { + url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; + hash = "sha256-/L4IsRHZwf2wm5wIlSsG4cgpxiFj66JYTEtOyFm+B50="; + }; + + aarch64-linux = fetchurl { + url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}-arm64.tar.gz"; + hash = "sha256-a8hye/27bXMdWvmgb1HW3nBhxoyQjIrotDqe03miAmA="; + }; + + x86_64-darwin = fetchurl { + url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/Obsidian-${version}.dmg"; + hash = "sha256-O4XBO0zlVRLobhcKfNKklOLbaVrIiMBgHhU8uFt3iBs="; + }; + + aarch64-darwin = x86_64-darwin; }; + src = + srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + icon = fetchurl { url = "https://obsidian.md/images/obsidian-logo-gradient.svg"; hash = "sha256-EZsBuWyZ9zYJh0LDKfRAMTtnY70q6iLK/ggXlplDEoA="; @@ -96,13 +107,18 @@ let runHook postInstall ''; - passthru.updateScript = writeScript "updater" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl jq common-updater-scripts - set -eu -o pipefail - latestVersion="$(curl -sS https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json | jq -r '.latestVersion')" - update-source-version obsidian "$latestVersion" - ''; + passthru = { + inherit srcs; + updateScript = writeScript "updater" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + set -eu -o pipefail + latestVersion="$(curl -sS https://raw.githubusercontent.com/obsidianmd/obsidian-releases/master/desktop-releases.json | jq -r '.latestVersion')" + for platform in ${toString meta.platforms}; do + update-source-version obsidian "$latestVersion" --ignore-same-version --source-key=passthru.srcs.$platform + done + ''; + }; }; darwin = stdenv.mkDerivation { diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index 155c3ee506e9..2093557b0949 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -168,10 +168,12 @@ goBuild (finalAttrs: { cmake gitMinimal ] - ++ lib.optionals enableRocm [ - rocmPackages.llvm.bintools + ++ lib.optionals enableRocm ( rocmLibs - ] + ++ [ + rocmPackages.llvm.bintools + ] + ) ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ] ++ lib.optionals (enableRocm || enableCuda) [ makeBinaryWrapper diff --git a/pkgs/by-name/pa/pat/package.nix b/pkgs/by-name/pa/pat/package.nix index f52534b444fe..465ab4575510 100644 --- a/pkgs/by-name/pa/pat/package.nix +++ b/pkgs/by-name/pa/pat/package.nix @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optional stdenv.hostPlatform.isLinux [ libax25 ]; + buildInputs = lib.optional stdenv.hostPlatform.isLinux libax25; # Needed by wl2k-go go module for libax25 to include support for Linux' AX.25 stack by linking against libax25. # ref: https://github.com/la5nta/wl2k-go/blob/abe3ae5bf6a2eec670a21672d461d1c3e1d4c2f3/transport/ax25/ax25.go#L11-L17 diff --git a/pkgs/by-name/pa/patroni/package.nix b/pkgs/by-name/pa/patroni/package.nix index 1a71561808c3..c2f035bd9674 100644 --- a/pkgs/by-name/pa/patroni/package.nix +++ b/pkgs/by-name/pa/patroni/package.nix @@ -50,7 +50,7 @@ python3Packages.buildPythonApplication (finalAttrs: { urllib3 ydiff ]) - ++ lib.attrVals extras finalAttrs.passthru.optional-dependencies; + ++ lib.flatten (lib.attrVals extras finalAttrs.passthru.optional-dependencies); optional-dependencies = with python3Packages; { aws = [ boto3 ]; diff --git a/pkgs/by-name/pe/persepolis/package.nix b/pkgs/by-name/pe/persepolis/package.nix index d6fa0eaa6736..f07b52fad3dd 100644 --- a/pkgs/by-name/pe/persepolis/package.nix +++ b/pkgs/by-name/pe/persepolis/package.nix @@ -40,8 +40,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: { "\${qtWrapperArgs[@]}" ]; - propagatedBuildInputs = [ - (with python3.pkgs; [ + propagatedBuildInputs = ( + with python3.pkgs; + [ psutil pyside6 pysocks @@ -51,8 +52,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: { setproctitle setuptools yt-dlp - ]) - ]; + ] + ); meta = { description = "Download manager GUI written in Python"; diff --git a/pkgs/by-name/pi/pi-coding-agent/package.nix b/pkgs/by-name/pi/pi-coding-agent/package.nix index 7a1374f3f89a..cd15401c5004 100644 --- a/pkgs/by-name/pi/pi-coding-agent/package.nix +++ b/pkgs/by-name/pi/pi-coding-agent/package.nix @@ -7,6 +7,7 @@ writableTmpDirAsHomeHook, ripgrep, makeBinaryWrapper, + stdenvNoCC, }: buildNpmPackage (finalAttrs: { pname = "pi-coding-agent"; @@ -65,7 +66,17 @@ buildNpmPackage (finalAttrs: { # Clean up now-dangling .bin symlinks find "$nm/.bin" -xtype l -delete + '' + + lib.optionalString stdenvNoCC.hostPlatform.isDarwin '' + # Remove foreign Linux binaries that make audit-tmpdir try to inspect ELF + # RPATHs with patchelf + find "$nm/koffi/build/koffi" -mindepth 1 -maxdepth 1 -type d \ + ! -name 'darwin_*' -exec rm -r {} + + rm -rf \ + "$nm/@anthropic-ai/sandbox-runtime/dist/vendor/seccomp" \ + "$nm/@anthropic-ai/sandbox-runtime/vendor/seccomp" ''; + postFixup = "wrapProgram $out/bin/pi --prefix PATH : ${lib.makeBinPath [ ripgrep ]}"; doInstallCheck = true; diff --git a/pkgs/by-name/pv/pvzge/package.nix b/pkgs/by-name/pv/pvzge/package.nix index 61bdf577cdcb..df5a2c35353e 100644 --- a/pkgs/by-name/pv/pvzge/package.nix +++ b/pkgs/by-name/pv/pvzge/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { makeWrapper imagemagick ] - ++ lib.optional stdenvNoCC.hostPlatform.isDarwin [ desktopToDarwinBundle ]; + ++ lib.optional stdenvNoCC.hostPlatform.isDarwin desktopToDarwinBundle; postPatch = '' sed -i "s|.*|PvZ2: Gardendless|" docs/index.html diff --git a/pkgs/by-name/py/pympress/package.nix b/pkgs/by-name/py/pympress/package.nix index e5482da2bbe0..288ea438fb5d 100644 --- a/pkgs/by-name/py/pympress/package.nix +++ b/pkgs/by-name/py/pympress/package.nix @@ -37,9 +37,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pycairo pygobject3 ] - ++ lib.optional withVLC [ - python-vlc - ]; + ++ lib.optional withVLC python-vlc; nativeBuildInputs = [ wrapGAppsHook3 diff --git a/pkgs/by-name/re/redo-apenwarr/package.nix b/pkgs/by-name/re/redo-apenwarr/package.nix index adbb56107b22..38aae496b40d 100644 --- a/pkgs/by-name/re/redo-apenwarr/package.nix +++ b/pkgs/by-name/re/redo-apenwarr/package.nix @@ -66,11 +66,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ python3 - (with python3.pkgs; [ - beautifulsoup4 - markdown - ]) which + python3.pkgs.beautifulsoup4 + python3.pkgs.markdown installShellFiles gnumake42 # fails with make 4.4 ]; diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix index 44b29adaa74e..8c2dd9008831 100644 --- a/pkgs/by-name/re/renovate/package.nix +++ b/pkgs/by-name/re/renovate/package.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { python3 yq-go ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild cctools # contains libtool, required by better-sqlite3 ]; diff --git a/pkgs/by-name/ry/ryubing/package.nix b/pkgs/by-name/ry/ryubing/package.nix index 11c1b657625d..4551d4c6ffcc 100644 --- a/pkgs/by-name/ry/ryubing/package.nix +++ b/pkgs/by-name/ry/ryubing/package.nix @@ -43,10 +43,8 @@ buildDotnetModule rec { }; nativeBuildInputs = - lib.optional stdenv.hostPlatform.isLinux [ - wrapGAppsHook3 - ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ + lib.optional stdenv.hostPlatform.isLinux wrapGAppsHook3 + ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools darwin.sigtool ]; @@ -82,11 +80,11 @@ buildDotnetModule rec { libGL SDL2 ] - ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ udev pulseaudio ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ moltenvk ]; + ++ lib.optional stdenv.hostPlatform.isDarwin moltenvk; projectFile = "Ryujinx.sln"; testProjectFile = "src/Ryujinx.Tests/Ryujinx.Tests.csproj"; diff --git a/pkgs/by-name/sh/shairport-sync/package.nix b/pkgs/by-name/sh/shairport-sync/package.nix index d760a0208aec..4fffcd8bbde7 100644 --- a/pkgs/by-name/sh/shairport-sync/package.nix +++ b/pkgs/by-name/sh/shairport-sync/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { # mkDerivation's splicing logic from kicking in. "${glib.dev}" ] - ++ optional enableAirplay2 [ + ++ optionals enableAirplay2 [ libplist.bin unixtools.xxd ]; diff --git a/pkgs/by-name/so/sope/package.nix b/pkgs/by-name/so/sope/package.nix index 3ef83e1fe6ab..1178a10b7563 100644 --- a/pkgs/by-name/so/sope/package.nix +++ b/pkgs/by-name/so/sope/package.nix @@ -23,7 +23,7 @@ clangStdenv.mkDerivation rec { hash = "sha256-0G28qDXygDe/TJ2znNE+NVQry3bkqUO59jqtJm/t2S4="; }; - nativeBuildInputs = lib.optional (libpq != null) [ libpq.pg_config ]; + nativeBuildInputs = lib.optional (libpq != null) libpq.pg_config; buildInputs = [ gnustep-base libxml2 diff --git a/pkgs/by-name/st/streamlink/package.nix b/pkgs/by-name/st/streamlink/package.nix index 6dd2a98702b0..70ca89507d66 100644 --- a/pkgs/by-name/st/streamlink/package.nix +++ b/pkgs/by-name/st/streamlink/package.nix @@ -58,7 +58,7 @@ python3Packages.buildPythonApplication rec { urllib3 websocket-client ] - ++ lib.attrVals extras optional-dependencies; + ++ lib.flatten (lib.attrVals extras optional-dependencies); optional-dependencies = with python3Packages; { decompress = urllib3.optional-dependencies.brotli ++ urllib3.optional-dependencies.zstd; diff --git a/pkgs/by-name/te/terminusdb/package.nix b/pkgs/by-name/te/terminusdb/package.nix index 535b866c13fb..4884cfc2208d 100644 --- a/pkgs/by-name/te/terminusdb/package.nix +++ b/pkgs/by-name/te/terminusdb/package.nix @@ -105,10 +105,8 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; nativeBuildInputs = [ - (with rustPlatform; [ - cargoSetupHook - bindgenHook # provides libclang - ]) + rustPlatform.cargoSetupHook + rustPlatform.bindgenHook # provides libclang cargo installShellFiles protobuf diff --git a/pkgs/by-name/ti/tigervnc/package.nix b/pkgs/by-name/ti/tigervnc/package.nix index 4e6a935afb58..cebd3311ac44 100644 --- a/pkgs/by-name/ti/tigervnc/package.nix +++ b/pkgs/by-name/ti/tigervnc/package.nix @@ -209,7 +209,7 @@ stdenv.mkDerivation (finalAttrs: { ] ); - propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux xorg-server.propagatedBuildInputs; + propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isLinux xorg-server.propagatedBuildInputs; passthru.tests.tigervnc = nixosTests.tigervnc; diff --git a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix index 87688c78770a..ac828b09fd5e 100644 --- a/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix +++ b/pkgs/by-name/tr/tree-sitter/grammars/grammar-sources.nix @@ -2583,9 +2583,9 @@ }; t32 = { - version = "7.2.6"; + version = "9.0.0"; url = "github:xasc/tree-sitter-t32"; - hash = "sha256-r89C29D8N8E+MJi+RUxTE0+Y/e4ykLzIDaw/AQHegLc="; + hash = "sha256-IL+wPbopaiX+pG/9yvkXx0VVPVCSgG05uObw/wsQGAw="; meta = { maintainers = with lib.maintainers; [ aciceri diff --git a/pkgs/by-name/tu/turses/package.nix b/pkgs/by-name/tu/turses/package.nix index a24ee8d7dcb5..7c04dae2c0c2 100644 --- a/pkgs/by-name/tu/turses/package.nix +++ b/pkgs/by-name/tu/turses/package.nix @@ -22,10 +22,12 @@ let tag = "v${version}"; hash = "sha256-3BbQeCaAhlz9h5GnhficNubJHu4kTpnCDM4oKzlti0w="; }; - dependencies = oldAttrs.dependencies ++ [ - super.six - super.requests.optional-dependencies.socks - ]; + dependencies = + oldAttrs.dependencies + ++ [ + super.six + ] + ++ super.requests.optional-dependencies.socks; doCheck = false; }); }; diff --git a/pkgs/by-name/vc/vcv-rack/package.nix b/pkgs/by-name/vc/vcv-rack/package.nix index 8e49779c72c1..d7dcbe4c22ca 100644 --- a/pkgs/by-name/vc/vcv-rack/package.nix +++ b/pkgs/by-name/vc/vcv-rack/package.nix @@ -123,7 +123,7 @@ let libjack2 libpulseaudio ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ apple-sdk_14 ]; + ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_14; cmakeFlags = [ (lib.cmakeBool "RTAUDIO_API_ALSA" stdenv.hostPlatform.isLinux) diff --git a/pkgs/by-name/vi/vimdoc-language-server/package.nix b/pkgs/by-name/vi/vimdoc-language-server/package.nix index 696dba96ebd7..0d0b79b41805 100644 --- a/pkgs/by-name/vi/vimdoc-language-server/package.nix +++ b/pkgs/by-name/vi/vimdoc-language-server/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "vimdoc-language-server"; - version = "0.1.2"; + version = "0.2.2"; src = fetchFromGitHub { owner = "barrettruth"; repo = "vimdoc-language-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-4Uy9RUauRf9IjfykjrLRviKaMNX2fpmSdA/bvkYqgQY="; + hash = "sha256-iLNRJlQbhaz9zm+XWlck1bzkMj/tP7uN2PixNy+wZpo="; }; - cargoHash = "sha256-319K2fD8ae+MWgvNhmhgrD6syCDkO2FMgXr8z45CMr4="; + cargoHash = "sha256-g0YlVcWOdQvgEKZvfusNn0ZVZYOgKeHp0G8OQ96BDn0="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/vo/voxtype/package.nix b/pkgs/by-name/vo/voxtype/package.nix index 62084d779d78..b28df4f4a5ac 100644 --- a/pkgs/by-name/vo/voxtype/package.nix +++ b/pkgs/by-name/vo/voxtype/package.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage (finalAttrs: { makeBinaryWrapper pkg-config ] - ++ lib.optional vulkanSupport [ + ++ lib.optionals vulkanSupport [ shaderc vulkan-headers vulkan-loader diff --git a/pkgs/by-name/wh/whoogle-search/package.nix b/pkgs/by-name/wh/whoogle-search/package.nix index def30f89e255..260ee63aa50e 100644 --- a/pkgs/by-name/wh/whoogle-search/package.nix +++ b/pkgs/by-name/wh/whoogle-search/package.nix @@ -18,44 +18,46 @@ python3Packages.buildPythonApplication (finalAttrs: { build-system = with python3Packages; [ setuptools ]; - dependencies = with python3Packages; [ - attrs - beautifulsoup4 - brotli - cachetools - certifi - cffi - click - cryptography - cssutils - defusedxml - flask - h11 - httpcore - httpx - httpx.optional-dependencies.http2 - httpx.optional-dependencies.socks - idna - itsdangerous - jinja2 - markupsafe - more-itertools - packaging - pluggy - pycodestyle - pycparser - pyopenssl - pyparsing - pytest - python-dateutil - python-dotenv - soupsieve - stem - validators - waitress - wcwidth - werkzeug - ]; + dependencies = + with python3Packages; + [ + attrs + beautifulsoup4 + brotli + cachetools + certifi + cffi + click + cryptography + cssutils + defusedxml + flask + h11 + httpcore + httpx + idna + itsdangerous + jinja2 + markupsafe + more-itertools + packaging + pluggy + pycodestyle + pycparser + pyopenssl + pyparsing + pytest + python-dateutil + python-dotenv + soupsieve + stem + validators + waitress + wcwidth + werkzeug + ] + ++ httpx.optional-dependencies.http2 + ++ httpx.optional-dependencies.socks; postInstall = '' # This creates renamed versions of the static files for cache busting, diff --git a/pkgs/by-name/wt/wtfutil/package.nix b/pkgs/by-name/wt/wtfutil/package.nix index 4246b93b0ea4..4ed70c5d0cd9 100644 --- a/pkgs/by-name/wt/wtfutil/package.nix +++ b/pkgs/by-name/wt/wtfutil/package.nix @@ -47,7 +47,7 @@ buildGoModule (finalAttrs: { doInstallCheck = true; # Darwin Error: mkdir /var/empty: file exists - nativeInstallCheckInputs = lib.optional (!stdenv.hostPlatform.isDarwin) [ versionCheckHook ]; + nativeInstallCheckInputs = lib.optional (!stdenv.hostPlatform.isDarwin) versionCheckHook; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix index 93eec2ec20c0..a4de10b06d8f 100644 --- a/pkgs/by-name/xp/xpra/package.nix +++ b/pkgs/by-name/xp/xpra/package.nix @@ -188,7 +188,7 @@ effectiveBuildPythonApplication rec { xxhash systemd ] - ++ lib.optional withNvenc [ + ++ lib.optionals withNvenc [ nvencHeaders nvjpegHeaders ]; diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix index cb6413ab6349..7b64a5f319b3 100644 --- a/pkgs/by-name/yc/ycmd/package.nix +++ b/pkgs/by-name/yc/ycmd/package.nix @@ -43,10 +43,10 @@ stdenv.mkDerivation { [ abseil-cpp boost - libllvm.all - libclang.all legacy-cgi ] + ++ libllvm.all + ++ libclang.all ++ [ jedi jedi-language-server diff --git a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix index 4d3753946bcc..1bcb7cd0d9cb 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/wrapper.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { wrapGAppsHook4 ]; - buildInputs = lib.forEach selectedPlugs (x: x.buildInputs) ++ selectedPlugs; + buildInputs = lib.concatMap (x: x.buildInputs) selectedPlugs ++ selectedPlugs; dontUnpack = true; dontConfigure = true; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix index cb089c3cd0c5..8bdbbffac072 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/wrapper.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { wrapGAppsHook3 ]; - buildInputs = lib.forEach selectedIndicators (x: x.buildInputs) ++ selectedIndicators; + buildInputs = lib.concatMap (x: x.buildInputs) selectedIndicators ++ selectedIndicators; dontUnpack = true; dontConfigure = true; diff --git a/pkgs/development/compilers/dart/default.nix b/pkgs/development/compilers/dart/default.nix index ae4457394304..d46491d947de 100644 --- a/pkgs/development/compilers/dart/default.nix +++ b/pkgs/development/compilers/dart/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dart"; - version = "3.11.4"; + version = "3.11.6"; src = let @@ -25,10 +25,10 @@ stdenv.mkDerivation (finalAttrs: { aarch64-darwin = "macos-arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-UtYvBbAHzLcRfPQcGb7aHIfBRLJ+pgCxa0ycjqj8j9Q="; - aarch64-linux = "sha256-w1um8N4fXrvyNQZhK//DR8e6lMOkx1EQyrEVeJIWbTw="; - x86_64-darwin = "sha256-GHTjTHJmbIPfsAbF4AmxjDETSw9YD04/6lGecoe1xrA="; - aarch64-darwin = "sha256-DwyZtAeZLuaX2MFVPzhERiFeX45wI9sTc4Y2SVopRE8="; + x86_64-linux = "sha256-6g/yOW6lr0Aro1mKkTmg9LGzRx2dfoNIgtFVliJ2Ct0="; + aarch64-linux = "sha256-PBKZ9GjroP13z5uC1+doOCwemAg3tgyndKLOtPnX20s="; + x86_64-darwin = "sha256-gccm33wZaltIGlHOwExsECxRyOFMeW+FdZvu7M7Ychw="; + aarch64-darwin = "sha256-09iIdY8xOvDLp03MoVfShBdyyW4NR8ZN1SvVTc8Rr3Y="; }; in fetchurl { diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix index 1e66c4dbd0de..260717a7ed66 100644 --- a/pkgs/development/compilers/dotnet/wrapper.nix +++ b/pkgs/development/compilers/dotnet/wrapper.nix @@ -223,7 +223,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { buildInputs = [ zlib ] - ++ lib.optional stdenv.hostPlatform.isDarwin [ + ++ lib.optionals stdenv.hostPlatform.isDarwin [ swiftPackages.swift darwin.ICU ]; diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.22.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.22.0.json new file mode 100644 index 000000000000..a52594977801 --- /dev/null +++ b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.22.0.json @@ -0,0 +1,107 @@ +{ + "release_date": "2026-05-08", + "release_label": "9.22.0", + "release_product": "cudnn", + "cudnn": { + "name": "NVIDIA CUDA Deep Neural Network library", + "license": "cudnn", + "license_path": "cudnn/LICENSE.txt", + "version": "9.22.0.52", + "linux-x86_64": { + "cuda12": { + "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-9.22.0.52_cuda12-archive.tar.xz", + "sha256": "3c350637c820f586c292501124fda0d8ae1104f4ccdb688ad06aa929cf23f112", + "md5": "ac17703926f0e0e048afc64e838eebc6", + "size": "959541460" + }, + "cuda13": { + "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-9.22.0.52_cuda13-archive.tar.xz", + "sha256": "6853561e3fbb545e2d25ad567876eadbfff4db49e210abd285e82b55bcb982b0", + "md5": "4246179d88fc98af8660b31d6eca3f8e", + "size": "900775012" + } + }, + "cuda_variant": [ + "12", + "13" + ], + "linux-sbsa": { + "cuda12": { + "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-9.22.0.52_cuda12-archive.tar.xz", + "sha256": "262bd96796be659746d1179b0d5954af1deb2968b2eedb1c9575b2c71647fc5c", + "md5": "2a34e340717108946bbc58f1c1af3a19", + "size": "1008891848" + }, + "cuda13": { + "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-9.22.0.52_cuda13-archive.tar.xz", + "sha256": "37fb82cc142cc95f9bde1915970cf527edb4949ca99e6f9a337b5ab2e3ec4ecb", + "md5": "66dcaa8627fe3442d823a629042b1d14", + "size": "1076455496" + } + }, + "windows-x86_64": { + "cuda12": { + "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-9.22.0.52_cuda12-archive.zip", + "sha256": "a1515e809b9a269b1e1756923a6d48944393de24d82ddd7e18c85f8440e72a20", + "md5": "4b9d29b6c912ad4a0797fbd364e6ee73", + "size": "1826587315" + }, + "cuda13": { + "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-9.22.0.52_cuda13-archive.zip", + "sha256": "11f714ad2699f1d548546fe8797ca563c498d4c66d5a4e9b6c2948325ca8da7d", + "md5": "62029f3058dc11c94a9dc040141680b6", + "size": "1262900618" + } + } + }, + "cudnn_jit": { + "name": "NVIDIA CUDA Deep Neural Network Graph JIT library", + "license": "cudnn", + "license_path": "cudnn_jit/LICENSE.txt", + "version": "9.22.0.52", + "linux-x86_64": { + "cuda12": { + "relative_path": "cudnn_jit/linux-x86_64/cudnn_jit-linux-x86_64-9.22.0.52_cuda12-archive.tar.xz", + "sha256": "46ebd101756c055e8c61b644868813e6d2488c54c4e5e218d5562cc9f8701f1b", + "md5": "46953e9ffdbbd778f14566a9bc581ac7", + "size": "45201028" + }, + "cuda13": { + "relative_path": "cudnn_jit/linux-x86_64/cudnn_jit-linux-x86_64-9.22.0.52_cuda13-archive.tar.xz", + "sha256": "8043f5fdc06d603309da29b0c228ec3113c78aaca2914182ed6039c468ff88c9", + "md5": "5bbbe893367bf6ca88a91c2584558dac", + "size": "47070044" + } + }, + "cuda_variant": [ + "12", + "13" + ], + "linux-sbsa": { + "cuda12": { + "relative_path": "cudnn_jit/linux-sbsa/cudnn_jit-linux-sbsa-9.22.0.52_cuda12-archive.tar.xz", + "sha256": "5002f74513a076b5082ada6dcd7e926a1b7063b3ecbc3fee10bb98470de396f5", + "md5": "571a7587ba0dc6f61d96364ffd63e397", + "size": "43473568" + }, + "cuda13": { + "relative_path": "cudnn_jit/linux-sbsa/cudnn_jit-linux-sbsa-9.22.0.52_cuda13-archive.tar.xz", + "sha256": "5f536e1d91b6b22c6b21dfc8bc0616a9aca78f64e8d6370d78e1e0975355dbd5", + "md5": "62cdc32a21b76d83090437feb0238ca3", + "size": "44695488" + } + } + }, + "cudnn_samples": { + "name": "NVIDIA cuDNN samples", + "license": "cudnn", + "license_path": "cudnn_samples/LICENSE.txt", + "version": "9.22.0.52", + "source": { + "relative_path": "cudnn_samples/source/cudnn_samples-source-9.22.0.52-archive.tar.xz", + "sha256": "be8f0b63546d89d46d498bac1f28a5ba487c78c0360ee2957c5b359382274cf6", + "md5": "676a9f1ff3d0e9812f38683013f4a83e", + "size": "1665684" + } + } +} \ No newline at end of file diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index aa07149bf988..e8d9286f0706 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1572,7 +1572,7 @@ with haskellLib; # https://github.com/mgajda/json-autotype/issues/25 json-autotype = dontCheck super.json-autotype; - gargoyle-postgresql-nix = addBuildTool [ pkgs.postgresql ] super.gargoyle-postgresql-nix; + gargoyle-postgresql-nix = addBuildTool pkgs.postgresql super.gargoyle-postgresql-nix; # PortMidi needs an environment variable to have ALSA find its plugins: # https://github.com/NixOS/nixpkgs/issues/6860 diff --git a/pkgs/development/mobile/androidenv/tools.nix b/pkgs/development/mobile/androidenv/tools.nix index df216fefdb17..efcbe8bdd6a1 100644 --- a/pkgs/development/mobile/androidenv/tools.nix +++ b/pkgs/development/mobile/androidenv/tools.nix @@ -17,7 +17,7 @@ deployAndroidPackage { name = "androidsdk-tools"; inherit package os arch; nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (os == "linux") [ autoPatchelfHook ]; - buildInputs = lib.optional (os == "linux") ( + buildInputs = lib.optionals (os == "linux") ( (with pkgs; [ glibc freetype diff --git a/pkgs/development/octave-modules/io/default.nix b/pkgs/development/octave-modules/io/default.nix index a4db56e12a42..ca3b8b642a61 100644 --- a/pkgs/development/octave-modules/io/default.nix +++ b/pkgs/development/octave-modules/io/default.nix @@ -16,9 +16,7 @@ buildOctavePackage rec { sha256 = "sha256-G49gAZ/lzir1YwEAPjBGRjNJ3VMxI+iXnsS0yev8f2s="; }; - buildInputs = [ - (lib.optional enableJava jdk) - ]; + buildInputs = lib.optional enableJava jdk; propagatedBuildInputs = [ unzip diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 6b5ad40fb2bc..0b35804525ad 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -13,16 +13,16 @@ pytestCheckHook, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "aiodiscover"; - version = "2.7.1"; + version = "3.0.0"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "aiodiscover"; - tag = "v${version}"; - hash = "sha256-q0HXANSfoDPlGdokfiQcsMHkt9ZmD604JRL/SDQx2hw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-O5aQ2yCcy6ZtDviH8Jie3BrgS4kPhSDHBVhbXco5oqM="; }; build-system = [ poetry-core ]; @@ -51,8 +51,8 @@ buildPythonPackage rec { meta = { description = "Python module to discover hosts via ARP and PTR lookup"; homepage = "https://github.com/bdraco/aiodiscover"; - changelog = "https://github.com/bdraco/aiodiscover/releases/tag/${src.tag}"; - license = with lib.licenses; [ asl20 ]; + changelog = "https://github.com/bdraco/aiodiscover/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/bleak-esphome/default.nix b/pkgs/development/python-modules/bleak-esphome/default.nix index 9157005080b8..460949f309e7 100644 --- a/pkgs/development/python-modules/bleak-esphome/default.nix +++ b/pkgs/development/python-modules/bleak-esphome/default.nix @@ -19,14 +19,14 @@ buildPythonPackage (finalAttrs: { pname = "bleak-esphome"; - version = "3.7.4"; + version = "3.7.5"; pyproject = true; src = fetchFromGitHub { owner = "bluetooth-devices"; repo = "bleak-esphome"; tag = "v${finalAttrs.version}"; - hash = "sha256-f26E+/JTas2ugs7HYD9KYKX1qy7nrWd1+Osgz7fhl0c="; + hash = "sha256-ZV7C+ohEbRXYpAUmZ4wVbv8Ng4eZcLofc+o9Q5Rqp2E="; }; postPatch = '' diff --git a/pkgs/development/python-modules/codecarbon/default.nix b/pkgs/development/python-modules/codecarbon/default.nix new file mode 100644 index 000000000000..73407458e071 --- /dev/null +++ b/pkgs/development/python-modules/codecarbon/default.nix @@ -0,0 +1,152 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + setuptools, + + # dependencies + arrow, + authlib, + click, + nvidia-ml-py, + pandas, + prometheus-client, + psutil, + py-cpuinfo, + pycountry, + pydantic, + questionary, + rapidfuzz, + requests, + rich, + typer, + + # optional-dependencies + amdsmi, + dash, + dash-bootstrap-components, + fire, + + # tests + bcrypt, + dependency-injector, + email-validator, + fastapi, + fastapi-pagination, + httpx, + jwt, + logfire, + psycopg2, + pydantic-settings, + pytestCheckHook, + requests-mock, + responses, + sqlalchemy, +}: + +buildPythonPackage (finalAttrs: { + pname = "codecarbon"; + version = "3.2.6"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "mlco2"; + repo = "codecarbon"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Nzt+CKXnv6zvWKsFD7duguVj0AA4eWZgFUlBdIEujD8="; + }; + + build-system = [ + setuptools + ]; + + dependencies = [ + arrow + authlib + click + nvidia-ml-py + pandas + prometheus-client + psutil + py-cpuinfo + pycountry + pydantic + questionary + rapidfuzz + requests + rich + typer + ]; + + optional-dependencies = { + amdsmi = [ + amdsmi + ]; + carbonboard = [ + dash + dash-bootstrap-components + fire + ]; + viz-legacy = [ + dash + dash-bootstrap-components + fire + ]; + }; + + pythonImportsCheck = [ "codecarbon" ]; + + nativeBuildInputs = [ + bcrypt + dash + dependency-injector + email-validator + fastapi + fastapi-pagination + httpx + jwt + logfire + psycopg2 + pydantic-settings + pytestCheckHook + requests-mock + responses + sqlalchemy + ]; + + enabledTestPaths = [ + "carbonserver/tests/" + ]; + + disabledTestPaths = [ + # Fail in the sandbox: + # FileNotFoundError: [Errno 2] No such file or directory: '/sys/class/powercap/intel-rapl/intel-rapl:0/energy_uj' + "examples/" + + # _pytest.outcomes.Exit: CODECARBON_API_URL is not defined + "carbonserver/tests/api/integration/test_api_black_box.py" + + # Require unpackaged (and unmaintained) fief-client + "carbonserver/tests/api/routers/" + "carbonserver/tests/api/service/test_auth_provider.py" + + # Require internet access + "carbonserver/tests/api/integration/test_project_cascade_delete.py" + ]; + + disabledTests = [ + # AttributeError: does not have the attribute 'decode' + "test_check_user_from_jwt" + ]; + + meta = { + description = "Track emissions from Compute and recommend ways to reduce their impact on the environment"; + homepage = "https://github.com/mlco2/codecarbon"; + changelog = "https://github.com/mlco2/codecarbon/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/corsair-scan/default.nix b/pkgs/development/python-modules/corsair-scan/default.nix index 364ce1081940..a4dafe2321a0 100644 --- a/pkgs/development/python-modules/corsair-scan/default.nix +++ b/pkgs/development/python-modules/corsair-scan/default.nix @@ -6,20 +6,21 @@ mock, pytestCheckHook, requests, + setuptools, tldextract, urllib3, validators, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "corsair-scan"; version = "0.2.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "Santandersecurityresearch"; repo = "corsair_scan"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-s94ZiTL7tBrhUaeB/O3Eh8o8zqtfdt0z8LKep1bZWiY="; }; @@ -28,7 +29,9 @@ buildPythonPackage rec { --replace "'pytest-runner'," "" ''; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ validators requests urllib3 @@ -53,8 +56,8 @@ buildPythonPackage rec { description = "Python module to check for Cross-Origin Resource Sharing (CORS) misconfigurations"; mainProgram = "corsair"; homepage = "https://github.com/Santandersecurityresearch/corsair_scan"; - changelog = "https://github.com/Santandersecurityresearch/corsair_scan/releases/tag/v${version}"; + changelog = "https://github.com/Santandersecurityresearch/corsair_scan/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ mit ]; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 25279d246c36..1f546cd80f48 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -1,34 +1,45 @@ { lib, - aiohttp, buildPythonPackage, - fastapi, fetchFromGitHub, + + # build-system + cython, + setuptools, + + # optional-dependencies + aiohttp, + pydantic, flask, + pyyaml, + + # tests + fastapi, httpx, mypy-boto3-s3, numpy, - pydantic, pytest-asyncio, pytestCheckHook, - pyyaml, scipy, - setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "dependency-injector"; - version = "4.48.3"; + version = "4.49.0"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "ets-labs"; repo = "python-dependency-injector"; - tag = version; - hash = "sha256-J4M4SM256vZa2JUhagcbKu+DAUk1Op9HN+WpLL6ScBc="; + tag = finalAttrs.version; + hash = "sha256-oL+Vgz2EOD/w385MJy+hLfkSctLEKRrzbx5RP9N8AmY="; }; - build-system = [ setuptools ]; + build-system = [ + cython + setuptools + ]; optional-dependencies = { aiohttp = [ aiohttp ]; @@ -46,7 +57,7 @@ buildPythonPackage rec { pytestCheckHook scipy ] - ++ lib.concatAttrValues optional-dependencies; + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; pythonImportsCheck = [ "dependency_injector" ]; @@ -56,15 +67,16 @@ buildPythonPackage rec { "tests/unit/wiring/test_*_py36.py" "tests/unit/providers/configuration/test_from_pydantic_py36.py" "tests/unit/providers/configuration/test_pydantic_settings_in_init_py36.py" + + # Requires unpackaged fast-depends + "tests/unit/wiring/test_fastdepends.py" ]; meta = { description = "Dependency injection microframework for Python"; homepage = "https://github.com/ets-labs/python-dependency-injector"; - changelog = "https://github.com/ets-labs/python-dependency-injector/blob/${src.tag}/docs/main/changelog.rst"; + changelog = "https://github.com/ets-labs/python-dependency-injector/blob/${finalAttrs.src.tag}/docs/main/changelog.rst"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ gerschtli ]; - # https://github.com/ets-labs/python-dependency-injector/issues/726 - broken = lib.versionAtLeast pydantic.version "2"; }; -} +}) diff --git a/pkgs/development/python-modules/drf-pydantic/default.nix b/pkgs/development/python-modules/drf-pydantic/default.nix index 63543d888cf2..63a41b5c1795 100644 --- a/pkgs/development/python-modules/drf-pydantic/default.nix +++ b/pkgs/development/python-modules/drf-pydantic/default.nix @@ -35,8 +35,8 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook pytest-cov-stub - pydantic.optional-dependencies.email - ]; + ] + ++ pydantic.optional-dependencies.email; meta = { changelog = "https://github.com/georgebv/drf-pydantic/releases/tag/${src.tag}"; diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix index 8d8266310ab9..1e39e5afa04d 100644 --- a/pkgs/development/python-modules/e3-core/default.nix +++ b/pkgs/development/python-modules/e3-core/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { stevedore tqdm ] - ++ lib.optional stdenv.hostPlatform.isLinux [ + ++ lib.optionals stdenv.hostPlatform.isLinux [ # See https://github.com/AdaCore/e3-core/blob/v22.6.0/pyproject.toml#L37-L42 # These are required only on Linux. Darwin has its own set of requirements psutil diff --git a/pkgs/development/python-modules/eth-keys/default.nix b/pkgs/development/python-modules/eth-keys/default.nix index 7377ae5f925b..c5787c8703db 100644 --- a/pkgs/development/python-modules/eth-keys/default.nix +++ b/pkgs/development/python-modules/eth-keys/default.nix @@ -46,8 +46,8 @@ buildPythonPackage rec { pydantic ] ++ optional-dependencies.coincurve - ++ lib.optional (!isPyPy) eth-hash.optional-dependencies.pysha3 - ++ lib.optional isPyPy eth-hash.optional-dependencies.pycryptodome; + ++ lib.optionals (!isPyPy) eth-hash.optional-dependencies.pysha3 + ++ lib.optionals isPyPy eth-hash.optional-dependencies.pycryptodome; pythonImportsCheck = [ "eth_keys" ]; diff --git a/pkgs/development/python-modules/fastapi-pagination/default.nix b/pkgs/development/python-modules/fastapi-pagination/default.nix new file mode 100644 index 000000000000..b00f868fac28 --- /dev/null +++ b/pkgs/development/python-modules/fastapi-pagination/default.nix @@ -0,0 +1,50 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + # build-system + hatchling, + + # dependencies + fastapi, + pydantic, + typing-extensions, +}: + +buildPythonPackage (finalAttrs: { + pname = "fastapi-pagination"; + version = "0.15.12"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "uriyyo"; + repo = "fastapi-pagination"; + tag = finalAttrs.version; + hash = "sha256-AzpNyTzlzPHkrx8BghZFHer3w+GpNIUYRo15rRRO0UY="; + }; + + build-system = [ + hatchling + ]; + + dependencies = [ + fastapi + pydantic + typing-extensions + ]; + + pythonImportsCheck = [ "fastapi_pagination" ]; + + # Tests require network access + doCheck = false; + + meta = { + description = "FastAPI pagination"; + homepage = "https://github.com/uriyyo/fastapi-pagination"; + changelog = "https://github.com/uriyyo/fastapi-pagination/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ GaetanLepage ]; + }; +}) diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix index 6cbb8515a8d4..dd6bb64b4c74 100644 --- a/pkgs/development/python-modules/frigidaire/default.nix +++ b/pkgs/development/python-modules/frigidaire/default.nix @@ -12,14 +12,14 @@ buildPythonPackage (finalAttrs: { pname = "frigidaire"; - version = "0.18.43"; + version = "0.18.44"; pyproject = true; src = fetchFromGitHub { owner = "bm1549"; repo = "frigidaire"; tag = finalAttrs.version; - hash = "sha256-ZlfzJVWxIEJ1NgVQwB74fZgW0RJ5lHEO3aavNNs3jLE="; + hash = "sha256-Laq5I0KmsJKXAg2aZn0INGF1coaGf5GLEfYOop6YR4I="; }; postPatch = '' diff --git a/pkgs/development/python-modules/functions-framework/default.nix b/pkgs/development/python-modules/functions-framework/default.nix index d80198bfd1ce..fa7b692b6a71 100644 --- a/pkgs/development/python-modules/functions-framework/default.nix +++ b/pkgs/development/python-modules/functions-framework/default.nix @@ -1,27 +1,34 @@ { lib, buildPythonPackage, + fetchFromGitHub, + pythonAtLeast, + + # build-system + setuptools, + + # dependencies click, cloudevents, deprecation, - docker, - fetchFromGitHub, flask, gunicorn, - httpx, - pretend, - pytest-asyncio, - pytestCheckHook, - requests, - setuptools, starlette, uvicorn, uvicorn-worker, watchdog, werkzeug, + + # tests + docker, + httpx, + pretend, + pytest-asyncio, + pytestCheckHook, + requests, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "functions-framework"; version = "3.10.1"; pyproject = true; @@ -29,7 +36,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "functions-framework-python"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-CEH0PokH3lhyJl7OPIpJkaKZxAUp1fYVia89DtGoJ7k="; }; @@ -62,6 +69,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "functions_framework" ]; + disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [ + # _pickle.PicklingError: Can't pickle local object . at 0x7ffff47e54e0> + "tests/test_timeouts.py" + ]; + disabledTests = [ # Test requires a running Docker instance "test_cloud_run_http" @@ -70,8 +82,8 @@ buildPythonPackage rec { meta = { description = "FaaS (Function as a service) framework for writing portable Python functions"; homepage = "https://github.com/GoogleCloudPlatform/functions-framework-python"; - changelog = "https://github.com/GoogleCloudPlatform/functions-framework-python/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/GoogleCloudPlatform/functions-framework-python/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix index 491b3754b8ce..7642871d9e24 100644 --- a/pkgs/development/python-modules/iamdata/default.nix +++ b/pkgs/development/python-modules/iamdata/default.nix @@ -8,14 +8,14 @@ buildPythonPackage (finalAttrs: { pname = "iamdata"; - version = "0.1.202605151"; + version = "0.1.202605171"; pyproject = true; src = fetchFromGitHub { owner = "cloud-copilot"; repo = "iam-data-python"; tag = "v${finalAttrs.version}"; - hash = "sha256-kfdMiKFSnsuD5A8VBjH7ZCQB1SqoorV0feOPHVYWivE="; + hash = "sha256-GOo1K3nDzF3S3sUp6kvzYWdoAoO94ttKOtNLiPliMY4="; }; __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix index bfd8fd2ecc3b..1487685ad2c4 100644 --- a/pkgs/development/python-modules/langchain-aws/default.nix +++ b/pkgs/development/python-modules/langchain-aws/default.nix @@ -62,8 +62,7 @@ buildPythonPackage (finalAttrs: { ]; optional-dependencies = { - anthropic = [ - anthropic.optional-dependencies.bedrock + anthropic = anthropic.optional-dependencies.bedrock ++ [ langchain-anthropic ]; }; diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index a0dc30d33258..b12c11c20341 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -6,16 +6,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "life360"; - version = "7.0.1"; + version = "7.1.0"; pyproject = true; src = fetchFromGitHub { owner = "pnbruckner"; repo = "life360"; - tag = "v${version}"; - hash = "sha256-GkCs479lXcnCvb5guxyc+ZuZdiH4n8uD2VbkC+yijgg="; + tag = "v${finalAttrs.version}"; + hash = "sha256-D7ZtC9WrGTuU7cOs37P+y9zqOrOlfa919FVicejy6n4="; }; build-system = [ setuptools ]; @@ -30,8 +30,8 @@ buildPythonPackage rec { meta = { description = "Module to interact with Life360"; homepage = "https://github.com/pnbruckner/life360"; - changelog = "https://github.com/pnbruckner/life360/releases/tag/v${version}"; + changelog = "https://github.com/pnbruckner/life360/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/mayim/default.nix b/pkgs/development/python-modules/mayim/default.nix index 028ed296da2d..8fdcee438141 100644 --- a/pkgs/development/python-modules/mayim/default.nix +++ b/pkgs/development/python-modules/mayim/default.nix @@ -44,11 +44,14 @@ buildPythonPackage rec { pytest-asyncio pytest-cov-stub ] - ++ (with optional-dependencies; [ - postgres - mysql - sqlite - ]); + ++ ( + with optional-dependencies; + lib.concatLists [ + postgres + mysql + sqlite + ] + ); pythonImportsCheck = [ "mayim" ]; diff --git a/pkgs/development/python-modules/pynobo/default.nix b/pkgs/development/python-modules/pynobo/default.nix index e2fbcbaec534..84a5498e85bf 100644 --- a/pkgs/development/python-modules/pynobo/default.nix +++ b/pkgs/development/python-modules/pynobo/default.nix @@ -5,16 +5,16 @@ setuptools, }: -buildPythonPackage rec { +buildPythonPackage (finalAttrs: { pname = "pynobo"; - version = "1.8.1"; + version = "1.9.0"; pyproject = true; src = fetchFromGitHub { owner = "echoromeo"; repo = "pynobo"; - tag = "v${version}"; - hash = "sha256-OSgpT9CLkfnv1BLAJApZUs3vMc1WE2eG7ZrinCLy/0U="; + tag = "v${finalAttrs.version}"; + hash = "sha256-7saIhGkcRkT+HATpnL+DcIWarZue7UCp1lTyfgzLfl8="; }; build-system = [ setuptools ]; @@ -27,8 +27,8 @@ buildPythonPackage rec { meta = { description = "Python TCP/IP interface for Nobo Hub/Nobo Energy Control devices"; homepage = "https://github.com/echoromeo/pynobo"; - changelog = "https://github.com/echoromeo/pynobo/releases/tag/v${version}"; - license = with lib.licenses; [ gpl3Plus ]; + changelog = "https://github.com/echoromeo/pynobo/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; -} +}) diff --git a/pkgs/development/python-modules/python-openevse-http/default.nix b/pkgs/development/python-modules/python-openevse-http/default.nix index 107cdb1c2485..81bd81eccc91 100644 --- a/pkgs/development/python-modules/python-openevse-http/default.nix +++ b/pkgs/development/python-modules/python-openevse-http/default.nix @@ -13,14 +13,14 @@ buildPythonPackage (finalAttrs: { pname = "python-openevse-http"; - version = "0.3.0"; + version = "0.3.3"; pyproject = true; src = fetchFromGitHub { owner = "firstof9"; repo = "python-openevse-http"; tag = finalAttrs.version; - hash = "sha256-+FD3WEHcons11Ui8j9euvm0/mB4nFPL7LIaDsHAuzQw="; + hash = "sha256-U6v2YcPOllJwmlhQ+ilexj5u1Lom3zwXeQUyKan4j2I="; }; build-system = [ setuptools ]; diff --git a/pkgs/development/python-modules/pytorch-bench/default.nix b/pkgs/development/python-modules/pytorch-bench/default.nix index 3b8e1551947b..6748a0e1f3f0 100644 --- a/pkgs/development/python-modules/pytorch-bench/default.nix +++ b/pkgs/development/python-modules/pytorch-bench/default.nix @@ -2,43 +2,61 @@ lib, buildPythonPackage, fetchFromGitHub, + + # build-system setuptools, + + # dependencies + codecarbon, colorama, matplotlib, numpy, - pynvml, + nvidia-ml-py, torch, torchprofile, + tqdm, + + # passthru + nix-update-script, }: buildPythonPackage { pname = "pytorch-bench"; - version = "unstable-2024-07-18"; + version = "0-unstable-2025-05-05"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "MaximeGloesener"; repo = "torch-benchmark"; - rev = "405a3fc2d147b43b4c1f7edb7aca0a60ba343ac5"; - hash = "sha256-KU3dAf97A6lkMNTKRay23BMFQfn1ReAFNaJ0kG2RfnA="; + rev = "f22db3b2e5920cf084e088e7748e3ffd32343853"; + hash = "sha256-+jd+H5hL+DotlLaBiaixb//hxyvEF6aAJYSHX1hfsP8="; }; build-system = [ setuptools ]; + pythonRemoveDeps = [ + # pynvml is deprecated and replaced by nvidia-ml-py which provides the same API + "pynvml" + ]; dependencies = [ + codecarbon colorama matplotlib numpy - pynvml + nvidia-ml-py torch torchprofile + tqdm ]; - pythonImportsCheck = [ - "pytorch_bench" - ]; + pythonImportsCheck = [ "pytorch_bench" ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; meta = { description = "Benchmarking tool for torch"; diff --git a/pkgs/development/python-modules/requests-cache/default.nix b/pkgs/development/python-modules/requests-cache/default.nix index 3be91dbea9cd..92ee76c409b8 100644 --- a/pkgs/development/python-modules/requests-cache/default.nix +++ b/pkgs/development/python-modules/requests-cache/default.nix @@ -30,14 +30,14 @@ buildPythonPackage (finalAttrs: { pname = "requests-cache"; - version = "1.3.1"; + version = "1.3.2"; pyproject = true; src = fetchFromGitHub { owner = "requests-cache"; repo = "requests-cache"; tag = "v${finalAttrs.version}"; - hash = "sha256-t9SJ+enZHHYPRXaSrPop2hVOagE4oMnuXExO2DeNttc="; + hash = "sha256-qil5z54kkxu8QlPQ2P/7jo+VyfC+KhhiSUyAVmuLG/o="; }; build-system = [ hatchling ]; diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix index e4f85d57adb9..7492add38e8e 100644 --- a/pkgs/development/python-modules/shiboken6/default.nix +++ b/pkgs/development/python-modules/shiboken6/default.nix @@ -34,9 +34,7 @@ stdenv'.mkDerivation (finalAttrs: { buildInputs = [ python.pkgs.qt6.qtbase ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - python.pkgs.qt6.darwinVersionInputs - ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin python.pkgs.qt6.darwinVersionInputs; cmakeFlags = [ "-DBUILD_TESTS=OFF" diff --git a/pkgs/development/python-modules/swh-core/default.nix b/pkgs/development/python-modules/swh-core/default.nix index 8f0e90a34136..fd2590ff4cea 100644 --- a/pkgs/development/python-modules/swh-core/default.nix +++ b/pkgs/development/python-modules/swh-core/default.nix @@ -101,7 +101,6 @@ buildPythonPackage (finalAttrs: { msgpack postgresql postgresqlTestHook - psycopg.optional-dependencies.pool pylzma pytestCheckHook pytest-aiohttp @@ -119,7 +118,8 @@ buildPythonPackage (finalAttrs: { types-requests unzip pkgs.zstd - ]; + ] + ++ psycopg.optional-dependencies.pool; disabledTestPaths = lib.optionals (pythonAtLeast "3.14") [ # shutil.RegistryError: .tar.zst is already registered for "zstdtar" diff --git a/pkgs/development/python-modules/uptime-kuma-api/default.nix b/pkgs/development/python-modules/uptime-kuma-api/default.nix index 816eb2ebe254..bfe9f77cba58 100644 --- a/pkgs/development/python-modules/uptime-kuma-api/default.nix +++ b/pkgs/development/python-modules/uptime-kuma-api/default.nix @@ -20,8 +20,8 @@ buildPythonPackage rec { propagatedBuildInputs = [ packaging python-socketio - python-socketio.optional-dependencies.client - ]; + ] + ++ python-socketio.optional-dependencies.client; pythonImportsCheck = [ "uptime_kuma_api" ]; diff --git a/pkgs/development/ruby-modules/with-packages/default.nix b/pkgs/development/ruby-modules/with-packages/default.nix index 8e63fa12edaa..5f3d87aefb71 100644 --- a/pkgs/development/ruby-modules/with-packages/default.nix +++ b/pkgs/development/ruby-modules/with-packages/default.nix @@ -77,9 +77,9 @@ let name = "${ruby.name}-with-packages"; nativeBuildInputs = [ makeBinaryWrapper ]; buildInputs = [ - selected ruby - ]; + ] + ++ selected; dontUnpack = true; diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix index 1cfcd31d5996..f2d068f68adc 100644 --- a/pkgs/development/tools/godot/common.nix +++ b/pkgs/development/tools/godot/common.nix @@ -620,7 +620,7 @@ let scons ] ++ lib.optionals withWayland [ wayland-scanner ] - ++ lib.optional (editor && withMono) [ + ++ lib.optionals (editor && withMono) [ makeWrapper dotnet-sdk ] diff --git a/pkgs/os-specific/linux/drbd/driver.nix b/pkgs/os-specific/linux/drbd/driver.nix index 04dfa1b51a10..612dfc0c4fa2 100644 --- a/pkgs/os-specific/linux/drbd/driver.nix +++ b/pkgs/os-specific/linux/drbd/driver.nix @@ -21,8 +21,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "pic" ]; - nativeBuildInputs = [ - kernel.moduleBuildDependencies + nativeBuildInputs = kernel.moduleBuildDependencies ++ [ flex coccinelle python3 diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 6cc038efdb63..e37423ade9c8 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -6,10 +6,11 @@ let getComponentDeps = component: home-assistant.getPackages component home-assistant.python.pkgs; + inherit (lib) concatMap; # some components' tests have additional dependencies extraCheckInputs = with home-assistant.python.pkgs; { - alexa = map getComponentDeps [ + alexa = concatMap getComponentDeps [ "cloud" "frontend" "stream" @@ -50,7 +51,7 @@ let pychromecast ]; lutron_caseta = getComponentDeps "frontend"; - mastodon = map getComponentDeps [ + mastodon = concatMap getComponentDeps [ "stream" ]; miele = getComponentDeps "cloud"; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 7df90e856846..e1680f07cfa4 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -52,6 +52,7 @@ let unique unsafeDiscardStringContext unsafeGetAttrPos + warn warnIf zipAttrsWith ; @@ -482,7 +483,12 @@ let if isSingularDependency dep then index + 1 else if isList dep then - seq (checkDependencyList' ([ index ] ++ positions) name dep) (index + 1) + warn + '' + Dependency of package '${attrs.name or attrs.pname}' uses a nested list in attribute '${name}'. + This is deprecated as of Nixpkgs release 26.05, and support will + be removed in a future nixpkgs release.'' + (seq (checkDependencyList' ([ index ] ++ positions) name dep) (index + 1)) else throw "Dependency is not of a valid type: ${ concatMapStrings (ix: "element ${toString ix} of ") ([ index ] ++ positions) diff --git a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix index 48b76ca7179b..b43526bcc264 100644 --- a/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix +++ b/pkgs/tools/package-management/lix/common-nix-eval-jobs.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { # nlohmann_json can be only discovered via cmake files cmake ] - ++ (lib.optional stdenv.cc.isClang [ buildPackages.clang-tools ]); + ++ (lib.optional stdenv.cc.isClang buildPackages.clang-tools); # point 'nix edit' and ofborg at the file that defines the attribute, # not this common file. diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index e1432c948d41..5ced49991fdc 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -12,11 +12,15 @@ let }; # NOTE: - # The manifests are largely the same except for TensorRT: - # - linux-x86_64 is generally the best supported and can use the latest release - # - linux-sbsa (post-Orin Jetson and ARM) comes in second; NVIDIA dropped support for CUDA 12 with 10.13.2 (there is no - # 10.13.1), so we use 10.13.0 for all CUDA 12 releases. - # - linux-aarch64 (pre-Thor Jetson) is historically least supported; we use the latest release available. + # The manifests are largely the same except for: + # - TensorRT: + # - linux-x86_64 is generally the best supported and can use the latest release + # - linux-sbsa (post-Orin Jetson and ARM) comes in second; NVIDIA dropped support for CUDA 12 with 10.13.2 (there is no + # 10.13.1), so we use 10.13.0 for all CUDA 12 releases. + # - linux-aarch64 (pre-Thor Jetson) is historically least supported; we use the latest release available. + # - cudnn: + # - NVIDIA dropped linux-aarch64 (pre-Thor Jetson) support after 9.13.0, so we keep 9.13.0 for pre-Thor + # Jetson and use the latest release everywhere else. cudaPackages_12_6 = let @@ -25,7 +29,7 @@ let mkCudaPackages { cublasmp = "0.8.1"; cuda = "12.6.3"; - cudnn = "9.13.0"; + cudnn = if hasJetsonCudaCapability then "9.13.0" else "9.22.0"; cudss = "0.6.0"; cuquantum = "25.09.0"; cusolvermp = "0.8.0"; @@ -52,7 +56,7 @@ let mkCudaPackages { cublasmp = "0.8.1"; cuda = "12.8.1"; - cudnn = "9.13.0"; + cudnn = if hasJetsonCudaCapability then "9.13.0" else "9.22.0"; cudss = "0.6.0"; cuquantum = "25.09.0"; cusolvermp = "0.8.0"; @@ -79,7 +83,7 @@ let mkCudaPackages { cublasmp = "0.8.1"; cuda = "12.9.1"; - cudnn = "9.13.0"; + cudnn = if hasJetsonCudaCapability then "9.13.0" else "9.22.0"; cudss = "0.6.0"; cuquantum = "25.09.0"; cusolvermp = "0.8.0"; @@ -109,7 +113,8 @@ let mkCudaPackages { cublasmp = "0.8.1"; cuda = "13.0.3"; - cudnn = "9.13.0"; + cudnn = + if hasPreThorJetsonCudaCapability requestedJetsonCudaCapabilities then "9.13.0" else "9.22.0"; cudss = "0.6.0"; cuquantum = "25.09.0"; cusolvermp = "0.8.0"; @@ -131,7 +136,8 @@ let mkCudaPackages { cublasmp = "0.8.1"; cuda = "13.1.1"; - cudnn = "9.13.0"; + cudnn = + if hasPreThorJetsonCudaCapability requestedJetsonCudaCapabilities then "9.13.0" else "9.22.0"; cudss = "0.6.0"; cuquantum = "25.09.0"; cusolvermp = "0.8.0"; @@ -153,7 +159,8 @@ let mkCudaPackages { cublasmp = "0.8.1"; cuda = "13.2.0"; - cudnn = "9.13.0"; + cudnn = + if hasPreThorJetsonCudaCapability requestedJetsonCudaCapabilities then "9.13.0" else "9.22.0"; cudss = "0.6.0"; cuquantum = "25.09.0"; cusolvermp = "0.8.0"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0443a3664d6a..75a1ff10b2df 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2978,6 +2978,8 @@ self: super: with self; { cocotb-bus = callPackage ../development/python-modules/cocotb-bus { }; + codecarbon = callPackage ../development/python-modules/codecarbon { }; + codepy = callPackage ../development/python-modules/codepy { }; coffea = callPackage ../development/python-modules/coffea { }; @@ -5421,6 +5423,8 @@ self: super: with self; { fastapi-mcp = callPackage ../development/python-modules/fastapi-mcp { }; + fastapi-pagination = callPackage ../development/python-modules/fastapi-pagination { }; + fastapi-sso = callPackage ../development/python-modules/fastapi-sso { }; fastapi-versionizer = callPackage ../development/python-modules/fastapi-versionizer { };