From 39c3f09f30db0c65828df02e3012568286ca48c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 1 Dec 2024 18:34:44 +0000 Subject: [PATCH 01/97] ocamlPackages.reason: 3.13.0 -> 3.14.0 --- pkgs/development/compilers/reason/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/reason/default.nix b/pkgs/development/compilers/reason/default.nix index 89487bdaa362..7a8e4afe0a74 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { pname = "reason"; - version = "3.13.0"; + version = "3.14.0"; minimalOCamlVersion = "4.11"; src = fetchurl { url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; - hash = "sha256-3yVEYGvIJKZwguIBGCbnoc3nrwzLW6RX6Tf+AYw85+Q="; + hash = "sha256-HQm6JKBZR0Wrazi01fgerYVltzy2mtRq8cLCb40yTwA="; }; nativeBuildInputs = [ From afb2a27b571cf3e9f2f1f18ef140a25766af9212 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 11 Dec 2024 23:05:10 -0500 Subject: [PATCH 02/97] elastix: update homepage --- pkgs/development/libraries/science/biology/elastix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/biology/elastix/default.nix b/pkgs/development/libraries/science/biology/elastix/default.nix index 46b297722feb..0775efd7ec96 100644 --- a/pkgs/development/libraries/science/biology/elastix/default.nix +++ b/pkgs/development/libraries/science/biology/elastix/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = !stdenv.hostPlatform.isDarwin; # usual dynamic linker issues meta = with lib; { - homepage = "https://elastix.lumc.nl"; + homepage = "https://elastix.dev"; description = "Image registration toolkit based on ITK"; changelog = "https://github.com/SuperElastix/elastix/releases/tag/${finalAttrs.version}"; maintainers = with maintainers; [ bcdarwin ]; From 34e13b3ace62cd2c2d1986ec1270a9f804bc9559 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Dec 2024 08:50:38 +0000 Subject: [PATCH 03/97] ocamlPackages.lacaml: 11.1.0 -> 11.1.1 --- pkgs/development/ocaml-modules/lacaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lacaml/default.nix b/pkgs/development/ocaml-modules/lacaml/default.nix index 613e93c83f42..f97b90f7a344 100644 --- a/pkgs/development/ocaml-modules/lacaml/default.nix +++ b/pkgs/development/ocaml-modules/lacaml/default.nix @@ -6,7 +6,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); buildDunePackage rec { pname = "lacaml"; - version = "11.1.0"; + version = "11.1.1"; useDune2 = true; @@ -14,7 +14,7 @@ buildDunePackage rec { src = fetchurl { url = "https://github.com/mmottl/lacaml/releases/download/${version}/lacaml-${version}.tbz"; - sha256 = "sha256-3wuUX942wyWWXb5MjfeHZhx2/kS/+3JFVd04Ty/ZtwA="; + sha256 = "sha256-NEs7A/lfA+8AE6k19EPW02e1pseDE7HobGSB/ZwLcoc="; }; buildInputs = [ dune-configurator ]; From 9289b2b9ffc447590a796241074df8364d95a905 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Dec 2024 22:01:54 +0000 Subject: [PATCH 04/97] dune_3: 3.17.0 -> 3.17.1 --- pkgs/development/tools/ocaml/dune/3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index 0cadd4fb20e0..dcae9d8664c4 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.17.0"; + version = "3.17.1"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - hash = "sha256-LDqmxB7Tnj1sGiktdfSAa9gDEIQa/FFnOqWc6cgWUHw="; + hash = "sha256-a57l7QUTeaacpFFzrGxd61a0ShwW4wt8NxNDMD2DWsY="; }; nativeBuildInputs = [ ocaml findlib ]; From 749a30e19a15750306362eaf3b8d97bd038f69fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 19 Dec 2024 08:16:52 +0000 Subject: [PATCH 05/97] vscode-extensions.sourcery.sourcery: 1.25.0 -> 1.27.0 --- .../editors/vscode/extensions/sourcery.sourcery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index 3d425e8e89fe..666844e2b490 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.25.0"; - hash = "sha256-oIKJsoGI2MqRZAnfroHbEiYObeATkFaw2ONC9WDFSDc="; + version = "1.27.0"; + hash = "sha256-Z7kINeq4m0XZ4wFalC0vZylMbR5dRTyFr4AZkHD+N/M="; }; postPatch = '' From f68400f3daf459304d0af6ed62641cb3e1e3207e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 20 Dec 2024 12:49:07 +0000 Subject: [PATCH 06/97] ocamlPackages.higlo: 0.9 -> 0.10.0 --- pkgs/development/ocaml-modules/higlo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/higlo/default.nix b/pkgs/development/ocaml-modules/higlo/default.nix index 2f5d5df61e3d..849dd45a617e 100644 --- a/pkgs/development/ocaml-modules/higlo/default.nix +++ b/pkgs/development/ocaml-modules/higlo/default.nix @@ -8,14 +8,14 @@ buildDunePackage rec { pname = "higlo"; - version = "0.9"; + version = "0.10.0"; src = fetchFromGitLab { domain = "framagit.org"; owner = "zoggy"; repo = "higlo"; rev = version; - hash = "sha256-SaFFzp4FCjVLdMLH6mNIv3HzJbkXJ5Ojbku258LCfLI="; + hash = "sha256-A5Su4+eBOq/WNdY/3EBQ3KqrRQuaCI1x25cEuoZp4Mo="; }; propagatedBuildInputs = [ From 6a28bdc3519072a587513fa92de50ef2dde9ce25 Mon Sep 17 00:00:00 2001 From: codgician <15964984+codgician@users.noreply.github.com> Date: Mon, 23 Dec 2024 04:50:57 +0000 Subject: [PATCH 07/97] linuxPackages_latest.prl-tools: 20.1.2-55742 -> 20.1.3-55743 --- pkgs/os-specific/linux/prl-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 862eda8b2217..1348ce1c3ba9 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -41,13 +41,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "prl-tools"; - version = "20.1.2-55742"; + version = "20.1.3-55743"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { url = "https://download.parallels.com/desktop/v${lib.versions.major finalAttrs.version}/${finalAttrs.version}/ParallelsDesktop-${finalAttrs.version}.dmg"; - hash = "sha256-R7pQhmLpMOHExPwH4YM3WDnp1PcwpH5Bif3C1/N55Bg="; + hash = "sha256-5lbTTQucop/jnsVudoqTO9bESR5tdn8NFu9Nm2WphU4="; }; hardeningDisable = [ From 0401c5caa68be20a912ef3227786cb4a6456eed7 Mon Sep 17 00:00:00 2001 From: eilvelia Date: Sun, 29 Dec 2024 17:19:23 +0000 Subject: [PATCH 08/97] nq: 0.5 -> 1.0 Note: in the 1.0 release, the fq and tq utilities have been renamed to nqtail and nqterm respectively. This also enables doCheck and adds meta.changelog. --- .../manual/release-notes/rl-2505.section.md | 2 ++ pkgs/by-name/nq/nq/package.nix | 29 +++++++++++++------ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 834066df59ac..c859178176cf 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -249,6 +249,8 @@ [Prisma ORM upgrade guide](https://www.prisma.io/docs/orm/more/upgrade-guides/upgrading-versions/upgrading-to-prisma-6) for more information. +- `nq` was updated to 1.0, which renames the `fq` and `tq` utilities to `nqtail` and `nqterm` respectively. + - `zf` was updated to 0.10.2, which includes breaking changes from the [0.10.0 release](https://github.com/natecraddock/zf/releases/tag/0.10.0). `zf` no longer does Unicode normalization of the input and no longer supports terminal escape sequences in the `ZF_PROMPT` environment variable. diff --git a/pkgs/by-name/nq/nq/package.nix b/pkgs/by-name/nq/nq/package.nix index 03a7039259cd..28e2b1eefc7f 100644 --- a/pkgs/by-name/nq/nq/package.nix +++ b/pkgs/by-name/nq/nq/package.nix @@ -2,28 +2,39 @@ stdenv, lib, fetchFromGitHub, + perl, # for tests }: stdenv.mkDerivation rec { pname = "nq"; - version = "0.5"; + + version = "1.0"; + src = fetchFromGitHub { - owner = "chneukirchen"; + owner = "leahneukirchen"; repo = "nq"; rev = "v${version}"; - sha256 = "sha256-g14t2Wy2GwiqnfEDiLAPGehzUgK6mLC+5PAZynez62s="; + hash = "sha256-gdVBSE2a4rq46o0uO9ICww6zicVgn6ykf4CeJ/MmiF4="; }; + + nativeCheckInputs = [ perl ]; + makeFlags = [ "PREFIX=$(out)" ]; + postPatch = '' - sed -i tq \ + sed -i nqterm \ -e 's|\bnq\b|'$out'/bin/nq|g' \ - -e 's|\bfq\b|'$out'/bin/fq|g' + -e 's|\bnqtail\b|'$out'/bin/nqtail|g' ''; - meta = with lib; { + + doCheck = true; + + meta = { description = "Unix command line queue utility"; - homepage = "https://github.com/chneukirchen/nq"; - license = licenses.publicDomain; - platforms = platforms.all; + homepage = "https://github.com/leahneukirchen/nq"; + changelog = "https://github.com/leahneukirchen/nq/blob/v${version}/NEWS.md"; + license = lib.licenses.publicDomain; + platforms = lib.platforms.all; maintainers = [ ]; }; } From 5580564c40aadd497b84cb9c6ea7985b60e11cc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 30 Dec 2024 17:01:34 +0000 Subject: [PATCH 09/97] esbuild: 0.24.0 -> 0.24.2 --- pkgs/development/tools/esbuild/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/esbuild/default.nix b/pkgs/development/tools/esbuild/default.nix index c5921c694473..b9b169790688 100644 --- a/pkgs/development/tools/esbuild/default.nix +++ b/pkgs/development/tools/esbuild/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "esbuild"; - version = "0.24.0"; + version = "0.24.2"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - hash = "sha256-czQJqLz6rRgyh9usuhDTmgwMC6oL5UzpwNFQ3PKpKck="; + hash = "sha256-XVZNHPMl03hpGHgoaViWWj8eMDZBKDb7BfOrPGlVqEM="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; From bd8d64e7ccbd71e258cb2377dfbaf3e3fd7aa4d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 31 Dec 2024 22:09:27 +0000 Subject: [PATCH 10/97] lima: 1.0.2 -> 1.0.3 --- pkgs/applications/virtualization/lima/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/lima/default.nix b/pkgs/applications/virtualization/lima/default.nix index 74a75ce57871..282fcac2395e 100644 --- a/pkgs/applications/virtualization/lima/default.nix +++ b/pkgs/applications/virtualization/lima/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "lima"; - version = "1.0.2"; + version = "1.0.3"; src = fetchFromGitHub { owner = "lima-vm"; repo = "lima"; rev = "v${version}"; - hash = "sha256-LNsxMrbEgdosGDDUNvMZq/hpP5azNiIHjKTp0Iw/PC0="; + hash = "sha256-S0Mk7h4gH5syP/ayK5g1g8HG5f23sKCQCCbM6xOj+n0="; }; - vendorHash = "sha256-taozyQBJvkCsJAaOHg1gFK4qOnepRbzIn4jHzxfAn6A="; + vendorHash = "sha256-1SHiz+lfG4nl1qavq/Fd73UV8LkErILk7d8XZJSbHd0="; nativeBuildInputs = [ makeWrapper @@ -71,7 +71,7 @@ buildGoModule rec { ''; doInstallCheck = true; - # Workaround for: "panic: $HOME is not defined" at https://github.com/lima-vm/lima/blob/v1.0.2/pkg/limayaml/defaults.go#L52 + # Workaround for: "panic: $HOME is not defined" at https://github.com/lima-vm/lima/blob/v1.0.3/pkg/limayaml/defaults.go#L52 # Don't use versionCheckHook for this package. It cannot inject environment variables. installCheckPhase = '' if [[ "$(HOME="$(mktemp -d)" "$out/bin/limactl" --version | cut -d ' ' -f 3)" == "${version}" ]]; then From e7d194c79af7cd72c3bf670eee81fdc03fef0b5e Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Sat, 8 Jun 2024 14:25:35 -0400 Subject: [PATCH 11/97] python312Packages.deid: 0.3.22 -> 0.3.25 --- .../python-modules/deid/default.nix | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/deid/default.nix b/pkgs/development/python-modules/deid/default.nix index 180b7a8e2947..8d60dd9aa3e9 100644 --- a/pkgs/development/python-modules/deid/default.nix +++ b/pkgs/development/python-modules/deid/default.nix @@ -14,11 +14,13 @@ let deid-data = buildPythonPackage rec { pname = "deid-data"; version = "unstable-2022-12-06"; - format = "pyproject"; + pyproject = true; + disabled = pythonOlder "3.7"; - nativeBuildInputs = [ setuptools ]; - propagatedBuildInputs = [ pydicom ]; + build-system = [ setuptools ]; + + dependencies = [ pydicom ]; src = fetchFromGitHub { owner = "pydicom"; @@ -37,9 +39,9 @@ let in buildPythonPackage rec { pname = "deid"; - version = "0.3.22"; + version = "0.3.25"; + pyproject = true; - format = "pyproject"; disabled = pythonOlder "3.7"; # Pypi version has no tests @@ -47,11 +49,13 @@ buildPythonPackage rec { owner = "pydicom"; repo = pname; # the github repo does not contain Pypi version tags: - rev = "40dc96125daeb65856d643e12c3d6dfec756be0d"; - hash = "sha256-OtxQPF29eqt8I1Q12ga8a1IjBVO+VBk6y0DQmRtCNoU="; + rev = "830966d52846c6b721fabb4cc1c75f39eabd55cc"; + hash = "sha256-+slwnQSeRHpoCsvZ24Gq7rOBpQL37a6Iqrj4Mqj6PCo="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ matplotlib pydicom python-dateutil @@ -64,11 +68,12 @@ buildPythonPackage rec { pythonImportsCheck = [ "deid" ]; - meta = with lib; { + meta = { description = "Best-effort anonymization for medical images"; mainProgram = "deid"; + changelog = "https://github.com/pydicom/deid/blob/${version}/CHANGELOG.md"; homepage = "https://pydicom.github.io/deid"; - license = licenses.mit; - maintainers = with maintainers; [ bcdarwin ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ bcdarwin ]; }; } From e500ef4fe08f2ee496599b5be3fca8787aacbc34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 02:59:08 +0000 Subject: [PATCH 12/97] survex: 1.4.14 -> 1.4.15 --- pkgs/applications/misc/survex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/survex/default.nix b/pkgs/applications/misc/survex/default.nix index 8638487d135a..a3e42d9121fb 100644 --- a/pkgs/applications/misc/survex/default.nix +++ b/pkgs/applications/misc/survex/default.nix @@ -22,11 +22,11 @@ stdenv.mkDerivation rec { pname = "survex"; - version = "1.4.14"; + version = "1.4.15"; src = fetchurl { url = "https://survex.com/software/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-TKOgbwUGE1z1PUZxfukugZWsJY1ml/VMAJ7xDIqWZWs="; + hash = "sha256-8RuVHVugJmTP3CBYXzxxZGe5GYGUxJrlkzxXFRakkWI="; }; nativeBuildInputs = [ From 3a06509bd7679b92029265c68d8b56acccb5cc65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 Jan 2025 05:13:52 +0000 Subject: [PATCH 13/97] rocksdb: 9.8.4 -> 9.10.0 --- pkgs/by-name/ro/rocksdb/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/rocksdb/package.nix b/pkgs/by-name/ro/rocksdb/package.nix index 70de68530e82..c3273e52e95f 100644 --- a/pkgs/by-name/ro/rocksdb/package.nix +++ b/pkgs/by-name/ro/rocksdb/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "rocksdb"; - version = "9.8.4"; + version = "9.10.0"; src = fetchFromGitHub { owner = "facebook"; repo = "rocksdb"; rev = "v${finalAttrs.version}"; - hash = "sha256-A6Gx4FqoGlxITUUz9k6tkDjUcLtMUBK9JS8vuAS96H0="; + hash = "sha256-G+DlQwEUyd7JOCjS1Hg1cKWmA/qAiK8UpUIKcP+riGQ="; }; patches = lib.optional ( From 22513cc050f21dc0e8a8658f9553d76bba01893d Mon Sep 17 00:00:00 2001 From: misilelab Date: Fri, 3 Jan 2025 18:16:02 +0900 Subject: [PATCH 14/97] packwiz: 0-unstable-2024-05-27 -> 0-unstable-2024-10-15 Signed-off-by: misilelab --- pkgs/by-name/pa/packwiz/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/pa/packwiz/package.nix b/pkgs/by-name/pa/packwiz/package.nix index c5b3ba677089..a37e5656abeb 100644 --- a/pkgs/by-name/pa/packwiz/package.nix +++ b/pkgs/by-name/pa/packwiz/package.nix @@ -8,17 +8,17 @@ buildGoModule { pname = "packwiz"; - version = "0-unstable-2024-05-27"; + version = "0-unstable-2024-10-15"; src = fetchFromGitHub { owner = "packwiz"; repo = "packwiz"; - rev = "7b4be47578151c36e784306b36d251ec2590e50c"; - sha256 = "sha256-XBp8Xv55R8rhhsQiWnOPH8c3fCpV/yq41ozJDcGdWfs="; + rev = "0626c00149a8d9a5e9f76e5640e7b8b95c064350"; + sha256 = "sha256-eAGfLUcyjDR2oJjLK3+DiuICTqoOcIwO5wL350w6vGw="; }; passthru.updateScript = unstableGitUpdater { }; - vendorHash = "sha256-yL5pWbVqf6mEpgYsItLnv8nwSmoMP+SE0rX/s7u2vCg="; + vendorHash = "sha256-krdrLQHM///dtdlfEhvSUDV2QljvxFc2ouMVQVhN7A0="; nativeBuildInputs = [ installShellFiles From fd793921ee660a7dd605b4d9e3e159293e5b7df4 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Fri, 3 Jan 2025 13:43:24 +0000 Subject: [PATCH 15/97] foot: 1.20.0 -> 1.20.1 Changes: https://codeberg.org/dnkl/foot/releases/tag/1.20.1 --- pkgs/by-name/fo/foot/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix index f1f7b5e5021d..46a77c1c568e 100644 --- a/pkgs/by-name/fo/foot/package.nix +++ b/pkgs/by-name/fo/foot/package.nix @@ -27,7 +27,7 @@ }: let - version = "1.20.0"; + version = "1.20.1"; # build stimuli file for PGO build and the script to generate it # independently of the foot's build, so we can cache the result @@ -104,7 +104,7 @@ stdenv.mkDerivation { owner = "dnkl"; repo = "foot"; rev = version; - hash = "sha256-bvU8A2y/9ETqgFtBUZ5wp0dXybTCLl32yY/BB6r/pd8="; + hash = "sha256-0tnB6fCZEUAlQ3iPxXXlJ5EXPMeWSNIHsIWV4d3cuKM="; }; separateDebugInfo = true; From 739b2ababce6d703eb5487f5e7bb041b2fa2d922 Mon Sep 17 00:00:00 2001 From: FliegendeWurst Date: Fri, 3 Jan 2025 11:24:34 +0100 Subject: [PATCH 16/97] seabios: disable PIE hardening --- pkgs/by-name/se/seabios/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix index 619db76a88d8..32ca4b294d03 100644 --- a/pkgs/by-name/se/seabios/package.nix +++ b/pkgs/by-name/se/seabios/package.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ "fortify" "pic" + "pie" # ld: warning: creating DT_TEXTREL in a PIE (and more) "stackprotector" ]; From f809487d8ad84541c453a70f35eb2f3727e70ead Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Dec 2024 15:32:16 +0000 Subject: [PATCH 17/97] netlify-cli: 17.37.2 -> 17.38.0 --- pkgs/development/web/netlify-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/netlify-cli/default.nix b/pkgs/development/web/netlify-cli/default.nix index d3dd38fcb2a2..e5f368684200 100644 --- a/pkgs/development/web/netlify-cli/default.nix +++ b/pkgs/development/web/netlify-cli/default.nix @@ -11,16 +11,16 @@ buildNpmPackage rec { pname = "netlify-cli"; - version = "17.37.2"; + version = "17.38.0"; src = fetchFromGitHub { owner = "netlify"; repo = "cli"; tag = "v${version}"; - hash = "sha256-1UaIPCzyHMKNJfDFILPYIrjHwzHAmlYNk+aHZM1Bp6Q="; + hash = "sha256-fK+Z6bqnaqSYXgO0lUbGALZeCiAnvMd6LkMSH7JB7J8="; }; - npmDepsHash = "sha256-pJaNdR9jyFSdfE+yLnQn9/Gbq2CbH6y3aEVbpg3Ft/o="; + npmDepsHash = "sha256-oFt+l8CigOtm3W5kiT0kFsqKLOJB9ggfiFQgUU5xQ1I="; inherit nodejs; From ed4333ddc6e8e60d363fafa6f22f3adad91d5a2d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Jan 2025 09:29:00 +0000 Subject: [PATCH 18/97] doomretro: 5.6 -> 5.6.1 --- pkgs/by-name/do/doomretro/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/do/doomretro/package.nix b/pkgs/by-name/do/doomretro/package.nix index debbdce7a0d1..cc124e2ed384 100644 --- a/pkgs/by-name/do/doomretro/package.nix +++ b/pkgs/by-name/do/doomretro/package.nix @@ -15,13 +15,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "doomretro"; - version = "5.6"; + version = "5.6.1"; src = fetchFromGitHub { owner = "bradharding"; repo = "doomretro"; rev = "v${finalAttrs.version}"; - hash = "sha256-ykErEXKpd/79cUhubZiLC7u10yJy8oYCWOMeHLYRHts="; + hash = "sha256-v/a7Jc82QpH58c6pkki8xXZBi0v54oz03A2A/Oz3udU="; }; nativeBuildInputs = [ From 164f941b1d8290bd3511c2ffe45ae60fec98d441 Mon Sep 17 00:00:00 2001 From: thtrf Date: Sat, 4 Jan 2025 14:44:47 +0100 Subject: [PATCH 19/97] addwater: 1.1.6 -> 1.2.2 --- pkgs/by-name/ad/addwater/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ad/addwater/package.nix b/pkgs/by-name/ad/addwater/package.nix index 98c4c687fd24..d79cf096aebb 100644 --- a/pkgs/by-name/ad/addwater/package.nix +++ b/pkgs/by-name/ad/addwater/package.nix @@ -10,11 +10,12 @@ python3Packages, wrapGAppsHook4, appstream, + nix-update-script, }: python3Packages.buildPythonApplication rec { pname = "addwater"; - version = "1.1.6"; + version = "1.2.2"; # built with meson, not a python format pyproject = false; @@ -22,7 +23,7 @@ python3Packages.buildPythonApplication rec { owner = "largestgithubuseronearth"; repo = "addwater"; tag = "v${version}"; - hash = "sha256-5iuSRA18TWj6naw5MraGZ1Y9OUWEVg2oKqQtkC8rMWw="; + hash = "sha256-BpV4nJbJNMI0Nzzsl1NbsWTNRMFRBSrUF1+Qdd7h6eg="; }; buildInputs = [ @@ -45,6 +46,8 @@ python3Packages.buildPythonApplication rec { requests ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Installer for the fantastic GNOME for Firefox theme"; homepage = "https://github.com/largestgithubuseronearth/addwater"; From 2cb36224ec9df0e7548103c1f03cccf80cda1d25 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 2 Jan 2025 09:26:02 -0500 Subject: [PATCH 20/97] telegram-desktop: 5.9.0 -> 5.10.0 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.9.0...v5.10.0 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.10.0 --- .../telegram/telegram-desktop/unwrapped.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index b35707d421c5..33a78c5ebeba 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -46,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop-unwrapped"; - version = "5.9.0"; + version = "5.10.0"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-X29+VKY2L5kIh7eV1b3gMJ6Oi8Jjbr6uZuysKzH9roQ="; + hash = "sha256-gkwu28VWelUhjkvcosBnGuT1J0MLykOufcsn9jl7vqU="; }; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' From c8da173b4d38f76a3760ce4ea747556d675c5f49 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Sat, 4 Jan 2025 17:20:37 +0100 Subject: [PATCH 21/97] newsraft: 0.27 -> 0.28 --- pkgs/by-name/ne/newsraft/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/newsraft/package.nix b/pkgs/by-name/ne/newsraft/package.nix index 26a1e1f04114..4ffcba1333b7 100644 --- a/pkgs/by-name/ne/newsraft/package.nix +++ b/pkgs/by-name/ne/newsraft/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsraft"; - version = "0.27"; + version = "0.28"; src = fetchFromGitea { domain = "codeberg.org"; owner = "newsraft"; repo = "newsraft"; rev = "newsraft-${finalAttrs.version}"; - hash = "sha256-MtdFnoB6Dc3xvTCc2PMIp5VsZiU5JE58q6WctM3mDZw="; + hash = "sha256-iRoQLGmiAPpt9ZpvHpytIWHldkvV/5qVjurypCycJYI="; }; nativeBuildInputs = [ pkg-config ]; From 09f66bd9f89b5ed75d305a938622df5cdf6a24c7 Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Sat, 4 Jan 2025 17:22:31 +0100 Subject: [PATCH 22/97] newsraft: remove `with lib;` --- pkgs/by-name/ne/newsraft/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ne/newsraft/package.nix b/pkgs/by-name/ne/newsraft/package.nix index 4ffcba1333b7..7116c7d63031 100644 --- a/pkgs/by-name/ne/newsraft/package.nix +++ b/pkgs/by-name/ne/newsraft/package.nix @@ -38,12 +38,12 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "Feed reader for terminal"; homepage = "https://codeberg.org/grisha/newsraft"; - license = licenses.isc; - maintainers = with maintainers; [ arthsmn ]; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ arthsmn ]; mainProgram = "newsraft"; - platforms = platforms.all; + platforms = lib.platforms.all; }; }) From ec96d56b2926bed3a6c9d0197c48e9c878b8500a Mon Sep 17 00:00:00 2001 From: luftmensch-luftmensch Date: Sat, 4 Jan 2025 17:23:04 +0100 Subject: [PATCH 23/97] newsraft: add luftmensch-luftmensch maintainer --- pkgs/by-name/ne/newsraft/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/newsraft/package.nix b/pkgs/by-name/ne/newsraft/package.nix index 7116c7d63031..5304c5e83ee9 100644 --- a/pkgs/by-name/ne/newsraft/package.nix +++ b/pkgs/by-name/ne/newsraft/package.nix @@ -42,7 +42,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Feed reader for terminal"; homepage = "https://codeberg.org/grisha/newsraft"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ arthsmn ]; + maintainers = with lib.maintainers; [ + arthsmn + luftmensch-luftmensch + ]; mainProgram = "newsraft"; platforms = lib.platforms.all; }; From 39e440ab5344e0f876ee4d7bcd08002a691362b3 Mon Sep 17 00:00:00 2001 From: Mynacol Date: Sat, 4 Jan 2025 17:05:00 +0000 Subject: [PATCH 24/97] pcmciaUtils: Fix udev rule path The pcmciaUtils udev rules failed to apply, as some paths were not replaced correctly. For example, the following udev line is in the source package: SUBSYSTEM=="pcmcia", ENV{MODALIAS}=="?*", \ RUN+="__UDEVHELPERDIR__/pcmcia-check-broken-cis" The Makefile by default replaces the `__UDEVHELPERDIR__` with `${prefix}/lib/udev`, which is the wrong place on NixOS. To quickly set the correct path, just replace this placeholder string directly. With this patch, the udev rules can be applied, as it is done with `hardware.pcmcia.enable`. The files are referenced correctly and pcmcia works fine on real hardware. --- pkgs/by-name/pc/pcmciaUtils/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/pc/pcmciaUtils/package.nix b/pkgs/by-name/pc/pcmciaUtils/package.nix index 5ae0c4d24ab0..d6707a89d39e 100644 --- a/pkgs/by-name/pc/pcmciaUtils/package.nix +++ b/pkgs/by-name/pc/pcmciaUtils/package.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { sed -i " s,/sbin/modprobe,${kmod}&,; s,/lib/udev/,$out/sbin/,; + s,__UDEVHELPERDIR__/,$out/lib/udev/,; " udev/* # fix-color */ sed -i " s,/lib/firmware,$out&,; From e9d9adb73f1a70894f27bb4750fe98089ac87c24 Mon Sep 17 00:00:00 2001 From: Mynacol Date: Sat, 4 Jan 2025 17:29:00 +0000 Subject: [PATCH 25/97] nixos/hardware.pcmcia: Fix passthru.function usage passthru.function is not existent, instead use overrideAttrs which has almost the intended functionality. It triggers a rebuild, which _should_ be fine for this package. --- nixos/modules/hardware/pcmcia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/pcmcia.nix b/nixos/modules/hardware/pcmcia.nix index 45022f6c124b..9f289b029463 100644 --- a/nixos/modules/hardware/pcmcia.nix +++ b/nixos/modules/hardware/pcmcia.nix @@ -5,7 +5,7 @@ ... }: let - pcmciaUtils = pkgs.pcmciaUtils.passthru.function { + pcmciaUtils = pkgs.pcmciaUtils.overrideAttrs { inherit (config.hardware.pcmcia) firmware config; }; in From 14ae86ce16acf8939c854c9624a36fd8d289ccb5 Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Sat, 4 Jan 2025 19:40:40 +0200 Subject: [PATCH 26/97] net-news-wire: add `meta.sourceProvenance` --- pkgs/by-name/ne/net-news-wire/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/ne/net-news-wire/package.nix b/pkgs/by-name/ne/net-news-wire/package.nix index e618bace6466..8c3b3bed2607 100644 --- a/pkgs/by-name/ne/net-news-wire/package.nix +++ b/pkgs/by-name/ne/net-news-wire/package.nix @@ -39,5 +39,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.mit; platforms = platforms.darwin; maintainers = with maintainers; [ jakuzure ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; } From cf149e96331407531900337cb7be6f7c22aa3875 Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Sat, 4 Jan 2025 19:40:41 +0200 Subject: [PATCH 27/97] net-news-wire: add DimitarNestorov to maintainers --- pkgs/by-name/ne/net-news-wire/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/net-news-wire/package.nix b/pkgs/by-name/ne/net-news-wire/package.nix index 8c3b3bed2607..33f740b4a1bb 100644 --- a/pkgs/by-name/ne/net-news-wire/package.nix +++ b/pkgs/by-name/ne/net-news-wire/package.nix @@ -38,7 +38,10 @@ stdenvNoCC.mkDerivation rec { changelog = "https://github.com/Ranchero-Software/NetNewsWire/releases/tag/mac-${version}"; license = licenses.mit; platforms = platforms.darwin; - maintainers = with maintainers; [ jakuzure ]; + maintainers = with maintainers; [ + jakuzure + DimitarNestorov + ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; } From 7a74fa015539ef635039e6cd21a539975da19e23 Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Sat, 4 Jan 2025 19:40:41 +0200 Subject: [PATCH 28/97] net-news-wire: remove `with lib;` --- pkgs/by-name/ne/net-news-wire/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ne/net-news-wire/package.nix b/pkgs/by-name/ne/net-news-wire/package.nix index 33f740b4a1bb..853714127508 100644 --- a/pkgs/by-name/ne/net-news-wire/package.nix +++ b/pkgs/by-name/ne/net-news-wire/package.nix @@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec { passthru.updateScript = nix-update-script { }; - meta = with lib; { + meta = { description = "RSS reader for macOS and iOS"; longDescription = '' It's like podcasts — but for reading. @@ -36,9 +36,9 @@ stdenvNoCC.mkDerivation rec { ''; homepage = "https://github.com/Ranchero-Software/NetNewsWire"; changelog = "https://github.com/Ranchero-Software/NetNewsWire/releases/tag/mac-${version}"; - license = licenses.mit; - platforms = platforms.darwin; - maintainers = with maintainers; [ + license = lib.licenses.mit; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ jakuzure DimitarNestorov ]; From 23a18299bcacfdbcecb1a201f644880b054d1bc7 Mon Sep 17 00:00:00 2001 From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com> Date: Sat, 4 Jan 2025 19:40:41 +0200 Subject: [PATCH 29/97] net-news-wire: fix update script --- pkgs/by-name/ne/net-news-wire/package.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/net-news-wire/package.nix b/pkgs/by-name/ne/net-news-wire/package.nix index 853714127508..3f99283f731a 100644 --- a/pkgs/by-name/ne/net-news-wire/package.nix +++ b/pkgs/by-name/ne/net-news-wire/package.nix @@ -26,7 +26,12 @@ stdenvNoCC.mkDerivation rec { runHook postInstall ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^mac-(\\d+\\.\\d+\\.\\d+)$" + ]; + }; meta = { description = "RSS reader for macOS and iOS"; From b0f93f74f6c23702c6d7737613a0774bd9e1cb0a Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 11 Dec 2024 00:15:29 -0500 Subject: [PATCH 30/97] python312Packages.dicom2nifti: 2.4.11 -> 2.5.1 --- pkgs/development/python-modules/dicom2nifti/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dicom2nifti/default.nix b/pkgs/development/python-modules/dicom2nifti/default.nix index b3f9e73e1134..6df9a652fb6f 100644 --- a/pkgs/development/python-modules/dicom2nifti/default.nix +++ b/pkgs/development/python-modules/dicom2nifti/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dicom2nifti"; - version = "2.4.11"; + version = "2.5.1"; pyproject = true; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "icometrix"; repo = pname; tag = version; - hash = "sha256-/JauQZcCQDl1ukcSE3YPbf1SyhVxDNJUlqnFwdlwYQY="; + hash = "sha256-lPaBKqYO8B138fCgeKH6vpwGQhN3JCOnDj5PgaYfRPA="; }; build-system = [ setuptools ]; From cd02e995c14c7b0b5e8215e4faa042f2202f41a4 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Thu, 2 Jan 2025 04:29:55 +0100 Subject: [PATCH 31/97] vale: 3.9.2 -> 3.9.3 Diff: https://github.com/errata-ai/vale/compare/v3.9.2...v3.9.3 Changelog: https://github.com/errata-ai/vale/releases/tag/v3.9.3 --- pkgs/by-name/va/vale/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/va/vale/package.nix b/pkgs/by-name/va/vale/package.nix index c4afbd084e49..0ad90479c75f 100644 --- a/pkgs/by-name/va/vale/package.nix +++ b/pkgs/by-name/va/vale/package.nix @@ -4,13 +4,14 @@ fetchFromGitHub, makeBinaryWrapper, symlinkJoin, + versionCheckHook, vale, valeStyles, }: buildGoModule rec { pname = "vale"; - version = "3.9.2"; + version = "3.9.3"; subPackages = [ "cmd/vale" ]; @@ -18,7 +19,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-2LiuzO1Fha4uS0WNs2mihE/EOSTZa0fOWPzuBw22VlM="; + hash = "sha256-2IvVF/x8n1zvVXHAJLAFuDrw0Oi/RuQDa851SBlyRIk="; }; vendorHash = "sha256-EWAgzb3ruxYqaP+owcyGDzNnkPDYp0ttHwCgNXuuTbk="; @@ -30,6 +31,9 @@ buildGoModule rec { # Tests require network access doCheck = false; + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; passthru.withStyles = selector: From d00a13d9f3b87a799ca96d2d2eecfa0246f6b1b7 Mon Sep 17 00:00:00 2001 From: rein Date: Sun, 5 Jan 2025 01:01:51 +0530 Subject: [PATCH 32/97] syncthing: 1.28.0 -> 1.28.1 Bugfixes: - Folder overlap not detected when using tilde - WebUI table column widths broken on iPhone 12 Pro Max and wider - Sync status stays at 'Syncing xx%" when remote device pauses the folder. - Firefox, dark theme: device ID is hard to read - Junctions as dirs doesn't work anymore - Disabled checkbox panels don't respect dark theme - Address override not respected in fresh default config - panic: runtime error: index out of range [-1] Enhancements: - Ignoring symbolic links when syncing on android as well Closes #370900 --- pkgs/applications/networking/syncthing/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 8c0e1ef2ca79..06208da05641 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -13,16 +13,16 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { pname = stname; - version = "1.28.0"; + version = "1.28.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; tag = "v${version}"; - hash = "sha256-JW78n/3hssH600uXn4YLxcIJylPbSpEZICtKmqfqamI="; + hash = "sha256-Xr2765+DDK7dm3WDIwB3vbMG5CrguxsFp9qGd4wwhnA="; }; - vendorHash = "sha256-9/PfiOSCInduQXZ47KbrD3ca9O0Zt+TP7XoX+HjwQgs="; + vendorHash = "sha256-V8mMvIiEaYzTIFwUsdcV5ntHklR7Cs3ZhB5nYUT0180="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ # Recent versions of macOS seem to require binaries to be signed when From 2660dd1e712043a3e328d1e0e4c688382073d72c Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Fri, 27 Dec 2024 00:53:38 +0100 Subject: [PATCH 33/97] workflows: lock Ubuntu runner to ubuntu-22.04 Lock the Ubuntu runner to ubuntu-22.04 to avoid accidental updates [1] and increase reproducibility. [1]: https://github.com/actions/runner-images/issues/10636 --- .github/workflows/backport.yml | 2 +- .github/workflows/basic-eval.yml | 2 +- .github/workflows/check-cherry-picks.yml | 2 +- .github/workflows/check-maintainers-sorted.yaml | 2 +- .github/workflows/check-nix-format.yml | 2 +- .github/workflows/check-nixf-tidy.yml | 2 +- .github/workflows/check-shell.yml | 2 +- .github/workflows/codeowners-v2.yml | 4 ++-- .github/workflows/editorconfig-v2.yml | 2 +- .github/workflows/eval-lib-tests.yml | 2 +- .github/workflows/eval.yml | 10 +++++----- .github/workflows/get-merge-commit.yml | 2 +- .github/workflows/labels.yml | 2 +- .github/workflows/manual-nixos-v2.yml | 2 +- .github/workflows/manual-nixpkgs-v2.yml | 2 +- .github/workflows/nix-parse-v2.yml | 2 +- .github/workflows/nixpkgs-vet.yml | 2 +- .github/workflows/no-channel.yml | 2 +- .github/workflows/periodic-merge-24h.yml | 2 +- .github/workflows/periodic-merge-6h.yml | 2 +- .github/workflows/periodic-merge-haskell-updates.yml | 2 +- ci/README.md | 2 +- 22 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 1e5a1a229d54..faa74fd248f6 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -14,7 +14,7 @@ jobs: backport: name: Backport Pull Request if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index be6050456189..0c4becc5521c 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -16,7 +16,7 @@ permissions: jobs: tests: name: basic-eval-checks - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml index cbd5d66c4232..6572214e8a06 100644 --- a/.github/workflows/check-cherry-picks.yml +++ b/.github/workflows/check-cherry-picks.yml @@ -11,7 +11,7 @@ permissions: {} jobs: check: name: cherry-pick-check - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/check-maintainers-sorted.yaml b/.github/workflows/check-maintainers-sorted.yaml index 7092cf3fee38..ba438d8dc678 100644 --- a/.github/workflows/check-maintainers-sorted.yaml +++ b/.github/workflows/check-maintainers-sorted.yaml @@ -10,7 +10,7 @@ permissions: jobs: nixos: name: maintainer-list-check - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 19f80085c5cc..9bfe44b166f7 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -18,7 +18,7 @@ jobs: nixos: name: nixfmt-check - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: get-merge-commit if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')" steps: diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml index 481ae2df4c31..0cbdcf745571 100644 --- a/.github/workflows/check-nixf-tidy.yml +++ b/.github/workflows/check-nixf-tidy.yml @@ -9,7 +9,7 @@ permissions: jobs: nixos: name: exp-nixf-tidy-check - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: "!contains(github.event.pull_request.title, '[skip treewide]')" steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml index 316813879e81..63b4e4d4fe82 100644 --- a/.github/workflows/check-shell.yml +++ b/.github/workflows/check-shell.yml @@ -11,7 +11,7 @@ permissions: {} jobs: x86_64-linux: name: shell-check-x86_64-linux - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index ae95fd0de05f..d425c60ae3c6 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -41,7 +41,7 @@ jobs: # Check that code owners is valid check: name: Check - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: get-merge-commit if: needs.get-merge-commit.outputs.mergedSha steps: @@ -88,7 +88,7 @@ jobs: # Request reviews from code owners request: name: Request - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 diff --git a/.github/workflows/editorconfig-v2.yml b/.github/workflows/editorconfig-v2.yml index 07afb60bc3ae..9b6f0b3128b0 100644 --- a/.github/workflows/editorconfig-v2.yml +++ b/.github/workflows/editorconfig-v2.yml @@ -16,7 +16,7 @@ jobs: tests: name: editorconfig-check - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: get-merge-commit if: "needs.get-merge-commit.outputs.mergedSha && github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: diff --git a/.github/workflows/eval-lib-tests.yml b/.github/workflows/eval-lib-tests.yml index 9321783c7996..c1cfa31644f2 100644 --- a/.github/workflows/eval-lib-tests.yml +++ b/.github/workflows/eval-lib-tests.yml @@ -13,7 +13,7 @@ jobs: nixpkgs-lib-tests: name: nixpkgs-lib-tests - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: get-merge-commit if: needs.get-merge-commit.outputs.mergedSha steps: diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index 72b2103b8720..fabefc15602f 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -21,7 +21,7 @@ jobs: attrs: name: Attributes - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: get-merge-commit # Skip this and dependent steps if the PR can't be merged if: needs.get-merge-commit.outputs.mergedSha @@ -60,7 +60,7 @@ jobs: eval-aliases: name: Eval nixpkgs with aliases enabled - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [ attrs, get-merge-commit ] steps: - name: Check out the PR at the test merge commit @@ -78,7 +78,7 @@ jobs: outpaths: name: Outpaths - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [ attrs, get-merge-commit ] strategy: fail-fast: false @@ -118,7 +118,7 @@ jobs: process: name: Process - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [ outpaths, attrs, get-merge-commit ] outputs: baseRunId: ${{ steps.baseRunId.outputs.baseRunId }} @@ -218,7 +218,7 @@ jobs: # Separate job to have a very tightly scoped PR write token tag: name: Tag - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: [ attrs, process ] if: needs.process.outputs.baseRunId permissions: diff --git a/.github/workflows/get-merge-commit.yml b/.github/workflows/get-merge-commit.yml index 63154d73ed9d..3820ed125291 100644 --- a/.github/workflows/get-merge-commit.yml +++ b/.github/workflows/get-merge-commit.yml @@ -12,7 +12,7 @@ permissions: {} jobs: resolve-merge-commit: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: mergedSha: ${{ steps.merged.outputs.mergedSha }} steps: diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index 724164bebdfc..f46cf693bc83 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -16,7 +16,7 @@ permissions: jobs: labels: name: label-pr - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml index 0678568e5271..25c8df2a7b2b 100644 --- a/.github/workflows/manual-nixos-v2.yml +++ b/.github/workflows/manual-nixos-v2.yml @@ -13,7 +13,7 @@ on: jobs: nixos: name: nixos-manual-build - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml index 0410cfd904b2..d444c57d676b 100644 --- a/.github/workflows/manual-nixpkgs-v2.yml +++ b/.github/workflows/manual-nixpkgs-v2.yml @@ -15,7 +15,7 @@ on: jobs: nixpkgs: name: nixpkgs-manual-build - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml index b6bb8fe28197..9e4e5aa0a676 100644 --- a/.github/workflows/nix-parse-v2.yml +++ b/.github/workflows/nix-parse-v2.yml @@ -16,7 +16,7 @@ jobs: tests: name: nix-files-parseable-check - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: get-merge-commit if: "needs.get-merge-commit.outputs.mergedSha && github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml index 65c1028f1059..5320aa6f91fa 100644 --- a/.github/workflows/nixpkgs-vet.yml +++ b/.github/workflows/nixpkgs-vet.yml @@ -25,7 +25,7 @@ jobs: check: name: nixpkgs-vet # This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases. - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long. timeout-minutes: 10 needs: get-merge-commit diff --git a/.github/workflows/no-channel.yml b/.github/workflows/no-channel.yml index 623a011c6e73..0792b79a3da5 100644 --- a/.github/workflows/no-channel.yml +++ b/.github/workflows/no-channel.yml @@ -13,7 +13,7 @@ permissions: {} jobs: fail: name: "This PR is is targeting a channel branch" - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - run: | cat < From fcfbe6fff4a4daef98bf7e274739553489b55d67 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Sun, 5 Jan 2025 00:14:40 +0100 Subject: [PATCH 34/97] workflows: update Ubuntu runner to ubuntu-24.04 Link: https://github.com/actions/runner-images/issues/10636 --- .github/workflows/backport.yml | 2 +- .github/workflows/basic-eval.yml | 2 +- .github/workflows/check-cherry-picks.yml | 2 +- .github/workflows/check-maintainers-sorted.yaml | 2 +- .github/workflows/check-nix-format.yml | 2 +- .github/workflows/check-nixf-tidy.yml | 2 +- .github/workflows/check-shell.yml | 2 +- .github/workflows/codeowners-v2.yml | 4 ++-- .github/workflows/editorconfig-v2.yml | 2 +- .github/workflows/eval-lib-tests.yml | 2 +- .github/workflows/eval.yml | 10 +++++----- .github/workflows/get-merge-commit.yml | 2 +- .github/workflows/labels.yml | 2 +- .github/workflows/manual-nixos-v2.yml | 2 +- .github/workflows/manual-nixpkgs-v2.yml | 2 +- .github/workflows/nix-parse-v2.yml | 2 +- .github/workflows/nixpkgs-vet.yml | 2 +- .github/workflows/no-channel.yml | 2 +- .github/workflows/periodic-merge-24h.yml | 2 +- .github/workflows/periodic-merge-6h.yml | 2 +- .github/workflows/periodic-merge-haskell-updates.yml | 2 +- ci/README.md | 2 +- 22 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index faa74fd248f6..42283f3ab40c 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -14,7 +14,7 @@ jobs: backport: name: Backport Pull Request if: github.repository_owner == 'NixOS' && github.event.pull_request.merged == true && (github.event_name != 'labeled' || startsWith('backport', github.event.label.name)) - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: # Use a GitHub App to create the PR so that CI gets triggered # The App is scoped to Repository > Contents and Pull Requests: write for Nixpkgs diff --git a/.github/workflows/basic-eval.yml b/.github/workflows/basic-eval.yml index 0c4becc5521c..8698d5fff392 100644 --- a/.github/workflows/basic-eval.yml +++ b/.github/workflows/basic-eval.yml @@ -16,7 +16,7 @@ permissions: jobs: tests: name: basic-eval-checks - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 # we don't limit this action to only NixOS repo since the checks are cheap and useful developer feedback steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/check-cherry-picks.yml b/.github/workflows/check-cherry-picks.yml index 6572214e8a06..71b3bff044c7 100644 --- a/.github/workflows/check-cherry-picks.yml +++ b/.github/workflows/check-cherry-picks.yml @@ -11,7 +11,7 @@ permissions: {} jobs: check: name: cherry-pick-check - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/check-maintainers-sorted.yaml b/.github/workflows/check-maintainers-sorted.yaml index ba438d8dc678..21247e20cb9b 100644 --- a/.github/workflows/check-maintainers-sorted.yaml +++ b/.github/workflows/check-maintainers-sorted.yaml @@ -10,7 +10,7 @@ permissions: jobs: nixos: name: maintainer-list-check - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/check-nix-format.yml b/.github/workflows/check-nix-format.yml index 9bfe44b166f7..d0b8c84c031d 100644 --- a/.github/workflows/check-nix-format.yml +++ b/.github/workflows/check-nix-format.yml @@ -18,7 +18,7 @@ jobs: nixos: name: nixfmt-check - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: get-merge-commit if: "needs.get-merge-commit.outputs.mergedSha && !contains(github.event.pull_request.title, '[skip treewide]')" steps: diff --git a/.github/workflows/check-nixf-tidy.yml b/.github/workflows/check-nixf-tidy.yml index 0cbdcf745571..e18964acb7f3 100644 --- a/.github/workflows/check-nixf-tidy.yml +++ b/.github/workflows/check-nixf-tidy.yml @@ -9,7 +9,7 @@ permissions: jobs: nixos: name: exp-nixf-tidy-check - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: "!contains(github.event.pull_request.title, '[skip treewide]')" steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml index 63b4e4d4fe82..d3ac3690641a 100644 --- a/.github/workflows/check-shell.yml +++ b/.github/workflows/check-shell.yml @@ -11,7 +11,7 @@ permissions: {} jobs: x86_64-linux: name: shell-check-x86_64-linux - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: diff --git a/.github/workflows/codeowners-v2.yml b/.github/workflows/codeowners-v2.yml index d425c60ae3c6..b5f1f88d0c88 100644 --- a/.github/workflows/codeowners-v2.yml +++ b/.github/workflows/codeowners-v2.yml @@ -41,7 +41,7 @@ jobs: # Check that code owners is valid check: name: Check - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: get-merge-commit if: needs.get-merge-commit.outputs.mergedSha steps: @@ -88,7 +88,7 @@ jobs: # Request reviews from code owners request: name: Request - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - uses: cachix/install-nix-action@08dcb3a5e62fa31e2da3d490afc4176ef55ecd72 # v30 diff --git a/.github/workflows/editorconfig-v2.yml b/.github/workflows/editorconfig-v2.yml index 9b6f0b3128b0..7c79cef1aae4 100644 --- a/.github/workflows/editorconfig-v2.yml +++ b/.github/workflows/editorconfig-v2.yml @@ -16,7 +16,7 @@ jobs: tests: name: editorconfig-check - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: get-merge-commit if: "needs.get-merge-commit.outputs.mergedSha && github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: diff --git a/.github/workflows/eval-lib-tests.yml b/.github/workflows/eval-lib-tests.yml index c1cfa31644f2..39fb99ae0ff9 100644 --- a/.github/workflows/eval-lib-tests.yml +++ b/.github/workflows/eval-lib-tests.yml @@ -13,7 +13,7 @@ jobs: nixpkgs-lib-tests: name: nixpkgs-lib-tests - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: get-merge-commit if: needs.get-merge-commit.outputs.mergedSha steps: diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index fabefc15602f..d0e5a8781ebe 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -21,7 +21,7 @@ jobs: attrs: name: Attributes - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: get-merge-commit # Skip this and dependent steps if the PR can't be merged if: needs.get-merge-commit.outputs.mergedSha @@ -60,7 +60,7 @@ jobs: eval-aliases: name: Eval nixpkgs with aliases enabled - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: [ attrs, get-merge-commit ] steps: - name: Check out the PR at the test merge commit @@ -78,7 +78,7 @@ jobs: outpaths: name: Outpaths - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: [ attrs, get-merge-commit ] strategy: fail-fast: false @@ -118,7 +118,7 @@ jobs: process: name: Process - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: [ outpaths, attrs, get-merge-commit ] outputs: baseRunId: ${{ steps.baseRunId.outputs.baseRunId }} @@ -218,7 +218,7 @@ jobs: # Separate job to have a very tightly scoped PR write token tag: name: Tag - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: [ attrs, process ] if: needs.process.outputs.baseRunId permissions: diff --git a/.github/workflows/get-merge-commit.yml b/.github/workflows/get-merge-commit.yml index 3820ed125291..c76215aff60c 100644 --- a/.github/workflows/get-merge-commit.yml +++ b/.github/workflows/get-merge-commit.yml @@ -12,7 +12,7 @@ permissions: {} jobs: resolve-merge-commit: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 outputs: mergedSha: ${{ steps.merged.outputs.mergedSha }} steps: diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml index f46cf693bc83..5e2e3aeb3751 100644 --- a/.github/workflows/labels.yml +++ b/.github/workflows/labels.yml @@ -16,7 +16,7 @@ permissions: jobs: labels: name: label-pr - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: - uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9 # v5.0.0 diff --git a/.github/workflows/manual-nixos-v2.yml b/.github/workflows/manual-nixos-v2.yml index 25c8df2a7b2b..014fef1f5924 100644 --- a/.github/workflows/manual-nixos-v2.yml +++ b/.github/workflows/manual-nixos-v2.yml @@ -13,7 +13,7 @@ on: jobs: nixos: name: nixos-manual-build - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/manual-nixpkgs-v2.yml b/.github/workflows/manual-nixpkgs-v2.yml index d444c57d676b..ec8a3f6d9876 100644 --- a/.github/workflows/manual-nixpkgs-v2.yml +++ b/.github/workflows/manual-nixpkgs-v2.yml @@ -15,7 +15,7 @@ on: jobs: nixpkgs: name: nixpkgs-manual-build - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: github.repository_owner == 'NixOS' steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 diff --git a/.github/workflows/nix-parse-v2.yml b/.github/workflows/nix-parse-v2.yml index 9e4e5aa0a676..61418079e62f 100644 --- a/.github/workflows/nix-parse-v2.yml +++ b/.github/workflows/nix-parse-v2.yml @@ -16,7 +16,7 @@ jobs: tests: name: nix-files-parseable-check - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 needs: get-merge-commit if: "needs.get-merge-commit.outputs.mergedSha && github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')" steps: diff --git a/.github/workflows/nixpkgs-vet.yml b/.github/workflows/nixpkgs-vet.yml index 5320aa6f91fa..5e39f3873b91 100644 --- a/.github/workflows/nixpkgs-vet.yml +++ b/.github/workflows/nixpkgs-vet.yml @@ -25,7 +25,7 @@ jobs: check: name: nixpkgs-vet # This needs to be x86_64-linux, because we depend on the tooling being pre-built in the GitHub releases. - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 # This should take 1 minute at most, but let's be generous. The default of 6 hours is definitely too long. timeout-minutes: 10 needs: get-merge-commit diff --git a/.github/workflows/no-channel.yml b/.github/workflows/no-channel.yml index 0792b79a3da5..b7b61f9d6492 100644 --- a/.github/workflows/no-channel.yml +++ b/.github/workflows/no-channel.yml @@ -13,7 +13,7 @@ permissions: {} jobs: fail: name: "This PR is is targeting a channel branch" - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - run: | cat < From dbd20ce0eb83ec5cffe11f2fa3feb78ca3f36506 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Fri, 27 Dec 2024 02:05:10 +0100 Subject: [PATCH 35/97] workflows: lock macOS runner to macos-14 --- .github/workflows/check-shell.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-shell.yml b/.github/workflows/check-shell.yml index d3ac3690641a..fda7db309e75 100644 --- a/.github/workflows/check-shell.yml +++ b/.github/workflows/check-shell.yml @@ -23,7 +23,7 @@ jobs: aarch64-darwin: name: shell-check-aarch64-darwin - runs-on: macos-latest + runs-on: macos-14 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 with: From 27e6ab385cac123b5358da86d7a95af4074928a0 Mon Sep 17 00:00:00 2001 From: Nicholas Sielicki Date: Sat, 4 Jan 2025 15:31:28 -0800 Subject: [PATCH 36/97] linuxPackages.ena: bump 2.13.1 -> 2.13.2 fixes a build failure with 6.13-rcX Signed-off-by: Nicholas Sielicki --- pkgs/os-specific/linux/ena/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ena/default.nix b/pkgs/os-specific/linux/ena/default.nix index 8062b2ccb5de..963b683a8593 100644 --- a/pkgs/os-specific/linux/ena/default.nix +++ b/pkgs/os-specific/linux/ena/default.nix @@ -7,7 +7,7 @@ }: let rev-prefix = "ena_linux_"; - version = "2.13.1"; + version = "2.13.2"; in stdenv.mkDerivation { inherit version; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "amzn"; repo = "amzn-drivers"; rev = "${rev-prefix}${version}"; - hash = "sha256-oFeTaulcnp9U7Zxhf08yNxpEtyxjI5QJmfITHVHDES0="; + hash = "sha256-v4S23lG3DGcsLcxwl4F11UlN7xD69mg0yS4fWs89+kM="; }; hardeningDisable = [ "pic" ]; From 09cecdd1ac34840484c95024a0401741b8c77f2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 Jan 2025 23:39:08 +0000 Subject: [PATCH 37/97] krabby: 0.2.1 -> 0.2.2 --- pkgs/by-name/kr/krabby/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/kr/krabby/package.nix b/pkgs/by-name/kr/krabby/package.nix index 5d7455a36a46..331f2a8f1522 100644 --- a/pkgs/by-name/kr/krabby/package.nix +++ b/pkgs/by-name/kr/krabby/package.nix @@ -5,14 +5,14 @@ }: rustPlatform.buildRustPackage rec { pname = "krabby"; - version = "0.2.1"; + version = "0.2.2"; src = fetchCrate { inherit pname version; - hash = "sha256-YEY4bUZV9BpyVXzEGvnLyfG0GdE3xMN9tHlsg6RqMkk="; + hash = "sha256-BmTx2kpnibTVuutAIrpFTTOGpO6WzITb6SXwUKuMtYY="; }; - cargoHash = "sha256-6NV+kqnloEFTygE5LLuCsgMYXGiDwOTnP6/CK2c9DOs="; + cargoHash = "sha256-gZzjx4JWe3CcG8wuQRTYjyEvvhCyUBXHQSw5sYhih9o="; meta = with lib; { description = "Print pokemon sprites in your terminal"; From e946f428f3d56f723f376c0e3ec8004587278fbd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 04:15:54 +0100 Subject: [PATCH 38/97] python313Packages.libusb1: 3.1.0 -> 3.2.0 https://github.com/vpelletier/python-libusb1/compare/refs/tags/3.1.0...3.2.0 --- .../python-modules/libusb1/ctypes.patch | 71 +++++++++++++++++++ .../python-modules/libusb1/default.nix | 29 +++++--- 2 files changed, 89 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/python-modules/libusb1/ctypes.patch diff --git a/pkgs/development/python-modules/libusb1/ctypes.patch b/pkgs/development/python-modules/libusb1/ctypes.patch new file mode 100644 index 000000000000..5d0ad9d03d38 --- /dev/null +++ b/pkgs/development/python-modules/libusb1/ctypes.patch @@ -0,0 +1,71 @@ +diff --git a/usb1/_libusb1.py b/usb1/_libusb1.py +index 42b01e9..36f2d16 100644 +--- a/usb1/_libusb1.py ++++ b/usb1/_libusb1.py +@@ -172,64 +172,13 @@ else: + LIBUSB_CALL_FUNCTYPE = CFUNCTYPE + + def __getLibrary(): +- my_dir = os.path.dirname(__file__) + system = platform.system() +- # If this is a binary wheel, try to use an integrated libusb first. +- # To use the libusb from the Python installation or the OS, install +- # from sdist: +- # > pip install --no-binary :all: libusb1 + if system == 'Windows': + dll_loader = ctypes.WinDLL +- libusb_list = [ +- os.path.join(my_dir, 'libusb-1.0.dll'), +- 'libusb-1.0.dll', +- ] +- find_library = None + else: + dll_loader = CDLL +- if system == 'Darwin': +- libusb_list = [ +- os.path.join(my_dir, 'libusb-1.0.dylib'), +- 'libusb-1.0.dylib', +- # macport standard path +- '/opt/local/lib/libusb-1.0.dylib', +- # fink standard path +- '/sw/lib/libusb-1.0.dylib', +- # homebrew standard path for symlink (Apple M1 Silicon) +- '/opt/homebrew/opt/libusb/lib/libusb-1.0.dylib', +- ] +- find_library = None +- else: +- # .so.0 should be the optimal suffix +- # .so is for BBB, especially if libusb-1.0.so was bundled in some +- # uses of this module. +- libusb_list = [ +- os.path.join(my_dir, 'libusb-1.0.so.0'), +- os.path.join(my_dir, 'libusb-1.0.so'), +- 'libusb-1.0.so.0', +- 'libusb-1.0.so', +- ] +- find_library = ( +- # libusb.so.2 on FreeBSD: load('libusb.so') would work fine, but... +- # libusb.so.2debian on Debian GNU/kFreeBSD: here it wouldn't work. +- 'usb' +- if 'FreeBSD' in system else +- 'usb-1.0' +- ) +- for filename in libusb_list: +- try: +- return dll_loader(filename, use_errno=True, use_last_error=True) +- except OSError: +- pass +- if find_library is not None: +- filename = ctypes.util.find_library(find_library) +- if filename is not None: +- return dll_loader(filename, use_errno=True, use_last_error=True) +- raise OSError( +- errno.ENOENT, +- 'cannot find a suitable libusb-1.0', +- libusb_list, +- ) ++ ++ return dll_loader("@libusb@", use_errno=True, use_last_error=True) + + __load_lock = Lock() + __loaded = False diff --git a/pkgs/development/python-modules/libusb1/default.nix b/pkgs/development/python-modules/libusb1/default.nix index 0304dd09677e..34f6c1b7636f 100644 --- a/pkgs/development/python-modules/libusb1/default.nix +++ b/pkgs/development/python-modules/libusb1/default.nix @@ -2,26 +2,33 @@ lib, stdenv, buildPythonPackage, - fetchPypi, + fetchFromGitHub, + substituteAll, + setuptools, libusb1, pytestCheckHook, }: buildPythonPackage rec { pname = "libusb1"; - version = "3.1.0"; - format = "setuptools"; + version = "3.2.0"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "4ee9b0a55f8bd0b3ea7017ae919a6c1f439af742c4a4b04543c5fd7af89b828c"; + src = fetchFromGitHub { + owner = "vpelletier"; + repo = "python-libusb1"; + tag = version; + hash = "sha256-D2VMqrq1MQa6gp8vxDiLRAqTDyRGK3qVKo6YMmo5Zrg="; }; - postPatch = '' - substituteInPlace usb1/_libusb1.py --replace \ - "ctypes.util.find_library(base_name)" \ - "'${libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'" - ''; + patches = [ + (substituteAll { + src = ./ctypes.patch; + libusb = "${lib.getLib libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + build-system = [ setuptools ]; buildInputs = [ libusb1 ]; From 264199011c0fa45bc2ee9ee9bfb2f1ac90f2c551 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 5 Jan 2025 01:45:38 +0100 Subject: [PATCH 39/97] python312Packages.pymatting: 1.1.10 -> 1.1.13 https://github.com/pymatting/pymatting/blob/afd2dec073cb08b8119300feec18c179a9d436f3/CHANGELOG.md#1113 --- .../python-modules/pymatting/default.nix | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/pymatting/default.nix b/pkgs/development/python-modules/pymatting/default.nix index a5b22b29744b..5d67894b4929 100644 --- a/pkgs/development/python-modules/pymatting/default.nix +++ b/pkgs/development/python-modules/pymatting/default.nix @@ -8,28 +8,38 @@ pytestCheckHook, scipy, setuptools, + config, + cudaSupport ? config.cudaSupport, + cupy, + pyopencl, }: buildPythonPackage rec { pname = "pymatting"; - version = "1.1.10"; + version = "1.1.13"; pyproject = true; src = fetchFromGitHub { owner = "pymatting"; repo = "pymatting"; - tag = "v${version}"; - hash = "sha256-wHCTqcBvVN/pTXH3iW57DPpMEsnehutRQB5NaugS6Zs="; + # https://github.com/pymatting/pymatting/issues/92 + rev = "afd2dec073cb08b8119300feec18c179a9d436f3"; + hash = "sha256-AzdhRZgcT+gfLPZYKJLQUW7uLyXoRy6SP2raHWd9XUY="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ - numba - numpy - pillow - scipy - ]; + dependencies = + [ + numba + numpy + pillow + scipy + ] + ++ lib.optionals cudaSupport [ + cupy + pyopencl + ]; nativeCheckInputs = [ pytestCheckHook ]; @@ -47,7 +57,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python library for alpha matting"; homepage = "https://github.com/pymatting/pymatting"; - changelog = "https://github.com/pymatting/pymatting/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/pymatting/pymatting/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ blaggacao ]; }; From 1c715c8bcf92cfaee894053d31300e8128457a21 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 00:41:55 +0100 Subject: [PATCH 40/97] python313Packages.authlib: 1.3.2 -> 1.4.0 https://github.com/lepture/authlib/blob/v1.4.0/docs/changelog.rst --- pkgs/development/python-modules/authlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/authlib/default.nix b/pkgs/development/python-modules/authlib/default.nix index 04574c0e2fe4..7ba63732046c 100644 --- a/pkgs/development/python-modules/authlib/default.nix +++ b/pkgs/development/python-modules/authlib/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "authlib"; - version = "1.3.2"; + version = "1.4.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "lepture"; repo = "authlib"; tag = "v${version}"; - hash = "sha256-gaFnai5QzHhnyn73JB+QzybaolLWC9barBFdnlEMyMU="; + hash = "sha256-GUB/ioyeFfuuKZqsqJkDq0e6ETa1jqyr+GJHPddLRkA="; }; build-system = [ setuptools ]; From f201129646a6e9f37d297d65b9c4a51b4791749d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 5 Jan 2025 02:47:42 +0100 Subject: [PATCH 41/97] python313Packages.quart-cors: 0.7.0 -> 0.8.0 https://github.com/pgjones/quart-cors/blob/refs/tags/0.8.0/CHANGELOG.rst --- pkgs/development/python-modules/quart-cors/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/quart-cors/default.nix b/pkgs/development/python-modules/quart-cors/default.nix index 296a2baaf30f..aca57d8e08f7 100644 --- a/pkgs/development/python-modules/quart-cors/default.nix +++ b/pkgs/development/python-modules/quart-cors/default.nix @@ -5,7 +5,7 @@ pythonOlder, # build-system - poetry-core, + pdm-backend, # propagates quart, @@ -19,17 +19,17 @@ buildPythonPackage rec { pname = "quart-cors"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; src = fetchFromGitHub { owner = "pgjones"; repo = "quart-cors"; tag = version; - hash = "sha256-qUzs0CTZHf3fGADBXPkd3CjZ6dnz1t3cTxflMErvz/k="; + hash = "sha256-f+l+j0bjzi5FTwJzdXNyCgh3uT4zldpg22ZOgW1Wub4="; }; - build-system = [ poetry-core ]; + build-system = [ pdm-backend ]; dependencies = [ quart ] ++ lib.optionals (pythonOlder "3.10") [ typing-extensions ]; From d48dd530ab43ea33b541979957dc7821e3b7e552 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Jan 2025 20:44:16 +0100 Subject: [PATCH 42/97] home-assistant: allow passing explicit target version to updater --- pkgs/servers/home-assistant/update.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/update.py b/pkgs/servers/home-assistant/update.py index 70eb77ce9a1c..c75bbc432aa3 100755 --- a/pkgs/servers/home-assistant/update.py +++ b/pkgs/servers/home-assistant/update.py @@ -1,6 +1,7 @@ #!/usr/bin/env nix-shell #!nix-shell -I nixpkgs=channel:nixpkgs-unstable -i python3 -p "python3.withPackages (ps: with ps; [ aiohttp packaging ])" -p git nurl pyright ruff isort +import argparse import asyncio import json import os @@ -226,7 +227,7 @@ class HomeAssistant: ]) -async def main(): +async def main(target_version: Optional[str] = None): headers = {} if token := os.environ.get("GITHUB_TOKEN", None): headers.update({"GITHUB_TOKEN": token}) @@ -235,7 +236,7 @@ async def main(): hass = HomeAssistant(client) core_current = str(await Nix.eval("home-assistant.version")) - core_latest = await hass.get_latest_core_version() + core_latest = target_version or await hass.get_latest_core_version() if Version(core_latest) > Version(core_current): print(f"New Home Assistant version {core_latest} is available") @@ -257,7 +258,12 @@ async def main(): await asyncio.sleep(0) if __name__ == "__main__": + parser = argparse.ArgumentParser() + parser.add_argument("version", nargs="?") + args = parser.parse_args() + run_sync(["pyright", __file__]) run_sync(["ruff", "check", "--ignore=E501", __file__]) run_sync(["isort", __file__]) - asyncio.run(main()) + + asyncio.run(main(args.version)) From 9838539e4175d57d4e13979aa0b4f3eedd01f384 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Jan 2025 22:29:52 +0100 Subject: [PATCH 43/97] python313Packages.home-assistant-chip-wheels: use correct python version Referring to python3 will choose the default python version, which is different from the python version that matches the package set. When in python3Packages, always use python, not python3. --- .../python-modules/home-assistant-chip-wheels/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix index 469905525324..16c51f4e537a 100644 --- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix @@ -42,7 +42,7 @@ pylint, pyperclip, pyserial, - python3, + python, python-daemon, pyyaml, requests, @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { # Initialize only necessary submodules. cd connectedhomeip - ${python3}/bin/python3 scripts/checkout_submodules.py --platform linux --shallow + ${python.interpreter} scripts/checkout_submodules.py --platform linux --shallow # Keep the output deterministic. cd $out @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { zap-chip # gdbus-codegen glib - python3 + python # dependencies of build scripts click jinja2 @@ -254,7 +254,7 @@ stdenv.mkDerivation rec { ''chip_config_memory_debug_dmalloc=false'' ''chip_mdns="minimal"'' ''chip_minmdns_default_policy="libnl"'' - ''chip_python_version="${lib.versions.majorMinor python3.version}"'' + ''chip_python_version="${lib.versions.majorMinor python.version}"'' ''chip_python_platform_tag="any"'' ''chip_python_package_prefix="home-assistant-chip"'' ''custom_toolchain="custom"'' From b8327e3728dc963aef5e9457f47ff8119568d7c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Jan 2025 22:53:02 +0100 Subject: [PATCH 44/97] python313Packages.home-assistant-chip-wheels: hackfix pylint dep --- .../python-modules/home-assistant-chip-wheels/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix index 16c51f4e537a..584858a36bd3 100644 --- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix +++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix @@ -44,6 +44,7 @@ pyserial, python, python-daemon, + pythonOlder, pyyaml, requests, setuptools, @@ -200,7 +201,7 @@ stdenv.mkDerivation rec { pyelftools pygments pykwalify - pylint + (pylint.overridePythonAttrs { doCheck = pythonOlder "3.13"; }) pyperclip pyserial python-daemon From 900a1bdf2666ca18432fe6f4fee49223076d6042 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Jan 2025 22:54:25 +0100 Subject: [PATCH 45/97] python313Packages.aioacaia: 0.1.12 -> 0.1.13 https://github.com/zweckj/aioacaia/releases/tag/v0.1.13 --- pkgs/development/python-modules/aioacaia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioacaia/default.nix b/pkgs/development/python-modules/aioacaia/default.nix index a0cb33f61d23..52fff8c8a6eb 100644 --- a/pkgs/development/python-modules/aioacaia/default.nix +++ b/pkgs/development/python-modules/aioacaia/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aioacaia"; - version = "0.1.12"; + version = "0.1.13"; pyproject = true; disabled = pythonOlder "3.12"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "aioacaia"; tag = "v${version}"; - hash = "sha256-XtHze2EYLSGm3u8aG6vbogqki83k1mBKy/bC8gCCoWQ="; + hash = "sha256-c+xtVUSyH9dBz97eI+8YYG/yW08kZFLNXnHudxYchCE="; }; build-system = [ setuptools ]; From 3116d323729336e4b3448402b42d77425dbc5298 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Jan 2025 23:19:21 +0100 Subject: [PATCH 46/97] python313Packages.emoji: 2.13.2 -> 2.14.0 https://github.com/carpedm20/emoji/blob/v2.14.0/CHANGES.md --- pkgs/development/python-modules/emoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 2c6224ee6faa..038b908b47d3 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "emoji"; - version = "2.13.2"; + version = "2.14.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "carpedm20"; repo = "emoji"; tag = "v${version}"; - hash = "sha256-1oFzuIA2HFoBw50HHYi8bGZTAAeC6fesSnLReuXUZcM="; + hash = "sha256-ubZrVw069UiUvtEk9iff5lByGXyNalsKPv3Mj2X3qxc="; }; build-system = [ setuptools ]; From 59235992dbae52b43e57899c993bc99bdc27dc97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 4 Jan 2025 07:55:53 -0800 Subject: [PATCH 47/97] python313Packages.ical: 8.2.0 -> 8.3.0 Diff: https://github.com/allenporter/ical/compare/refs/tags/8.2.0...8.3.0 Changelog: https://github.com/allenporter/ical/releases/tag/8.3.0 --- pkgs/development/python-modules/ical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix index f065711d53d1..e31545f3be97 100644 --- a/pkgs/development/python-modules/ical/default.nix +++ b/pkgs/development/python-modules/ical/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "ical"; - version = "8.2.0"; + version = "8.3.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "ical"; tag = version; - hash = "sha256-9mnyhDKcZTZAGRxojQN9I9ZAgBmsSSsBPzCMZO6Rl5k="; + hash = "sha256-Hva4yCN46ACmKFZL5geR/NnEiEFHOCW/s+LOusnb1MI="; }; build-system = [ setuptools ]; From 2baaafa443e7d86bc8250480d731d7598ff84cc6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Jan 2025 23:55:01 +0100 Subject: [PATCH 48/97] python313Packages.aioautomower: 2024.10.3 -> 2024.12.0 https://github.com/Thomas55555/aioautomower/releases/tag/2024.12.0 --- .../python-modules/aioautomower/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix index 9c05c265f905..068a7c72ec05 100644 --- a/pkgs/development/python-modules/aioautomower/default.nix +++ b/pkgs/development/python-modules/aioautomower/default.nix @@ -1,6 +1,7 @@ { lib, aiohttp, + aioresponses, buildPythonPackage, fetchFromGitHub, freezegun, @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "aioautomower"; - version = "2024.10.3"; + version = "2024.12.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "Thomas55555"; repo = "aioautomower"; tag = version; - hash = "sha256-kLsHJBmNxh+PmJQ9Y9Ve/CACovzsRZyzVjor/VKUmYk="; + hash = "sha256-JLlmvd6Hgf1a3YU9xfbw8plEbRDNgCzxF3PpveGsrPg="; }; postPatch = '' @@ -47,6 +48,7 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + aioresponses freezegun pytest-asyncio pytest-cov-stub @@ -56,13 +58,14 @@ buildPythonPackage rec { pythonImportsCheck = [ "aioautomower" ]; - pytestFlagsArray = [ "--snapshot-update" ]; - disabledTests = [ # File is missing "test_standard_mower" # Call no found "test_post_commands" + # Timezone mismatches + "test_full_planner_event" + "test_sinlge_planner_event" ]; meta = with lib; { From 57054c0c30921281fac257cc6ae77e824b4360c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Jan 2025 23:57:29 +0100 Subject: [PATCH 49/97] python313Packages.aiohasupervisor: 0.2.1 -> 0.2.2b5 --- pkgs/development/python-modules/aiohasupervisor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohasupervisor/default.nix b/pkgs/development/python-modules/aiohasupervisor/default.nix index 2f906fef1954..500f3a848418 100644 --- a/pkgs/development/python-modules/aiohasupervisor/default.nix +++ b/pkgs/development/python-modules/aiohasupervisor/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "aiohasupervisor"; - version = "0.2.1"; + version = "0.2.2b5"; pyproject = true; disabled = pythonOlder "3.12"; src = fetchPypi { inherit pname version; - hash = "sha256-oSQhZf0lV5bJYdrfu4j8Hw1F+EQfivEPQomatHixy9k="; + hash = "sha256-EFVhR7L+1SVzXO4UpDrXA1EuPdeew55CV4ykO3K5BFI="; }; postPatch = '' From b87f87c82b9837a9f9531d748bf2f662ceeef8c3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Jan 2025 23:58:00 +0100 Subject: [PATCH 50/97] python313Packages.aioshelly: 12.1.0 -> 12.2.0 https://github.com/home-assistant-libs/aioshelly/releases/tag/12.2.0 --- pkgs/development/python-modules/aioshelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix index 551073c5fd99..9e0d4469df3b 100644 --- a/pkgs/development/python-modules/aioshelly/default.nix +++ b/pkgs/development/python-modules/aioshelly/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "aioshelly"; - version = "12.1.0"; + version = "12.2.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "aioshelly"; tag = version; - hash = "sha256-QcVyWabELa1bB2MOwQNPItXLgeOXlFpRh69dS+m1FLI="; + hash = "sha256-Y6gFFo0kzdHGaRqNVHhr0vvWBwRO2kOaoR4BFUbyYUQ="; }; build-system = [ setuptools ]; From c94c152d896d4174f7deb76797cb2526406fc318 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Jan 2025 23:58:39 +0100 Subject: [PATCH 51/97] python313Packages.aioswitcher: 5.0.0 -> 6.0.0 https://github.com/TomerFi/aioswitcher/releases/tag/6.0.0 --- pkgs/development/python-modules/aioswitcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 60d8ef96bbf1..e1d1d69a8275 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "5.0.0"; + version = "6.0.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "TomerFi"; repo = "aioswitcher"; tag = version; - hash = "sha256-cKHH1yXVm/kZigO1Ub0XZEv+yq4lROc4SGFLqFuwQto="; + hash = "sha256-nf4PEitfM9uYOlmm/cfILnFo/xx8g7rjYn2nkf3gjMg="; }; __darwinAllowLocalNetworking = true; From 8f67c40874db2554f169ff41936cdaed52ba8bd3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 2 Jan 2025 23:59:37 +0100 Subject: [PATCH 52/97] python313Packages.deebot-client: 9.4.0 -> 10.1.0 https://github.com/DeebotUniverse/client.py/releases/tag/10.1.0 --- pkgs/development/python-modules/deebot-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix index f5dc398478a7..93aaad9c0d7b 100644 --- a/pkgs/development/python-modules/deebot-client/default.nix +++ b/pkgs/development/python-modules/deebot-client/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "deebot-client"; - version = "9.4.0"; + version = "10.1.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "DeebotUniverse"; repo = "client.py"; tag = version; - hash = "sha256-hJGE9D0rsYKrd4XZIrOOnwaQlq75Qy4S8681wjr4VDs="; + hash = "sha256-qnXDr8+e13/VMFhFBbQJPdct5MjHwcBkLl+fo8xaEgY="; }; pythonRelaxDeps = [ From 8f1ecd51417931966b834e4feaaa285da44306e8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:05:46 +0100 Subject: [PATCH 53/97] python313Packages.demetriek: 0.4.0 -> 1.1.0 https://github.com/frenck/python-demetriek/releases/tag/v1.0.0 https://github.com/frenck/python-demetriek/releases/tag/v1.1.0 --- .../python-modules/demetriek/default.nix | 35 +++++++------------ 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/demetriek/default.nix b/pkgs/development/python-modules/demetriek/default.nix index 6f75104aad5f..b1a7701d9e2f 100644 --- a/pkgs/development/python-modules/demetriek/default.nix +++ b/pkgs/development/python-modules/demetriek/default.nix @@ -6,10 +6,11 @@ backoff, buildPythonPackage, fetchFromGitHub, - fetchpatch, + mashumaro, + orjson, poetry-core, - pydantic, pytest-asyncio, + pytest-cov-stub, pytestCheckHook, pythonOlder, yarl, @@ -17,55 +18,43 @@ buildPythonPackage rec { pname = "demetriek"; - version = "0.4.0"; + version = "1.1.0"; pyproject = true; - disabled = pythonOlder "3.9"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "frenck"; repo = "python-demetriek"; tag = "v${version}"; - hash = "sha256-LCHHBcZgO9gw5jyaJiiS4lKyb0ut+PJvKTylIvIKHhc="; + hash = "sha256-MDGAhsLbJqvywQntlPfM/cPyltqsqnt2C31ACpMPn0Y="; }; - patches = [ - # https://github.com/frenck/python-demetriek/pull/531 - (fetchpatch { - name = "pydantic_2-compatibility.patch"; - url = "https://github.com/frenck/python-demetriek/commit/e677fe5b735b6b28572e3e5fd6aab56fc056f5e6.patch"; - excludes = [ - "pyproject.toml" - "poetry.lock" - ]; - hash = "sha256-oMVR45KHDhcPId/0X9obJXCPE8s1gk5IgsGsgZesdZw="; - }) - ]; - postPatch = '' # Upstream doesn't set a version for the pyproject.toml substituteInPlace pyproject.toml \ - --replace "0.0.0" "${version}" \ - --replace "--cov" "" + --replace-fail "0.0.0" "${version}" ''; pythonRelaxDeps = [ "pydantic" ]; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ aiohttp awesomeversion backoff - pydantic + mashumaro + orjson yarl ]; nativeCheckInputs = [ aresponses pytest-asyncio + pytest-cov-stub pytestCheckHook ]; From de60ba364146f8bf3b0edbb0cd62cd440ec88b53 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:07:50 +0100 Subject: [PATCH 54/97] python313Packages.elmax-api: 0.0.6.3 -> 0.0.6.4rc0 https://github.com/albertogeniola/elmax-api/releases/tag/v0.0.6.4rc0 --- pkgs/development/python-modules/elmax-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix index 9265e5c9ebe1..49d3b046f13a 100644 --- a/pkgs/development/python-modules/elmax-api/default.nix +++ b/pkgs/development/python-modules/elmax-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "elmax-api"; - version = "0.0.6.3"; + version = "0.0.6.4rc0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "albertogeniola"; repo = pname; tag = "v${version}"; - hash = "sha256-jnm1AFnPxZIgD815ZFxV/i9ar4cZfsYJ0+xDpM3hKmg="; + hash = "sha256-BYVfP8B+p4J4gW+64xh9bT9sDcu/lk0R+MvLsYLwRfQ="; }; build-system = [ setuptools ]; From c8e4487d71842f998b2104d55643474e8686cff1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:09:01 +0100 Subject: [PATCH 55/97] python313Packages.flux-led: 1.0.4 -> 1.1.0 https://github.com/Danielhiversen/flux_led/releases/tag/1.1.0 --- .../python-modules/flux-led/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/flux-led/default.nix b/pkgs/development/python-modules/flux-led/default.nix index 905c597a8459..244d0dfdf42e 100644 --- a/pkgs/development/python-modules/flux-led/default.nix +++ b/pkgs/development/python-modules/flux-led/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "flux-led"; - version = "1.0.4"; + version = "1.1.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,18 +20,12 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "flux_led"; tag = version; - hash = "sha256-enYo2hZ1C8jqO+8xZhSmIOJQAyrtVUJ9S/e2Bxzhv0I="; + hash = "sha256-7gWqlb2PNRI50Xe8lv2Kim7wUYVzuQMa4BAbg2a7NvM="; }; postPatch = '' substituteInPlace setup.py \ --replace-fail '"pytest-runner>=5.2",' "" - # webcolors API change, https://github.com/Danielhiversen/flux_led/issues/401 - substituteInPlace flux_led/utils.py \ - --replace-fail "CSS2_HEX_TO_NAMES.values()" 'names("css2")' \ - --replace-fail "CSS21_HEX_TO_NAMES.values()" 'names("css21")' \ - --replace-fail "CSS3_HEX_TO_NAMES.values()" 'names("css3")' \ - --replace-fail "HTML4_HEX_TO_NAMES.values()" 'names("html4")' ''; build-system = [ setuptools ]; @@ -47,11 +41,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "flux_led" ]; - # disabledTests = [ - # # AttributeError: module 'webcolors' has no attribute 'CSS2_HEX_TO_NAMES' - # "test_get_color_names_list" - # ]; - meta = with lib; { description = "Python library to communicate with the flux_led smart bulbs"; homepage = "https://github.com/Danielhiversen/flux_led"; From 31b8690bc42f54ebc3b06a9e0442a51f64c65386 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:09:31 +0100 Subject: [PATCH 56/97] python313Packages.hass-nabucasa: 0.86.0 -> 0.87.0 https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.87.0 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 715a08c9f028..ee46fd1ecdbd 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.86.0"; + version = "0.87.0"; pyproject = true; disabled = pythonOlder "3.12"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = "hass-nabucasa"; tag = version; - hash = "sha256-ySo0G/Zh+KQMocMxrvUua704gt2tWQMlArqxBS/C9hs="; + hash = "sha256-V9iP/YRvxsdpYLqcRHSIULlOPQKq5fkouUXTNNeF0FY="; }; pythonRelaxDeps = [ "acme" ]; From 4de4a40fc0c7bb5b49304c813f96cace8a47c8c0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:09:58 +0100 Subject: [PATCH 57/97] python313Packages.unicode-rbnf: 2.1.0 -> 2.2.0 https://github.com/rhasspy/unicode-rbnf/blob/v2.2.0/CHANGELOG.md --- pkgs/development/python-modules/unicode-rbnf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix index 550ac9319a0a..c036cccf5f90 100644 --- a/pkgs/development/python-modules/unicode-rbnf/default.nix +++ b/pkgs/development/python-modules/unicode-rbnf/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "unicode-rbnf"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "unicode-rbnf"; tag = "v${version}"; - hash = "sha256-1kq8qTzFYYRRjlxBdvIiBuXbprA0bF4zMFOVbpgCR3c="; + hash = "sha256-jVooLqy1FjCQGll53DqQ074ypjGwPRBzVmgEYXtMP+Y="; }; nativeBuildInputs = [ setuptools ]; From 5a974159e38b8f097ccd50b78a1a3ef90f7f691b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:10:20 +0100 Subject: [PATCH 58/97] python313Packages.hassil: 2.0.5 -> 2.1.0 https://github.com/home-assistant/hassil/blob/2.1.0/CHANGELOG.md --- pkgs/development/python-modules/hassil/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix index 5fe012e54966..a961b278c024 100644 --- a/pkgs/development/python-modules/hassil/default.nix +++ b/pkgs/development/python-modules/hassil/default.nix @@ -17,19 +17,17 @@ let pname = "hassil"; - version = "2.0.5"; + version = "2.1.0"; in buildPythonPackage { inherit pname version; pyproject = true; - disabled = pythonOlder "3.9"; - src = fetchFromGitHub { owner = "home-assistant"; repo = "hassil"; tag = "v${version}"; - hash = "sha256-e6Y0GGURGKzbX1dniBbYEJB9K3/R84n3UmnMO0HPPPo="; + hash = "sha256-CGobMgaDHcruvOzVBIc6xS0tuaMT410t62KD3Hg30EY="; }; build-system = [ setuptools ]; From bc17ee7a4bc44557b892c1c910a8a53b167c7624 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:16:06 +0100 Subject: [PATCH 59/97] home-assistant.intents: 2024.12.9 -> 2025.1.1 https://github.com/home-assistant/intents/releases/tag/2025.1.1 --- pkgs/servers/home-assistant/intents.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 1acce31705b2..af4f2a7c32fb 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2024.12.9"; + version = "2025.1.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { repo = "intents-package"; rev = "refs/tags/${version}"; fetchSubmodules = true; - hash = "sha256-tjJLm3SCSKy2PWahzpEOHz1PgD1VNuxxpszhBWPrcOw="; + hash = "sha256-OeGupmeZ2KLpQHc0d50itTvlrA5XziKU8cAz9i6ztSw="; }; build-system = [ From 17111cf8ab331c2e0f84b38cda2d1d93aeba6de9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:16:17 +0100 Subject: [PATCH 60/97] python313Packages.idasen-ha: 2.6.2 -> 2.6.3 https://github.com/abmantis/idasen-ha/releases/tag/2.6.3 --- pkgs/development/python-modules/idasen-ha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/idasen-ha/default.nix b/pkgs/development/python-modules/idasen-ha/default.nix index d84fb04fffda..1475d6a85e36 100644 --- a/pkgs/development/python-modules/idasen-ha/default.nix +++ b/pkgs/development/python-modules/idasen-ha/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "idasen-ha"; - version = "2.6.2"; + version = "2.6.3"; pyproject = true; src = fetchFromGitHub { owner = "abmantis"; repo = "idasen-ha"; tag = version; - hash = "sha256-lqqSx4jxQVq2pjVv9lvaX6nNK6OqtMjPqOtLMLpVMUU="; + hash = "sha256-Z4MfJGL2uDqY1ddoV2fB+Ty/dKFhCUY8qBfP/i/naJs="; }; build-system = [ setuptools ]; From 11d6f73bf80dfab43aca9561d0922fa5c5eeea8a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:18:38 +0100 Subject: [PATCH 61/97] python313Packages.mozart-api: 4.1.1.116.3 -> 4.1.1.116.4 https://github.com/bang-olufsen/mozart-open-api/releases/tag/4.1.1.116.4 --- pkgs/development/python-modules/mozart-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mozart-api/default.nix b/pkgs/development/python-modules/mozart-api/default.nix index 67005b38cf1d..65421615d17e 100644 --- a/pkgs/development/python-modules/mozart-api/default.nix +++ b/pkgs/development/python-modules/mozart-api/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mozart-api"; - version = "4.1.1.116.3"; + version = "4.1.1.116.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mozart_api"; inherit version; - hash = "sha256-ioM+l+1ab191OTKXE4Ou8OOPafAqZz9XmxO5c82KH8g="; + hash = "sha256-9yg02AQdHMR/Yz0dpjSb3umdNRNTo7S04Q2BY/vu7WQ="; }; build-system = [ poetry-core ]; From 5a95e4901263ab8066e851b4a4c5eea357e33637 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:22:12 +0100 Subject: [PATCH 62/97] python313Packages.munch: backport test fixes --- pkgs/development/python-modules/munch/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/munch/default.nix b/pkgs/development/python-modules/munch/default.nix index aa7c359cdf2e..e81fc579ce0b 100644 --- a/pkgs/development/python-modules/munch/default.nix +++ b/pkgs/development/python-modules/munch/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, # build-system pbr, @@ -24,6 +25,14 @@ buildPythonPackage rec { hash = "sha256-p7DvOGRhkCmtJ32EfttyKXGGmO5kfb2bQGqok/RJtU8="; }; + patches = [ + (fetchpatch2 { + # python3.13 compat + url = "https://github.com/Infinidat/munch/commit/84651ee872f9ea6dbaed986fd3818202933a8b50.patch"; + hash = "sha256-n/uBAP7pnlGZcnDuxdMKWgAEdG9gWeGoLWB97T1KloY="; + }) + ]; + env.PBR_VERSION = version; nativeBuildInputs = [ From e9eadd94c8c8cd6863ea9b4d8edf9cc433383727 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:22:40 +0100 Subject: [PATCH 63/97] python313Packages.plugwise: 1.6.4 -> 1.6.4 https://github.com/plugwise/python-plugwise/releases/tag/v1.6.4 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 172415230716..9254d9e17962 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "1.6.3"; + version = "1.6.4"; pyproject = true; disabled = pythonOlder "3.11"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; tag = "v${version}"; - hash = "sha256-REWU3ngf93HUVDnyiErML41E+nPoqphfhBKmAYvV2+U="; + hash = "sha256-mzMa+i+DESgOo67SIUBofeY+KoEWdFCcNac7oqEZFgU="; }; postPatch = '' From 0fa08fd41860b257905aaa4ad32d89636a2a74dd Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:23:09 +0100 Subject: [PATCH 64/97] python313Packages.pyblu: 1.0.4 -> 2.0.0 https://github.com/LouisChrist/pyblu/releases/tag/v2.0.0 --- pkgs/development/python-modules/pyblu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyblu/default.nix b/pkgs/development/python-modules/pyblu/default.nix index 1fd0acec7288..583618944f91 100644 --- a/pkgs/development/python-modules/pyblu/default.nix +++ b/pkgs/development/python-modules/pyblu/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyblu"; - version = "1.0.4"; + version = "2.0.0"; pyproject = true; src = fetchFromGitHub { owner = "LouisChrist"; repo = "pyblu"; tag = "v${version}"; - hash = "sha256-BDuptBC72XG+q/5MlbPMjYDIhWKg4gfEo2pLOflwQaM="; + hash = "sha256-Y/9mPaOgynQock8nakjQHCs9VUs7w7EysYsGsDOM87Y="; }; pythonRelaxDeps = [ "aiohttp" ]; From b8816259e6efc3bba608fc2a70f15e01fc9290ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:40:06 +0100 Subject: [PATCH 65/97] python313Packages.renson-endura-delta: 1.7.1 -> 1.7.2 The GitHub repository and user are gone. I manually audited all of the code, because that seemed suspicious and could have put home-assistant users at risk, but everything looked innocent. --- .../renson-endura-delta/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/renson-endura-delta/default.nix b/pkgs/development/python-modules/renson-endura-delta/default.nix index 00f104055187..45aec971ed7e 100644 --- a/pkgs/development/python-modules/renson-endura-delta/default.nix +++ b/pkgs/development/python-modules/renson-endura-delta/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchFromGitHub, + fetchPypi, pytestCheckHook, pythonOlder, requests, @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "renson-endura-delta"; - version = "1.7.1"; + version = "1.7.2"; pyproject = true; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "jimmyd-be"; - repo = "Renson-endura-delta-library"; - tag = version; - hash = "sha256-ndk0qcRUWxUimNHg62UgeYK/MRKQd3e4JQDh9x8vFj8="; + # github repo is gone + src = fetchPypi { + pname = "renson_endura_delta"; + inherit version; + hash = "sha256-bL4faNFh+ocNNspZCXE6/UZ4nH3mKkHSAEvwtN0xfoE="; }; postPatch = '' @@ -32,6 +32,8 @@ buildPythonPackage rec { dependencies = [ requests ]; + doCheck = false; # no tests in sdist + nativeCheckInputs = [ pytestCheckHook requests-mock From bf9c1ec33f3b027c0c0e622873465680a0eca97c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:42:40 +0100 Subject: [PATCH 66/97] python313Packages.uiprotect: 6.6.5 -> 7.1.0 https://github.com/uilibs/uiprotect/blob/refs/tags/v7.1.0/CHANGELOG.md --- pkgs/development/python-modules/uiprotect/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix index 311686a205c5..fa8b6c395e7d 100644 --- a/pkgs/development/python-modules/uiprotect/default.nix +++ b/pkgs/development/python-modules/uiprotect/default.nix @@ -20,6 +20,7 @@ platformdirs, propcache, pydantic, + pydantic-extra-types, pyjwt, rich, typer, @@ -39,7 +40,7 @@ buildPythonPackage rec { pname = "uiprotect"; - version = "6.6.5"; + version = "7.1.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -48,7 +49,7 @@ buildPythonPackage rec { owner = "uilibs"; repo = "uiprotect"; tag = "v${version}"; - hash = "sha256-ZohQTXOLc2E0vfD21IUh6ECTfbAd2SZOg/73lk/UMO0="; + hash = "sha256-TALjJmTI5lMXyXcJtfyMVpqLo8dBbENG22EX7B+3QKQ="; }; build-system = [ poetry-core ]; @@ -71,6 +72,7 @@ buildPythonPackage rec { platformdirs propcache pydantic + pydantic-extra-types pyjwt rich typer From b9f8f53852611cabd059f1081f9118a0262f7c46 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:43:09 +0100 Subject: [PATCH 67/97] python313Packages.velbus-aio: 2024.11.1 -> 2024.12.3 https://github.com/Cereal2nd/velbus-aio/releases/tag/2024.12.3 --- pkgs/development/python-modules/velbus-aio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/velbus-aio/default.nix b/pkgs/development/python-modules/velbus-aio/default.nix index cbbe9107c87b..e94e4f0981cf 100644 --- a/pkgs/development/python-modules/velbus-aio/default.nix +++ b/pkgs/development/python-modules/velbus-aio/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "velbus-aio"; - version = "2024.11.1"; + version = "2024.12.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Cereal2nd"; repo = "velbus-aio"; tag = version; - hash = "sha256-hYtZgr5HJj1zjiCXBK63086ke/oWhO9CyIvnN/JUPm4="; + hash = "sha256-tRcPwbvQBy0cmavAyEvhp6SimseeBYAMH9wAfC4fpKg="; fetchSubmodules = true; }; From dfdb250b466554a4a0ff31f604f378af166ef1a6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 22:27:52 +0100 Subject: [PATCH 68/97] python313Packages.whirlpool-sixth-sense: 0.18.9 -> 0.18.11 https://github.com/abmantis/whirlpool-sixth-sense/compare/refs/tags/0.18.9...0.18.11 --- .../python-modules/whirlpool-sixth-sense/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix index 20efe25f5911..5c5c0917f100 100644 --- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix +++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "whirlpool-sixth-sense"; - version = "0.18.9"; + version = "0.18.11"; pyproject = true; disabled = pythonOlder "3.11"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "abmantis"; repo = "whirlpool-sixth-sense"; tag = version; - hash = "sha256-aDvUV83o/yKx15kenDGng5xh3LECLVlLWJlVe/y+1Co="; + hash = "sha256-dXLMyvNmVrc5kCozBwAIM5DKqjdiiqwwNLkhMGnH0fA="; }; build-system = [ setuptools ]; From 9a502b5b46952c1a41dfb534c33f7fe66730fdd6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:49:06 +0100 Subject: [PATCH 69/97] python313Packages.bellows: 0.42.5 -> 0.42.6 https://github.com/zigpy/bellows/releases/tag/0.42.6 --- pkgs/development/python-modules/bellows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index f0a06382d88c..afd111598693 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "bellows"; - version = "0.42.5"; + version = "0.42.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "bellows"; tag = version; - hash = "sha256-RdNJmIhJR4Ubb4hppFkde8EeYHtFSoJp3CJPGj0463U="; + hash = "sha256-qMODlsImGSvUkR+0jjrU23jJtM3c7JNJ7lY7Svli+ao="; }; postPatch = '' From 2e4091ad5dc0e41413411875ca543390c41ecb66 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:50:24 +0100 Subject: [PATCH 70/97] python313Packages.zigpy: 0.73.1 -> 0.73.3 https://github.com/zigpy/zigpy/releases/tag/0.73.3 --- pkgs/development/python-modules/zigpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix index dbdb5e3930c8..abc1699e12cf 100644 --- a/pkgs/development/python-modules/zigpy/default.nix +++ b/pkgs/development/python-modules/zigpy/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.73.1"; + version = "0.73.3"; pyproject = true; disabled = pythonOlder "3.9"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; tag = version; - hash = "sha256-Fb5rZhxd93QY0TYJTTLXEaqlxk3JdlIOun5FB7wJbSE="; + hash = "sha256-+YkNV6xbM38dHVpXD264KmzozborvotZRETAncpAUEs="; }; postPatch = '' From 3b53a07101a24d757a01adf5fd1d2c9a16da1ca2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:51:05 +0100 Subject: [PATCH 71/97] python313Packages.zha-quirks: 0.0.125 -> 0.0.129 https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.129 --- pkgs/development/python-modules/zha-quirks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index 9f38282e8a07..4acc1dbc7b0d 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.125"; + version = "0.0.129"; pyproject = true; disabled = pythonOlder "3.12"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha-device-handlers"; tag = version; - hash = "sha256-Tqt+ydp7Vr3pWBQ0T5B0CV+bfX+0yRXynEhD01afY/w="; + hash = "sha256-/lcF7MZrw85H5LBL8aBdaIuFRT5yJUhr+vN9gJHnPDw="; }; postPatch = '' From 4a5f6e178c7656ff82b35e60e59684e0135f9d4e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:53:53 +0100 Subject: [PATCH 72/97] python313Packages.zha: 0.0.42 -> 0.0.44 https://github.com/zigpy/zha/releases/tag/0.0.44 --- pkgs/development/python-modules/zha/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix index 72ff96ce950f..c94b328ed646 100644 --- a/pkgs/development/python-modules/zha/default.nix +++ b/pkgs/development/python-modules/zha/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "zha"; - version = "0.0.42"; + version = "0.0.44"; pyproject = true; disabled = pythonOlder "3.12"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zha"; tag = version; - hash = "sha256-iju/WjndlwEZjforoVyoIb6oTJNlvkEnsoQH2d6tFlQ="; + hash = "sha256-ZgCbhezNsWZsQQViPK04UQA2mGZz47rFiMAk2oR8xR4="; }; postPatch = '' From c4c4504878d8f942adc3372520f62b1fd8186427 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 01:54:23 +0100 Subject: [PATCH 73/97] python313Packages.zwave-js-server-python: 0.59.1 -> 0.60.0 https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/0.60.0 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 73b8ea454aa8..389e8635de4d 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.59.1"; + version = "0.60.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = "zwave-js-server-python"; tag = version; - hash = "sha256-7TbGRPGIpS8T0bmEIiRHChvdiKqTKccnkl0YVoQHfdE="; + hash = "sha256-+TW+6NhbtANtXf5ITAs+Mz8I7iZk93YYdUkUhp4m7pw="; }; build-system = [ setuptools ]; From 7d691016f9060017dac7b95781c7ac785c90e868 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 15:58:43 +0100 Subject: [PATCH 74/97] python313Packages.standard-chunk: init at 3.13.0 --- .../python-modules/standard-chunk/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/standard-chunk/default.nix diff --git a/pkgs/development/python-modules/standard-chunk/default.nix b/pkgs/development/python-modules/standard-chunk/default.nix new file mode 100644 index 000000000000..c5a30753b7f1 --- /dev/null +++ b/pkgs/development/python-modules/standard-chunk/default.nix @@ -0,0 +1,32 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, +}: + +buildPythonPackage rec { + pname = "standard-chunk"; + version = "3.13.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "youknowone"; + repo = "python-deadlib"; + tag = "v${version}"; + hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg="; + }; + + sourceRoot = "${src.name}/chunk"; + + build-system = [ setuptools ]; + + doCheck = false; # no tests + + meta = { + description = "Python dead batteries. See PEP 594"; + homepage = "https://github.com/youknowone/python-deadlib"; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9dcb43958cd0..f46c9f67ab7d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15513,6 +15513,8 @@ self: super: with self; { stm32loader = callPackage ../development/python-modules/stm32loader { }; + standard-chunk = callPackage ../development/python-modules/standard-chunk { }; + stone = callPackage ../development/python-modules/stone { }; stookalert = callPackage ../development/python-modules/stookalert { }; From 4c15259dcfc9bd3c9433af023fc8c13fc840f8c6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 16:00:10 +0100 Subject: [PATCH 75/97] python313Packages.standard-aifc: init at 3.13.0 --- .../python-modules/standard-aifc/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/standard-aifc/default.nix diff --git a/pkgs/development/python-modules/standard-aifc/default.nix b/pkgs/development/python-modules/standard-aifc/default.nix new file mode 100644 index 000000000000..5ef23d18f82b --- /dev/null +++ b/pkgs/development/python-modules/standard-aifc/default.nix @@ -0,0 +1,46 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + audioop-lts, + standard-chunk, + pytestCheckHook, +}: + +buildPythonPackage rec { + pname = "standard-aifc"; + version = "3.13.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "youknowone"; + repo = "python-deadlib"; + tag = "v${version}"; + hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg="; + }; + + sourceRoot = "${src.name}/aifc"; + + build-system = [ + setuptools + ]; + + dependencies = [ + audioop-lts + standard-chunk + ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ + "aifc" + ]; + + meta = { + description = "Standard library aifc redistribution"; + homepage = "https://github.com/youknowone/python-deadlib/tree/main/aifc"; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f46c9f67ab7d..4f85d83d4a09 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15513,6 +15513,8 @@ self: super: with self; { stm32loader = callPackage ../development/python-modules/stm32loader { }; + standard-aifc = callPackage ../development/python-modules/standard-aifc { }; + standard-chunk = callPackage ../development/python-modules/standard-chunk { }; stone = callPackage ../development/python-modules/stone { }; From 85200637fe21790e58bec4fc8401ce002b4f70c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 16:05:15 +0100 Subject: [PATCH 76/97] python313Packages.standard-telnetlib: init at 3.13.0 --- .../standard-telnetlib/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/standard-telnetlib/default.nix diff --git a/pkgs/development/python-modules/standard-telnetlib/default.nix b/pkgs/development/python-modules/standard-telnetlib/default.nix new file mode 100644 index 000000000000..c66530455ccc --- /dev/null +++ b/pkgs/development/python-modules/standard-telnetlib/default.nix @@ -0,0 +1,36 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + unittestCheckHook, +}: + +buildPythonPackage rec { + pname = "standard-telnetlib"; + version = "3.13.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "youknowone"; + repo = "python-deadlib"; + tag = "v${version}"; + hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg="; + }; + + sourceRoot = "${src.name}/telnetlib"; + + build-system = [ setuptools ]; + + # missing "reads" fixture when using pytest + nativeCheckInputs = [ unittestCheckHook ]; + + pythonImportsCheck = [ "telnetlib" ]; + + meta = { + description = "Python dead batteries. See PEP 594"; + homepage = "https://github.com/youknowone/python-deadlib"; + license = lib.licenses.psfl; + maintainers = with lib.maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4f85d83d4a09..abac140b6209 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15517,6 +15517,8 @@ self: super: with self; { standard-chunk = callPackage ../development/python-modules/standard-chunk { }; + standard-telnetlib = callPackage ../development/python-modules/standard-telnetlib { }; + stone = callPackage ../development/python-modules/stone { }; stookalert = callPackage ../development/python-modules/stookalert { }; From 84a73ee6c904a726613f6b564da72863e75843ff Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 5 Jan 2025 03:12:42 +0100 Subject: [PATCH 77/97] python313Packages.pyflick: fix pname --- pkgs/development/python-modules/pyflick/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pyflick/default.nix b/pkgs/development/python-modules/pyflick/default.nix index 4b11027d55f0..6d21852ca348 100644 --- a/pkgs/development/python-modules/pyflick/default.nix +++ b/pkgs/development/python-modules/pyflick/default.nix @@ -10,7 +10,7 @@ }: buildPythonPackage rec { - pname = "py-flick"; + pname = "pyflick"; version = "1.1.2"; pyproject = true; From a2e0b016f838c97875c4f21da37d990f395142ca Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 02:46:42 +0100 Subject: [PATCH 78/97] home-assistant: 2024.12.5 -> 2025.1.0 --- .../home-assistant/component-packages.nix | 112 ++++++++--- pkgs/servers/home-assistant/default.nix | 182 +----------------- pkgs/servers/home-assistant/frontend.nix | 4 +- .../patches/watchdog5-compat.patch | 13 -- .../update-component-packages.py | 3 - 5 files changed, 94 insertions(+), 220 deletions(-) delete mode 100644 pkgs/servers/home-assistant/patches/watchdog5-compat.patch diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 85747ca2877b..cb719aea0dac 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.12.5"; + version = "2025.1.0"; components = { "3_day_blinds" = ps: with ps; [ @@ -233,11 +233,9 @@ [ adb-shell androidtv - pure-python-adb ] ++ adb-shell.optional-dependencies.async - ++ androidtv.optional-dependencies.async - ++ pure-python-adb.optional-dependencies.async; + ++ androidtv.optional-dependencies.async; "androidtv_remote" = ps: with ps; [ androidtvremote2 @@ -497,6 +495,8 @@ ]; "backup" = ps: with ps; [ + aiohasupervisor + cronsim securetar ]; "baf" = @@ -776,6 +776,7 @@ "caldav" = ps: with ps; [ caldav + icalendar ]; "calendar" = ps: with ps; [ @@ -796,6 +797,7 @@ "cast" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -810,6 +812,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar zeroconf ]; "ccm15" = @@ -860,6 +863,7 @@ "cloud" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -869,6 +873,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "cloudflare" = ps: with ps; [ @@ -934,6 +939,9 @@ hassil home-assistant-intents ]; + "cookidoo" = + ps: with ps; [ + ]; # missing inputs: cookidoo-api "coolmaster" = ps: with ps; [ pycoolmasternet-async @@ -1030,6 +1038,7 @@ bluetooth-auto-recovery bluetooth-data-tools cached-ipaddress + cronsim dbus-fast fnv-hash-fast go2rtc-client @@ -1238,9 +1247,6 @@ aiohasupervisor paho-mqtt_1 ]; - "dte_energy_bridge" = - ps: with ps; [ - ]; "dublin_bus_transport" = ps: with ps; [ ]; @@ -1275,10 +1281,12 @@ "dynalite" = ps: with ps; [ aiohasupervisor + cronsim dynalite-devices dynalite-panel home-assistant-frontend pillow + securetar ]; "eafm" = ps: with ps; [ @@ -1345,6 +1353,9 @@ ps: with ps; [ pythonegardia ]; + "eheimdigital" = + ps: with ps; [ + ]; # missing inputs: eheimdigital "eight_sleep" = ps: with ps; [ ]; @@ -1817,8 +1828,10 @@ "frontend" = ps: with ps; [ aiohasupervisor + cronsim home-assistant-frontend pillow + securetar ]; "frontier_silicon" = ps: with ps; [ @@ -1891,7 +1904,9 @@ "generic" = ps: with ps; [ av + numpy pillow + pyturbojpeg ]; "generic_hygrostat" = ps: with ps; [ @@ -2126,6 +2141,9 @@ ps: with ps; [ aioharmony ]; + "harvey" = + ps: with ps; [ + ]; "hassio" = ps: with ps; [ aiohasupervisor @@ -2598,12 +2616,14 @@ "insteon" = ps: with ps; [ aiohasupervisor + cronsim home-assistant-frontend insteon-frontend-home-assistant pillow pyinsteon pyserial pyudev + securetar ]; "integration" = ps: with ps; [ @@ -2656,7 +2676,6 @@ "iron_os" = ps: with ps; [ aioesphomeapi - aiogithubapi aioruuvigateway aioshelly bleak @@ -2719,6 +2738,10 @@ "itunes" = ps: with ps; [ ]; + "ituran" = + ps: with ps; [ + pyituran + ]; "izone" = ps: with ps; [ python-izone @@ -2857,9 +2880,11 @@ "knx" = ps: with ps; [ aiohasupervisor + cronsim home-assistant-frontend knx-frontend pillow + securetar xknx xknxproject ]; @@ -2955,10 +2980,12 @@ "lcn" = ps: with ps; [ aiohasupervisor + cronsim home-assistant-frontend lcn-frontend pillow pypck + securetar ]; "ld2410_ble" = ps: with ps; [ @@ -3118,8 +3145,7 @@ ]; "livisi" = ps: with ps; [ - aiolivisi - ]; + ]; # missing inputs: livisi "llamalab_automate" = ps: with ps; [ ]; @@ -3147,10 +3173,12 @@ "logbook" = ps: with ps; [ aiohasupervisor + cronsim fnv-hash-fast home-assistant-frontend pillow psutil-home-assistant + securetar sqlalchemy ]; "logentries" = @@ -3172,6 +3200,7 @@ "loqed" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -3182,6 +3211,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "lovelace" = ps: with ps; [ @@ -3463,6 +3493,7 @@ "mobile_app" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -3474,6 +3505,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "mochad" = ps: with ps; [ @@ -3627,8 +3659,10 @@ "my" = ps: with ps; [ aiohasupervisor + cronsim home-assistant-frontend pillow + securetar ]; "myq" = ps: with ps; [ @@ -3690,6 +3724,7 @@ "netatmo" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -3700,6 +3735,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "netdata" = ps: with ps; [ @@ -3760,8 +3796,7 @@ ]; "niko_home_control" = ps: with ps; [ - niko-home-control - ]; + ]; # missing inputs: nhc "nilu" = ps: with ps; [ niluclient @@ -3878,6 +3913,9 @@ ps: with ps; [ defusedxml ]; + "ohme" = + ps: with ps; [ + ]; # missing inputs: ohme "ollama" = ps: with ps; [ ha-ffmpeg @@ -4070,6 +4108,7 @@ "owntracks" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -4081,6 +4120,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "p1_monitor" = ps: with ps; [ @@ -4105,12 +4145,17 @@ "panel_custom" = ps: with ps; [ aiohasupervisor + cronsim home-assistant-frontend pillow + securetar ]; "pcs_lighting" = ps: with ps; [ ]; + "peblar" = + ps: with ps; [ + ]; # missing inputs: peblar "peco" = ps: with ps; [ peco @@ -4180,6 +4225,7 @@ "plaato" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -4190,6 +4236,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "plant" = ps: with ps; [ @@ -4225,6 +4272,9 @@ "portlandgeneral" = ps: with ps; [ ]; + "powerfox" = + ps: with ps; [ + ]; # missing inputs: powerfox "powerwall" = ps: with ps; [ tesla-powerwall @@ -4414,6 +4464,7 @@ "rachio" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -4424,6 +4475,7 @@ python-matter-server pyturbojpeg rachiopy + securetar ]; "radarr" = ps: with ps; [ @@ -4518,6 +4570,7 @@ "recovery_mode" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -4529,6 +4582,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "recswitch" = ps: with ps; [ @@ -4999,9 +5053,6 @@ "simu" = ps: with ps; [ ]; - "simulated" = - ps: with ps; [ - ]; "sinch" = ps: with ps; [ ]; # missing inputs: clx-sdk-xms @@ -5044,6 +5095,10 @@ ps: with ps; [ goslide-api ]; + "slide_local" = + ps: with ps; [ + goslide-api + ]; "slimproto" = ps: with ps; [ aioslimproto @@ -5072,6 +5127,7 @@ "smartthings" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -5083,6 +5139,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "smarttub" = ps: with ps; [ @@ -5281,10 +5338,6 @@ ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron - "stookalert" = - ps: with ps; [ - stookalert - ]; "stookwijzer" = ps: with ps; [ stookwijzer @@ -5697,6 +5750,7 @@ "toon" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -5706,6 +5760,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar toonapi ]; "torque" = @@ -5726,8 +5781,12 @@ ps: with ps; [ + av + ha-ffmpeg ifaddr + numpy python-kasa + pyturbojpeg ] ++ python-kasa.optional-dependencies.speedups; "tplink_lte" = @@ -6064,6 +6123,9 @@ ps: with ps; [ waterfurnace ]; + "watergate" = + ps: with ps; [ + ]; # missing inputs: watergate-local-api "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf @@ -6138,6 +6200,7 @@ ps: with ps; [ aiohasupervisor aiowithings + cronsim ha-ffmpeg hass-nabucasa hassil @@ -6147,6 +6210,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar ]; "wiz" = ps: with ps; [ @@ -6259,6 +6323,7 @@ "yale" = ps: with ps; [ aiohasupervisor + cronsim ha-ffmpeg hass-nabucasa hassil @@ -6268,6 +6333,7 @@ pyspeex-noise python-matter-server pyturbojpeg + securetar yalexs yalexs-ble ]; @@ -6353,7 +6419,7 @@ ]; "zabbix" = ps: with ps; [ - py-zabbix + zabbix-utils ]; "zamg" = ps: with ps; [ @@ -6589,7 +6655,6 @@ "drop_connect" "dsmr" "dsmr_reader" - "dte_energy_bridge" "duckdns" "duke_energy" "dunehd" @@ -6803,6 +6868,7 @@ "israel_rail" "ista_ecotrend" "isy994" + "ituran" "izone" "jellyfin" "jewish_calendar" @@ -6846,7 +6912,6 @@ "linkplay" "litejet" "litterrobot" - "livisi" "local_calendar" "local_file" "local_ip" @@ -7108,12 +7173,12 @@ "simplefin" "simplepush" "simplisafe" - "simulated" "siren" "sky_remote" "skybell" "slack" "sleepiq" + "slide_local" "slimproto" "sma" "smappee" @@ -7152,7 +7217,6 @@ "statsd" "steam_online" "steamist" - "stookalert" "stookwijzer" "stream" "streamlabswater" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index f8b3d3f88bfd..6521effbd757 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -45,21 +45,6 @@ let ]; }); - aiopurpleair = super.aiopurpleair.overridePythonAttrs (oldAttrs: rec { - version = "2022.12.1"; - src = fetchFromGitHub { - owner = "bachya"; - repo = "aiopurpleair"; - rev = "refs/tags/${version}"; - hash = "sha256-YmJH4brWkTpgzyHwu9UnIWrY5qlDCmMtvF+KxQFXwfk="; - }; - postPatch = '' - substituteInPlace pyproject.toml --replace-fail \ - '"setuptools >= 35.0.2", "wheel >= 0.29.0", "poetry>=0.12"' \ - '"poetry-core"' - ''; - }); - aioskybell = super.aioskybell.overridePythonAttrs (oldAttrs: rec { version = "22.7.0"; src = fetchFromGitHub { @@ -115,24 +100,6 @@ let ]; }); - inline-snapshot = super.inline-snapshot.overridePythonAttrs (oldAttrs: { - disabledTests = oldAttrs.disabledTests or [ ] ++ [ - # fixture does not expect pydantic<2 - "test_pydantic_repr" - ]; - }); - - ollama = super.ollama.overridePythonAttrs (oldAttrs: rec { - version = "0.3.3"; - src = fetchFromGitHub { - owner = "ollama"; - repo = "ollama-python"; - tag = "v${version}"; - hash = "sha256-27OJwPvHBxCdaiHk8EQ2s1OeBzgsrzp1MjgKHNgvz+A="; - }; - dependencies = with self; [ httpx ]; - }); - openhomedevice = super.openhomedevice.overridePythonAttrs (oldAttrs: rec { version = "2.2"; src = fetchFromGitHub { @@ -195,18 +162,6 @@ let }; }); - pyaussiebb = super.pyaussiebb.overridePythonAttrs (oldAttrs: rec { - version = "0.0.18"; - src = fetchFromGitHub { - owner = "yaleman"; - repo = "aussiebb"; - rev = "refs/tags/v${version}"; - hash = "sha256-tEdddVsLFCHRvyLCctDakioiop2xWaJlfGE16P1ukHc="; - }; - }); - - pydantic = super.pydantic_1; - pydexcom = super.pydexcom.overridePythonAttrs (oldAttrs: rec { version = "0.2.3"; src = fetchFromGitHub { @@ -239,30 +194,6 @@ let }; }); - pylamarzocco = super.pylamarzocco.overridePythonAttrs (oldAttrs: rec { - version = "1.2.12"; - src = fetchFromGitHub { - owner = "zweckj"; - repo = "pylamarzocco"; - tag = "v${version}"; - hash = "sha256-h3Oh1y1tirOWh3I8piybLZfTKwyGk0zJJ6XmHvmbUW0="; - }; - dependencies = with self; [ - bleak - httpx - websockets - ]; - }); - - pymodbus = super.pymodbus.overridePythonAttrs (oldAttrs: rec { - version = "3.6.9"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-ScqxDO0hif8p3C6+vvm7FgSEQjCXBwUPOc7Y/3OfkoI="; - }; - }); - pyoctoprintapi = super.pyoctoprintapi.overridePythonAttrs (oldAttrs: rec { version = "0.1.12"; src = fetchFromGitHub { @@ -283,16 +214,6 @@ let }; }); - # newer versions require pydantic>=2 - python-on-whales = super.python-on-whales.overridePythonAttrs (oldAttrs: rec { - version = "0.72.0"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-oKI7zXfoUVmJXLQvyoDEmoCL4AwaYgaFcLKNlFFrC9o="; - }; - }); - pytradfri = super.pytradfri.overridePythonAttrs (oldAttrs: rec { version = "9.0.1"; src = fetchFromGitHub { @@ -303,45 +224,6 @@ let }; }); - # newer sigstore version transitivevly require pydantic>=2 - sigstore = super.sigstore.overridePythonAttrs (oldAttrs: rec { - version = "1.1.2"; - src = fetchFromGitHub { - owner = "sigstore"; - repo = "sigstore-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-QqY5GOBS75OkbSaF5Ua5jnJAhsYfVRuWLUoWDxX8Ino="; - }; - dependencies = with self; [ - appdirs - cryptography - id - pydantic - pyjwt - pyopenssl - requests - securesystemslib - sigstore-protobuf-specs - tuf - ]; - doCheck = false; # pytest too new - }); - - sigstore-protobuf-specs = super.sigstore-protobuf-specs.overridePythonAttrs { - version = "0.1.0"; - src = fetchPypi { - pname = "sigstore-protobuf-specs"; - version = "0.1.0"; - hash = "sha256-YistIxYToo7T5mYKzYeBhnW06DSG9JoPDBmKxUdfy4E="; - }; - nativeBuildInputs = with self; [ - flit-core - ]; - pythonRelaxDeps = [ - "betterproto" - ]; - }; - slack-sdk = super.slack-sdk.overridePythonAttrs (oldAttrs: rec { version = "2.5.0"; src = fetchFromGitHub { @@ -358,31 +240,6 @@ let doCheck = false; # Tests changed a lot for > 3 }); - # pinned for sigstore - tuf = super.tuf.overridePythonAttrs rec { - version = "2.1.0"; - src = fetchFromGitHub { - owner = "theupdateframework"; - repo = "python-tuf"; - rev = "refs/tags/v${version}"; - hash = "sha256-MdPctAZuKn/YAwpMJ5gWU7PXJD3iK7bYprLXV52wNQQ="; - }; - disabledTests = [ - "test_sign_failures" - ]; - }; - - voip-utils = super.voip-utils.overridePythonAttrs (oldAttrs: rec { - version = "0.1.0"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - rev = "refs/tags/v${version}"; - hash = "sha256-PG4L6KphH9JIZO76cCN8eClFE2CneEIExlXS+x79k3U="; - }; - # tests were not implemented until version 0.2.0 - doCheck = false; - }); - vulcan-api = super.vulcan-api.overridePythonAttrs (oldAttrs: rec { version = "2.3.2"; src = fetchFromGitHub { @@ -403,36 +260,6 @@ let }; }); - xbox-webapi = super.xbox-webapi.overridePythonAttrs (oldAttrs: rec { - version = "2.0.11"; - src = fetchFromGitHub { - owner = "OpenXbox"; - repo = "xbox-webapi-python"; - rev = "refs/tags/v${version}"; - hash = "sha256-fzMB+I8+ZTJUiZovcuj+d5GdHY9BJyJd6j92EhJeIFI="; - }; - postPatch = '' - sed -i '/pytest-runner/d' setup.py - ''; - propagatedBuildInputs = with self; [ - aiohttp - appdirs - ms-cv - pydantic - ecdsa - ]; - nativeCheckInputs = with self; [ - aresponses - ]; - }); - - youtubeaio = super.youtubeaio.overridePythonAttrs (old: { - pytestFlagsArray = [ - # fails with pydantic v1 - "--deselect=tests/test_video.py::test_fetch_video" - ]; - }); - # internal python packages only consumed by home-assistant itself home-assistant-frontend = self.callPackage ./frontend.nix { }; home-assistant-intents = self.callPackage ./intents.nix { }; @@ -462,7 +289,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.12.5"; + hassVersion = "2025.1.0"; in python.pkgs.buildPythonApplication rec { @@ -483,13 +310,13 @@ python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-LJgwtVQvO1iUPYfzAsE6l9u4+EIzAnc3IJ5FZb3xniM="; + hash = "sha256-tkjOWJ29fvWzto3y6zV8h8yPIGyhC5sBIL5koOsw5i0="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-PfedigJWHLv2BqHOgVedDyJxxxSmdHe2CvPNYCWi6aA="; + hash = "sha256-xaHD93crz4wm3CwX5d/UxeuOQ769G+ZnA26iE7y7hU4="; }; build-system = with python.pkgs; [ @@ -533,8 +360,6 @@ python.pkgs.buildPythonApplication rec { src = ./patches/ffmpeg-path.patch; ffmpeg = "${lib.getExe ffmpeg-headless}"; }) - - ./patches/watchdog5-compat.patch ]; postPatch = '' @@ -559,6 +384,7 @@ python.pkgs.buildPythonApplication rec { bcrypt certifi ciso8601 + cronsim cryptography fnv-hash-fast hass-nabucasa diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index ab8fbd714311..3551e61b0826 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20241127.8"; + version = "20250103.0"; format = "wheel"; src = fetchPypi { @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-6VQ5IgAsPMzHlBe20EinjByGC2AzUY5mYFVHBvIdR0E="; + hash = "sha256-i+XOHFGL7UVxL+bNohhi+8pF1kZ5oOY5EpZHR3NbwL4="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/patches/watchdog5-compat.patch b/pkgs/servers/home-assistant/patches/watchdog5-compat.patch deleted file mode 100644 index d4e27769579b..000000000000 --- a/pkgs/servers/home-assistant/patches/watchdog5-compat.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/homeassistant/components/folder_watcher/__init__.py b/homeassistant/components/folder_watcher/__init__.py -index 3aeaa6f7ef2..f5c2db513b7 100644 ---- a/homeassistant/components/folder_watcher/__init__.py -+++ b/homeassistant/components/folder_watcher/__init__.py -@@ -68,7 +68,7 @@ class EventHandler(PatternMatchingEventHandler): - - def __init__(self, patterns: list[str], hass: HomeAssistant, entry_id: str) -> None: - """Initialise the EventHandler.""" -- super().__init__(patterns) -+ super().__init__(patterns=patterns) - self.hass = hass - self.entry_id = entry_id - diff --git a/pkgs/servers/home-assistant/update-component-packages.py b/pkgs/servers/home-assistant/update-component-packages.py index 68301faf35ec..6efd2c5195f7 100755 --- a/pkgs/servers/home-assistant/update-component-packages.py +++ b/pkgs/servers/home-assistant/update-component-packages.py @@ -113,9 +113,6 @@ def parse_components(version: str = "master"): specific_integrations=None, action="generate", requirements=False, - core_integrations_path=pathlib.Path( - os.path.join(core_path, "homeassistant/components") - ), ) integrations = Integration.load_dir(config.core_integrations_path, config) for domain in sorted(integrations): From d5fc8adbbe607a78fd933729570a8e6e7475dece Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 3 Jan 2025 16:14:46 +0100 Subject: [PATCH 79/97] home-assistant: migrate to Python 3.13 --- pkgs/servers/home-assistant/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6521effbd757..7005a41f5cfc 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -4,7 +4,7 @@ callPackage, fetchFromGitHub, fetchPypi, - python312, + python313, substituteAll, ffmpeg-headless, inetutils, @@ -270,7 +270,7 @@ let }) ]; - python = python312.override { + python = python313.override { self = python; packageOverrides = lib.composeManyExtensions (defaultOverrides ++ [ packageOverrides ]); }; @@ -380,6 +380,7 @@ python.pkgs.buildPythonApplication rec { async-interrupt atomicwrites-homeassistant attrs + audioop-lts awesomeversion bcrypt certifi @@ -405,6 +406,8 @@ python.pkgs.buildPythonApplication rec { requests securetar sqlalchemy + standard-aifc + standard-telnetlib typing-extensions ulid-transform urllib3 From 2a53b0683dd8b8374ceff08b58a8a00563020365 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 00:14:43 +0100 Subject: [PATCH 80/97] home-assistant-custom-components.dirigera_platform: 2.6.4 -> 2.6.6 --- .../custom-components/dirigera_platform/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix b/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix index 4cc44ef19db0..095fd4b5cd8c 100644 --- a/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix +++ b/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "sanjoyg"; domain = "dirigera_platform"; - version = "2.6.4"; + version = "2.6.6"; src = fetchFromGitHub { owner = "sanjoyg"; repo = "dirigera_platform"; rev = version; - hash = "sha256-ftJUmJ5UWgm22YBfCIBAxRjG+niougw5ekrQNuSRgzI="; + hash = "sha256-OoTmEVjo6pzFQ5uoZOcmpOhVUoM2DM8HBAvJA58zjAU="; }; postPatch = '' @@ -24,6 +24,8 @@ buildHomeAssistantComponent rec { dependencies = [ dirigera ]; + ignoreVersionRequirement = [ "dirigera" ]; + meta = with lib; { description = "Home-assistant integration for IKEA Dirigera hub"; homepage = "https://github.com/sanjoyg/dirigera_platform"; From e4b5d93ec2549ea0bcab2965ef77dcfe7e891b16 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 00:16:10 +0100 Subject: [PATCH 81/97] home-assistant.python.pkgs.pytest-homeassistant-custom-component: 0.13.191 -> 0.13.200 https://github.com/MatthewFlamm/pytest-homeassistant-custom-component/blob/refs/tags/0.13.200/CHANGELOG.md --- .../home-assistant/pytest-homeassistant-custom-component.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix index 167b0e023c04..23c821a49738 100644 --- a/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix +++ b/pkgs/servers/home-assistant/pytest-homeassistant-custom-component.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pytest-homeassistant-custom-component"; - version = "0.13.191"; + version = "0.13.200"; pyproject = true; disabled = pythonOlder "3.12"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "MatthewFlamm"; repo = "pytest-homeassistant-custom-component"; rev = "refs/tags/${version}"; - hash = "sha256-Fm7Sg5u5rkCQFGHnOWimRM4X0EB4xGwY59gdgA1ZFBA="; + hash = "sha256-aZeC003EGa8qBR+sN3EK1EbbwLZqdzNf1bjTQyQ6l9I="; }; build-system = [ setuptools ]; From 14a605e0b91e32541bfdc6d37f022a013e8f011d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 00:17:54 +0100 Subject: [PATCH 82/97] home-assistant-custom-components.mass: remove This component is now integrated into home-assistant. https://www.home-assistant.io/integrations/music_assistant/ --- .../custom-components/mass/package.nix | 46 ------------------- 1 file changed, 46 deletions(-) delete mode 100644 pkgs/servers/home-assistant/custom-components/mass/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/mass/package.nix b/pkgs/servers/home-assistant/custom-components/mass/package.nix deleted file mode 100644 index 7ea860769956..000000000000 --- a/pkgs/servers/home-assistant/custom-components/mass/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - buildHomeAssistantComponent, - fetchFromGitHub, - toPythonModule, - async-timeout, - music-assistant, - pytestCheckHook, - pytest-asyncio, - pytest-cov-stub, - pytest-homeassistant-custom-component, -}: - -buildHomeAssistantComponent rec { - owner = "music-assistant"; - domain = "mass"; - version = "2024.9.1"; - - src = fetchFromGitHub { - owner = "music-assistant"; - repo = "hass-music-assistant"; - rev = version; - hash = "sha256-8YZ77SYv8hDsbKUjxPZnuAycLE8RkIbAq3HXk+OyAmM="; - }; - - dependencies = [ - async-timeout - (toPythonModule music-assistant) - ]; - - dontCheckManifest = true; # expects music-assistant 2.0.6, we have 2.0.7 - - nativeCheckInputs = [ - pytestCheckHook - pytest-asyncio - pytest-cov-stub - pytest-homeassistant-custom-component - ]; - - meta = with lib; { - description = "Turn your Home Assistant instance into a jukebox, hassle free streaming of your favorite media to Home Assistant media players"; - homepage = "https://github.com/music-assistant/hass-music-assistant"; - license = licenses.asl20; - maintainers = with maintainers; [ hexa ]; - }; -} From 54b521b7350266bf34f8fefb933c254a33a72c61 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 00:26:38 +0100 Subject: [PATCH 83/97] python313Packages.python-miio: apply patch for python3.13 compat --- pkgs/development/python-modules/python-miio/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-miio/default.nix b/pkgs/development/python-modules/python-miio/default.nix index 07466ebcddcd..2949211b9b27 100644 --- a/pkgs/development/python-modules/python-miio/default.nix +++ b/pkgs/development/python-modules/python-miio/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { pythonRelaxDeps = [ "defusedxml" ]; - nativeBuildInputs = [ poetry-core ]; + build-system = [ poetry-core ]; patches = [ (fetchpatch { @@ -47,9 +47,14 @@ buildPythonPackage rec { url = "https://github.com/rytilahti/python-miio/commit/67d9d771d04d51f5bd97f361ca1c15ae4a18c274.patch"; hash = "sha256-Os9vCSKyieCqHs63oX6gcLrtv1N7hbX5WvEurelEp8w="; }) + (fetchpatch { + # Python 3.13 compat + url = "https://github.com/rytilahti/python-miio/commit/0aa4df3ab1e47d564c8312016fbcfb3a9fc06c6c.patch"; + hash = "sha256-Zydv3xqCliA/oAnjNmqh0vDrlZFPcTAIyW6vIZzijZY="; + }) ]; - propagatedBuildInputs = [ + dependencies = [ android-backup appdirs attrs From 1d502e1eea147645e07bfff3b872fcf8cf9a5510 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 00:39:10 +0100 Subject: [PATCH 84/97] python313Packages.xbox-webapi: disable failing test This broke after updating ecdsa to 0.19.0. --- pkgs/development/python-modules/xbox-webapi/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/xbox-webapi/default.nix b/pkgs/development/python-modules/xbox-webapi/default.nix index 931d0be5748c..07aabe725302 100644 --- a/pkgs/development/python-modules/xbox-webapi/default.nix +++ b/pkgs/development/python-modules/xbox-webapi/default.nix @@ -44,6 +44,9 @@ buildPythonPackage rec { respx ]; + # https://github.com/OpenXbox/xbox-webapi-python/issues/114 + disabledTests = [ "test_import" ]; + meta = with lib; { changelog = "https://github.com/OpenXbox/xbox-webapi-python/blob/${src.rev}/CHANGELOG.md"; description = "Library to authenticate with Windows Live/Xbox Live and use their API"; From f4873e6f830dbf93c3e86301bf480111e881ab65 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 00:52:40 +0100 Subject: [PATCH 85/97] python313Packages.sentry-sdk_1: disable tests These fail in various ways and yet home-assistant makes use of the library.. --- pkgs/development/python-modules/sentry-sdk/1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/sentry-sdk/1.nix b/pkgs/development/python-modules/sentry-sdk/1.nix index c09abf95944c..0141a90c8876 100644 --- a/pkgs/development/python-modules/sentry-sdk/1.nix +++ b/pkgs/development/python-modules/sentry-sdk/1.nix @@ -102,7 +102,7 @@ buildPythonPackage rec { pytestCheckHook ]; - doCheck = !stdenv.hostPlatform.isDarwin; + doCheck = pythonOlder "3.13" && !stdenv.hostPlatform.isDarwin; disabledTests = [ # Issue with the asseration From d52453648837e535da388bfb8124bbfb792e7caf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 01:00:26 +0100 Subject: [PATCH 86/97] python313Packages.guppy3: 3.1.4.post1 -> 3.1.5 https://github.com/zhuyifei1999/guppy3/compare/refs/tags/v3.1.4.post1...v3.1.5 --- pkgs/development/python-modules/guppy3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/guppy3/default.nix b/pkgs/development/python-modules/guppy3/default.nix index e5df11502afd..bd0c90ea8665 100644 --- a/pkgs/development/python-modules/guppy3/default.nix +++ b/pkgs/development/python-modules/guppy3/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "guppy3"; - version = "3.1.4.post1"; + version = "3.1.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zhuyifei1999"; repo = pname; tag = "v${version}"; - hash = "sha256-HHy57P6WEHZKygAbdjEh6XAApFlQueiYGr02eSQMWfc="; + hash = "sha256-hgJcy4DRfZL50dCcRv2a6GJPDabsUMfDtq7HCXXYYz8="; }; nativeBuildInputs = [ setuptools ]; From d24f17feb662c0e009e4beac569f2f71f55e0851 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 02:15:02 +0100 Subject: [PATCH 87/97] python313Packages.openai: 1.58.1 -> 1.59.3 https://github.com/openai/openai-python/blob/v1.59.3/CHANGELOG.md --- .../python-modules/openai/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index c51b32f1e2c7..51cf9021c22c 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, pythonOlder, # build-system @@ -36,7 +37,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.58.1"; + version = "1.59.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -45,7 +46,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; tag = "v${version}"; - hash = "sha256-QK0NNMJM4sj4u8nlNPBBQpqV0pBYUMcSwKqhna5q10c="; + hash = "sha256-gMykGfNgpTlh8LiFXL2p5ECSpeYCfS0LTsgHIzT1c1I="; }; build-system = [ @@ -92,11 +93,16 @@ buildPythonPackage rec { "ignore::DeprecationWarning" ]; - disabledTests = [ - # Tests make network requests - "test_copy_build_request" - "test_basic_attribute_access_works" - ]; + disabledTests = + [ + # Tests make network requests + "test_copy_build_request" + "test_basic_attribute_access_works" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # RuntimeWarning: coroutine method 'aclose' of 'AsyncStream._iter_events' was never awaited + "test_multi_byte_character_multiple_chunks" + ]; disabledTestPaths = [ # Test makes network requests @@ -106,7 +112,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python client library for the OpenAI API"; homepage = "https://github.com/openai/openai-python"; - changelog = "https://github.com/openai/openai-python/releases/tag/v${version}"; + changelog = "https://github.com/openai/openai-python/blob/v${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ malo ]; mainProgram = "openai"; From bd9cd0008ac3560e004612c7b6697000517f107a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 02:22:45 +0100 Subject: [PATCH 88/97] python313Packages.aiocache: disable failing test --- .../python-modules/aiocache/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/aiocache/default.nix b/pkgs/development/python-modules/aiocache/default.nix index 3fd703919c2d..d1e7c8b53319 100644 --- a/pkgs/development/python-modules/aiocache/default.nix +++ b/pkgs/development/python-modules/aiocache/default.nix @@ -11,6 +11,7 @@ pytest-cov-stub, pytest-mock, pytestCheckHook, + pythonAtLeast, pythonOlder, redis, setuptools, @@ -54,10 +55,15 @@ buildPythonPackage rec { "--deselect=tests/ut/backends/test_redis.py::TestRedisBackend::test_close" ]; - disabledTests = [ - # Test calls apache benchmark and fails, no usable output - "test_concurrency_error_rates" - ]; + disabledTests = + [ + # Test calls apache benchmark and fails, no usable output + "test_concurrency_error_rates" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # https://github.com/aio-libs/aiocache/issues/863 + "test_cache_write_doesnt_wait_for_future" + ]; disabledTestPaths = [ # Benchmark and performance tests are not relevant for Nixpkgs From bbfc767f217cb555d03b034ffe95fc943e98b301 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 02:22:55 +0100 Subject: [PATCH 89/97] python313Packages.mypermobil: disable failing test --- .../python-modules/mypermobil/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/mypermobil/default.nix b/pkgs/development/python-modules/mypermobil/default.nix index 55c47e6e0691..85c2f56be151 100644 --- a/pkgs/development/python-modules/mypermobil/default.nix +++ b/pkgs/development/python-modules/mypermobil/default.nix @@ -2,6 +2,7 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, setuptools, aiocache, aiohttp, @@ -35,10 +36,15 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # requires networking - "test_region" - ]; + disabledTests = + [ + # requires networking + "test_region" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # AssertionError: MyPermobilAPIException not raised + "test_request_item_404" + ]; meta = { changelog = "https://github.com/Permobil-Software/mypermobil/releases/tag/v${version}"; From 63b9886a50db4e1d5f5a392836d9dc9ca20299e0 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 02:27:43 +0100 Subject: [PATCH 90/97] python313Packages.ndms2-client: fix build --- pkgs/development/python-modules/ndms2-client/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/ndms2-client/default.nix b/pkgs/development/python-modules/ndms2-client/default.nix index 573188d482ee..619cbe171cfa 100644 --- a/pkgs/development/python-modules/ndms2-client/default.nix +++ b/pkgs/development/python-modules/ndms2-client/default.nix @@ -2,7 +2,9 @@ lib, buildPythonPackage, fetchFromGitHub, + pythonAtLeast, setuptools, + standard-telnetlib, pytestCheckHook, }: @@ -19,6 +21,8 @@ buildPythonPackage rec { hash = "sha256-A19olC1rTHTy0xyeSP45fqvv9GUynQSrMgXBgW8ySOs="; }; + dependencies = lib.optionals (pythonAtLeast "3.13") [ standard-telnetlib ]; + nativeBuildInputs = [ setuptools ]; nativeCheckInputs = [ pytestCheckHook ]; From 8474e7afed5675c7061d3a6a90b0a93b05a31b1c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 02:32:06 +0100 Subject: [PATCH 91/97] python313Packages.iottycloud: fix tag and hash --- pkgs/development/python-modules/iottycloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/iottycloud/default.nix b/pkgs/development/python-modules/iottycloud/default.nix index 079093f6fef4..fd50d50013be 100644 --- a/pkgs/development/python-modules/iottycloud/default.nix +++ b/pkgs/development/python-modules/iottycloud/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pburgio"; repo = "iottyCloud"; - tag = "v${version}"; - hash = "sha256-EtAAUyVL7FTn0VoGmU5bU9XouMuEQUOx2t6j/wd1OEo="; + tag = version; + hash = "sha256-tsCa87BdwKumsv5N0lAPZmMIfm2W6Pw0LS3sF9c/oRA="; }; build-system = [ hatchling ]; From ddf9bd393c7dac89aa59d48fa99dc983e20d2f64 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 02:43:43 +0100 Subject: [PATCH 92/97] python313Packages.pillow-heif: test without pympler They failed to catch up with Python 3.11 test failures, so I have no faith in them. --- pkgs/development/python-modules/pillow-heif/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/pillow-heif/default.nix b/pkgs/development/python-modules/pillow-heif/default.nix index 7c3a051c7b43..947dc7dd6b0e 100644 --- a/pkgs/development/python-modules/pillow-heif/default.nix +++ b/pkgs/development/python-modules/pillow-heif/default.nix @@ -22,7 +22,6 @@ # tests opencv4, numpy, - pympler, pytestCheckHook, }: @@ -72,7 +71,6 @@ buildPythonPackage rec { nativeCheckInputs = [ opencv4 numpy - pympler pytestCheckHook ]; From 8152cf0acc7eb293cb00c607440c98aa6c7dbc15 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 02:59:37 +0100 Subject: [PATCH 93/97] python313Packages.nextcord: fix build --- .../python-modules/nextcord/default.nix | 24 ++++++++++++------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/nextcord/default.nix b/pkgs/development/python-modules/nextcord/default.nix index 930f2e83216c..6aa365990de3 100644 --- a/pkgs/development/python-modules/nextcord/default.nix +++ b/pkgs/development/python-modules/nextcord/default.nix @@ -2,6 +2,7 @@ lib, stdenv, buildPythonPackage, + pythonAtLeast, pythonOlder, fetchFromGitHub, substituteAll, @@ -9,6 +10,7 @@ libopus, aiohttp, aiodns, + audioop-lts, brotli, faust-cchardet, orjson, @@ -42,15 +44,19 @@ buildPythonPackage rec { setuptools ]; - dependencies = [ - aiodns - aiohttp - brotli - faust-cchardet - orjson - pynacl - setuptools # for pkg_resources, remove with next release - ]; + dependencies = + [ + aiodns + aiohttp + brotli + faust-cchardet + orjson + pynacl + setuptools # for pkg_resources, remove with next release + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + audioop-lts + ]; # upstream has no tests doCheck = false; From 63fd904e5dc4c7fb59fc67aa665baefb8c75ee2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 03:48:33 +0100 Subject: [PATCH 94/97] python313Packages.datadog: disable failing test --- .../python-modules/datadog/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 99b9e3d4a36a..1440d815c338 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -9,6 +9,7 @@ pytest-vcr, pytestCheckHook, python-dateutil, + pythonAtLeast, pythonOlder, requests, vcrpy, @@ -48,11 +49,16 @@ buildPythonPackage rec { "tests/integration/api/test_*.py" ]; - disabledTests = [ - "test_default_settings_set" - # https://github.com/DataDog/datadogpy/issues/746 - "TestDogshell" - ]; + disabledTests = + [ + "test_default_settings_set" + # https://github.com/DataDog/datadogpy/issues/746 + "TestDogshell" + ] + ++ lib.optionals (pythonAtLeast "3.13") [ + # https://github.com/DataDog/datadogpy/issues/880 + "test_timed_coroutine" + ]; pythonImportsCheck = [ "datadog" ]; From 6c0edebd0a78d9740e936d5446837ea71affe79a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 16:07:31 +0100 Subject: [PATCH 95/97] python313Packages.pyws66i: depend on standard-telnetlib on 3.13 --- pkgs/development/python-modules/pyws66i/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pyws66i/default.nix b/pkgs/development/python-modules/pyws66i/default.nix index 47df29289202..aa196c646a69 100644 --- a/pkgs/development/python-modules/pyws66i/default.nix +++ b/pkgs/development/python-modules/pyws66i/default.nix @@ -3,7 +3,9 @@ buildPythonPackage, fetchFromGitHub, pytestCheckHook, + pythonAtLeast, pythonOlder, + standard-telnetlib, }: buildPythonPackage rec { @@ -20,6 +22,8 @@ buildPythonPackage rec { hash = "sha256-NTL2+xLqSNsz4YdUTwr0nFjhm1NNgB8qDnWSoE2sizY="; }; + dependencies = lib.optionals (pythonAtLeast "3.13") [ standard-telnetlib ]; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "pyws66i" ]; From 2b46b6e09bfe915a934eee1ce58d1f4253911317 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 4 Jan 2025 17:25:11 +0100 Subject: [PATCH 96/97] python313Packages.homeassistant-stubs: 2024.12.5 -> 2025.1.0 https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.1.0 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 9808895b74fa..85796e4b15c5 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.12.5"; + version = "2025.1.0"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-ixDHGcs2Cvf6tIxYnn4j9Qs8MkmB1PGgIKnEN676Qs0="; + hash = "sha256-qKmHQrciezgGPHNNGy7lDM9LaCXJO/DuYIrk8qjWpDQ="; }; build-system = [ From 7656fe1477c1699bbd15eb8d82108a530e45b8fd Mon Sep 17 00:00:00 2001 From: Andrew Voynov Date: Sun, 5 Jan 2025 05:15:09 +0300 Subject: [PATCH 97/97] kdenlive: add meta.mainProgram --- pkgs/kde/gear/kdenlive/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/kde/gear/kdenlive/default.nix b/pkgs/kde/gear/kdenlive/default.nix index b9a6e321531c..6bc08951f3cc 100644 --- a/pkgs/kde/gear/kdenlive/default.nix +++ b/pkgs/kde/gear/kdenlive/default.nix @@ -40,4 +40,6 @@ mkKdeDerivation { qtWrapperArgs = [ "--set FREI0R_PATH ${frei0r}/lib/frei0r-1" ]; + + meta.mainProgram = "kdenlive"; }