From 3e202cdc67aba0eca1e4cd772a65424314e07b12 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 16 Sep 2024 22:50:09 +0200 Subject: [PATCH 01/58] python312Packages.boto: mark as broken Unmaintained since 2020, archived in the beginning of May 2024 and boken https://github.com/boto/boto/issues/3951 --- pkgs/development/python-modules/boto/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/boto/default.nix b/pkgs/development/python-modules/boto/default.nix index 0d352c9e2c52..3549c6986cf1 100644 --- a/pkgs/development/python-modules/boto/default.nix +++ b/pkgs/development/python-modules/boto/default.nix @@ -59,5 +59,8 @@ buildPythonPackage rec { Services. This includes S3, SQS, EC2, among others. ''; maintainers = [ ]; + # Unmaintained since 2020, archived in the beginning of May 2024 and broken + # https://github.com/boto/boto/issues/3951 + broken = true; }; } From 12242b0ad2d58ed4c4737fae6ce0296881ae5b94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 14:44:32 +0200 Subject: [PATCH 02/58] python312Packages.impacket: 0.11.0 -> 0.12.0 Changelog: https://github.com/fortra/impacket/releases/tag/impacket_0_12_0 --- pkgs/development/python-modules/impacket/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/impacket/default.nix b/pkgs/development/python-modules/impacket/default.nix index 8cd34b50f828..b9ca971b1e4c 100644 --- a/pkgs/development/python-modules/impacket/default.nix +++ b/pkgs/development/python-modules/impacket/default.nix @@ -8,6 +8,7 @@ ldap3, ldapdomaindump, pyasn1, + pyasn1-modules, pycryptodomex, pyopenssl, pythonOlder, @@ -18,16 +19,18 @@ buildPythonPackage rec { pname = "impacket"; - version = "0.11.0"; + version = "0.12.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-7kA5tNKu3o9fZEeLxZ+qyGA2eWviTeqNwY8An7CQXko="; + hash = "sha256-iVh9G4NqUiDXSEjJNHV5YrOCiG3KixtKDETWk/JgBkM="; }; + pythonRelaxDeps = [ "pyopenssl" ]; + build-system = [ setuptools ]; dependencies = [ @@ -37,6 +40,7 @@ buildPythonPackage rec { ldap3 ldapdomaindump pyasn1 + pyasn1-modules pycryptodomex pyopenssl setuptools From 681d8b224eef1b47b33f64ab3e9f1171866ef3c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 13:28:56 +0000 Subject: [PATCH 03/58] libretro.play: unstable-2024-09-04 -> unstable-2024-09-12 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 154725424d97..b6a699bed617 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -652,11 +652,11 @@ "src": { "owner": "jpd002", "repo": "Play-", - "rev": "9752b303037186a2e2581b864bc25136402cdc79", - "hash": "sha256-zJFgZjE9CvozH/5hFdnGsVL6q2Pb4QFvyipebzYjB3g=", + "rev": "2ecf0923f8000464b0056d42c369f698421187b5", + "hash": "sha256-fKfN1e7UANs+CAJzjqWmzFsEzSwoRz6vW8ZD7sh9O7E=", "fetchSubmodules": true }, - "version": "unstable-2024-09-04" + "version": "unstable-2024-09-12" }, "ppsspp": { "fetcher": "fetchFromGitHub", From 0fd53bfad84f59fdc23b3f8f7b9b33e37eaf8247 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 13:58:55 +0000 Subject: [PATCH 04/58] libretro.snes9x: unstable-2024-09-05 -> unstable-2024-09-15 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 154725424d97..44bafa9cfe26 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -754,10 +754,10 @@ "src": { "owner": "snes9xgit", "repo": "snes9x", - "rev": "645a4712e797486787e2a0521928dea7cca143fd", - "hash": "sha256-2WgkouQZ6OW3mmPTMjioPikvg077Jx+bzIwV6Wz4blA=" + "rev": "0727b4a474bf496d06ad42dd7ecc5527996aff3a", + "hash": "sha256-Zx36Yzftascnsqnd3ltutFKGB4fRBcP81vKYJRB2FjU=" }, - "version": "unstable-2024-09-05" + "version": "unstable-2024-09-15" }, "snes9x2002": { "fetcher": "fetchFromGitHub", From 90541763b059b0667ca9a723f195d403bef4c57b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 13:59:11 +0000 Subject: [PATCH 05/58] libretro.beetle-psx-hw: unstable-2024-09-06 -> unstable-2024-09-16 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 154725424d97..3c4fcfa8bcc3 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "12a9895466fc1d895e3f4570494af7b398470975", - "hash": "sha256-O0pdGapKKEcjHamEtRs88++L/HF+eppV7Z7GVQrV8ZM=" + "rev": "261e52b7dd35e8fd2c8b1f760a3ba4cf7fce60c5", + "hash": "sha256-HV/O7zJscLJAzhAoch44kKwBKavasdvf1VDvudLU2q0=" }, - "version": "unstable-2024-09-06" + "version": "unstable-2024-09-16" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", From 3022d8e8fc3e424bfa9c48c31a0968901fb4ae6e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 16:37:31 +0200 Subject: [PATCH 06/58] pysqlrecon: 0.2.0 -> 0.3.0 Diff: https://github.com/Tw1sm/PySQLRecon/compare/refs/tags/v0.2.0...v0.3.0 Changelog: https://github.com/Tw1sm/PySQLRecon/blob/0.3.0/CHANGELOG.md --- pkgs/by-name/py/pysqlrecon/package.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/py/pysqlrecon/package.nix b/pkgs/by-name/py/pysqlrecon/package.nix index 32c98e42fdd6..664c6b7c88e8 100644 --- a/pkgs/by-name/py/pysqlrecon/package.nix +++ b/pkgs/by-name/py/pysqlrecon/package.nix @@ -1,31 +1,32 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "pysqlrecon"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "Tw1sm"; repo = "PySQLRecon"; rev = "refs/tags/v${version}"; - hash = "sha256-AJCvGpOjnh5ih5HrrpI+x0zyB7P6rMGL70707UunhEM="; + hash = "sha256-+pme4uOgsh6iZEL73PaR1Y55r+Z/SPEVD2QWBsnMsNs="; }; pythonRelaxDeps = [ + "impacket" "rich" "typer" ]; - nativeBuildInputs = with python3.pkgs; [ - poetry-core - ]; + nativeBuildInputs = with python3.pkgs; [ poetry-core ]; propagatedBuildInputs = with python3.pkgs; [ impacket + pycryptodome rich typer ]; @@ -33,9 +34,7 @@ python3.pkgs.buildPythonApplication rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ - "pysqlrecon" - ]; + pythonImportsCheck = [ "pysqlrecon" ]; meta = with lib; { description = "Offensive MSSQL toolkit"; From cd8de4ffefae377536b46a3eb1bf92264b254311 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 14:47:51 +0000 Subject: [PATCH 07/58] libretro.ppsspp: unstable-2024-09-06 -> unstable-2024-09-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 154725424d97..585cadf05ce6 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -663,11 +663,11 @@ "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "4250bdc2a6cadbd450aa48f7e5fbc67b2df172bf", - "hash": "sha256-4Vf7D7aUkZ+eL7Nz0fToDIGB35xi6vc+UJTM0rKpdXE=", + "rev": "0bb69a0ccf5655310de1a41af96fde50cdc85840", + "hash": "sha256-h5edSaaqu0YEqKeMEY4iGWmp0w2AbqbEHergd0DsCGI=", "fetchSubmodules": true }, - "version": "unstable-2024-09-06" + "version": "unstable-2024-09-17" }, "prboom": { "fetcher": "fetchFromGitHub", From db108f74919a3ed63dc6d937be3895909deb460a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 14:47:59 +0000 Subject: [PATCH 08/58] libretro.mame2003-plus: unstable-2024-09-06 -> unstable-2024-09-09 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 154725424d97..b165ff9d43f5 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -439,10 +439,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "5f5e32598720cd795dbcf53c1400a122ef0fcd76", - "hash": "sha256-TJUgDHDPPKGx4QnKOI6FpCYcLsY2j7GM1atEoq5zg8Y=" + "rev": "3aa773e2a4e1ded9e255428ec7ef617f09840d6d", + "hash": "sha256-zMD6bC6KNCspDAkTB5lFEiV7wMfYy+mHgljjYOA2b6E=" }, - "version": "unstable-2024-09-06" + "version": "unstable-2024-09-09" }, "mame2010": { "fetcher": "fetchFromGitHub", From 719fa5936a8ecb2598720fe1c9fddd3799a1c8f1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 16:24:45 +0000 Subject: [PATCH 09/58] libretro.mame: unstable-2024-08-31 -> unstable-2024-09-15 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 154725424d97..eef115fd08d8 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -408,11 +408,11 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "8b9b8f5f5b47161327d93522318c81fba2087b2f", - "hash": "sha256-xnIYMvLsd4k4wdu3IvWBJy3V8l3NfZvUjYOISunHnwI=", + "rev": "184cebe571ab6b06f5015404bd40404d25433d9a", + "hash": "sha256-8lnpgpNo9wVkaIiZyXMakTnia5CVHnaTMUpB47iVVhE=", "fetchSubmodules": true }, - "version": "unstable-2024-08-31" + "version": "unstable-2024-09-15" }, "mame2000": { "fetcher": "fetchFromGitHub", From 9842db60600dd87313fa056ff2ceff74c51b38c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 16:25:29 +0000 Subject: [PATCH 10/58] libretro.puae: unstable-2024-08-26 -> unstable-2024-09-17 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 154725424d97..18820e6f745b 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -694,10 +694,10 @@ "src": { "owner": "libretro", "repo": "libretro-uae", - "rev": "3ef950be5b45b89d09e05bdc1f8f2f4a794dd7a6", - "hash": "sha256-364KIt7LoJqW3nsdy30CDwctWgqH+tgtWUjsmf8AswA=" + "rev": "4b4875f5c29e59fcc7aaab0decdce7af694b70e1", + "hash": "sha256-XaEa3QAzPzboRFdrPlhLmTPy52ClwyR/eQTpo/V++zU=" }, - "version": "unstable-2024-08-26" + "version": "unstable-2024-09-17" }, "quicknes": { "fetcher": "fetchFromGitHub", From 4aa07243abfba4bf7f8f8bfd6b6a91f6589a0a20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 16:26:11 +0000 Subject: [PATCH 11/58] libretro.fbneo: unstable-2024-09-03 -> unstable-2024-09-12 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 154725424d97..976e39f54a84 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -287,10 +287,10 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "a03a6f526684067823de922f1b15d7eb27fd5394", - "hash": "sha256-7J/RuBTpjqG306IsQe9PBnJnT+QzFVNgpG124XaAcRA=" + "rev": "ea3f1696173441f32e35ddd7295c330443691f00", + "hash": "sha256-spTZ7ZjaBiF6CdQwtrTcafKAszHGJxEnR/mzrlD/1mI=" }, - "version": "unstable-2024-09-03" + "version": "unstable-2024-09-12" }, "fceumm": { "fetcher": "fetchFromGitHub", From 3a8dfd5c34e31347af93f07f0ef329007b712d1d Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 17 Sep 2024 21:36:24 +0400 Subject: [PATCH 12/58] libspatialindex: fix on darwin --- pkgs/development/libraries/libspatialindex/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/development/libraries/libspatialindex/default.nix index 0f9d958ab8c9..e8cce6133c1f 100644 --- a/pkgs/development/libraries/libspatialindex/default.nix +++ b/pkgs/development/libraries/libspatialindex/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, fixDarwinDylibNames }: stdenv.mkDerivation (finalAttrs: { pname = "libspatialindex"; @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs test/ ''; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; cmakeFlags = [ (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) @@ -31,6 +31,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; + postFixup = lib.optionalString stdenv.isDarwin '' + install_name_tool -change "@rpath/libspatialindex.7.dylib" "$out/lib/libspatialindex.7.dylib" $out/lib/libspatialindex_c.dylib + ''; + meta = with lib; { description = "Extensible spatial index library in C++"; homepage = "https://libspatialindex.org"; From 27336c661940b1aff02e3e122c0756c4d712d84b Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 17 Sep 2024 21:46:31 +0400 Subject: [PATCH 13/58] libspatialindex: migrate to by-name --- .../default.nix => by-name/li/libspatialindex/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/libspatialindex/default.nix => by-name/li/libspatialindex/package.nix} (100%) diff --git a/pkgs/development/libraries/libspatialindex/default.nix b/pkgs/by-name/li/libspatialindex/package.nix similarity index 100% rename from pkgs/development/libraries/libspatialindex/default.nix rename to pkgs/by-name/li/libspatialindex/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f5a5ece5be8..3f553a3aad40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21845,8 +21845,6 @@ with pkgs; libspatialaudio = callPackage ../development/libraries/libspatialaudio { }; - libspatialindex = callPackage ../development/libraries/libspatialindex { }; - libspatialite = callPackage ../development/libraries/libspatialite { }; libstatgrab = callPackage ../development/libraries/libstatgrab { From a5599c35f17f682763cf078751968e00f17ea4e8 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 17 Sep 2024 21:49:55 +0400 Subject: [PATCH 14/58] libspatialindex: nixfmt-rfc-style --- pkgs/by-name/li/libspatialindex/package.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/li/libspatialindex/package.nix b/pkgs/by-name/li/libspatialindex/package.nix index e8cce6133c1f..ead9fe2b09e0 100644 --- a/pkgs/by-name/li/libspatialindex/package.nix +++ b/pkgs/by-name/li/libspatialindex/package.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fixDarwinDylibNames }: +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + fixDarwinDylibNames, +}: stdenv.mkDerivation (finalAttrs: { pname = "libspatialindex"; @@ -35,11 +41,11 @@ stdenv.mkDerivation (finalAttrs: { install_name_tool -change "@rpath/libspatialindex.7.dylib" "$out/lib/libspatialindex.7.dylib" $out/lib/libspatialindex_c.dylib ''; - meta = with lib; { + meta = { description = "Extensible spatial index library in C++"; homepage = "https://libspatialindex.org"; - license = licenses.mit; - maintainers = teams.geospatial.members; - platforms = platforms.unix; + license = lib.licenses.mit; + maintainers = lib.teams.geospatial.members; + platforms = lib.platforms.unix; }; }) From 7a8fa7b8bbce78803be5cf2faefa296e2554c35e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 17:56:59 +0000 Subject: [PATCH 15/58] libretro.fuse: unstable-2024-06-28 -> unstable-2024-09-13 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 154725424d97..4934c7bb8946 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -338,10 +338,10 @@ "src": { "owner": "libretro", "repo": "fuse-libretro", - "rev": "4d511d7fc3faa7714fa5de2e824793d35d5f4da8", - "hash": "sha256-mfCv7PvroPqzJ/nXCa74h0c7lHlbTVnJM3rNIj3UvQI=" + "rev": "b7f789133970b69ab27d1d181bc8c8930a462130", + "hash": "sha256-LzKWc6mWXxrYu44HwOmVBzXoebvQIwccwLIwUulKFto=" }, - "version": "unstable-2024-06-28" + "version": "unstable-2024-09-13" }, "gambatte": { "fetcher": "fetchFromGitHub", From 8bb1ca333367a42694f3ce17cbe3779b25137c7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 17:57:12 +0000 Subject: [PATCH 16/58] libretro.atari800: unstable-2024-09-06 -> unstable-2024-09-13 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 154725424d97..072f4085ce54 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -15,10 +15,10 @@ "src": { "owner": "libretro", "repo": "libretro-atari800", - "rev": "72884ccbf9ec8ce7b65d7fc6f44e127e3abdf799", - "hash": "sha256-+trOeRe9YJzOfGgtKGb5UGYKf8RVxEc+rxEw+bgFz5M=" + "rev": "173edee31172db46f46512918cda11192a2bd977", + "hash": "sha256-liZKtoiAlA/CFFY0AsfxUkWUQCXIgtLlJCaNydvYCXE=" }, - "version": "unstable-2024-09-06" + "version": "unstable-2024-09-13" }, "beetle-gba": { "fetcher": "fetchFromGitHub", From bd015f96e8d19bd5a2b2d339b296c3169d453b2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 18:57:52 +0000 Subject: [PATCH 17/58] libretro.flycast: unstable-2024-08-30 -> unstable-2024-09-16 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 154725424d97..826bbf169ede 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -307,11 +307,11 @@ "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "9691fe962228ab0c08f3a4801e6fa0a3c47218ef", - "hash": "sha256-pRrc5EAZQ6fz9JAzOa2mPVByplQ66On2KMqGPVhmA4A=", + "rev": "38de2868a09a015186d692eb01d5fd89308c8128", + "hash": "sha256-eC2BH/3c+2/kktWtYiq6MeI2I5bAkOfwOsTSjkPNqlg=", "fetchSubmodules": true }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-16" }, "fmsx": { "fetcher": "fetchFromGitHub", From 3f1f230019f896db0f716e27bd523151b60f32a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 19:09:45 +0000 Subject: [PATCH 18/58] libretro.genesis-plus-gx: unstable-2024-08-30 -> unstable-2024-09-15 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 154725424d97..4aab6c065131 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -358,10 +358,10 @@ "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "f0a21a7b30e033cef8e4870f7ab3781dad3606db", - "hash": "sha256-h9QJVlAoztlObYKqOWWRxxJ18+VhgmpMRUQOE+/PCI0=" + "rev": "1eb04313cdd1d4d79e166d9f3e75c4b3223b142c", + "hash": "sha256-lAMVsw0NBFPrG3CRsj6IGKDrVUhH2vDUuAzl2rEEhdk=" }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-15" }, "gpsp": { "fetcher": "fetchFromGitHub", From c6f194545745d4a3edd43c9de5a5547d6de6824d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 19:16:06 +0000 Subject: [PATCH 19/58] libretro.gambatte: unstable-2024-08-30 -> unstable-2024-09-06 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 154725424d97..f9787152fd57 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -348,10 +348,10 @@ "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "1fbeee0a46b12d3ab28c4795172929ebb31808ea", - "hash": "sha256-EusFBTtJheGNfbA3lXHGt1IlSbvT6uAY/J/XkIaLJag=" + "rev": "f775ef92c93c495432bbd51d854568c686ec711b", + "hash": "sha256-0WnrCN1F8S+Zy4Mxygm+cc1cSVc6Q91a+VVv7EbmgjA=" }, - "version": "unstable-2024-08-30" + "version": "unstable-2024-09-06" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", From 9e93e4b8956b7a10b6b583deab234ceb423f32d5 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Tue, 17 Sep 2024 15:18:02 -0400 Subject: [PATCH 20/58] distrobuilder: add repack-windows dependencies repack-windows is used to inject Incus device drivers into a Windows ISO for use with Incus. --- .../virtualization/distrobuilder/default.nix | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/virtualization/distrobuilder/default.nix b/pkgs/tools/virtualization/distrobuilder/default.nix index 5ccf8070c3c9..ed53623e5454 100644 --- a/pkgs/tools/virtualization/distrobuilder/default.nix +++ b/pkgs/tools/virtualization/distrobuilder/default.nix @@ -1,24 +1,30 @@ { lib -, pkg-config , buildGoModule -, fetchFromGitHub -, makeWrapper +, callPackage +, cdrkit , coreutils +, debootstrap +, fetchFromGitHub , gnupg , gnutar -, squashfsTools -, debootstrap -, callPackage +, hivex +, makeWrapper , nixosTests +, pkg-config +, squashfsTools +, wimlib }: let bins = [ + cdrkit coreutils + debootstrap gnupg gnutar + hivex squashfsTools - debootstrap + wimlib ]; in buildGoModule rec { From 9fb83eb131c62b3a2d7eb615cc73c2572d0baf73 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 16 Sep 2024 17:47:24 -0300 Subject: [PATCH 21/58] nix-update: refactor - use python3Packages - because splicing - be more explicit - do not use pname as parameter - meta.homepage - checkPhase -> installCheckPhase - no nested with - no platforms.all - because Python is not in all platforms --- pkgs/by-name/ni/nix-update/package.nix | 46 ++++++++++++++++---------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index 95cc0518ebe2..bb645c7d788c 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -1,42 +1,54 @@ -{ lib -, python3 -, fetchFromGitHub -, nix -, nix-prefetch-git -, nixpkgs-review +{ + lib, + fetchFromGitHub, + nix, + nix-prefetch-git, + nixpkgs-review, + python3Packages, }: -python3.pkgs.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "nix-update"; version = "1.5.1"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; - repo = pname; + repo = "nix-update"; rev = "refs/tags/${version}"; hash = "sha256-JXls4EgMDAWtd736nXS2lYTUv9QIjRpkCTimxNtMN7Q="; }; - nativeBuildInputs = [ - python3.pkgs.setuptools - ]; + nativeBuildInputs = [ python3Packages.setuptools ]; makeWrapperArgs = [ - "--prefix" "PATH" ":" (lib.makeBinPath [ nix nix-prefetch-git nixpkgs-review ]) + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ + nix + nix-prefetch-git + nixpkgs-review + ]) ]; checkPhase = '' + runHook preCheck + $out/bin/nix-update --help >/dev/null + + runHook postCheck ''; - meta = with lib; { + meta = { + homepage = "https://github.com/Mic92/nix-update/"; description = "Swiss-knife for updating nix packages"; - inherit (src.meta) homepage; changelog = "https://github.com/Mic92/nix-update/releases/tag/${version}"; - license = licenses.mit; - maintainers = with maintainers; [ figsoda mic92 ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + figsoda + mic92 + ]; mainProgram = "nix-update"; - platforms = platforms.all; }; } From 23c316282ed184bd04e130bbceefd2923d171732 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 16 Sep 2024 18:00:16 -0300 Subject: [PATCH 22/58] nix-update-script: migrate to nix-update package --- .../ni/nix-update/nix-update-script.nix} | 0 pkgs/by-name/ni/nix-update/package.nix | 5 +++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) rename pkgs/{common-updater/nix-update.nix => by-name/ni/nix-update/nix-update-script.nix} (100%) diff --git a/pkgs/common-updater/nix-update.nix b/pkgs/by-name/ni/nix-update/nix-update-script.nix similarity index 100% rename from pkgs/common-updater/nix-update.nix rename to pkgs/by-name/ni/nix-update/nix-update-script.nix diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index bb645c7d788c..7b2a16216da9 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -1,5 +1,6 @@ { lib, + callPackage, fetchFromGitHub, nix, nix-prefetch-git, @@ -40,6 +41,10 @@ python3Packages.buildPythonApplication rec { runHook postCheck ''; + passthru = { + nix-update-script = callPackage ./nix-update-script.nix { }; + }; + meta = { homepage = "https://github.com/Mic92/nix-update/"; description = "Swiss-knife for updating nix packages"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4578b4c46e48..71430d1a68b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -139,7 +139,7 @@ with pkgs; unstableGitUpdater = callPackage ../common-updater/unstable-updater.nix { }; - nix-update-script = callPackage ../common-updater/nix-update.nix { }; + inherit (nix-update) nix-update-script; ### Push NixOS tests inside the fixed point From f19ef08998749070aa94a1819f11adfdabf7025e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 17 Sep 2024 16:48:14 -0300 Subject: [PATCH 23/58] nix-update: get rid of rec So that nix-update-script can refer to nix-update itself. --- pkgs/by-name/ni/nix-update/package.nix | 91 +++++++++++++------------- 1 file changed, 47 insertions(+), 44 deletions(-) diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index 7b2a16216da9..884862c4f3aa 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -8,52 +8,55 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { - pname = "nix-update"; - version = "1.5.1"; - pyproject = true; +let + self = python3Packages.buildPythonApplication { + pname = "nix-update"; + version = "1.5.1"; + pyproject = true; - src = fetchFromGitHub { - owner = "Mic92"; - repo = "nix-update"; - rev = "refs/tags/${version}"; - hash = "sha256-JXls4EgMDAWtd736nXS2lYTUv9QIjRpkCTimxNtMN7Q="; - }; + src = fetchFromGitHub { + owner = "Mic92"; + repo = "nix-update"; + rev = "refs/tags/${self.version}"; + hash = "sha256-JXls4EgMDAWtd736nXS2lYTUv9QIjRpkCTimxNtMN7Q="; + }; - nativeBuildInputs = [ python3Packages.setuptools ]; + nativeBuildInputs = [ python3Packages.setuptools ]; - makeWrapperArgs = [ - "--prefix" - "PATH" - ":" - (lib.makeBinPath [ - nix - nix-prefetch-git - nixpkgs-review - ]) - ]; - - checkPhase = '' - runHook preCheck - - $out/bin/nix-update --help >/dev/null - - runHook postCheck - ''; - - passthru = { - nix-update-script = callPackage ./nix-update-script.nix { }; - }; - - meta = { - homepage = "https://github.com/Mic92/nix-update/"; - description = "Swiss-knife for updating nix packages"; - changelog = "https://github.com/Mic92/nix-update/releases/tag/${version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - figsoda - mic92 + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ + nix + nix-prefetch-git + nixpkgs-review + ]) ]; - mainProgram = "nix-update"; + + checkPhase = '' + runHook preCheck + + $out/bin/nix-update --help >/dev/null + + runHook postCheck + ''; + + passthru = { + nix-update-script = callPackage ./nix-update-script.nix { nix-update = self; }; + }; + + meta = { + homepage = "https://github.com/Mic92/nix-update/"; + description = "Swiss-knife for updating nix packages"; + changelog = "https://github.com/Mic92/nix-update/releases/tag/${self.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + figsoda + mic92 + ]; + mainProgram = "nix-update"; + }; }; -} +in +self From ca641eb04b554d2cb463c93c948a003eae1dd901 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Mon, 16 Sep 2024 18:01:30 -0300 Subject: [PATCH 24/58] nix-update-script: nixfmt-rfc-style --- pkgs/by-name/ni/nix-update/nix-update-script.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ni/nix-update/nix-update-script.nix b/pkgs/by-name/ni/nix-update/nix-update-script.nix index 342b1677c6de..82da510d5061 100644 --- a/pkgs/by-name/ni/nix-update/nix-update-script.nix +++ b/pkgs/by-name/ni/nix-update/nix-update-script.nix @@ -1,7 +1,11 @@ -{ lib, nix-update }: - -{ attrPath ? null -, extraArgs ? [ ] +{ + lib, + nix-update, }: -[ "${lib.getExe nix-update}" ] ++ extraArgs ++ lib.optional (attrPath != null) attrPath +{ + attrPath ? null, + extraArgs ? [ ], +}: + +[ "${lib.getExe nix-update}" ] ++ extraArgs ++ lib.optionals (attrPath != null) [ attrPath ] From d5137d4d2e6553360dd0efa9152a8be1bff7c434 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 17 Sep 2024 17:03:49 -0300 Subject: [PATCH 25/58] nix-update: nativeBuildInputs -> build-system --- pkgs/by-name/ni/nix-update/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index 884862c4f3aa..08f8fe9bcf1e 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -21,7 +21,7 @@ let hash = "sha256-JXls4EgMDAWtd736nXS2lYTUv9QIjRpkCTimxNtMN7Q="; }; - nativeBuildInputs = [ python3Packages.setuptools ]; + build-system = [ python3Packages.setuptools ]; makeWrapperArgs = [ "--prefix" From f5a6aaee1880af60bfc8d7a1e0996bd018dd9c1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Sep 2024 20:23:37 +0000 Subject: [PATCH 26/58] python312Packages.icontract: 2.6.6 -> 2.7.0 --- pkgs/development/python-modules/icontract/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/icontract/default.nix b/pkgs/development/python-modules/icontract/default.nix index 7076732ba63c..b372a31b2c25 100644 --- a/pkgs/development/python-modules/icontract/default.nix +++ b/pkgs/development/python-modules/icontract/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "icontract"; - version = "2.6.6"; + version = "2.7.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Parquery"; repo = "icontract"; rev = "refs/tags/v${version}"; - hash = "sha256-R5/FBfuTvXItfTlNZMSnO18Q+etnHbQyXFWpaOpOLes="; + hash = "sha256-+0h3Zb7lTxtaWTv2/MmvQCcccUKhTOxGqbqKELE8mQY="; }; preCheck = '' From d95dcb364a96fb8138e5862eb07d99b364d4c291 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 22:49:36 +0200 Subject: [PATCH 27/58] python312Packages.playwrightcapture: 1.25.15 -> 1.26.0 Diff: https://github.com/Lookyloo/PlaywrightCapture/compare/refs/tags/v1.25.15...v1.26.0 Changelog: https://github.com/Lookyloo/PlaywrightCapture/releases/tag/v1.26.0 --- pkgs/development/python-modules/playwrightcapture/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix index c29f3a115b0b..8717bfa11759 100644 --- a/pkgs/development/python-modules/playwrightcapture/default.nix +++ b/pkgs/development/python-modules/playwrightcapture/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "playwrightcapture"; - version = "1.25.15"; + version = "1.26.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "Lookyloo"; repo = "PlaywrightCapture"; rev = "refs/tags/v${version}"; - hash = "sha256-4vwCxh7yCYYHXxxBpWqGFKr/0tcy33n5Q8LqJl9yOuk="; + hash = "sha256-v6n+zsiLEQHeAeSALDxu4FWwwQaD/zu3rwxIjR57Ly4="; }; pythonRelaxDeps = [ From a5169c156aaa6425e7793b7b6fc1b7f20e25a96b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 22:49:51 +0200 Subject: [PATCH 28/58] python312Packages.lacuscore: 1.10.13 -> 1.11.0 Diff: https://github.com/ail-project/LacusCore/compare/refs/tags/v1.10.13...v1.11.0 Changelog: https://github.com/ail-project/LacusCore/releases/tag/v1.11.0 --- pkgs/development/python-modules/lacuscore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix index ef06e6f50755..a263fa60c152 100644 --- a/pkgs/development/python-modules/lacuscore/default.nix +++ b/pkgs/development/python-modules/lacuscore/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "lacuscore"; - version = "1.10.13"; + version = "1.11.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ail-project"; repo = "LacusCore"; rev = "refs/tags/v${version}"; - hash = "sha256-BqVPxkQLJrVYSVvtSnq0hwC5DdcyBZyvKAULwmAagzo="; + hash = "sha256-O9nB+hxMrIJDeK6BrxmX/yr0OoIXxshKJxz9fU6b2V0="; }; pythonRelaxDeps = [ From 62c7101156d152a9f4fcd33deda9e463ae71313f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 23:01:32 +0200 Subject: [PATCH 29/58] python312Packages.apispec-webframeworks: 1.1.0 -> 1.2.0 Diff: https://github.com/marshmallow-code/apispec-webframeworks/compare/refs/tags/1.1.0...1.2.0 Changelog: https://github.com/marshmallow-code/apispec-webframeworks/blob/1.2.0/CHANGELOG.rst --- .../python-modules/apispec-webframeworks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apispec-webframeworks/default.nix b/pkgs/development/python-modules/apispec-webframeworks/default.nix index 3953083d41a6..9eda4b633fd8 100644 --- a/pkgs/development/python-modules/apispec-webframeworks/default.nix +++ b/pkgs/development/python-modules/apispec-webframeworks/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "apispec-webframeworks"; - version = "1.1.0"; + version = "1.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = "apispec-webframeworks"; rev = "refs/tags/${version}"; - hash = "sha256-qepiaRW36quIgxBtEHMF3HN0wO6jp2uGAHgg5fJoMUY="; + hash = "sha256-V4tdqcHfYRh9VoXUTPXM3SIOogJDJB14SLj5dSd7LzU="; }; nativeBuildInputs = [ flit-core ]; From 29df8af169c6c836fd63fe6c311e42e7be55729a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 23:02:01 +0200 Subject: [PATCH 30/58] python312Packages.apispec-webframeworks:: refactor --- .../python-modules/apispec-webframeworks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apispec-webframeworks/default.nix b/pkgs/development/python-modules/apispec-webframeworks/default.nix index 9eda4b633fd8..a89d12ea0d50 100644 --- a/pkgs/development/python-modules/apispec-webframeworks/default.nix +++ b/pkgs/development/python-modules/apispec-webframeworks/default.nix @@ -27,9 +27,9 @@ buildPythonPackage rec { hash = "sha256-V4tdqcHfYRh9VoXUTPXM3SIOogJDJB14SLj5dSd7LzU="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ apispec ] ++ apispec.optional-dependencies.yaml; + dependencies = [ apispec ] ++ apispec.optional-dependencies.yaml; nativeCheckInputs = [ aiohttp From a558d61ae5a26af4ebf496b1627ce80d78b40799 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 23:26:39 +0200 Subject: [PATCH 31/58] python312Packages.tencentcloud-sdk-python: 3.0.1232 -> 3.0.1233 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1232...3.0.1233 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1233/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 794d11c090a3..72deddbe1421 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1232"; + version = "3.0.1233"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-aPqhdOJH+cOqohf6zvo5X5nf+Kb6HLZ+UCc3SQ13C6w="; + hash = "sha256-PGchoNGaynhKSRxWtW/vV6q1+9mZFTqNOi8hksbIlw0="; }; build-system = [ setuptools ]; From 82cc961d9288bf55fccd2c149a510bdea7a8ca47 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 23:39:17 +0200 Subject: [PATCH 32/58] python312Packages.tesla-fleet-api: 0.7.5 -> 0.7.8 Diff: https://github.com/Teslemetry/python-tesla-fleet-api/compare/refs/tags/v0.7.5...v0.7.8 Changelog: https://github.com/Teslemetry/python-tesla-fleet-api/releases/tag/v0.7.8 --- pkgs/development/python-modules/tesla-fleet-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix index e8a8169a7304..9e854fc168d6 100644 --- a/pkgs/development/python-modules/tesla-fleet-api/default.nix +++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tesla-fleet-api"; - version = "0.7.5"; + version = "0.7.8"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Teslemetry"; repo = "python-tesla-fleet-api"; rev = "refs/tags/v${version}"; - hash = "sha256-9klPi+nscylkhvWRSqegT7aCBSH2/wc39u6aNJwpicU="; + hash = "sha256-jExS2bnxz35mqzN2f6qrqInpoNWGUYLzueKeXp//9/8="; }; build-system = [ setuptools ]; From 5b340f9313cb904d7f293e4314fde778d4c799f6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 23:39:53 +0200 Subject: [PATCH 33/58] python312Packages.types-pytz: 2024.1.0.20240417 -> 2024.2.0.20240913 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 55aefbd5fd39..d7d5b7a17391 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2024.1.0.20240417"; + version = "2024.2.0.20240913"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-aBDIofaPIf3w9PN0pDJIfHdkWgrAsx3kv0aQzyGtOYE="; + hash = "sha256-RDO130pvxYe77UFxbYalul2DK0N45Qb0DTS8nIHfLCQ="; }; nativeBuildInputs = [ setuptools ]; From 9b7a02a5a98ca7cb8d998c45e5dc29ce1a455b67 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 23:40:20 +0200 Subject: [PATCH 34/58] python312Packages.types-pytz: refator --- pkgs/development/python-modules/types-pytz/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index d7d5b7a17391..7e6986f2a95a 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { hash = "sha256-RDO130pvxYe77UFxbYalul2DK0N45Qb0DTS8nIHfLCQ="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; # Modules doesn't have tests doCheck = false; From d211b9b3073ec5dd4079ae9ffec75f5effc9bc98 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 23:44:06 +0200 Subject: [PATCH 35/58] python312Packages.slack-sdk: 3.32.0 -> 3.33.0 Diff: https://github.com/slackapi/python-slack-sdk/compare/refs/tags/v3.32.0...v3.33.0 Changelog: https://github.com/slackapi/python-slack-sdk/releases/tag/v3.33.0 --- pkgs/development/python-modules/slack-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix index 3a5573a50bb4..ce57cb147a30 100644 --- a/pkgs/development/python-modules/slack-sdk/default.nix +++ b/pkgs/development/python-modules/slack-sdk/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.32.0"; + version = "3.33.0"; pyproject = true; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "slackapi"; repo = "python-slack-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-lAFisE1So1h7xWzqZHbv1iJrVckzxT4vEU7mA2Vc7oA="; + hash = "sha256-S41OyTyFjEfKvTlKwxHq7P/uzWreMIHimI6pECItTzo="; }; postPatch = '' From 6a30c10b918691042894b6b65d23cfa86645622f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 23:45:52 +0200 Subject: [PATCH 36/58] python312Packages.google-cloud-netapp: 0.3.13 -> 0.3.14 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-netapp-v0.3.14/packages/google-cloud-netapp/CHANGELOG.md --- .../python-modules/google-cloud-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index 6c3ff4b8214a..4fd68969054e 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "google-cloud-netapp"; - version = "0.3.13"; + version = "0.3.14"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_netapp"; inherit version; - hash = "sha256-XsMBVG3bb0n1X9av9xoViccohuL2OxiXC5dkadHULIw="; + hash = "sha256-XjhNY4YG51+9OTZBj3jivgA2Del7RafXCIE/ATtyqWE="; }; build-system = [ setuptools ]; From 01f7424484760a3cfda762dd6a8fbb5263357bf7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 23:47:12 +0200 Subject: [PATCH 37/58] python312Packages.google-cloud-asset: 3.26.3 -> 3.26.4 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-v3.26.4/packages/google-cloud-asset/CHANGELOG.md --- .../development/python-modules/google-cloud-asset/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-asset/default.nix b/pkgs/development/python-modules/google-cloud-asset/default.nix index 127b51a742e1..5f6c9c54f2b4 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.26.3"; + version = "3.26.4"; pyproject = true; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_asset"; inherit version; - hash = "sha256-RgW2cZSumJj0TtwJrQyC2tGpdEy5I4asR527/IrMMDQ="; + hash = "sha256-c/xmHAD8zXdi+2ifs4bHWPS2B49Fcnr4RqLfrpGwQzs="; }; build-system = [ setuptools ]; From baaedf1392ed229d43366440aaa2ccdf0d8b2e93 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 17 Sep 2024 23:50:24 +0200 Subject: [PATCH 38/58] python312Packages.universal-pathlib: 0.2.4 -> 0.2.5 Changelog: https://github.com/fsspec/universal_pathlib/releases/tag/v0.2.5 --- pkgs/development/python-modules/universal-pathlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix index 32b79b3e22ce..007aaab546ad 100644 --- a/pkgs/development/python-modules/universal-pathlib/default.nix +++ b/pkgs/development/python-modules/universal-pathlib/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "universal-pathlib"; - version = "0.2.4"; + version = "0.2.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "universal_pathlib"; inherit version; - hash = "sha256-VXChH9iMrRu8YiCz5yP92K38XF4AhlIJ6IrwP/SqFUs="; + hash = "sha256-6l1PuBeMKrRpz0+kbQzrFsyzeNpG27woqLnB7r3MxlU="; }; build-system = [ From d71203e97c437ac7df3440e1c853d1888956cd7e Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 17 Sep 2024 17:52:34 -0500 Subject: [PATCH 39/58] kops: add 1.30, update 1.28, drop 1.26 - drop kops_1_26 - keep kops_1_27 for now - kops_1_28: 1.28.5 -> 1.28.7 - keep kops_1_29 as default while 1.30 is in beta - init kops_1_30 at 1.30.1 --- .../networking/cluster/kops/default.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 79dcfd2a9fc1..fd19982b9502 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -49,12 +49,6 @@ in rec { mkKops = generic; - kops_1_26 = mkKops rec { - version = "1.26.6"; - sha256 = "sha256-qaehvPgB3phZl/K577hig4G4RxAUi6Im94vXP5ctnWM="; - rev = "v${version}"; - }; - kops_1_27 = mkKops rec { version = "1.27.1"; sha256 = "sha256-WV+0380yj8GHckY4PDM3WspbZ/YuYZOAQEMd2ygEOjo="; @@ -62,8 +56,8 @@ rec { }; kops_1_28 = mkKops rec { - version = "1.28.5"; - sha256 = "sha256-spw3lTrp6RlxkTNoZ/3Yz/U2tdvBnwiYORS2QtOSX9k="; + version = "1.28.7"; + sha256 = "sha256-rTf7+w/o8MGSBKV9wCzZOEI0v31exZhOJpRABeF/KyI="; rev = "v${version}"; }; @@ -72,4 +66,10 @@ rec { sha256 = "sha256-SRj0x9N+yfTG/UL/hu1ds46Zt6d5SUYU0PA9lPHO6jQ="; rev = "v${version}"; }; + + kops_1_30 = mkKops rec { + version = "1.30.1"; + sha256 = "sha256-aj2OnjkXlBEH830RoJiAlhiFfS1zjVoX38PrsgAaB7A="; + rev = "v${version}"; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97bf23bde3e6..673701c5089d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37779,10 +37779,10 @@ with pkgs; # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_26 kops_1_27 kops_1_28 kops_1_29 + kops_1_30 ; kops = kops_1_29; From c5bf3cb87e6de796fa540e7e5bb666f581aa8796 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 Sep 2024 01:52:42 +0200 Subject: [PATCH 40/58] python312Packages.unifi-ap: init at 0.0.1 --- .../python-modules/unifi-ap/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/unifi-ap/default.nix diff --git a/pkgs/development/python-modules/unifi-ap/default.nix b/pkgs/development/python-modules/unifi-ap/default.nix new file mode 100644 index 000000000000..f5bfb6088bc0 --- /dev/null +++ b/pkgs/development/python-modules/unifi-ap/default.nix @@ -0,0 +1,44 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + setuptools, + paramiko, +}: + +buildPythonPackage rec { + pname = "unifi-ap"; + version = "0.0.1"; + pyproject = true; + + src = fetchFromGitHub { + owner = "tofuSCHNITZEL"; + repo = "unifi_ap"; + rev = "v${version}"; + hash = "sha256-dEaDRcQEx+n+zvxVHD58B1AdFj004L76AtVDesnP+gQ="; + }; + + build-system = [ + setuptools + ]; + + pythonRelaxDeps = [ "paramiko" ]; + + dependencies = [ + paramiko + ]; + + pythonImportsCheck = [ + "unifi_ap" + ]; + + doCheck = false; # no tests + + meta = { + changelog = "https://github.com/tofuSCHNITZEL/unifi_ap/releases/tag/v${version}"; + description = "Python API for UniFi accesspoints"; + homepage = "https://github.com/tofuSCHNITZEL/unifi_ap"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f8c31381060..2c4b0027a301 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16862,6 +16862,8 @@ self: super: with self; { unifi = callPackage ../development/python-modules/unifi { }; + unifi-ap = callPackage ../development/python-modules/unifi-ap { }; + unifi-discovery = callPackage ../development/python-modules/unifi-discovery { }; unify = callPackage ../development/python-modules/unify { }; From d57c6374aa6e0728fef83b6c245db692f42fb84e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 Sep 2024 01:53:36 +0200 Subject: [PATCH 41/58] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 860dadafe331..6f98aeb153f9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -4494,7 +4494,8 @@ aiounifi ]; "unifi_direct" = ps: with ps; [ - ]; # missing inputs: unifi_ap + unifi-ap + ]; "unifiled" = ps: with ps; [ unifiled ]; From a5aaad589e0dc031d6d25c498d5f04ee3ca7d7b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Sep 2024 00:13:58 +0000 Subject: [PATCH 42/58] modelscan: 0.8.0 -> 0.8.1 --- pkgs/by-name/mo/modelscan/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/modelscan/package.nix b/pkgs/by-name/mo/modelscan/package.nix index 9784cd769f9d..aff4446489aa 100644 --- a/pkgs/by-name/mo/modelscan/package.nix +++ b/pkgs/by-name/mo/modelscan/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "modelscan"; - version = "0.8.0"; + version = "0.8.1"; pyproject = true; src = fetchFromGitHub { owner = "protectai"; repo = "modelscan"; rev = "refs/tags/v${version}"; - hash = "sha256-G+jBbDiDiQr3E5JuUdNvfIjVpoVCpsDQRoZ7L659BF0="; + hash = "sha256-90VnIVQFjtKgLCHc+tmOtDdgJP8aaH4h5ZiOOejnXgQ="; }; build-system = with python3.pkgs; [ From 2c5637f570e2842a38d02c2d0056223a27f31379 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Sep 2024 02:48:13 +0000 Subject: [PATCH 43/58] python312Packages.hwi: 3.0.0 -> 3.1.0 --- pkgs/development/python-modules/hwi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hwi/default.nix b/pkgs/development/python-modules/hwi/default.nix index fb506ab96f3c..70f8b48fce92 100644 --- a/pkgs/development/python-modules/hwi/default.nix +++ b/pkgs/development/python-modules/hwi/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "hwi"; - version = "3.0.0"; + version = "3.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bitcoin-core"; repo = "HWI"; rev = "refs/tags/${version}"; - hash = "sha256-hpMH3Zy3/TTBYUukJQZw63f0KuE3O9G2aYcGdL6Q3eM="; + hash = "sha256-sQqft+5M+X+91bFqpUrbDRrFzpe/l1+w+pnIHwqezR8="; }; propagatedBuildInputs = [ From fdb98ce118eb73ba566da52c87abe994ace7433d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Sep 2024 03:09:00 +0000 Subject: [PATCH 44/58] python312Packages.edk2-pytool-library: 0.21.10 -> 0.21.11 --- .../python-modules/edk2-pytool-library/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 59059586c89b..41479c4f2659 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.21.10"; + version = "0.21.11"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "refs/tags/v${version}"; - hash = "sha256-77Eu1yqCsYgRgEMxBFEmV51Tj/NGH1sFjx016fC3uMM="; + hash = "sha256-5d/IEa7IGbQ2FIAl6Y8tBJIzCNDPibmhy35CSpcWQ8A="; }; build-system = [ From e6bdaab974c3f4495739c5f1de2c35fcd85a4372 Mon Sep 17 00:00:00 2001 From: hellodword <46193371+hellodword@users.noreply.github.com> Date: Wed, 18 Sep 2024 05:08:37 +0000 Subject: [PATCH 45/58] sing-box: 1.9.4 -> 1.9.5 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index d654b75e4990..fb0e8600c459 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-+BQWmb09kCAjJioutD9xOWxQoZtBrTJFp0yAun/nDCc="; + hash = "sha256-yPIlijm5NBtBT2+bkS0sJvPb/Lwqq/ZOcl5g848BvRA="; }; - vendorHash = "sha256-LCA59LijHLpM1bo4/yuFGrnk0g9DSXEZwmBUspGylV8="; + vendorHash = "sha256-/lp+3mPkGMABpvnxqpuC/7NiKrmcEWYQ80Wb7Ng1eBI="; tags = [ "with_quic" From 3e8e7be24d6ea364ebbfe84311c976e412c70548 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Tue, 17 Sep 2024 12:42:36 -0400 Subject: [PATCH 46/58] tart: 2.18.0 -> 2.18.2 Diff: https://github.com/cirruslabs/tart/compare/2.18.0...2.18.2 --- pkgs/applications/virtualization/tart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/tart/default.nix b/pkgs/applications/virtualization/tart/default.nix index cddad036d68e..fb5f28325260 100644 --- a/pkgs/applications/virtualization/tart/default.nix +++ b/pkgs/applications/virtualization/tart/default.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "tart"; - version = "2.18.0"; + version = "2.18.2"; src = fetchurl { url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart-arm64.tar.gz"; - hash = "sha256-no05QZpvaF7Kn9lU26lXjimHJn7xHydmh7Rv50aXPm4="; + hash = "sha256-0057/lRisAw3fzh2LNqHUx72PR/67mW/cqm7hU34GAU="; }; sourceRoot = "."; From 6c9a6461526177195d4ee13f970ac396450f3caa Mon Sep 17 00:00:00 2001 From: liam-murphy14 Date: Sat, 14 Sep 2024 21:29:16 -0700 Subject: [PATCH 47/58] electron-chromedriver_32: init at 32.1.0, electron-chromedriver_31: 31.4.0 -> 31.6.0, electron-chromedriver_30: 30.4.0 -> 30.5.1 --- .../tools/electron/chromedriver/info.json | 39 ++++++++++++------- pkgs/top-level/all-packages.nix | 3 +- 2 files changed, 27 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json index c6f0d90416b6..213bc53abf74 100644 --- a/pkgs/development/tools/electron/chromedriver/info.json +++ b/pkgs/development/tools/electron/chromedriver/info.json @@ -12,24 +12,35 @@ }, "30": { "hashes": { - "aarch64-darwin": "3e432bd550279c2d58c6a02b0bda048fa2a9a89aef9752e22c39a518a83fe96f", - "aarch64-linux": "338f2a361448e78aa8c319cd582f2dd6d891d6c0c66b676c628e50511c27514f", - "armv7l-linux": "8cffae19618fe5f0eaff40378c40084e18f9747bbbe2d87390203a3012c98367", - "headers": "1zpl51g8d0j6xw4h2pw1wy6qlwgxj37x4lsj377kg27y809rf5ah", - "x86_64-darwin": "4d38f40ec33955dd0aef5cc0053b2b07c4744abb9f2614a44780280c4678aca9", - "x86_64-linux": "7ff1b75defc522f327c0f1bf6f4d13938b041cf5de1d7417b9dc5d1e7026e93c" + "aarch64-darwin": "3de7da4462c7690f75680aecac8fddedc4b998d0da769136d8eff2932b36004e", + "aarch64-linux": "3722d46929fd2c7b33c17d37464a08150e60d9269053eb67195795254fb5e947", + "armv7l-linux": "a786d51f834c24b768bd415bf9a2fc5c1d9abdf9dc0b1a091bf9a8ff101becfe", + "headers": "0db38ndw9rrd8ixa14761cbff6ns31b6302bzx5q4in8i4dkrrs3", + "x86_64-darwin": "d89b89f7c2ba45cb10df7fc23722bacf6f77e13002c42648762cd18ae3fa9182", + "x86_64-linux": "688e4da8dbcb7dbfacab6f29341d96736e6d06e4c8029835b83ef30b69885b01" }, - "version": "30.4.0" + "version": "30.5.1" }, "31": { "hashes": { - "aarch64-darwin": "bca203c7705e56baa5c7c2f972dd3a606ee80589514a3d83283960b67bad446c", - "aarch64-linux": "a040723dc5c7860527f2718e5b3aaf43d219e35ae391a3338c7a85de2d08afb7", - "armv7l-linux": "64306c594ad37c94e2562d3fe4832667191321f90ec797e41ceae4640da26289", - "headers": "0iclnzcihiw7bnf7nn0p56m8zz8cwn951ccf6g52d7pfr791gbnv", - "x86_64-darwin": "47a04768ed44c4f4128d1fe90818b58cbef6da63b1112acaf2bbb7c20d22ad7d", - "x86_64-linux": "61225378c9a6097974638c241730db60230c9d774a2c7242aa9f001299bccf4b" + "aarch64-darwin": "904d665b4df7377ccdae58c35328456bf2a05a8d3e878954e48175ee60103b3f", + "aarch64-linux": "d66e80621dc8c667ca634c30c4be8486b56ebce17ba6debab5eb70dd40ed9ab9", + "armv7l-linux": "ae76cf56a793f7c98411f997db610d4729b6992e7ccbb7651a960947e87c5bb2", + "headers": "1vm3r688cjl5014x4lmmwh9927wbx26nd38lijmim434n32aby88", + "x86_64-darwin": "3ee05c812e0ce5cb0ee7a36fb1c3a52447d8bfef80a57ca82667b501a354778a", + "x86_64-linux": "65b04f0d8980c17d205644903718a4b41ba6c1fab9d25a58dadf00b6db24a402" }, - "version": "31.4.0" + "version": "31.6.0" + }, + "32": { + "hashes": { + "aarch64-darwin": "8f40b497d21a8b7d2b3df168b1cf4311f6a39acab241f05ffee0dad6409e0801", + "aarch64-linux": "f92df0fafdf1be14d38a4ed4b1555f71c922ab3c096148c71aef8a46f95e0127", + "armv7l-linux": "f8c170268d348411fa5d27642327305aeca539459615a5e7648484728f4e0eed", + "headers": "01wwikj54d3fm6bsz9z61dcl7d5mzbk48mcaycrbmq1rg0h0kk5a", + "x86_64-darwin": "5efdf72e580336e91d6d696dab79ab9b932a2eaf91ff4da744b63da24f8288ca", + "x86_64-linux": "f48ca709758744f6c1ab5062444405c1416c27b57143707bfea321116f641cec" + }, + "version": "32.1.0" } } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3506c8b4b68d..399de17d3985 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17152,7 +17152,8 @@ with pkgs; inherit (callPackages ../development/tools/electron/chromedriver { }) electron-chromedriver_29 electron-chromedriver_30 - electron-chromedriver_31; + electron-chromedriver_31 + electron-chromedriver_32; electron_24 = electron_24-bin; electron_27 = electron_27-bin; From 8a251278699b65a18d3a34b8f6bb48eb0e3ecfb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Sep 2024 06:27:50 +0000 Subject: [PATCH 48/58] telegram-desktop: 5.5.2 -> 5.5.5 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 78d6a1da58ef..6aefc520c7e9 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -63,14 +63,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop"; - version = "5.5.2"; + version = "5.5.5"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-5edk3+RusCq93A6mkzCoegxr6J2fRc9rtGk6IpGHBAY="; + hash = "sha256-LWIOgyHp43bLN4RQtBKH2HitfVI6AKstPK5es2s+wVw="; }; patches = [ From 26ca094f5073125eea22749635bb39c0d5681658 Mon Sep 17 00:00:00 2001 From: PixelSergey Date: Mon, 16 Sep 2024 17:26:57 +0300 Subject: [PATCH 49/58] meow: init at 2.1.3 --- pkgs/by-name/me/meow/package.nix | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 pkgs/by-name/me/meow/package.nix diff --git a/pkgs/by-name/me/meow/package.nix b/pkgs/by-name/me/meow/package.nix new file mode 100644 index 000000000000..afadac89b9b8 --- /dev/null +++ b/pkgs/by-name/me/meow/package.nix @@ -0,0 +1,31 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage rec { + pname = "meow"; + version = "2.1.3"; + + src = fetchFromGitHub { + owner = "PixelSergey"; + repo = "meow"; + rev = "v${version}"; + hash = "sha256-PB871c137uxxPaYbV6NB8kECVUrQWTeVz0ciVLHrph4="; + }; + + cargoHash = "sha256-4BoKZUgt4jf8jy2HU3J6RuT0GXNqkJnBUR09wNlNm7E="; + + postInstall = '' + ln -s $out/bin/meow-cli $out/bin/meow + ''; + + meta = { + description = "Print ASCII cats to your terminal"; + homepage = "https://github.com/PixelSergey/meow"; + license = lib.licenses.mit; + mainProgram = "meow"; + maintainers = with lib.maintainers; [ pixelsergey ]; + }; +} From d2f0f2afab2b87740e4a90b09b40ba95f8a55d7b Mon Sep 17 00:00:00 2001 From: PixelSergey Date: Mon, 16 Sep 2024 18:36:45 +0300 Subject: [PATCH 50/58] maintainers: add pixelsergey --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index fb68bf14e030..1b1f1f5e4f8a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16471,6 +16471,12 @@ githubId = 20472367; name = "Peter Hebden"; }; + pixelsergey = { + email = "sergey.ichtchenko@gmail.com"; + github = "PixelSergey"; + githubId = 14542417; + name = "Sergey Ichtchenko"; + }; pjbarnoy = { email = "pjbarnoy@gmail.com"; github = "waaamb"; From 7828fece7502f55562be7bcfa0b285575fc52323 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Sep 2024 06:53:07 +0000 Subject: [PATCH 51/58] libretro.dosbox-pure: unstable-2024-08-25 -> unstable-2024-09-16 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d8a17157d4d0..87b65dc7fcee 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -246,10 +246,10 @@ "src": { "owner": "schellingb", "repo": "dosbox-pure", - "rev": "dd8d2989a652d56a7a1588b65a42cc58477638c2", - "hash": "sha256-XA6hBJa/GFUaRG/+PSUBXaFJedjsRVLfR7Z5pmEwY0k=" + "rev": "ea7b947a8ed156a1ce2ce49329a5686c69f80075", + "hash": "sha256-aqNyYG7H+YBLhQlnkfBfmX3PkBF8GeYXc+KHkvkxlRo=" }, - "version": "unstable-2024-08-25" + "version": "unstable-2024-09-16" }, "easyrpg": { "fetcher": "fetchFromGitHub", From 64084c1de3366de080d7e83590f198116a6cd810 Mon Sep 17 00:00:00 2001 From: Boris Petrov Date: Tue, 17 Sep 2024 22:44:21 +0200 Subject: [PATCH 52/58] klevernotes: init at 1.0.0 --- pkgs/kde/default.nix | 1 + pkgs/kde/misc/klevernotes/default.nix | 38 +++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/kde/misc/klevernotes/default.nix diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 81874617f70a..8019e64ea588 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -63,6 +63,7 @@ kirigami-addons = self.callPackage ./misc/kirigami-addons {}; kio-extras-kf5 = self.callPackage ./misc/kio-extras-kf5 {}; kio-fuse = self.callPackage ./misc/kio-fuse {}; + klevernotes = self.callPackage ./misc/klevernotes {}; ktextaddons = self.callPackage ./misc/ktextaddons {}; kunifiedpush = self.callPackage ./misc/kunifiedpush {}; kup = self.callPackage ./misc/kup {}; diff --git a/pkgs/kde/misc/klevernotes/default.nix b/pkgs/kde/misc/klevernotes/default.nix new file mode 100644 index 000000000000..3998a5a940da --- /dev/null +++ b/pkgs/kde/misc/klevernotes/default.nix @@ -0,0 +1,38 @@ +{ + lib, + mkKdeDerivation, + fetchurl, + qtsvg, + qtwebengine, +}: +mkKdeDerivation rec { + pname = "klevernotes"; + version = "1.0.0"; + + src = fetchurl { + url = "mirror://kde/stable/klevernotes/${version}/klevernotes-${version}.tar.xz"; + hash = "sha256-9nXOaa2/DyJO3nXGbnvPaYjXFrVoAgx52th67l5geOU="; + }; + + extraBuildInputs = [ + qtsvg + qtwebengine + ]; + + meta.license = with lib.licenses; [ + bsd3 + cc-by-sa-40 + cc0 + # TODO: add FSFAP license + gpl2Plus + gpl3Only + gpl3Plus + lgpl2Only + lgpl2Plus + lgpl21Only + lgpl21Plus + lgpl3Only + lgpl3Plus + mit + ]; +} From dda4598ca1fc39081e9331ef76ae3dd7a4a3320f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Sep 2024 07:50:21 +0000 Subject: [PATCH 53/58] kaldi: 0-unstable-2024-07-25 -> 0-unstable-2024-09-16 --- pkgs/tools/audio/kaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index 4b969c11ba78..5b7242364834 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -19,13 +19,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "kaldi"; - version = "0-unstable-2024-07-25"; + version = "0-unstable-2024-09-16"; src = fetchFromGitHub { owner = "kaldi-asr"; repo = "kaldi"; - rev = "122a3f239ed2f24271eb61b9aa3060fa06b820ac"; - sha256 = "sha256-tUb4YeYXFWpxV4GONoxo2QwRqbBemqm2sFP6jkoiBWA="; + rev = "d9ab0465aa2849ff645c027110c48899d5ec6ca8"; + sha256 = "sha256-usrHtVGkp++mU9rWI3u3vXJ8aAycujw9+5VQd0X0idY="; }; cmakeFlags = [ From 0e4b6c1c7faec2a6bfdc4f85a4c11cfa992e525c Mon Sep 17 00:00:00 2001 From: Florian Franzen Date: Wed, 18 Sep 2024 10:31:50 +0200 Subject: [PATCH 54/58] pythonPackages.leveldb: disable past 3.12 --- pkgs/development/python-modules/leveldb/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/leveldb/default.nix b/pkgs/development/python-modules/leveldb/default.nix index 7212c2c4e02b..a13f11c74206 100644 --- a/pkgs/development/python-modules/leveldb/default.nix +++ b/pkgs/development/python-modules/leveldb/default.nix @@ -1,19 +1,26 @@ { lib, - fetchPypi, buildPythonPackage, + fetchPypi, + pythonAtLeast, + setuptools, }: buildPythonPackage rec { pname = "leveldb"; version = "0.201"; - format = "setuptools"; + + pyproject = true; + + disabled = pythonAtLeast "3.12"; src = fetchPypi { inherit pname version; sha256 = "1cffe776842917e09f073bd6ea5856c64136aebddbe51bd17ea29913472fecbf"; }; + nativeBuildInputs = [ setuptools ]; + meta = with lib; { homepage = "https://code.google.com/archive/p/py-leveldb/"; description = "Thread-safe Python bindings for LevelDB"; From 43b276a43b6bda39b47a06990649801ff6a7eb82 Mon Sep 17 00:00:00 2001 From: Honnip Date: Wed, 18 Sep 2024 16:33:55 +0900 Subject: [PATCH 55/58] dissent: fix `/usr/bin` path --- pkgs/by-name/di/dissent/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/di/dissent/package.nix b/pkgs/by-name/di/dissent/package.nix index 1014b1f1fc33..36708fb39215 100644 --- a/pkgs/by-name/di/dissent/package.nix +++ b/pkgs/by-name/di/dissent/package.nix @@ -44,6 +44,8 @@ buildGoModule rec { ]; postInstall = '' + substituteInPlace nix/so.libdb.dissent.service \ + --replace-warn "/usr/bin/dissent" "$out/bin/dissent" install -D -m 444 -t $out/share/applications nix/so.libdb.dissent.desktop install -D -m 444 -t $out/share/icons/hicolor/scalable/apps internal/icons/hicolor/scalable/apps/so.libdb.dissent.svg install -D -m 444 -t $out/share/icons/hicolor/symbolic/apps internal/icons/symbolic/apps/so.libdb.dissent-symbolic.svg From ec9cf7a4785eccf97c54d7eff4434a77c391eb17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Sep 2024 10:30:41 +0000 Subject: [PATCH 56/58] serie: 0.3.0 -> 0.4.0 --- pkgs/by-name/se/serie/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix index f003e5b80390..516756d12c77 100644 --- a/pkgs/by-name/se/serie/package.nix +++ b/pkgs/by-name/se/serie/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "serie"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "lusingander"; repo = "serie"; rev = "v${version}"; - hash = "sha256-LjWpWgOInnPL4Ke8Ntk+bEJBljPSEe14RCKzN50JUGA="; + hash = "sha256-RP9Tv6IrDfawjXCQp0nB0nd7b6IwkdykHcEfGEguFHo="; }; - cargoHash = "sha256-Ynnp7jSnkNHbL98JOXjV6v97IXWwi2HiZC5SkChCRv0="; + cargoHash = "sha256-HxIyWlFKDRod5nSENZguNYz/vn+E9Ux0K3dMhX7I/zQ="; buildInputs = lib.optionals stdenv.isDarwin ( with darwin.apple_sdk.frameworks; From 594e129f27683ece85538959c31b5a7ed823b121 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Sep 2024 10:56:56 +0000 Subject: [PATCH 57/58] boxbuddy: 2.2.11 -> 2.2.12 --- pkgs/by-name/bo/boxbuddy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/bo/boxbuddy/package.nix b/pkgs/by-name/bo/boxbuddy/package.nix index 4ba6c90fdeb8..db8e357899f6 100644 --- a/pkgs/by-name/bo/boxbuddy/package.nix +++ b/pkgs/by-name/bo/boxbuddy/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "boxbuddy"; - version = "2.2.11"; + version = "2.2.12"; src = fetchFromGitHub { owner = "Dvlv"; repo = "BoxBuddyRS"; rev = version; - hash = "sha256-MPeGaAoKbLit/d0UCZjAEso4i2vZ8H4D8Ia8Mutqnvg="; + hash = "sha256-PoPIIwe2SlK/iQTyqIhMG0dRobU98L5hnOciMmi9coo="; }; - cargoHash = "sha256-5tSM5sqrePpP7YOLuKi4i78F48oSexLVHQSyx6g7fio="; + cargoHash = "sha256-En5TVCW/URJEry4sTd+vdi8K1YO2L0X5pYu/TGsrx6U="; # The software assumes it is installed either in flatpak or in the home directory # so the xdg data path needs to be patched here From 2be4286e70b74f09c8e19ea11d7f30ee15643fb1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 18 Sep 2024 13:10:24 +0200 Subject: [PATCH 58/58] matrix-appservice-irc: 3.0.1 -> 3.0.2 https://github.com/matrix-org/matrix-appservice-irc/releases/tag/3.0.2 --- .../matrix-synapse/matrix-appservice-irc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix index e62e43ff7055..c17f0fcec98f 100644 --- a/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix +++ b/pkgs/servers/matrix-synapse/matrix-appservice-irc/default.nix @@ -13,19 +13,19 @@ let pname = "matrix-appservice-irc"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "matrix-org"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-LlcGcE3ik/xaiySyW5vfemGmukR7rlZrhfZOJwwfLDM="; + hash = "sha256-ugnFlvu5kkfTHPD44/F8OvGUx55VcHQvTS99T7Wc2fE="; }; yarnOfflineCache = fetchYarnDeps { name = "${pname}-${version}-offline-cache"; yarnLock = "${src}/yarn.lock"; - hash = "sha256-VUqi1OBuUeLbjDH0yBZDSkJBkaMWdzYddcHB5rikJwQ="; + hash = "sha256-PObpXC8VIdsqhOZLLeHdS9mvXnjNQOrs2vlTeK5keRw="; }; in