From 3e53f2b569c3463d314311c4c96947f0a1b9f8b9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 10:31:58 +0100 Subject: [PATCH 001/201] lib/licenses: add xskat --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index baf92007123d..f5da7f62901b 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1212,6 +1212,11 @@ in mkLicense lset) ({ spdxId = "ZPL-2.1"; fullName = "Zope Public License 2.1"; }; + + xskat = { + spdxId = "XSkat"; + fullName = "XSkat License"; + }; } // { # TODO: remove legacy aliases agpl3 = { From a16469199953d74aa4a832eded584ed98eaef72a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 10:33:32 +0100 Subject: [PATCH 002/201] xskat: change license to xskat --- pkgs/games/xskat/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix index 6baf397ad678..0d9fc5fe312f 100644 --- a/pkgs/games/xskat/default.nix +++ b/pkgs/games/xskat/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Famous german card game"; platforms = platforms.unix; - license = licenses.free; + license = licenses.xskat; longDescription = "Play the german card game Skat against the AI or over IRC."; homepage = "https://web.archive.org/web/20221003060115/https://www.xskat.de/xskat.html"; }; From d4a13075248705dab85a7218ccde8cbd4817e4b2 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 10:40:02 +0100 Subject: [PATCH 003/201] lib/licenses: add xinetd --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index f5da7f62901b..5011aad543ee 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1198,6 +1198,11 @@ in mkLicense lset) ({ url = "https://mcj.sourceforge.net/authors.html#xfig"; }; + xinetd = { + spdxId = "xinetd"; + fullName = "xinetd License"; + }; + zlib = { spdxId = "Zlib"; fullName = "zlib License"; From 00aad0ecd98f6bab86cd4a791083a19d60c7112c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 10:42:15 +0100 Subject: [PATCH 004/201] xinetd: change license to xinetd --- pkgs/servers/xinetd/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/xinetd/default.nix b/pkgs/servers/xinetd/default.nix index d7d1c94d9de2..db8c65354d7f 100644 --- a/pkgs/servers/xinetd/default.nix +++ b/pkgs/servers/xinetd/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { description = "Secure replacement for inetd"; platforms = lib.platforms.linux; homepage = "https://github.com/openSUSE/xinetd"; - license = lib.licenses.free; + license = lib.licenses.xinetd; maintainers = with lib.maintainers; [ fgaz ]; }; } From a302ae8adc0a9f89e5ade805e980e32b0de41eae Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 12:11:14 +0100 Subject: [PATCH 005/201] lib/licenses: add smlnj --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 5011aad543ee..85eb7292bccf 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -1051,6 +1051,11 @@ in mkLicense lset) ({ url = "https://sources.debian.org/copyright/license/debianutils/4.9.1/"; }; + smlnj = { + spdxId = "SMLNJ"; + fullName = "Standard ML of New Jersey License"; + }; + sspl = { shortName = "SSPL"; fullName = "Server Side Public License"; From 052fc6613b77a5dd24240a16756c3a25adcf1efa Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 12:13:33 +0100 Subject: [PATCH 006/201] xfontsel: change license to x11, smlnj and mit Found at https://gitlab.freedesktop.org/xorg/app/xfontsel/-/blob/master/COPYING --- pkgs/applications/misc/xfontsel/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xfontsel/default.nix b/pkgs/applications/misc/xfontsel/default.nix index ecafb9d5118c..6bcab225c25a 100644 --- a/pkgs/applications/misc/xfontsel/default.nix +++ b/pkgs/applications/misc/xfontsel/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.x.org/"; description = "Allows testing the fonts available in an X server"; - license = licenses.free; + license = with licenses; [ x11 smlnj mit ]; maintainers = with maintainers; [ viric ]; platforms = platforms.unix; }; From 03d654beb03ee8d293785629f31bc50f113c0bca Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 12:59:58 +0100 Subject: [PATCH 007/201] welkin: change license to bsd3 $src/license also see http://simile.mit.edu/welkin/ --- pkgs/tools/graphics/welkin/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix index 111abc745be5..e825f5e5d2b8 100644 --- a/pkgs/tools/graphics/welkin/default.nix +++ b/pkgs/tools/graphics/welkin/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; hydraPlatforms = []; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.free; + license = lib.licenses.bsd3; platforms = with lib.platforms; unix; }; } From 186ff75feed99ec1b9d6b4a97465ff99cb8140a9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 13:10:16 +0100 Subject: [PATCH 008/201] vue: change license to ecl20 found at https://vue.tufts.edu/faq --- pkgs/applications/misc/vue/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/vue/default.nix b/pkgs/applications/misc/vue/default.nix index db9313b6be61..4743530197b0 100644 --- a/pkgs/applications/misc/vue/default.nix +++ b/pkgs/applications/misc/vue/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ raskin ]; platforms = with lib.platforms; linux; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - license = lib.licenses.free; # Apache License fork, actually + license = lib.licenses.ecl20; }; } From 00ed9a344cb48ceeb56e0a1fcdebcfd0cca6564d Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 13:27:44 +0100 Subject: [PATCH 009/201] virtual-ans: chnage license to unfreeRedistibutable found in $src/docs/license/Virtual ANS.txt --- pkgs/applications/audio/virtual-ans/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/virtual-ans/default.nix b/pkgs/applications/audio/virtual-ans/default.nix index 07f006aa0cc1..a14d5c5a37e2 100644 --- a/pkgs/applications/audio/virtual-ans/default.nix +++ b/pkgs/applications/audio/virtual-ans/default.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://warmplace.ru/soft/ans/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.free; + license = licenses.unfreeRedistributable; # I cannot test the Darwin version, so I'll leave it disabled platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = with maintainers; [ jacg ]; From 4cbf461ffd3f493ce4e6b0f0c663df087c385c4a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 13:49:40 +0100 Subject: [PATCH 010/201] vdrsymbols: change license to bitstreamVera and publicDomain --- pkgs/data/fonts/vdrsymbols/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/vdrsymbols/default.nix b/pkgs/data/fonts/vdrsymbols/default.nix index 5df82b31cfe5..fd7aba9ec063 100644 --- a/pkgs/data/fonts/vdrsymbols/default.nix +++ b/pkgs/data/fonts/vdrsymbols/default.nix @@ -27,6 +27,6 @@ stdenvNoCC.mkDerivation rec { # Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved. # DejaVu changes are in public domain # See https://dejavu-fonts.github.io/License.html for details - license = licenses.free; + license = with licenses; [ bitstreamVera publicDomain ]; }; } From 346182c334e4f9169cc262ac79c798b895002fe0 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Wed, 27 Dec 2023 12:54:33 +0100 Subject: [PATCH 011/201] ubuntu-font-family: change license to ufl found at https://launchpad.net/ubuntu-font-family --- pkgs/data/fonts/ubuntu-font-family/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/ubuntu-font-family/default.nix b/pkgs/data/fonts/ubuntu-font-family/default.nix index 331e34690a5e..671ba8b4b48d 100644 --- a/pkgs/data/fonts/ubuntu-font-family/default.nix +++ b/pkgs/data/fonts/ubuntu-font-family/default.nix @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { contemporary style and contains characteristics unique to the Ubuntu brand that convey a precise, reliable and free attitude."; homepage = "http://font.ubuntu.com/"; - license = licenses.free; + license = licenses.ufl; platforms = platforms.all; maintainers = [ maintainers.antono ]; }; From 95f9761fd96a64fd82ea6feb57b9cf190a636a50 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 30 Dec 2023 00:40:41 +0100 Subject: [PATCH 012/201] lib/license: add dtoa --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 85eb7292bccf..0dfd8ef5e69c 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -405,6 +405,11 @@ in mkLicense lset) ({ fullName = "Detection Rule License 1.0"; }; + dtoa = { + spdxId = "dtoa"; + fullName = "dtoa License"; + }; + eapl = { fullName = "EPSON AVASYS PUBLIC LICENSE"; url = "https://avasys.jp/hp/menu000000700/hpg000000603.htm"; From ad306fc1c89cd397c26aba7978a7eed77e515c2c Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 30 Dec 2023 00:42:24 +0100 Subject: [PATCH 013/201] u9fs: change license to dtoa found at https://bitbucket.org/plan9-from-bell-labs/u9fs/src/master/LICENSE --- pkgs/servers/u9fs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/u9fs/default.nix b/pkgs/servers/u9fs/default.nix index 9056b4791672..cb85a972e034 100644 --- a/pkgs/servers/u9fs/default.nix +++ b/pkgs/servers/u9fs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Serve 9P from Unix"; homepage = "http://p9f.org/magic/man2html?man=u9fs§=4"; - license = licenses.free; + license = licenses.dtoa; maintainers = [ maintainers.ehmry ]; platforms = platforms.unix; mainProgram = "u9fs"; From 4711e8868124ad860cea902b8ab6e3223e78a9e5 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 30 Dec 2023 01:00:48 +0100 Subject: [PATCH 014/201] tty-clock: change license to bsd3 found at https://github.com/xorg62/tty-clock/blob/master/LICENSE --- pkgs/tools/misc/tty-clock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/tty-clock/default.nix b/pkgs/tools/misc/tty-clock/default.nix index 32701caa64de..0abb0c668be0 100644 --- a/pkgs/tools/misc/tty-clock/default.nix +++ b/pkgs/tools/misc/tty-clock/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; homepage = "https://github.com/xorg62/tty-clock"; - license = licenses.free; + license = licenses.bsd3; description = "Digital clock in ncurses"; platforms = platforms.all; maintainers = [ maintainers.koral ]; From 3b388c963bff85c26a0b3d3c15f6685a9e3cf5b9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 30 Dec 2023 01:01:56 +0100 Subject: [PATCH 015/201] tinyxml: change license to zlib found at https://sourceforge.net/projects/tinyxml/ in license section --- pkgs/development/libraries/tinyxml/2.6.2.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/tinyxml/2.6.2.nix b/pkgs/development/libraries/tinyxml/2.6.2.nix index ebfd8e5670ff..bff932f43096 100644 --- a/pkgs/development/libraries/tinyxml/2.6.2.nix +++ b/pkgs/development/libraries/tinyxml/2.6.2.nix @@ -74,7 +74,7 @@ in stdenv.mkDerivation { meta = { description = "Simple, small, C++ XML parser that can be easily integrating into other programs"; homepage = "http://www.grinninglizard.com/tinyxml/index.html"; - license = lib.licenses.free; + license = lib.licenses.zlib; platforms = lib.platforms.unix; }; } From 88c08be88ffd6266451c3a547122aa55f31a2576 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 30 Dec 2023 15:46:49 +0100 Subject: [PATCH 016/201] taskopen: change license to gpl2Plus found at https://github.com/jschlatow/taskopen/blob/master/LICENSE --- pkgs/applications/misc/taskopen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/taskopen/default.nix b/pkgs/applications/misc/taskopen/default.nix index 88050d2f449d..54361a0fbbd5 100644 --- a/pkgs/applications/misc/taskopen/default.nix +++ b/pkgs/applications/misc/taskopen/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { description = "Script for taking notes and open urls with taskwarrior"; homepage = "https://github.com/ValiValpas/taskopen"; platforms = platforms.linux; - license = licenses.free; + license = licenses.gpl2Plus; maintainers = [ maintainers.winpat ]; }; } From 93d4c4b42cf410dc996e7d333dbcfc62117ac2d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Feb 2024 10:38:34 +0000 Subject: [PATCH 017/201] dyff: 1.6.0 -> 1.7.1 --- pkgs/development/tools/dyff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dyff/default.nix b/pkgs/development/tools/dyff/default.nix index a549563aabbe..0e16e37e274d 100644 --- a/pkgs/development/tools/dyff/default.nix +++ b/pkgs/development/tools/dyff/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dyff"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "homeport"; repo = "dyff"; rev = "v${version}"; - sha256 = "sha256-MyQVTAfKHog6BiqqT8eaIPlUMctHz+Oe4eZqfpgiHNs="; + sha256 = "sha256-4jW8KJqdhrx79Q5ioyMGOlmLosTEkEIrdBwMjfiIcsY="; }; - vendorHash = "sha256-VAPJqa1930Vmjjj9rSjVTk6e4HD3JbOk6VC8v37kijQ="; + vendorHash = "sha256-JhjngBZK3vWlKzCCkTWJf/VrBXUW6T4FcUivn5CMBjE="; subPackages = [ "cmd/dyff" From 2d8effb0fc5d0abd1ccad3e857239ba92f860b46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Feb 2024 08:16:47 +0000 Subject: [PATCH 018/201] lidarr: 2.0.7.3849 -> 2.1.7.4030 --- pkgs/servers/lidarr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/lidarr/default.nix b/pkgs/servers/lidarr/default.nix index aba1c766ce50..06a51b450331 100644 --- a/pkgs/servers/lidarr/default.nix +++ b/pkgs/servers/lidarr/default.nix @@ -8,13 +8,13 @@ let x86_64-darwin = "x64"; }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-TqwVWV3kfBTqGYf6PT9H0E9YiG/AfLWEViKocVrhZuU="; - arm64-linux_hash = "sha256-aCaUZgnk4rnhEV3hDVZx1Bfz+PteefGeGvEdoKXGxxg="; - x64-osx_hash = "sha256-4O3H2gsH2Q3V9xY1fIMzkaU0qSEg3CF89chnrMdCmdk="; + x64-linux_hash = "sha256-njTaQIi15k0+8tnuIO+waRmSE+BAG46ln+qzesFfI0E="; + arm64-linux_hash = "sha256-dgX/G3eyWjtVmwptv0+Fbmt7/SjR26N5Ug+YXeC9fgU="; + x64-osx_hash = "sha256-kFliWQB1eQK1AoeWIZ3XaYj5mwSwRJWL2G8OwaLTFN4="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "lidarr"; - version = "2.0.7.3849"; + version = "2.1.7.4030"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.${os}-core-${arch}.tar.gz"; From e9db8c4c77271ec3766f6a7b22e66c2e63bc87c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Feb 2024 01:36:32 +0000 Subject: [PATCH 019/201] clingcon: 5.2.0 -> 5.2.1 --- pkgs/applications/science/logic/potassco/clingcon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/potassco/clingcon.nix b/pkgs/applications/science/logic/potassco/clingcon.nix index e024ffb9364e..4966bf608bc9 100644 --- a/pkgs/applications/science/logic/potassco/clingcon.nix +++ b/pkgs/applications/science/logic/potassco/clingcon.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "clingcon"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "potassco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wZfTneoQSqEnLAVE8WyPh9EABmOEhDgRm6yWAF1T7Nk="; + sha256 = "sha256-R2kgcw8VUwhOdvPXnsahT5gnoUd5DXLqfdH++8rFoAA="; }; postPatch = '' From 963348a9c280caa6b8e27200aeb4f67694805949 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Feb 2024 01:40:42 +0000 Subject: [PATCH 020/201] cctz: 2.3 -> 2.4 --- pkgs/development/libraries/cctz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cctz/default.nix b/pkgs/development/libraries/cctz/default.nix index 0b945c8c5990..c0f8a58a18d9 100644 --- a/pkgs/development/libraries/cctz/default.nix +++ b/pkgs/development/libraries/cctz/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cctz"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "google"; repo = "cctz"; rev = "v${version}"; - sha256 = "0254xfwscfkjc3fbvx6qgifr3pwkc2rb03z8pbvvqy098di9alhr"; + sha256 = "sha256-F4h8nT1karymV16FFHC0ldSbdOOx5AMstqi4Bc5m3UQ="; }; makeFlags = [ "PREFIX=$(out)" ]; From 9acf9f0a191dc19d0754da2f57e684db8ecb57d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Feb 2024 03:49:20 +0000 Subject: [PATCH 021/201] confluent-platform: 7.5.0 -> 7.6.0 --- pkgs/servers/confluent-platform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/confluent-platform/default.nix b/pkgs/servers/confluent-platform/default.nix index 2c4e1c5d4f47..5bc010663b0c 100644 --- a/pkgs/servers/confluent-platform/default.nix +++ b/pkgs/servers/confluent-platform/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "confluent-platform"; - version = "7.5.0"; + version = "7.6.0"; src = fetchurl { url = "https://packages.confluent.io/archive/${lib.versions.majorMinor finalAttrs.version}/confluent-${finalAttrs.version}.tar.gz"; - hash = "sha256-HaK3Do6oRGm6ovvNNGvZE34rYNRQnrmt1GKglTSZ9ls="; + hash = "sha256-bHT8VWSUqxiM/g7opRXZmEOAs2d61dWBTtuwwlzPgBc="; }; nativeBuildInputs = [ From 1c102628bc6039df4809e7b7495c99526c82d886 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Feb 2024 03:54:20 +0000 Subject: [PATCH 022/201] trytond: 7.0.5 -> 7.0.7 --- pkgs/development/python-modules/trytond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index f196b3a3d472..eb1665bf0bf2 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.0.5"; + version = "7.0.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-UTDONJrb28gnGkoV6Rb/2ChsgcLIxCmDhSd4gvFxq14="; + hash = "sha256-cxh9Aqn5gNVXJ2ArQPVSAX8joSnwyXakY4KE9d1VREk="; }; propagatedBuildInputs = [ From 6422f3435d9a392da347139385c7c672fd02f81b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Feb 2024 16:08:30 +0000 Subject: [PATCH 023/201] ibus-engines.m17n: 1.4.27 -> 1.4.28 --- pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix index eea671dc7b55..2509659cf8ef 100644 --- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix +++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "ibus-m17n"; - version = "1.4.27"; + version = "1.4.28"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus-m17n"; rev = version; - sha256 = "sha256-A8XxmYEi7OuJk1BhXCtk/hx5/JOqg2sJ6yE9gzaTRNA="; + sha256 = "sha256-3/AnytPIIi1Q2i/25rkqOZWgUCtouO+cS+TByp9neOI="; }; nativeBuildInputs = [ From f95591df2c33a60aa91df1ee28e4f4dfd91f2609 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Feb 2024 05:50:54 +0000 Subject: [PATCH 024/201] grafana-dash-n-grab: 0.5.1 -> 0.5.2 --- pkgs/servers/monitoring/grafana-dash-n-grab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix index 52309195a419..089d2f4e4db1 100644 --- a/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix +++ b/pkgs/servers/monitoring/grafana-dash-n-grab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "grafana-dash-n-grab"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "esnet"; repo = "gdg"; - sha256 = "sha256-OLMa5s3QoK+ZeU3v/mPW9tPXqKTS/f+90pPpT+nlWFU="; + sha256 = "sha256-EG1hLyoy75nvA1ZmSHSPVEzMwhq6d0PxmVUpQysjsRg="; }; - vendorHash = "sha256-y5eqG0kB3kGZ2X/VR6aVT+qCVZQd2MbFDqReoPwNtO4="; + vendorHash = "sha256-w0w6ac8sNxsVBEYps6ZhM7F4PFcIWKah0cnk/NBtA8M="; ldflags = [ "-s" From 949e1be104548adf37b8d60cb86ecd003085b74d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Feb 2024 07:25:03 +0000 Subject: [PATCH 025/201] google-java-format: 1.19.2 -> 1.20.0 --- pkgs/development/tools/google-java-format/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/google-java-format/default.nix b/pkgs/development/tools/google-java-format/default.nix index bf499e891dd6..906e62b7ecbe 100644 --- a/pkgs/development/tools/google-java-format/default.nix +++ b/pkgs/development/tools/google-java-format/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "google-java-format"; - version = "1.19.2"; + version = "1.20.0"; src = fetchurl { url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar"; - sha256 = "sha256-2Ji19wxVr9z3wEMeSX1opIRyw4Ty0E/m8JeN/+Ysvio="; + sha256 = "sha256-zFeojPLgGMDXJOclevMTLndI/gGkvBn9PH6DoyyEh4A="; }; dontUnpack = true; From 2d09024e5fbe7cf30ebd0912612413038a941f68 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Feb 2024 08:09:47 +0000 Subject: [PATCH 026/201] undefined-medium: 1.1 -> 1.2 --- pkgs/data/fonts/undefined-medium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/undefined-medium/default.nix b/pkgs/data/fonts/undefined-medium/default.nix index 3e3087c6abc8..c1b22f787117 100644 --- a/pkgs/data/fonts/undefined-medium/default.nix +++ b/pkgs/data/fonts/undefined-medium/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "undefined-medium"; - version = "1.1"; + version = "1.2"; src = fetchzip { - url = "https://github.com/andirueckel/undefined-medium/archive/v1.1.zip"; - hash = "sha256-iquxt7lo92y4AQZf23Ij5Qzg2U7buL3kGLksQSR6vac="; + url = "https://github.com/andirueckel/undefined-medium/archive/v1.2.zip"; + hash = "sha256-hgHwi25T+aM7ljzk5uR4x+CqoRJ3/IOyktdp/mDW46I="; }; installPhase = '' From 90f257d961039f74987b703a033c9a2aa36de3a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Feb 2024 08:12:34 +0000 Subject: [PATCH 027/201] zimfw: 1.12.1 -> 1.13.0 --- pkgs/shells/zsh/zimfw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zimfw/default.nix b/pkgs/shells/zsh/zimfw/default.nix index af452968fa63..c62c978b983d 100644 --- a/pkgs/shells/zsh/zimfw/default.nix +++ b/pkgs/shells/zsh/zimfw/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "zimfw"; - version = "1.12.1"; + version = "1.13.0"; src = fetchFromGitHub { owner = "zimfw"; repo = "zimfw"; rev = "v${version}"; ## zim only needs this one file to be installed. sparseCheckout = [ "zimfw.zsh" ]; - sha256 = "sha256-BoUNUdhRUWNi2ttxgWJxbjHw64K9k0rNjRi2L4V+gLk="; + sha256 = "sha256-yo1+jXmBzJdFLaVpmyKe8cyceg+sIgD++l2mSYPaKd8="; }; strictDeps = true; dontConfigure = true; From 79e9d4ca4e3cd20821745cd8c51f6b87acd33b17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Feb 2024 19:46:56 +0000 Subject: [PATCH 028/201] orca-slicer: 1.9.0 -> 1.9.1 --- pkgs/applications/misc/bambu-studio/orca-slicer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/bambu-studio/orca-slicer.nix b/pkgs/applications/misc/bambu-studio/orca-slicer.nix index 251423d24d35..b600f6164010 100644 --- a/pkgs/applications/misc/bambu-studio/orca-slicer.nix +++ b/pkgs/applications/misc/bambu-studio/orca-slicer.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, makeDesktopItem, bambu-studio }: let orca-slicer = bambu-studio.overrideAttrs (finalAttrs: previousAttrs: { - version = "1.9.0"; + version = "1.9.1"; pname = "orca-slicer"; src = fetchFromGitHub { owner = "SoftFever"; repo = "OrcaSlicer"; rev = "v${finalAttrs.version}"; - hash = "sha256-v6REKDlFhyW6kEEfpcm8Sjezkh6uLaBusMuVk8n3Ts0="; + hash = "sha256-+JYUpyEr3xraJEb1wDkyle+jAQiNE+AMUTT1fhh4Clw="; }; meta = with lib; { From b7899c6ff833bbc2f31d61f40d7aabe77d63a59f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Feb 2024 20:39:29 +0000 Subject: [PATCH 029/201] cdogs-sdl: 1.5.0 -> 2.0.0 --- pkgs/games/cdogs-sdl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/cdogs-sdl/default.nix b/pkgs/games/cdogs-sdl/default.nix index 5c74b10ef32a..e6ea213b6220 100644 --- a/pkgs/games/cdogs-sdl/default.nix +++ b/pkgs/games/cdogs-sdl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "cdogs-sdl"; - version = "1.5.0"; + version = "2.0.0"; src = fetchFromGitHub { repo = pname; owner = "cxong"; rev = version; - sha256 = "sha256-XSq0TK3ZuLOa8JJnp/Qxt16Ru3p35tq5FOo4+tv+c60="; + sha256 = "sha256-es04sCqthjf9unK2mbsBVHlxOeTpimQ+ViabhC/WD0I="; }; postPatch = '' From 2b436231e88759eeac6dab7f30bae2e8c7330752 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Feb 2024 10:22:22 +0000 Subject: [PATCH 030/201] goa: 3.14.6 -> 3.15.0 --- pkgs/development/tools/goa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 19ac74f7f427..4928bf501ab8 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.14.6"; + version = "3.15.0"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - hash = "sha256-u26k4jKT68AMb9pQf/5FCuX+yGpcuGJ6uOIqXfWbg2o="; + hash = "sha256-F5ynJn3uuKSNZYZy+S6OV0AGv9HMpp4oo7lacQ+q3bw="; }; - vendorHash = "sha256-PcPYsTjWt4N27ahHCdx+ZylujmuX/hopN9o7vKUAA5w="; + vendorHash = "sha256-SvNuSSLL/zj7rg+k0wNiJazQgZBWrUrpGgumbADkHQY="; subPackages = [ "cmd/goa" ]; From 0303f073dcbd4fb49ba73609eb30745f09d4f908 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Feb 2024 10:22:25 +0000 Subject: [PATCH 031/201] openxr-loader: 1.0.33 -> 1.0.34 --- pkgs/development/libraries/openxr-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 3c739d30d386..c89baab7936b 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.33"; + version = "1.0.34"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-26CRpxiTfZOq6sQSl0H53UmYzPY/6mP33EPObdkwnQs="; + sha256 = "sha256-AzqGNFJozmtivj+gXYHPZX2iYginQ2gXbLCImhMH9Jc="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; From 8c9b74f324e77c883b456d95cd83a49e82c6fb34 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 18 Feb 2024 11:36:42 +0000 Subject: [PATCH 032/201] python311Packages.basemap: 1.4.0 -> 1.4.1 --- pkgs/development/python-modules/basemap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/basemap/default.nix b/pkgs/development/python-modules/basemap/default.nix index b3e26b5a55d6..3dd2e761b097 100644 --- a/pkgs/development/python-modules/basemap/default.nix +++ b/pkgs/development/python-modules/basemap/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "basemap"; - version = "1.4.0"; + version = "1.4.1"; format = "setuptools"; src = fetchFromGitHub { owner = "matplotlib"; repo = "basemap"; rev = "refs/tags/v${version}"; - hash = "sha256-RlEizHJwSojujqFFi14T5/W5L9juVSHMQepbRlirMeI="; + hash = "sha256-0rTGsphwLy2yGvhO7bcmFqdgysIXXkDBmURwRVw3ZHY="; }; sourceRoot = "${src.name}/packages/basemap"; From ad8f3a891f9e50931351bca421b621fae746a8fa Mon Sep 17 00:00:00 2001 From: D3vil0p3r Date: Sun, 18 Feb 2024 17:22:06 +0100 Subject: [PATCH 033/201] htb-toolkit: add platforms metadata --- pkgs/by-name/ht/htb-toolkit/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ht/htb-toolkit/package.nix b/pkgs/by-name/ht/htb-toolkit/package.nix index 9930f02e38bd..b833fed50580 100644 --- a/pkgs/by-name/ht/htb-toolkit/package.nix +++ b/pkgs/by-name/ht/htb-toolkit/package.nix @@ -61,9 +61,10 @@ rustPlatform.buildRustPackage { meta = with lib; { description = "Play Hack The Box directly on your system"; - homepage = "https://github.com/D3vil0p3r/htb-toolkit"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ d3vil0p3r ]; mainProgram = "htb-toolkit"; + homepage = "https://github.com/D3vil0p3r/htb-toolkit"; + maintainers = with maintainers; [ d3vil0p3r ]; + platforms = platforms.unix; + license = licenses.gpl3Plus; }; } From fd06200ae6c98924e274f21cc2c91f36ac8932f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 19 Feb 2024 23:25:49 +0000 Subject: [PATCH 034/201] far2l: 2.5.3 -> 2.6.0 --- pkgs/applications/misc/far2l/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/far2l/default.nix b/pkgs/applications/misc/far2l/default.nix index bca4a1d86a72..ad2cc905d9cf 100644 --- a/pkgs/applications/misc/far2l/default.nix +++ b/pkgs/applications/misc/far2l/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "far2l"; - version = "2.5.3"; + version = "2.6.0"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; rev = "v_${version}"; - sha256 = "sha256-aK6+7ChFAkeDiEYU2llBb//PBej2Its/wBeuG7ys/ew="; + sha256 = "sha256-fLBWHhvfqEiaZkFyNs8CKr5vFMQ5mrbo/X3oGwJmFoo="; }; nativeBuildInputs = [ cmake ninja pkg-config m4 perl makeWrapper ]; From 5c736ea810c70e0e56ffe79011c79ce1e06eecd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Feb 2024 02:03:41 +0000 Subject: [PATCH 035/201] genact: 1.3.0 -> 1.4.2 --- pkgs/applications/misc/genact/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index 1d5c11063c00..43dee3baca4b 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "genact"; - version = "1.3.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iPDIbfbRNhgmTQHw9gNczXTcUaJ0dQpBDHg5ZOQQJ4M="; + sha256 = "sha256-Rn9kJWutWKPj9cLu2ZJKITmC+I8/ikhCAoIp00Yg6ZA="; }; - cargoHash = "sha256-Hg8Xlcx0j70Z8IwlJPCwm+qhurXjtKGLI3ZUCeHL1KY="; + cargoHash = "sha256-kmXtwS5pCLEq5dbNHtWYGzDKjOUlVlr5xippVd2wl8k="; nativeBuildInputs = [ installShellFiles ]; From a048b5ca638cd7776705dd2edfdd69bba0bb2ffc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Feb 2024 11:27:18 +0000 Subject: [PATCH 036/201] prometheus-artifactory-exporter: 1.13.2 -> 1.14.0 --- pkgs/servers/monitoring/prometheus/artifactory-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index f77257745872..54b5c8370bdf 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -6,17 +6,17 @@ buildGoModule rec { pname = "artifactory_exporter"; - version = "1.13.2"; + version = "1.14.0"; rev = "v${version}"; src = fetchFromGitHub { owner = "peimanja"; repo = pname; rev = rev; - hash = "sha256-m5ToXry1LgjWSTU9bjOtsgfVF8wKiKuTwCIC7jNGSKY="; + hash = "sha256-+CCUSI7Rh9fENzsg7rpI01Cm++kafd1nGgpyFRt20Ug="; }; - vendorHash = "sha256-ikWxTHmqHFWAReKMf6LFza/bhkcfxa4euXUixKPvcpQ="; + vendorHash = "sha256-CQ7JvXcutj63UzaYk/jbmd9G2whN48Xv1PCllaI9Nuo="; subPackages = [ "." ]; From 517228f1e74c7ee3580f72869da9e6da4e2e78e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Feb 2024 11:34:01 +0000 Subject: [PATCH 037/201] moonlight-embedded: 2.6.2 -> 2.7.0 --- pkgs/applications/misc/moonlight-embedded/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix index 005434b7d14c..e22923e2423f 100644 --- a/pkgs/applications/misc/moonlight-embedded/default.nix +++ b/pkgs/applications/misc/moonlight-embedded/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "moonlight-embedded"; - version = "2.6.2"; + version = "2.7.0"; src = fetchFromGitHub { owner = "moonlight-stream"; repo = "moonlight-embedded"; rev = "v${version}"; - sha256 = "sha256-57gD8vyUk4+eJB+QkD+hZzyzM+Lhvue1mY7xSApYWn8="; + sha256 = "sha256-Jc706BjIT3rS9zwntNOdgszP4CHuX+qxvPvWeU68Amg="; fetchSubmodules = true; }; From c23dc48a6998412b1bf4d2f175a2672f590a9fbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Feb 2024 20:36:15 +0000 Subject: [PATCH 038/201] squirrel-sql: 4.6.0 -> 4.7.1 --- pkgs/development/tools/database/squirrel-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/squirrel-sql/default.nix b/pkgs/development/tools/database/squirrel-sql/default.nix index 0f866d5e5ae7..2d0795dee76b 100644 --- a/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/pkgs/development/tools/database/squirrel-sql/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { pname = "squirrel-sql"; - version = "4.6.0"; + version = "4.7.1"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; - sha256 = "sha256-MMRn83yAi9saUI3/QHggj4s2t0uzZ1oJf9+CIqf4dGc="; + sha256 = "sha256-Y7eG2otbLjtXvs3mRXWL8jJywuhBQ9i/MfWJXvkxnuU="; }; nativeBuildInputs = [ makeWrapper unzip ]; From 96f1273f750421d6563784942515016f63fb9ef4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 20 Feb 2024 22:01:56 +0000 Subject: [PATCH 039/201] protoc-gen-connect-go: 1.14.0 -> 1.15.0 --- pkgs/development/tools/protoc-gen-connect-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-connect-go/default.nix b/pkgs/development/tools/protoc-gen-connect-go/default.nix index 6a39509d0c67..60b7199fe19e 100644 --- a/pkgs/development/tools/protoc-gen-connect-go/default.nix +++ b/pkgs/development/tools/protoc-gen-connect-go/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "protoc-gen-connect-go"; - version = "1.14.0"; + version = "1.15.0"; src = fetchFromGitHub { owner = "connectrpc"; repo = "connect-go"; rev = "refs/tags/v${version}"; - hash = "sha256-lb0kMIcVOZz/8s7exsrv4I7PuF/mIzrZ6TSv4cii1UY="; + hash = "sha256-0jQYZ4T3fE+TEQ/z9RooRqMtDCWHQUWzVCqEak6JKmQ="; }; - vendorHash = "sha256-tiTdGoAuY+DxYvwI1glX7LqgwOI3hCfrgszV81cxkE0="; + vendorHash = "sha256-rQCKj1L0kQccxWCmR0+D4itypZqJ2YuBuzCkdOVLO/U="; subPackages = [ "cmd/protoc-gen-connect-go" From bf1a92c099d4d1ce6b5c7be89a4838b213aaf26f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Feb 2024 07:19:36 +0000 Subject: [PATCH 040/201] exodus: 24.1.15 -> 24.2.12 --- pkgs/applications/blockchains/exodus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/exodus/default.nix b/pkgs/applications/blockchains/exodus/default.nix index 110ddb9017e5..323bca0844cc 100644 --- a/pkgs/applications/blockchains/exodus/default.nix +++ b/pkgs/applications/blockchains/exodus/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "exodus"; - version = "24.1.15"; + version = "24.2.12"; src = fetchurl { name = "exodus-linux-x64-${version}.zip"; url = "https://downloads.exodus.com/releases/${pname}-linux-x64-${version}.zip"; curlOptsList = [ "--user-agent" "Mozilla/5.0" ]; - sha256 = "sha256-KfUlYnonlyI/5sWIM9CS/eo9a4KWeG7Gqe/KkAqSbbY="; + sha256 = "sha256-oT0CgmfNXq9Kdoo+l+GHW2NVcT12MxJxq9BlIP7lMDE="; }; nativeBuildInputs = [ unzip ]; From 2420888e820ba4fe2f4df3af4b4093f5c91612c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Feb 2024 07:20:51 +0000 Subject: [PATCH 041/201] libgig: 4.4.0 -> 4.4.1 --- pkgs/development/libraries/libgig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgig/default.nix b/pkgs/development/libraries/libgig/default.nix index 48d45797096b..fcc44025400c 100644 --- a/pkgs/development/libraries/libgig/default.nix +++ b/pkgs/development/libraries/libgig/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libgig"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; - sha256 = "sha256-ZwQMrK8da12lFz7UAY2i+eW3rzPFhngdUfeV3hW65iI="; + sha256 = "sha256-/cie+rH5BhKObFRymWdXfo0EYgFwGLwSVRJX313+OqQ="; }; nativeBuildInputs = [ autoconf automake libtool pkg-config ]; From acde7b0dbafaefaa285e805b9f10150f1b3ea363 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 21 Feb 2024 19:35:16 +0000 Subject: [PATCH 042/201] gcompris: 3.3 -> 4.0 --- pkgs/games/gcompris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gcompris/default.nix b/pkgs/games/gcompris/default.nix index a9e9f860d852..c6e16da0280c 100644 --- a/pkgs/games/gcompris/default.nix +++ b/pkgs/games/gcompris/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "gcompris"; - version = "3.3"; + version = "4.0"; src = fetchurl { url = "mirror://kde/stable/gcompris/qt/src/gcompris-qt-${version}.tar.xz"; - hash = "sha256-8hqiq1wYw4irbOXCrwcJqTMuLISzSmSqPuw2Rn8XzQA="; + hash = "sha256-wcTqnK7ESv+jWHr5asedlkQ5rZV9iV4PLS8yQkvuDrY="; }; cmakeFlags = [ From 2a9407f30df7cf62244439aeacc529a8c82ea849 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 01:47:43 +0000 Subject: [PATCH 043/201] holochain-launcher: 0.11.0 -> 0.11.5 --- pkgs/applications/misc/holochain-launcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/holochain-launcher/default.nix b/pkgs/applications/misc/holochain-launcher/default.nix index f2be253e3fac..111a36e3ee02 100644 --- a/pkgs/applications/misc/holochain-launcher/default.nix +++ b/pkgs/applications/misc/holochain-launcher/default.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation rec { name = "holochain-launcher"; - version = "0.11.0"; + version = "0.11.5"; prerelease = "beta-2"; src = fetchurl { url = "https://github.com/holochain/launcher/releases/download/v${version}/holochain-launcher-${prerelease}_${version}_amd64.deb"; - sha256 = "sha256-yxovSsPyIzFONa1ACeLkZqDCElDI3uTm81YOYW0/FXE="; + sha256 = "sha256-MRFQJRfvJ+dLmPDfPQX9wErIwEr07EAUqxic8kbKVdo="; }; nativeBuildInputs = [ From 119a63272ca2f9a4bf9358e121bca365a54f29bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 02:28:04 +0000 Subject: [PATCH 044/201] sqlcmd: 1.5.0 -> 1.6.0 --- pkgs/development/tools/database/sqlcmd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix index 80883ebfe996..956a28a0d976 100644 --- a/pkgs/development/tools/database/sqlcmd/default.nix +++ b/pkgs/development/tools/database/sqlcmd/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sqlcmd"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { repo = "go-sqlcmd"; owner = "microsoft"; rev = "v${version}"; - sha256 = "sha256-T7Jfxup3yTh0YhalUO/wxyAT4209BhZkUTbCGZggcJ0="; + sha256 = "sha256-LLRNaY6ArUNoKSWSauCh2RKEGO5+G1OnoCAqMaAfOkY="; }; - vendorHash = "sha256-NYWmTXGxt2ko/puNiY2Z0K6gFZW4IC//iT6xQcqSVsQ="; + vendorHash = "sha256-G6Patjrafg9VXXbisBDs/JVvy0SA6moTquKj66z9lzw="; proxyVendor = true; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From cd3487f624afeb16738def4450eba97f985253a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 02:36:10 +0000 Subject: [PATCH 045/201] pachyderm: 2.8.4 -> 2.9.0 --- pkgs/applications/networking/cluster/pachyderm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 3f0e3c693b5d..1e381c7470fb 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.8.4"; + version = "2.9.0"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-W6UXkMn+FsqjPFK2t8taJRZPnvLJe9/P3mhOAwjNW/Q="; + hash = "sha256-5xC0D7XB1db3mxUkzIyvmVIxOlL8XX8Vxpmtf60BQNM="; }; - vendorHash = "sha256-IRTzptluBxGm14IKK4n+2hfPrQ9YcqYA16WgbRkTV/s="; + vendorHash = "sha256-EW8DURf6URPQQMakHnRuF9Xh5iKh2y4cz6XYgXQwJM4="; subPackages = [ "src/server/cmd/pachctl" ]; From 111835a500edbe3f17976f24fa3af7ea441360f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 02:54:55 +0000 Subject: [PATCH 046/201] sdrangel: 7.18.0 -> 7.18.1 --- pkgs/applications/radio/sdrangel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 459fc1f48963..c20aded859da 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -52,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.18.0"; + version = "7.18.1"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-5+OUOqQb0ekeAVCOr+MftttqTwcDeiV44Oni6i3rO0w="; + hash = "sha256-7sGjO2DyjA/KeAEBTrli+/9QZTKu7VKkJFp3BJk9UVs="; }; nativeBuildInputs = [ From 0afb028097674794590ed50fab8adefeb3f00070 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 04:03:05 +0000 Subject: [PATCH 047/201] yoshimi: 2.3.1.3 -> 2.3.2 --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 2fdc579a3d82..02370d22ab7a 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "yoshimi"; - version = "2.3.1.3"; + version = "2.3.2"; src = fetchFromGitHub { owner = "Yoshimi"; repo = pname; rev = version; - hash = "sha256-G4XLRYFndXW6toRyL7n1xV1ueGKVnkY1NgtpzaZ8h+I="; + hash = "sha256-UaZjT7B9T3a3W9PD9abA/WPmt9Id8/zUUSZU05+8x9c="; }; sourceRoot = "${src.name}/src"; From ec629d858fd93d4b0398b9a8f99d34d344174235 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 04:19:00 +0000 Subject: [PATCH 048/201] besu: 24.1.1 -> 24.1.2 --- pkgs/applications/blockchains/besu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index 63ae0d8fe9ad..f599c44b5a62 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "24.1.1"; + version = "24.1.2"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-Sw3dWiW+LfXSMkv/k1eF62Pk46X0IWFOppC6y1ucs0Q="; + sha256 = "sha256-CC24z0+2dSeqDddX5dJUs7SX9QJ8Iyh/nAp0pqdDvwg="; }; nativeBuildInputs = [ makeWrapper ]; From 30120631aa269718e1cb45f3a026b0106fe3e7d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 06:53:42 +0000 Subject: [PATCH 049/201] python311Packages.xmlschema: 3.0.1 -> 3.0.2 --- pkgs/development/python-modules/xmlschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index f8752d5d2321..6b2d5cfda09a 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "xmlschema"; - version = "3.0.1"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "refs/tags/v${version}"; - hash = "sha256-7gko4BFbTnQ+MpSQiGVaAldZcb1X16hinXaHg+nvPgs="; + hash = "sha256-jYFhoNx4Oxm7c0LsSQ0xw9fY/yxfQU5JoP5RteHzeYM="; }; propagatedBuildInputs = [ From debe29016091766a77dc1d80eadfbd19f19d2518 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Feb 2024 08:40:49 +0100 Subject: [PATCH 050/201] python311Packages.xmlschema: refactor --- pkgs/development/python-modules/xmlschema/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index 6b2d5cfda09a..5869ad70fcea 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -6,12 +6,13 @@ , lxml , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "xmlschema"; version = "3.0.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,6 +23,10 @@ buildPythonPackage rec { hash = "sha256-jYFhoNx4Oxm7c0LsSQ0xw9fY/yxfQU5JoP5RteHzeYM="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ elementpath ]; From 62579be8a36ea446b45c9d4bb7097f4dd3fe213a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 14:24:33 +0000 Subject: [PATCH 051/201] python311Packages.debian-inspector: 31.0.0 -> 31.1.0 --- pkgs/development/python-modules/debian-inspector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/debian-inspector/default.nix b/pkgs/development/python-modules/debian-inspector/default.nix index eb0b89ba9871..0add3d134ec7 100644 --- a/pkgs/development/python-modules/debian-inspector/default.nix +++ b/pkgs/development/python-modules/debian-inspector/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "debian-inspector"; - version = "31.0.0"; + version = "31.1.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "debian_inspector"; inherit version; - hash = "sha256-RglPlTRksmm7CYVere7jySy2tIegv6JuulN7Usw9a0c="; + hash = "sha256-68+8FwZPEL07bSEizbyXtxpJSvDruvr5qM6t/osWT5k="; }; dontConfigure = true; From c6cc244b1e9eb64eef5bbe78a09ae2beeb8c3e4b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 15:54:03 +0000 Subject: [PATCH 052/201] bash_unit: 2.1.0 -> 2.2.0 --- pkgs/tools/misc/bash_unit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/bash_unit/default.nix b/pkgs/tools/misc/bash_unit/default.nix index ffedb168f1b4..f929348bc1bb 100644 --- a/pkgs/tools/misc/bash_unit/default.nix +++ b/pkgs/tools/misc/bash_unit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "bash_unit"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "pgrange"; repo = pname; rev = "v${version}"; - sha256 = "sha256-c1C+uBo5PSH07VjulCxkmvfj7UYm6emdDAaN00uvAcg="; + sha256 = "sha256-sYs7b6I1VhO2TLLhMFuaV9AtLoavcoKvCRYfVNGAg20="; }; installPhase = '' From b668dcd8de523584955bff9b6f402b642983a174 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 01:03:44 +0000 Subject: [PATCH 053/201] eclipse-mat: 1.14.0.20230315 -> 1.15.0.20231206 --- pkgs/development/tools/eclipse-mat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/eclipse-mat/default.nix b/pkgs/development/tools/eclipse-mat/default.nix index b76364c59552..309a3e02bd6f 100644 --- a/pkgs/development/tools/eclipse-mat/default.nix +++ b/pkgs/development/tools/eclipse-mat/default.nix @@ -19,7 +19,7 @@ }: let - pVersion = "1.14.0.20230315"; + pVersion = "1.15.0.20231206"; pVersionTriple = lib.splitVersion pVersion; majorVersion = lib.elemAt pVersionTriple 0; minorVersion = lib.elemAt pVersionTriple 1; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.halifax.rwth-aachen.de/eclipse//mat/${baseVersion}/rcp/MemoryAnalyzer-${version}-linux.gtk.x86_64.zip"; - sha256 = "sha256-9YFJILMRhIln4vo99noRxYARh1M/mjwg7t8RdAJCoW4="; + sha256 = "sha256-icmo5zdK0XaH32kXwZUVaQ0VPSGEgvlLr7v7PtdbmCg="; }; desktopItem = makeDesktopItem { From 5428c69de9153d2ea079b22d4244cd365bbe8489 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 04:08:43 +0000 Subject: [PATCH 054/201] polypane: 17.1.0 -> 18.0.0 --- pkgs/applications/networking/browsers/polypane/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/polypane/default.nix b/pkgs/applications/networking/browsers/polypane/default.nix index cf963ab31785..aa4032a7d7d9 100644 --- a/pkgs/applications/networking/browsers/polypane/default.nix +++ b/pkgs/applications/networking/browsers/polypane/default.nix @@ -2,12 +2,12 @@ let pname = "polypane"; - version = "17.1.0"; + version = "18.0.0"; src = fetchurl { url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-vOSw+zjO8OJWRzAdnl4i3MLg+AyXFQwYBg332MXdQhw="; + sha256 = "sha256-d2A+edQJKyChNCA7QH+YjlcIlHYVghX3UP60ZZBtP1s="; }; appimageContents = appimageTools.extractType2 { From 1698ab22202db0b9432e829a551ea678cf76057b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 05:41:16 +0000 Subject: [PATCH 055/201] open-stage-control: 1.25.7 -> 1.26.1 --- pkgs/applications/audio/open-stage-control/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/open-stage-control/default.nix b/pkgs/applications/audio/open-stage-control/default.nix index 2d446174fb11..b789dc668a8e 100644 --- a/pkgs/applications/audio/open-stage-control/default.nix +++ b/pkgs/applications/audio/open-stage-control/default.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "open-stage-control"; - version = "1.25.7"; + version = "1.26.1"; src = fetchFromGitHub { owner = "jean-emmanuel"; repo = "open-stage-control"; rev = "v${version}"; - hash = "sha256-BvWr+AhNGh2t4DleKFqgCqijma4CcXOSMoDtSeEUiEc="; + hash = "sha256-uw9vj12vs2N4nap6z1L6sGoCuPpRCmvfGoK/b+zHwHA="; }; # Remove some Electron stuff from package.json From a9bb4d1c6759e12bbdee5abe7c112001de1f9453 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 07:31:01 +0000 Subject: [PATCH 056/201] sosreport: 4.6.1 -> 4.7.0 --- pkgs/applications/logging/sosreport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/logging/sosreport/default.nix b/pkgs/applications/logging/sosreport/default.nix index 467feb4b496e..f28396470789 100644 --- a/pkgs/applications/logging/sosreport/default.nix +++ b/pkgs/applications/logging/sosreport/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "sosreport"; - version = "4.6.1"; + version = "4.7.0"; src = fetchFromGitHub { owner = "sosreport"; repo = "sos"; rev = "refs/tags/${version}"; - sha256 = "sha256-IW3b+zAxXnr7H+/XxJA+tJZYNte1nVdDaMhW3TcGxzo="; + sha256 = "sha256-SB8qLpa9ncAJjUkbPRuSY2eJ1fNMaLSR7BR/tgO+ZUs="; }; nativeBuildInputs = [ From 593000b7d1e21cd84c7ecd965a64916b0982b202 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 09:31:48 +0000 Subject: [PATCH 057/201] squashfuse: 0.5.0 -> 0.5.2 --- pkgs/tools/filesystems/squashfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/squashfuse/default.nix b/pkgs/tools/filesystems/squashfuse/default.nix index c1c374ac0340..71a25ef88b3f 100644 --- a/pkgs/tools/filesystems/squashfuse/default.nix +++ b/pkgs/tools/filesystems/squashfuse/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "squashfuse"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "vasi"; repo = pname; rev = version; - sha256 = "sha256-nCdAO5WPYt/aHdNnfkIJqz0T59COgsSGeXho4bFZVTY="; + sha256 = "sha256-76PQB+6ls/RCjEP8Z4DEtX0xemN3srCsLM7DsDqiTVA="; }; nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; From 9e87044ded431997bfacc5f53a15591b51e7526e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 12:02:13 +0000 Subject: [PATCH 058/201] python311Packages.django-simple-history: 3.4.0 -> 3.5.0 --- .../python-modules/django-simple-history/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-simple-history/default.nix b/pkgs/development/python-modules/django-simple-history/default.nix index a38671d97c0f..4c31b8725763 100644 --- a/pkgs/development/python-modules/django-simple-history/default.nix +++ b/pkgs/development/python-modules/django-simple-history/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "django-simple-history"; - version = "3.4.0"; + version = "3.5.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jazzband"; repo = "django-simple-history"; rev = "refs/tags/${version}"; - hash = "sha256-XY6YNajwX5z3AXkYYGFtrURDqxub9EQwu52jQ7CZwrI="; + hash = "sha256-BW/F+RBf1KvwGRY9IK00+n69Jtx/ndEuvpHSi8/odSE="; }; nativeBuildInputs = [ From 738881c8d2d628d43168295d861cf17b53c7068c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 13:11:02 +0000 Subject: [PATCH 059/201] ocamlPackages.dscheck: 0.2.0 -> 0.4.0 --- pkgs/development/ocaml-modules/dscheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/dscheck/default.nix b/pkgs/development/ocaml-modules/dscheck/default.nix index a684a46fdd44..a2dd8bd9d2a9 100644 --- a/pkgs/development/ocaml-modules/dscheck/default.nix +++ b/pkgs/development/ocaml-modules/dscheck/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "dscheck"; - version = "0.2.0"; + version = "0.4.0"; minimalOCamlVersion = "5.0"; src = fetchurl { url = "https://github.com/ocaml-multicore/dscheck/releases/download/${version}/dscheck-${version}.tbz"; - hash = "sha256-QgkbnD3B1lONg9U60BM2xWVgIt6pZNmOmxkKy+UJH9E="; + hash = "sha256-WWqa2O1y7krpIcxG7KLprn9SIQoWGSD3lgpXLZ9P9kA="; }; propagatedBuildInputs = [ containers oseq ]; From cb3d40911de27e954d6c56eaf32bce35164e5509 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 15:57:16 +0000 Subject: [PATCH 060/201] ballerina: 2201.8.4 -> 2201.8.5 --- pkgs/development/compilers/ballerina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ballerina/default.nix b/pkgs/development/compilers/ballerina/default.nix index c979b0225298..5f2e4d88b0ce 100644 --- a/pkgs/development/compilers/ballerina/default.nix +++ b/pkgs/development/compilers/ballerina/default.nix @@ -1,6 +1,6 @@ { ballerina, lib, writeText, runCommand, makeWrapper, fetchzip, stdenv, openjdk }: let - version = "2201.8.4"; + version = "2201.8.5"; codeName = "swan-lake"; in stdenv.mkDerivation { pname = "ballerina"; @@ -8,7 +8,7 @@ in stdenv.mkDerivation { src = fetchzip { url = "https://dist.ballerina.io/downloads/${version}/ballerina-${version}-${codeName}.zip"; - hash = "sha256-9+h5tK77ebbob1fOIB98mi9t6QJFB230yJMba6o+yEI="; + hash = "sha256-xqgLEMlc8s7qsrjz9kDBvwmfS0ytTqP4yOaet6xog8A="; }; nativeBuildInputs = [ makeWrapper ]; From 47a5d2d0b58e8938023c24523eababf7421fbd31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 16:04:06 +0000 Subject: [PATCH 061/201] pidgin: 2.14.12 -> 2.14.13 --- .../networking/instant-messengers/pidgin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 1314853ad668..211c5b49bf9a 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -43,11 +43,11 @@ let unwrapped = stdenv.mkDerivation rec { pname = "pidgin"; - version = "2.14.12"; + version = "2.14.13"; src = fetchurl { url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2"; - sha256 = "sha256-KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc="; + sha256 = "sha256-EgBJ3I4X4JoqfSVq/yGR/4SRq7hAyMfrMZoWHi3xa6g="; }; nativeBuildInputs = [ makeWrapper intltool ]; From 67d804b373a192cd837043dd24256b78a971ba7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 16:09:57 +0000 Subject: [PATCH 062/201] steampipe: 0.21.7 -> 0.21.8 --- pkgs/tools/misc/steampipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/steampipe/default.nix b/pkgs/tools/misc/steampipe/default.nix index ecfa780cc532..31d27ffe8bae 100644 --- a/pkgs/tools/misc/steampipe/default.nix +++ b/pkgs/tools/misc/steampipe/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "steampipe"; - version = "0.21.7"; + version = "0.21.8"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "v${version}"; - hash = "sha256-puaqAMUnlQNOQmxhJCKQKTBypTjdModijtIpPBZsIXY="; + hash = "sha256-PY2CpieY1kTuT3Yd6i5hiRjVEwYNHn1GF+E0g6u8BP0="; }; vendorHash = "sha256-yS2FiTnK65LAY3tGSlMy0LMg6691tS/9yQ4w7HrW/pw="; From 63279fb2b0cfdf6a9f2d12bd4ac45975ab9a7a07 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 17:06:12 +0000 Subject: [PATCH 063/201] protontricks: 1.11.0 -> 1.11.1 --- pkgs/tools/package-management/protontricks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/protontricks/default.nix b/pkgs/tools/package-management/protontricks/default.nix index 462a2546ff5d..c3c43163c671 100644 --- a/pkgs/tools/package-management/protontricks/default.nix +++ b/pkgs/tools/package-management/protontricks/default.nix @@ -16,13 +16,13 @@ buildPythonApplication rec { pname = "protontricks"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "Matoking"; repo = pname; rev = version; - sha256 = "sha256-5FpcIaQodvNjdqUfD9hvXlrdhszr98j0zm3MCCpZFoc="; + sha256 = "sha256-a40IAFrzQ0mogMoXKb+Lp0fPc1glYophqtftigk3nAc="; }; patches = [ From 6af7d9276d1e04b6155c08d8c39e372f4314a0d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 09:59:46 +0000 Subject: [PATCH 064/201] ocamlPackages.domain-local-timeout: 0.1.0 -> 1.0.1 --- .../ocaml-modules/domain-local-timeout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/domain-local-timeout/default.nix b/pkgs/development/ocaml-modules/domain-local-timeout/default.nix index 1baef274006f..f0a1874acad2 100644 --- a/pkgs/development/ocaml-modules/domain-local-timeout/default.nix +++ b/pkgs/development/ocaml-modules/domain-local-timeout/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "domain-local-timeout"; - version = "0.1.0"; + version = "1.0.1"; minimalOCamlVersion = "4.12"; src = fetchurl { url = "https://github.com/ocaml-multicore/domain-local-timeout/releases/download/${version}/domain-local-timeout-${version}.tbz"; - hash = "sha256-UTqcHdGAN/LrvumPhW4Cy6RY8RJ/iVO5zTJKrhPRTjk="; + hash = "sha256-6sCqUkOjN8E+7OLUwVQntkv0vrQDkGDV8KNqDhVm0d8="; }; propagatedBuildInputs = [ mtime psq thread-table ]; From 8213444c63728f9876c2520a00b7c32e9540b581 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 11:26:02 +0000 Subject: [PATCH 065/201] ocamlPackages.qcheck-multicoretests-util: 0.2 -> 0.3 --- pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix index ec3ba0b1dac1..84355d916085 100644 --- a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix +++ b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix @@ -4,13 +4,13 @@ buildDunePackage rec { pname = "qcheck-multicoretests-util"; - version = "0.2"; + version = "0.3"; src = fetchFromGitHub { owner = "ocaml-multicore"; repo = "multicoretests"; rev = version; - hash = "sha256-U1ZqfWMwpAvbPq5yp2U9YTFklT4MypzTSfNvcKJfaYE="; + hash = "sha256-0fbMDksC23jojJV+aegBoSwKf1hNzDUvDEbo31HUDoM="; }; propagatedBuildInputs = [ qcheck-core ]; From ff69cc4aacdb2b06d2c77c1a96d3f389afcc684d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 11:37:11 +0000 Subject: [PATCH 066/201] ocamlPackages.linenoise: 1.4.0 -> 1.5 --- pkgs/development/ocaml-modules/linenoise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/linenoise/default.nix b/pkgs/development/ocaml-modules/linenoise/default.nix index dfd8d585e9b8..c096e2542396 100644 --- a/pkgs/development/ocaml-modules/linenoise/default.nix +++ b/pkgs/development/ocaml-modules/linenoise/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "linenoise"; - version = "1.4.0"; + version = "1.5"; minimalOCamlVersion = "4.03"; @@ -10,7 +10,7 @@ buildDunePackage rec { owner = "fxfactorial"; repo = "ocaml-${pname}"; rev = "v${version}"; - sha256 = "sha256-bIpZ9TO4/j24nQw5nsW7fUF7af5lhd/EmwhQRd0NYb4="; + sha256 = "sha256-ywcL5w65XXqInREalf0aDxvoEYA6tZW9eU5NGI/QETI="; }; propagatedBuildInputs = [ result ]; From 81ca2cb993a26c654f635e97f3787284a6754805 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 12:50:35 +0000 Subject: [PATCH 067/201] ocamlPackages.ocaml-version: 3.6.2 -> 3.6.4 --- pkgs/development/ocaml-modules/ocaml-version/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix index 16f0242a9bf7..547c31cc9eab 100644 --- a/pkgs/development/ocaml-modules/ocaml-version/default.nix +++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "ocaml-version"; - version = "3.6.2"; + version = "3.6.4"; src = fetchurl { url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz"; - hash = "sha256-XJ0xq71ZiR39phQIULXFDLHoj3HntxLI+v2gR0Bp/rI="; + hash = "sha256-JwvOv+Q4gevAnIl73l6juQc3t2c+5BAPjAxs/zIYctw="; }; checkInputs = [ alcotest ]; From b2378d4262aac26d3c3a1f33ca8132e2f8a145d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 13:40:24 +0000 Subject: [PATCH 068/201] ocamlPackages.tar: 2.5.1 -> 2.6.0 --- pkgs/development/ocaml-modules/tar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/tar/default.nix b/pkgs/development/ocaml-modules/tar/default.nix index 3a21fd21a0c3..f0d8876fd41e 100644 --- a/pkgs/development/ocaml-modules/tar/default.nix +++ b/pkgs/development/ocaml-modules/tar/default.nix @@ -8,10 +8,10 @@ buildDunePackage rec { pname = "tar"; - version = "2.5.1"; + version = "2.6.0"; src = fetchurl { url = "https://github.com/mirage/ocaml-tar/releases/download/v${version}/tar-${version}.tbz"; - hash = "sha256-00QPSIZnoFvhZEnDcdEDJUqhE0uKLxNMM2pUE8aMPfQ="; + hash = "sha256-yv8MtwRjQ+K/9/wPkhfk4xI1VV5MSIn7GUeSmFtvse4="; }; minimalOCamlVersion = "4.08"; From 17cd479aeeb1437582895b2873d86a497e9166e3 Mon Sep 17 00:00:00 2001 From: Noah Snelson Date: Sun, 3 Sep 2023 17:03:22 -0700 Subject: [PATCH 069/201] am2rlauncher: init at 2.3.0 --- .../am/am2rlauncher/am2r-run-binary.patch | 14 +++ pkgs/by-name/am/am2rlauncher/deps.nix | 43 ++++++++ pkgs/by-name/am/am2rlauncher/package.nix | 104 ++++++++++++++++++ 3 files changed, 161 insertions(+) create mode 100644 pkgs/by-name/am/am2rlauncher/am2r-run-binary.patch create mode 100644 pkgs/by-name/am/am2rlauncher/deps.nix create mode 100644 pkgs/by-name/am/am2rlauncher/package.nix diff --git a/pkgs/by-name/am/am2rlauncher/am2r-run-binary.patch b/pkgs/by-name/am/am2rlauncher/am2r-run-binary.patch new file mode 100644 index 000000000000..4383190dfe91 --- /dev/null +++ b/pkgs/by-name/am/am2rlauncher/am2r-run-binary.patch @@ -0,0 +1,14 @@ +diff --git a/AM2RLauncher/AM2RLauncherLib/Profile.cs b/AM2RLauncher/AM2RLauncherLib/Profile.cs +index 8186350..2f9de2a 100644 +--- a/AM2RLauncher/AM2RLauncherLib/Profile.cs ++++ b/AM2RLauncher/AM2RLauncherLib/Profile.cs +@@ -796,7 +796,8 @@ public static class Profile + UseShellExecute = false, + WorkingDirectory = gameDirectory, + #if NOAPPIMAGE +- FileName = $"{gameDirectory}/runner" ++ FileName = "am2r-run", ++ Arguments = "./runner" + #else + FileName = $"{gameDirectory}/AM2R.AppImage" + #endif diff --git a/pkgs/by-name/am/am2rlauncher/deps.nix b/pkgs/by-name/am/am2rlauncher/deps.nix new file mode 100644 index 000000000000..b59e6d1dcd18 --- /dev/null +++ b/pkgs/by-name/am/am2rlauncher/deps.nix @@ -0,0 +1,43 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.34"; sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"; }) + (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.34"; sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"; }) + (fetchNuGet { pname = "Eto.Forms"; version = "2.7.1"; sha256 = "1hzbdnmn5znycfi0mvqa5k5mz9gasy58qzwa7fjmlkwj8ab87l9r"; }) + (fetchNuGet { pname = "Eto.Platform.Gtk"; version = "2.7.1"; sha256 = "09iz85s728jy5qg7y30qvqw5rpsr3yxffrchk1avryk87ky1ysys"; }) + (fetchNuGet { pname = "GdkSharp"; version = "3.24.24.34"; sha256 = "0r0x0yib7chwsyrbpvicrfwldwqx5lyqq4p86zaxpmzd6zdaj0x5"; }) + (fetchNuGet { pname = "GioSharp"; version = "3.24.24.34"; sha256 = "02hxvgjd4w9jpzbkk7qf9q9bkvyp5hfzwxfqp10vg5lpl9yl3xpx"; }) + (fetchNuGet { pname = "GLibSharp"; version = "3.24.24.34"; sha256 = "0kvp033fgdwc8p2abfp5z9pzq66cvwbnjfvr4v4bkpy5s5h181kq"; }) + (fetchNuGet { pname = "GtkSharp"; version = "3.24.24.34"; sha256 = "0028hzmmqyfx87qqmaf9cgb5psn7gkbmqvixcid67x1d6mzxjicb"; }) + (fetchNuGet { pname = "LibGit2Sharp"; version = "0.27.0"; sha256 = "0n8crafpp4jq74km45wlm3jm0h96ggvqxy26wrz55azgjpk6p1gz"; }) + (fetchNuGet { pname = "LibGit2Sharp.NativeBinaries"; version = "2.0.319"; sha256 = "0xm6np8y182v5246imnkw1fj2sx8x2nl3568kkm3razcgb0y5xlf"; }) + (fetchNuGet { pname = "log4net"; version = "2.0.15"; sha256 = "1iq1rd0z0m15ln247jjrimj3avq50vh6njvw4x158r5v6nz093nb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "6.0.0"; sha256 = "0c6pcj088g1yd1vs529q3ybgsd2vjlk5y1ic6dkmbhvrp5jibl9p"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "PangoSharp"; version = "3.24.24.34"; sha256 = "1r0h14cklglfpv1lhv93cxmzi2w7d5s03gzpq3j5dmrz43flg9zw"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.1"; sha256 = "04kb1mdrlcixj9zh1xdi5as0k0qi8byr5mi3p3jcxx72qz93s2y3"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "5.0.0"; sha256 = "021h7x98lblq9avm1bgpa4i31c2kgsa7zn4sqhxf39g087ar756j"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.5.0"; sha256 = "1frpy24mn6q7hgwayj98kkx89z861f5dmia4j6zc0a2ydgx8x02c"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "6.0.0"; sha256 = "0sqapr697jbb4ljkq46msg0xx1qpmc31ivva6llyz2wzq3mpmxbw"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.3"; sha256 = "1afi6s2r1mh1kygbjmfba6l4f87pi5sg13p4a48idqafli94qxln"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.5.0"; sha256 = "11qlc8q6b7xlspayv07718ibzvlj6ddqqxkvcbxv5b24d5kzbrb7"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "6.0.0"; sha256 = "05kd3a8w7658hjxq9vvszxip30a479fjmfq4bq1r95nrsvs4hbss"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "4.5.0"; sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "6.0.0"; sha256 = "0jsl4xdrkqi11iwmisi1r2f2qn5pbvl79mzq877gndw6ans2zhzw"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "6.0.0"; sha256 = "1wy9pq9vn1bqg5qnv53iqrbx04yzdmjw4x5yyi09y3459vaa1sip"; }) +] diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix new file mode 100644 index 000000000000..d0dbf909500f --- /dev/null +++ b/pkgs/by-name/am/am2rlauncher/package.nix @@ -0,0 +1,104 @@ +{ lib +, buildDotnetModule +, writeShellScript +, glibc +, gtk3 +, libappindicator +, webkitgtk +, e2fsprogs +, libnotify +, libgit2 +, openssl +, xdelta +, file +, busybox +, openjdk +, patchelf +, fetchFromGitHub +, buildFHSEnv +, glib-networking +}: +let + am2r-run = buildFHSEnv { + name = "am2r-run"; + + multiArch = true; + + multiPkgs = pkgs: with pkgs; [ + stdenv.cc.cc.lib + xorg.libX11 + xorg.libXext + xorg.libXrandr + xorg.libXxf86vm + curl + libGLU + libglvnd + openal + zlib + ]; + + runScript = writeShellScript "am2r-run" '' + exec -- "$1" "$@" + ''; + }; +in +buildDotnetModule { + pname = "am2rlauncher"; + version = "2.3.0-unstable-2023-11-08"; + + src = fetchFromGitHub { + owner = "AM2R-Community-Developers"; + repo = "AM2RLauncher"; + rev = "5d8b7d9b3de68e6215c10b9fd223b7f1d5e40dea"; + sha256 = "sha256-/nHqo8jh3sOUngbpqdfiQjUWO/8Uzpc5jtW7Ep4q6Wg="; + }; + + projectFile = "AM2RLauncher/AM2RLauncher.Gtk/AM2RLauncher.Gtk.csproj"; + + nugetDeps = ./deps.nix; + executables = "AM2RLauncher.Gtk"; + + runtimeDeps = [ + glibc + gtk3 + libappindicator + webkitgtk + e2fsprogs + libnotify + libgit2 + openssl + ]; + + buildInputs = [ gtk3 ]; + + patches = [ ./am2r-run-binary.patch ]; + + dotnetFlags = [ ''-p:DefineConstants="NOAPPIMAGE;NOAUTOUPDATE;PATCHOPENSSL"'' ]; + + postFixup = '' + wrapProgram $out/bin/AM2RLauncher.Gtk \ + --prefix PATH : ${lib.makeBinPath [ am2r-run xdelta file openjdk patchelf ]} \ + --prefix GIO_EXTRA_MODULES : ${glib-networking}/lib/gio/modules + + mkdir -p $out/share/icons + install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.png $out/share/icons/AM2RLauncher.png + install -Dm644 $src/AM2RLauncher/distribution/linux/AM2RLauncher.desktop $out/share/applications/AM2RLauncher.desktop + + # renames binary for desktop file + mv $out/bin/AM2RLauncher.Gtk $out/bin/AM2RLauncher + ''; + + meta = with lib; { + homepage = "https://github.com/AM2R-Community-Developers/AM2RLauncher"; + description = "A front-end for dealing with AM2R updates and mods"; + longDescription = '' + A front-end application that simplifies installing the latest + AM2R-Community-Updates, creating APKs for Android use, as well as Mods for + AM2R. + ''; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nsnelson ]; + mainProgram = "AM2RLauncher"; + platforms = platforms.linux; + }; +} From 772f3f226210e325493f034b6a6ba8293541d56e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 22:07:24 +0000 Subject: [PATCH 070/201] python311Packages.aiocomelit: 0.8.3 -> 0.9.0 --- pkgs/development/python-modules/aiocomelit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index 64fd61e2219a..3575b0f93fe3 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiocomelit"; - version = "0.8.3"; + version = "0.9.0"; format = "pyproject"; disabled = pythonOlder "3.10"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "chemelli74"; repo = "aiocomelit"; rev = "refs/tags/v${version}"; - hash = "sha256-og54xVby9kyLtsIBCmH3KjKSSWaxHtXCH+wvHdrGQAU="; + hash = "sha256-Fjf7mXXUnBTtPfNHHJdFx5ho4eg0N3iHCGsACa4IMjY="; }; postPatch = '' From 8277cec0e3c370dde56863f7556fdf74a13c4c55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 25 Feb 2024 21:36:30 +0000 Subject: [PATCH 071/201] phosh-mobile-settings: 0.35.1 -> 0.36.0 --- .../window-managers/phosh/phosh-mobile-settings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 3d0517386d69..5bc0765f0fe8 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -20,12 +20,12 @@ stdenv.mkDerivation rec { pname = "phosh-mobile-settings"; - version = "0.35.1"; + version = "0.36.0"; src = fetchurl { # This tarball includes the meson wrapped subproject 'gmobile'. url = "https://sources.phosh.mobi/releases/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-Kg3efPs0knbJ9b0buIkgqIL1XplcZpGIi0hxJptG6UI="; + hash = "sha256-rktrEBRjOUWGb0Qfcyr03dSxpU2XnC0xHb07x8qc9JU="; }; nativeBuildInputs = [ From 6d56d4cdaf0b6b0e7bb0e8347b2065c2b3f35fef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Feb 2024 05:42:03 +0000 Subject: [PATCH 072/201] ocamlPackages.reason: 3.10.0 -> 3.11.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 12e58b6739ad..954c58718cf3 100644 --- a/pkgs/development/compilers/reason/default.nix +++ b/pkgs/development/compilers/reason/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "ocaml${ocaml.version}-reason"; - version = "3.10.0"; + version = "3.11.0"; src = fetchurl { url = "https://github.com/reasonml/reason/releases/download/${version}/reason-${version}.tbz"; - hash = "sha256-F+rUwoZK9yc/VtCtYsRWS+Lq3nbT2oex04HtW0T0Zss="; + hash = "sha256-pYg38Up58EfI65nVUYrrFu5kNTV0KGz9WyhMmKGiclA="; }; strictDeps = true; From b5778e7aa1652f48f1f3058022d7f8449a0e8a22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Feb 2024 09:14:37 +0000 Subject: [PATCH 073/201] nitter: unstable-2024-01-12 -> unstable-2024-02-26 --- pkgs/by-name/ni/nitter/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ni/nitter/package.nix b/pkgs/by-name/ni/nitter/package.nix index 002f0f859867..3b3e89cf3e69 100644 --- a/pkgs/by-name/ni/nitter/package.nix +++ b/pkgs/by-name/ni/nitter/package.nix @@ -8,13 +8,13 @@ buildNimPackage (finalAttrs: prevAttrs: { pname = "nitter"; - version = "unstable-2024-01-12"; + version = "unstable-2024-02-26"; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "52db03b73ad5f83f67c83ab197ae3b20a2523d39"; - hash = "sha256-Jp8iix6VUeepigGx+eeJUTQeZfSJ3tSc/TAa5AMfG2U="; + rev = "c6edec04901d0a37799499ed4c6921db640fb5a4"; + hash = "sha256-N3d63nyVzUTa2+UemA1REFfVsw6iOVU8xUlYraR55m4="; }; lockFile = ./lock.json; From 7b4155b2329892c4199e2125ed1d117e4cb9fd10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Feb 2024 11:52:06 +0000 Subject: [PATCH 074/201] re-flex: 3.5.1 -> 4.0.1 --- pkgs/development/tools/parsing/re-flex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/re-flex/default.nix b/pkgs/development/tools/parsing/re-flex/default.nix index 85150a04884b..645d4e280288 100644 --- a/pkgs/development/tools/parsing/re-flex/default.nix +++ b/pkgs/development/tools/parsing/re-flex/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "re-flex"; - version = "3.5.1"; + version = "4.0.1"; src = fetchFromGitHub { owner = "Genivia"; repo = "RE-flex"; rev = "v${version}"; - sha256 = "sha256-AP8889MQSAq/CIfZRDOkaqkTrT6EPqHK0bbeLa9v6h8="; + sha256 = "sha256-eQ2+RthvOKCd2Dl6i+9DahJArFfOhPJkn6PI/yuaqos="; }; nativeBuildInputs = [ boost autoconf automake ]; From ae6f0885290b2d6b6d74a9e26e50bcd5a604647f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Feb 2024 21:40:53 +0000 Subject: [PATCH 075/201] ocamlPackages.mirage-crypto: 0.11.2 -> 0.11.3 --- pkgs/development/ocaml-modules/mirage-crypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 3c8b00285e97..74e9a455bebe 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -8,11 +8,11 @@ buildDunePackage rec { duneVersion = "3"; pname = "mirage-crypto"; - version = "0.11.2"; + version = "0.11.3"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-${version}.tbz"; - sha256 = "sha256-1rl8t/DcNEpgJRPMAxN8Hn8K4QXQchYUYmz08jHt92Q="; + sha256 = "sha256-v7Uw+hac2QXrx+JEnzQHz71nAjrAspG4tvShQ3pdlbE="; }; doCheck = true; From 7350e1c973eac47d92e968ed156921cbceb8c287 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 26 Feb 2024 21:40:53 +0000 Subject: [PATCH 076/201] ocamlPackages.utop: 2.13.1 -> 2.14.0 --- pkgs/development/tools/ocaml/utop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix index e2f0abd65c95..450666a25609 100644 --- a/pkgs/development/tools/ocaml/utop/default.nix +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -6,14 +6,14 @@ buildDunePackage rec { pname = "utop"; - version = "2.13.1"; + version = "2.14.0"; propagatedBuildInputs = [ findlib lambda-term xdg zed logs ]; minimalOCamlVersion = "4.11"; src = fetchurl { url = "https://github.com/ocaml-community/utop/releases/download/${version}/utop-${version}.tbz"; - sha256 = "sha256-sE7Co5TRpqKKeURMWPZuq3e390QB9HFKpubxwhJab/0="; + sha256 = "sha256-D9WpvFtFhSSnFGOh/gzRb5t74TZzrjAxGLchbg0nO6k="; }; nativeBuildInputs = [ makeWrapper cppo ]; From d7f87e388d54ea804e2fbc035458b8f9508d96fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 27 Feb 2024 04:04:09 +0000 Subject: [PATCH 077/201] sitespeed-io: 33.0.0 -> 33.1.1 --- pkgs/tools/networking/sitespeed-io/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sitespeed-io/default.nix b/pkgs/tools/networking/sitespeed-io/default.nix index 846e386ced3b..e852df0b8d4c 100644 --- a/pkgs/tools/networking/sitespeed-io/default.nix +++ b/pkgs/tools/networking/sitespeed-io/default.nix @@ -24,13 +24,13 @@ assert (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled."; buildNpmPackage rec { pname = "sitespeed-io"; - version = "33.0.0"; + version = "33.1.1"; src = fetchFromGitHub { owner = "sitespeedio"; repo = "sitespeed.io"; rev = "v${version}"; - hash = "sha256-UmviwcxL67fn8B4ruJH9yKdcYVqmxqKSImQszKhDHZ0="; + hash = "sha256-Blzv0fLWqDfLYbtSVTUbhWS75fkqADzEwYQvomeqt1U="; }; nodejs = nodejs_18; @@ -46,7 +46,7 @@ buildNpmPackage rec { dontNpmBuild = true; npmInstallFlags = [ "--omit=dev" ]; - npmDepsHash = "sha256-FggwOnuQ+azgdLxfc6EUAsbl0+il6/2+p1t7MCrTNgE="; + npmDepsHash = "sha256-+oU0+AVWf7PNqZCUI/KYe+PoNrHNaR35N6SifYCSRp4="; postInstall = '' mv $out/bin/sitespeed{.,-}io From cbf7ad12a77efe34bb89b49649c870d2f96c15da Mon Sep 17 00:00:00 2001 From: Niklas Gollenstede Date: Tue, 27 Feb 2024 17:08:40 +0100 Subject: [PATCH 078/201] onnxruntime: fix evaluation with cudaSupport --- pkgs/development/libraries/onnxruntime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/onnxruntime/default.nix b/pkgs/development/libraries/onnxruntime/default.nix index f804dcdc1d4b..4ece5feea365 100644 --- a/pkgs/development/libraries/onnxruntime/default.nix +++ b/pkgs/development/libraries/onnxruntime/default.nix @@ -187,8 +187,8 @@ effectiveStdenv.mkDerivation rec { ] ++ lib.optionals pythonSupport [ "-Donnxruntime_ENABLE_PYTHON=ON" ] ++ lib.optionals cudaSupport [ - (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" cutlass) - (lib.cmakeFeature "onnxruntime_CUDNN_HOME" cudaPackages.cudnn) + (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_CUTLASS" "${cutlass}") + (lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}") (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString) ]; From 9e633d53f3cb3030588012187ed12633cc60f9c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Feb 2024 01:31:12 +0000 Subject: [PATCH 079/201] consul-template: 0.36.0 -> 0.37.1 --- pkgs/tools/system/consul-template/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/consul-template/default.nix b/pkgs/tools/system/consul-template/default.nix index ea25b0cb1955..08ad879193f8 100644 --- a/pkgs/tools/system/consul-template/default.nix +++ b/pkgs/tools/system/consul-template/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "consul-template"; - version = "0.36.0"; + version = "0.37.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = "consul-template"; rev = "v${version}"; - hash = "sha256-qhncff3DAJ3fiLJRVVcRZpDmzFEQI5J1cFXnlyUJRRs="; + hash = "sha256-s1UhbCxqWm7a5ulPPnbw0lO5lbRShTBBzAGuxWV5msM="; }; - vendorHash = "sha256-nOxdhVEMepZMq51M6MDIyTxBYThrwrT0C0wdwzsjoPI="; + vendorHash = "sha256-eFxXiRO2ruf1YLLWsCAYxTNUnKpaBXO8mLM4REThG1s="; # consul-template tests depend on vault and consul services running to # execute tests so we skip them here From a35685e157f589dd77fecc2b6fd4ad13a4309bb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 28 Feb 2024 09:06:36 +0000 Subject: [PATCH 080/201] vencord: 1.6.9 -> 1.7.0 --- pkgs/misc/vencord/default.nix | 8 ++-- pkgs/misc/vencord/package-lock.json | 64 ++++++++++++++--------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/pkgs/misc/vencord/default.nix b/pkgs/misc/vencord/default.nix index ccb02d47c9b7..50d62bb6cb95 100644 --- a/pkgs/misc/vencord/default.nix +++ b/pkgs/misc/vencord/default.nix @@ -5,8 +5,8 @@ , buildWebExtension ? false }: let - version = "1.6.9"; - gitHash = "f1bdf38"; + version = "1.7.0"; + gitHash = "8ccd731"; in buildNpmPackage rec { pname = "vencord"; @@ -16,7 +16,7 @@ buildNpmPackage rec { owner = "Vendicated"; repo = "Vencord"; rev = "v${version}"; - hash = "sha256-ROdp/ZajDvePgTksncPigATkogd3q1OqHl3xPw33txU="; + hash = "sha256-gbWmPRRLOXiLlkmcreuEkYRfY3dzrJS1dkM4/w4QmQ8="; }; ESBUILD_BINARY_PATH = lib.getExe (esbuild.overrideAttrs (final: _: { @@ -34,7 +34,7 @@ buildNpmPackage rec { npmRebuildFlags = [ "|| true" ]; makeCacheWritable = true; - npmDepsHash = "sha256-55ggitOOHk4BdNq8AlV0n75eWAbiya5qGr0yCS8vNF4="; + npmDepsHash = "sha256-uQj1dOBzMWNZoOHj2VlPJ0AX/5CSFH5Rv1Wgg4jwT2A="; npmFlags = [ "--legacy-peer-deps" ]; npmBuildScript = if buildWebExtension then "buildWeb" else "build"; npmBuildFlags = [ "--" "--standalone" "--disable-updater" ]; diff --git a/pkgs/misc/vencord/package-lock.json b/pkgs/misc/vencord/package-lock.json index 3e9f21af4796..eaaec2ca45ea 100644 --- a/pkgs/misc/vencord/package-lock.json +++ b/pkgs/misc/vencord/package-lock.json @@ -1,12 +1,12 @@ { "name": "vencord", - "version": "1.6.9", + "version": "1.7.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "vencord", - "version": "1.6.9", + "version": "1.7.0", "license": "GPL-3.0-or-later", "dependencies": { "@sapphi-red/web-noise-suppressor": "0.3.3", @@ -242,9 +242,9 @@ } }, "node_modules/@csstools/css-parser-algorithms": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.5.0.tgz", - "integrity": "sha512-abypo6m9re3clXA00eu5syw+oaPHbJTPapu9C4pzNsJ4hdZDzushT50Zhu+iIYXgEe1CxnRMn7ngsbV+MLrlpQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.6.0.tgz", + "integrity": "sha512-YfEHq0eRH98ffb5/EsrrDspVWAuph6gDggAE74ZtjecsmyyWpW768hOyiONa8zwWGbIWYfa2Xp4tRTrpQQ00CQ==", "dev": true, "funding": [ { @@ -283,9 +283,9 @@ } }, "node_modules/@csstools/media-query-list-parser": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.7.tgz", - "integrity": "sha512-lHPKJDkPUECsyAvD60joYfDmp8UERYxHGkFfyLJFTVK/ERJe0sVlIFLXU5XFxdjNDTerp5L4KeaKG+Z5S94qxQ==", + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.8.tgz", + "integrity": "sha512-DiD3vG5ciNzeuTEoh74S+JMjQDs50R3zlxHnBnfd04YYfA/kh2KiBCGhzqLxlJcNq+7yNQ3stuZZYLX6wK/U2g==", "dev": true, "funding": [ { @@ -301,14 +301,14 @@ "node": "^14 || ^16 || >=18" }, "peerDependencies": { - "@csstools/css-parser-algorithms": "^2.5.0", + "@csstools/css-parser-algorithms": "^2.6.0", "@csstools/css-tokenizer": "^2.2.3" } }, "node_modules/@csstools/selector-specificity": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.1.tgz", - "integrity": "sha512-NPljRHkq4a14YzZ3YD406uaxh7s0g6eAq3L9aLOWywoqe8PkYamAvtsh7KNX6c++ihDrJ0RiU+/z7rGnhlZ5ww==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-3.0.2.tgz", + "integrity": "sha512-RpHaZ1h9LE7aALeQXmXrJkRG84ZxIsctEN2biEUmFyKpzFM3zZ35eUMcIzZFsw/2olQE6v69+esEqU2f1MKycg==", "dev": true, "funding": [ { @@ -727,9 +727,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", - "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -894,9 +894,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.19.17", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.17.tgz", - "integrity": "sha512-SzyGKgwPzuWp2SHhlpXKzCX0pIOfcI4V2eF37nNBJOhwlegQ83omtVQ1XxZpDE06V/d6AQvfQdPfnw0tRC//Ng==", + "version": "18.19.19", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.19.tgz", + "integrity": "sha512-qqV6hSy9zACEhQUy5CEGeuXAZN0fNjqLWRIvOXOwdFYhFoKBiY08VKR5kgchr90+TitLVhpUEb54hk4bYaArUw==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -915,9 +915,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.55", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.55.tgz", - "integrity": "sha512-Y2Tz5P4yz23brwm2d7jNon39qoAtMMmalOQv6+fEFt1mT+FcM3D841wDpoUvFXhaYenuROCy3FZYqdTjM7qVyA==", + "version": "18.2.60", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.60.tgz", + "integrity": "sha512-dfiPj9+k20jJrLGOu9Nf6eqxm2EyJRrq2NvwOFsfbb7sFExZ9WELPs67UImHj3Ayxg8ruTtKtNnbjaF8olPq0A==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -941,9 +941,9 @@ "dev": true }, "node_modules/@types/semver": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz", - "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==", + "version": "7.5.8", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", "dev": true }, "node_modules/@types/yauzl": { @@ -2327,16 +2327,16 @@ } }, "node_modules/eslint": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", - "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.56.0", - "@humanwhocodes/config-array": "^0.11.13", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", "@ungap/structured-clone": "^1.2.0", @@ -2747,9 +2747,9 @@ } }, "node_modules/flatted": { - "version": "3.2.9", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", - "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", "dev": true }, "node_modules/for-in": { From 860a514288916cde7de3ac7dc4b40649e0bf173a Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sun, 4 Feb 2024 15:17:34 +0100 Subject: [PATCH 081/201] avisynthplus: init at 3.7.3 --- pkgs/by-name/av/avisynthplus/package.nix | 50 ++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/av/avisynthplus/package.nix diff --git a/pkgs/by-name/av/avisynthplus/package.nix b/pkgs/by-name/av/avisynthplus/package.nix new file mode 100644 index 000000000000..153e5dd4afb7 --- /dev/null +++ b/pkgs/by-name/av/avisynthplus/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + testers, + cmake, + gitUpdater, + fetchpatch, + libdevil, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "avisynthplus"; + version = "3.7.3"; + + src = fetchFromGitHub { + owner = "AviSynth"; + repo = "AviSynthPlus"; + rev = "v${finalAttrs.version}"; + hash = "sha256-v/AErktcegdrwxDbD0DZ/ZAxgaZmkZD+qxR3EPFsT08="; + }; + + patches = [ + # Remove after next relaese + (fetchpatch { + name = "fix-absolute-path.patch"; + url = "https://github.com/AviSynth/AviSynthPlus/commit/818983691e962ec3e590fcad07032f8a139a6b16.patch"; + hash = "sha256-4yUOnjtOroX+bhNUKbYz/giKaslzYdwPaaJWNkrTBr4="; + }) + ]; + + buildInputs = [ libdevil ]; + + nativeBuildInputs = [ cmake ]; + + passthru = { + updateScript = gitUpdater { rev-prefix = "v"; }; + tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; + }; + + meta = with lib; { + description = "An improved version of the AviSynth frameserver"; + homepage = "https://avs-plus.net/"; + changelog = "https://github.com/AviSynth/AviSynthPlus/releases/tag/${finalAttrs.src.rev}"; + license = licenses.gpl2Only; + pkgConfigModules = [ "avisynth" ]; + platforms = platforms.unix; + maintainers = with maintainers; [ jopejoe1 ]; + }; +}) From 6030a0857b0886ed7baf96d89a32653a2a11ce6e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Feb 2024 02:32:17 +0000 Subject: [PATCH 082/201] oxlint: 0.1.2 -> 0.2.12 --- pkgs/development/tools/oxlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/oxlint/default.nix b/pkgs/development/tools/oxlint/default.nix index 54bbc4e27a92..0d7eb08b41a1 100644 --- a/pkgs/development/tools/oxlint/default.nix +++ b/pkgs/development/tools/oxlint/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "oxlint"; - version = "0.1.2"; + version = "0.2.12"; src = fetchFromGitHub { owner = "web-infra-dev"; repo = "oxc"; rev = "oxlint_v${version}"; - hash = "sha256-XQDkNfgqjfUSDwC3JgdzCqYT4O14UWGImpk5gVyQKfE="; + hash = "sha256-uI+zzRRsRaO3OpDhhrp4VW7mHjwmOENHkPl5htYJ2dA="; }; - cargoHash = "sha256-pJW7191gUv3Sbp8C2IYxJz2G/nunmBnnKaV+yLX1ZKc="; + cargoHash = "sha256-FV79CORqCXj24CCgGLKew5/tpnjMgVEek0cL2FTFq1A="; buildInputs = [ rust-jemalloc-sys From 200a35c8c45b5e9debce8c7b954f0e867d59271f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Feb 2024 14:09:33 +0000 Subject: [PATCH 083/201] automatic-timezoned: 2.0.0 -> 2.0.4 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index d0f928f29291..2bac409565fa 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "2.0.0"; + version = "2.0.4"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-t7AozR3R+msppRnHTPRy3hd2SuCR9NZdg85+FLqSWEc="; + sha256 = "sha256-znoQPpnBU3cLxNmnIKvqj/fIuZDGCdmICx2UL1tqAnc="; }; - cargoHash = "sha256-d+SDI5keZ044LtS/A3K26moFVQngUfNNfr33PipTTg4="; + cargoHash = "sha256-1G81O+WKGVnRLGS6/6iiqsMiY5AaFrzEa9JD1MBDSGY="; meta = with lib; { description = "Automatically update system timezone based on location"; From 0fadf0fe78af0cd48c026204ccc466f9bbd5046a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Feb 2024 16:51:11 +0000 Subject: [PATCH 084/201] python311Packages.pytm: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/pytm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pytm/default.nix b/pkgs/development/python-modules/pytm/default.nix index be8f5089466e..5f5722159a1c 100644 --- a/pkgs/development/python-modules/pytm/default.nix +++ b/pkgs/development/python-modules/pytm/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "pytm"; - version = "1.2.0"; + version = "1.3.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "izar"; repo = pname; - rev = "v${version}"; - sha256 = "1bx4s9a5kdyr2xvpw0smmh7zi9w38891yfqzdj1bmnsjl57x6qrg"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-R/MDz6lCvUxtn6IJ8STHlWzkSjnUJziO+oPnaYhrr7U="; }; propagatedBuildInputs = [ pydal graphviz pandoc plantuml ]; From 704ca6186007f307c492858282def4b5393a36ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Feb 2024 17:19:36 +0000 Subject: [PATCH 085/201] ausweisapp: 2.0.3 -> 2.1.0 --- pkgs/applications/misc/ausweisapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix index 25599f383819..f00271bf7233 100644 --- a/pkgs/applications/misc/ausweisapp/default.nix +++ b/pkgs/applications/misc/ausweisapp/default.nix @@ -15,13 +15,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ausweisapp"; - version = "2.0.3"; + version = "2.1.0"; src = fetchFromGitHub { owner = "Governikus"; repo = "AusweisApp2"; rev = finalAttrs.version; - hash = "sha256-pnGtlNXwYNG+m3mmo815dqp2i098I/i7EKdLrDm/Su8="; + hash = "sha256-wgVu5Yr65Gu1z5SEWy5l4B6UiI5bIobBfZLhL7s+SRE="; }; nativeBuildInputs = [ From 5a1f7f0c7e81a6841b27341039b9eb88870e6080 Mon Sep 17 00:00:00 2001 From: Dominik Schrempf Date: Sat, 17 Feb 2024 17:37:07 +0100 Subject: [PATCH 086/201] kodiPackages: add `dschrempf` to kodi maintainer team --- maintainers/team-list.nix | 1 + pkgs/applications/video/kodi/addons/mediathekview/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index d43d6e975a81..c186c5ffd165 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -494,6 +494,7 @@ with lib.maintainers; { members = [ aanderse cpages + dschrempf edwtjo minijackson peterhoeg diff --git a/pkgs/applications/video/kodi/addons/mediathekview/default.nix b/pkgs/applications/video/kodi/addons/mediathekview/default.nix index 7f03d813388d..890567d5d6d5 100644 --- a/pkgs/applications/video/kodi/addons/mediathekview/default.nix +++ b/pkgs/applications/video/kodi/addons/mediathekview/default.nix @@ -20,6 +20,6 @@ buildKodiAddon rec { homepage = "https://github.com/mediathekview/plugin.video.mediathekview"; description = "Access media libraries of German speaking broadcasting stations"; license = licenses.mit; - maintainers = teams.kodi.members ++ [ lib.maintainers.dschrempf ]; + maintainers = teams.kodi.members; }; } From f5e44638f0ca3ae9680ee3d8a710b199916297e7 Mon Sep 17 00:00:00 2001 From: Bruno Rodrigues Date: Thu, 29 Feb 2024 20:57:35 +0100 Subject: [PATCH 087/201] rPackages.gmailr: fix build --- pkgs/development/r-modules/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index e7005357f2bb..652e520b28e2 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1000,6 +1000,10 @@ let preConfigure = "patchShebangs configure"; }); + gmailr = old.gmailr.overrideAttrs (attrs: { + postPatch = "patchShebangs configure"; + }); + purrr = old.purrr.overrideAttrs (attrs: { patchPhase = "patchShebangs configure"; }); From ab2a497ffc983d48fdb2a1fef507a7957ae9abc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Feb 2024 22:57:52 +0000 Subject: [PATCH 088/201] wasabiwallet: 2.0.5 -> 2.0.6 --- pkgs/applications/blockchains/wasabiwallet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index 18dac7501b79..fd2b0d245333 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; - sha256 = "sha256-1AgX+Klw/IsRRBV2M1OkLGE4DPqq6hX2h72RNzad2DM="; + sha256 = "sha256-VxtQZFsiUEeCMEWkdnmE9xXFoa7fWfOWC2UxnZZAia0="; }; dontBuild = true; From 038eedd6cb4d45f853dafaa5edf2d3f302e38182 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Fri, 1 Mar 2024 15:58:51 +0100 Subject: [PATCH 089/201] rpcs3: use lib.cmakeBool --- pkgs/by-name/rp/rpcs3/package.nix | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index fc139584c6e7..d65e6bfad137 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -62,20 +62,20 @@ stdenv.mkDerivation { ''; cmakeFlags = [ - "-DUSE_SYSTEM_ZLIB=ON" - "-DUSE_SYSTEM_LIBUSB=ON" - "-DUSE_SYSTEM_LIBPNG=ON" - "-DUSE_SYSTEM_FFMPEG=ON" - "-DUSE_SYSTEM_CURL=ON" - "-DUSE_SYSTEM_WOLFSSL=ON" - "-DUSE_SYSTEM_FAUDIO=ON" - "-DUSE_SYSTEM_PUGIXML=ON" - "-DUSE_SYSTEM_FLATBUFFERS=ON" - "-DUSE_SYSTEM_SDL=ON" - "-DWITH_LLVM=ON" - "-DBUILD_LLVM=OFF" - "-DUSE_NATIVE_INSTRUCTIONS=OFF" - "-DUSE_FAUDIO=${if faudioSupport then "ON" else "OFF"}" + (lib.cmakeBool "USE_SYSTEM_ZLIB" true) + (lib.cmakeBool "USE_SYSTEM_LIBUSB" true) + (lib.cmakeBool "USE_SYSTEM_LIBPNG" true) + (lib.cmakeBool "USE_SYSTEM_FFMPEG" true) + (lib.cmakeBool "USE_SYSTEM_CURL" true) + (lib.cmakeBool "USE_SYSTEM_WOLFSSL" true) + (lib.cmakeBool "USE_SYSTEM_FAUDIO" true) + (lib.cmakeBool "USE_SYSTEM_PUGIXML" true) + (lib.cmakeBool "USE_SYSTEM_FLATBUFFERS" true) + (lib.cmakeBool "USE_SYSTEM_SDL" true) + (lib.cmakeBool "WITH_LLVM" true) + (lib.cmakeBool "BUILD_LLVM" false) + (lib.cmakeBool "USE_NATIVE_INSTRUCTIONS" false) + (lib.cmakeBool "USE_FAUDIO" faudioSupport) ]; nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ]; From e468e3b9e2979fb10bb9783964d9d720a46ff155 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Fri, 1 Mar 2024 15:59:37 +0100 Subject: [PATCH 090/201] rpcs3: add `USE_SDL` and `USE_DISCORD_RPC` flags --- pkgs/by-name/rp/rpcs3/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix index d65e6bfad137..058d95bb4414 100644 --- a/pkgs/by-name/rp/rpcs3/package.nix +++ b/pkgs/by-name/rp/rpcs3/package.nix @@ -22,6 +22,7 @@ , flatbuffers , llvm_16 , cubeb +, enableDiscordRpc ? false , faudioSupport ? true , faudio , SDL2 @@ -72,9 +73,11 @@ stdenv.mkDerivation { (lib.cmakeBool "USE_SYSTEM_PUGIXML" true) (lib.cmakeBool "USE_SYSTEM_FLATBUFFERS" true) (lib.cmakeBool "USE_SYSTEM_SDL" true) + (lib.cmakeBool "USE_SDL" true) (lib.cmakeBool "WITH_LLVM" true) (lib.cmakeBool "BUILD_LLVM" false) (lib.cmakeBool "USE_NATIVE_INSTRUCTIONS" false) + (lib.cmakeBool "USE_DISCORD_RPC" enableDiscordRpc) (lib.cmakeBool "USE_FAUDIO" faudioSupport) ]; @@ -82,9 +85,9 @@ stdenv.mkDerivation { buildInputs = [ qtbase qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg - libevdev zlib libusb1 curl wolfssl python3 pugixml flatbuffers llvm_16 libSM + libevdev zlib libusb1 curl wolfssl python3 pugixml SDL2 flatbuffers llvm_16 libSM ] ++ cubeb.passthru.backendLibs - ++ lib.optionals faudioSupport [ faudio SDL2 ] + ++ lib.optional faudioSupport faudio ++ lib.optionals waylandSupport [ wayland qtwayland ]; postInstall = '' From 20398d6b56a5b287d22715e05469923a29e39198 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Mar 2024 16:52:59 +0000 Subject: [PATCH 091/201] vimPlugins.vim-clap: 0.50 -> 0.52 --- .../editors/vim/plugins/vim-clap/Cargo.lock | 594 ++++++++++++++---- .../editors/vim/plugins/vim-clap/default.nix | 5 +- 2 files changed, 482 insertions(+), 117 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock b/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock index a11cf3b18d64..0340204a82cc 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock +++ b/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock @@ -41,6 +41,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + [[package]] name = "anstream" version = "0.6.4" @@ -103,7 +109,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -179,12 +185,12 @@ dependencies = [ [[package]] name = "built" -version = "0.6.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b99c4cdc7b2c2364182331055623bdf45254fcb679fea565c40c3c11c101889a" +checksum = "96f9cdd34d6eb553f9ea20e5bf84abb7b13c729f113fc1d8e49dc00ad9fa8738" dependencies = [ "cargo-lock", - "git2", + "git2 0.16.1", ] [[package]] @@ -216,13 +222,13 @@ dependencies = [ [[package]] name = "cargo-lock" -version = "9.0.0" +version = "8.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" +checksum = "031718ddb8f78aa5def78a09e90defe30151d1f6c672f937af4dd916429ed996" dependencies = [ "semver", "serde", - "toml 0.7.8", + "toml", "url", ] @@ -249,6 +255,12 @@ dependencies = [ "thiserror", ] +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + [[package]] name = "cc" version = "1.0.83" @@ -295,6 +307,33 @@ dependencies = [ "chrono", ] +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + [[package]] name = "clap" version = "4.4.7" @@ -326,7 +365,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -337,21 +376,20 @@ checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cli" -version = "0.1.0" +version = "0.1.52" dependencies = [ "anyhow", "clap", + "criterion", "filter", - "futures", "icon", - "itertools", + "itertools 0.10.5", + "maple_config", "maple_core", "matcher", "num_cpus", - "pattern", "printer", "rayon", - "regex", "serde", "serde_json", "subprocess", @@ -373,6 +411,24 @@ dependencies = [ "winapi", ] +[[package]] +name = "code_tools" +version = "0.1.52" +dependencies = [ + "cargo_metadata", + "maple_config", + "maple_lsp", + "once_cell", + "paths", + "regex", + "serde", + "serde_json", + "tokio", + "toml", + "tracing", + "which", +] + [[package]] name = "colorchoice" version = "1.0.0" @@ -445,6 +501,42 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "criterion" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" +dependencies = [ + "anes", + "cast", + "ciborium", + "clap", + "criterion-plot", + "is-terminal", + "itertools 0.10.5", + "num-traits", + "once_cell", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + [[package]] name = "crossbeam-channel" version = "0.5.8" @@ -488,6 +580,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "darling" version = "0.20.3" @@ -509,7 +607,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn", + "syn 2.0.38", ] [[package]] @@ -520,7 +618,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -538,16 +636,25 @@ version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" dependencies = [ - "dirs-sys", + "dirs-sys 0.3.7", ] [[package]] name = "dirs" -version = "0.1.0" +version = "0.1.52" dependencies = [ "directories", ] +[[package]] +name = "dirs" +version = "5.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" +dependencies = [ + "dirs-sys 0.4.1", +] + [[package]] name = "dirs-sys" version = "0.3.7" @@ -560,10 +667,28 @@ dependencies = [ ] [[package]] -name = "dumb_analyzer" +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + +[[package]] +name = "doc_gen" version = "0.1.0" dependencies = [ - "serde_json", + "inflections", + "itertools 0.12.1", + "maple_config", + "quote", + "syn 1.0.109", + "toml", + "toml_edit", ] [[package]] @@ -620,25 +745,22 @@ dependencies = [ [[package]] name = "extracted_fzy" -version = "0.1.0" +version = "0.1.52" [[package]] name = "filter" -version = "0.1.0" +version = "0.1.52" dependencies = [ "icon", "matcher", "parking_lot", - "pattern", "printer", "rayon", - "serde", "serde_json", "subprocess", "thiserror", "tracing", "types", - "utils", ] [[package]] @@ -722,7 +844,7 @@ checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -793,9 +915,24 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git2" -version = "0.17.2" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b989d6a7ca95a362cf2cfc5ad688b3a467be1f87e480b8dad07fee8c79b0044" +checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" +dependencies = [ + "bitflags 1.3.2", + "libc", + "libgit2-sys", + "log", + "openssl-probe", + "openssl-sys", + "url", +] + +[[package]] +name = "git2" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc" dependencies = [ "bitflags 1.3.2", "libc", @@ -873,6 +1010,16 @@ dependencies = [ "tracing", ] +[[package]] +name = "half" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -1003,29 +1150,13 @@ dependencies = [ [[package]] name = "icon" -version = "0.1.0" +version = "0.1.52" dependencies = [ - "itertools", + "itertools 0.10.5", "pattern", "serde_json", ] -[[package]] -name = "ide" -version = "0.1.0" -dependencies = [ - "async-trait", - "cargo_metadata", - "once_cell", - "parking_lot", - "paths", - "regex", - "serde", - "serde_json", - "tokio", - "tracing", -] - [[package]] name = "ident_case" version = "1.0.1" @@ -1103,6 +1234,17 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +[[package]] +name = "is-terminal" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +dependencies = [ + "hermit-abi", + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -1112,6 +1254,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -1178,14 +1329,30 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libgit2-sys" -version = "0.15.2+1.6.4" +version = "0.14.2+1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a80df2e11fb4a61f4ba2ab42dbe7f74468da143f1a75c74e11dee7c813f694fa" +checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4" +dependencies = [ + "cc", + "libc", + "libssh2-sys", + "libz-sys", + "openssl-sys", + "pkg-config", +] + +[[package]] +name = "libssh2-sys" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b094a36eb4b8b8c8a7b4b8ae43b2944502be3e59cd87687595cf6b0a71b3f4ca" dependencies = [ "cc", "libc", "libz-sys", + "openssl-sys", "pkg-config", + "vcpkg", ] [[package]] @@ -1261,7 +1428,7 @@ dependencies = [ [[package]] name = "maple" -version = "0.1.50" +version = "0.1.51" dependencies = [ "built", "chrono", @@ -1271,28 +1438,41 @@ dependencies = [ "upgrade", ] +[[package]] +name = "maple_config" +version = "0.1.52" +dependencies = [ + "dirs 0.1.52", + "once_cell", + "paths", + "serde", + "serde_json", + "toml", + "types", +] + [[package]] name = "maple_core" -version = "0.1.0" +version = "0.1.52" dependencies = [ "async-trait", "base64 0.13.1", - "bytecount", "chrono", "chrono-humanize", "clap", + "code_tools", "colors-transform", "copypasta", - "dirs", - "dumb_analyzer", + "dirs 0.1.52", "filter", "futures", + "git2 0.15.0", "grep-matcher", "grep-searcher", "icon", - "ide", "ignore", - "itertools", + "itertools 0.10.5", + "maple_config", "maple_derive", "maple_lsp", "matcher", @@ -1313,7 +1493,7 @@ dependencies = [ "subprocess", "thiserror", "tokio", - "toml 0.5.11", + "toml", "tracing", "tree_sitter", "types", @@ -1323,20 +1503,21 @@ dependencies = [ [[package]] name = "maple_derive" -version = "0.1.0" +version = "0.1.52" dependencies = [ + "async-trait", "darling", "inflections", "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.38", "types", ] [[package]] name = "maple_lsp" -version = "0.1.0" +version = "0.1.52" dependencies = [ "futures-util", "lsp-types", @@ -1347,15 +1528,16 @@ dependencies = [ "serde_json", "thiserror", "tokio", + "toml", "tracing", "which", ] [[package]] name = "matcher" -version = "0.1.0" +version = "0.1.52" dependencies = [ - "dumb_analyzer", + "code_tools", "extracted_fzy", "fuzzy-matcher", "grep-matcher", @@ -1485,6 +1667,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" +[[package]] +name = "numtoa" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" + [[package]] name = "objc" version = "0.2.7" @@ -1551,6 +1739,36 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "openssl-sys" +version = "0.9.100" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae94056a791d0e1217d18b6cbdccb02c61e3054fc69893607f4067e3bb0b1fd1" +dependencies = [ + "cc", + "libc", + "pkg-config", + "vcpkg", +] + +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "overload" version = "0.1.1" @@ -1582,17 +1800,18 @@ dependencies = [ [[package]] name = "paths" -version = "0.1.0" +version = "0.1.52" dependencies = [ - "dirs", + "dirs 0.1.52", "dunce", - "itertools", + "itertools 0.10.5", "serde", + "shellexpand", ] [[package]] name = "pattern" -version = "0.1.0" +version = "0.1.52" dependencies = [ "once_cell", "regex", @@ -1636,20 +1855,57 @@ dependencies = [ "time", ] +[[package]] +name = "plotters" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-svg" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +dependencies = [ + "plotters-backend", +] + [[package]] name = "powerfmt" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + [[package]] name = "printer" -version = "0.1.0" +version = "0.1.52" dependencies = [ + "filter", "icon", "pattern", + "rayon", "serde", "serde_json", + "termion", "types", "unicode-width", "utils", @@ -1682,6 +1938,36 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha", + "rand_core", +] + +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core", +] + +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom", +] + [[package]] name = "raw-window-handle" version = "0.5.2" @@ -1726,6 +2012,12 @@ dependencies = [ "bitflags 1.3.2", ] +[[package]] +name = "redox_termios" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" + [[package]] name = "redox_users" version = "0.4.3" @@ -1849,7 +2141,7 @@ dependencies = [ [[package]] name = "rpc" -version = "0.1.0" +version = "0.1.52" dependencies = [ "serde", "serde_json", @@ -1971,7 +2263,7 @@ checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -1993,16 +2285,7 @@ checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ "proc-macro2", "quote", - "syn", -] - -[[package]] -name = "serde_spanned" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" -dependencies = [ - "serde", + "syn 2.0.38", ] [[package]] @@ -2026,6 +2309,15 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shellexpand" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da03fa3b94cc19e3ebfc88c4229c49d8f08cdbd1228870a45f0ffdf84988e14b" +dependencies = [ + "dirs 5.0.1", +] + [[package]] name = "signal-hook-registry" version = "1.4.1" @@ -2090,14 +2382,12 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "sublime_syntax" -version = "0.1.0" +version = "0.1.52" dependencies = [ "colors-transform", - "once_cell", "rgb2ansi256", "serde", "syntect", - "tracing", "utils", ] @@ -2110,6 +2400,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "syn" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + [[package]] name = "syn" version = "2.0.38" @@ -2163,6 +2464,18 @@ dependencies = [ "libc", ] +[[package]] +name = "termion" +version = "1.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" +dependencies = [ + "libc", + "numtoa", + "redox_syscall 0.2.16", + "redox_termios", +] + [[package]] name = "thiserror" version = "1.0.50" @@ -2180,7 +2493,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -2222,6 +2535,16 @@ dependencies = [ "time-core", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -2239,9 +2562,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -2257,13 +2580,13 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -2299,36 +2622,19 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit", -] - [[package]] name = "toml_datetime" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] [[package]] name = "toml_edit" -version = "0.19.15" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.1.0", - "serde", - "serde_spanned", "toml_datetime", "winnow", ] @@ -2369,7 +2675,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", ] [[package]] @@ -2451,6 +2757,15 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "tree-sitter-dockerfile" +version = "0.1.0" +source = "git+https://github.com/liuchengxu/tree-sitter-dockerfile?rev=be454233564871db713aab035e9cdc4c3ec572dc#be454233564871db713aab035e9cdc4c3ec572dc" +dependencies = [ + "cc", + "tree-sitter", +] + [[package]] name = "tree-sitter-go" version = "0.20.0" @@ -2522,6 +2837,18 @@ dependencies = [ "tree-sitter", ] +[[package]] +name = "tree-sitter-tags" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccb3f1376219530a37a809751ecf65aa35fd8b9c1c4ab6d4faf5f6a9eeda2c05" +dependencies = [ + "memchr", + "regex", + "thiserror", + "tree-sitter", +] + [[package]] name = "tree-sitter-toml" version = "0.20.0" @@ -2543,16 +2870,20 @@ dependencies = [ [[package]] name = "tree_sitter" -version = "0.1.0" +version = "0.1.52" dependencies = [ "cc", + "criterion", "once_cell", + "rand", "serde", - "toml 0.5.11", + "toml", + "tracing", "tree-sitter", "tree-sitter-bash", "tree-sitter-c", "tree-sitter-cpp", + "tree-sitter-dockerfile", "tree-sitter-go", "tree-sitter-highlight", "tree-sitter-javascript", @@ -2560,6 +2891,7 @@ dependencies = [ "tree-sitter-md", "tree-sitter-python", "tree-sitter-rust", + "tree-sitter-tags", "tree-sitter-toml", "tree-sitter-vim", ] @@ -2572,7 +2904,7 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "types" -version = "0.1.0" +version = "0.1.52" dependencies = [ "icon", "pattern", @@ -2613,12 +2945,11 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "upgrade" -version = "0.1.0" +version = "0.1.52" dependencies = [ "indicatif", "reqwest", "serde", - "serde_json", "tokio", ] @@ -2642,12 +2973,11 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "utils" -version = "0.1.0" +version = "0.1.52" dependencies = [ "bytecount", "memchr", "simdutf8", - "types", ] [[package]] @@ -2708,7 +3038,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -2742,7 +3072,7 @@ checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3065,6 +3395,12 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "write-json" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23f6174b2566cc4a74f95e1367ec343e7fa80c93cc8087f5c4a3d6a1088b2118" + [[package]] name = "x11-clipboard" version = "0.8.1" @@ -3096,6 +3432,34 @@ dependencies = [ "nix", ] +[[package]] +name = "xshell" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce2107fe03e558353b4c71ad7626d58ed82efaf56c54134228608893c77023ad" +dependencies = [ + "xshell-macros", +] + +[[package]] +name = "xshell-macros" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e2c411759b501fb9501aac2b1b2d287a6e93e5bdcf13c25306b23e1b716dd0e" + +[[package]] +name = "xtask" +version = "0.1.52" +dependencies = [ + "anyhow", + "chrono", + "clap", + "serde", + "serde_json", + "write-json", + "xshell", +] + [[package]] name = "yaml-rust" version = "0.4.5" diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index b43ab5501c76..b6b0267216f5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix @@ -11,13 +11,13 @@ }: let - version = "0.50"; + version = "0.52"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; rev = "v${version}"; - hash = "sha256-EYAylATdtwDzM92tN4OlzbQ1XqErRwT9mCNpzj63oxk="; + hash = "sha256-byG4DHa0rTzvlLW+d3eF8xCX8uft4b7HYJDqbVmTdNI="; }; meta = with lib; { @@ -36,6 +36,7 @@ let lockFile = ./Cargo.lock; outputHashes = { "subprocess-0.2.10" = "sha256-WcGrJ103ofGlQwi32kRGM3Z+uvKSCFBmFZbZXAtuWwM="; + "tree-sitter-dockerfile-0.1.0" = "sha256-K+duK3HcxlVgbLXBos3MUxyfnTywcHX6JM4Do0qAJO0="; "tree-sitter-vim-0.3.1-dev.0" = "sha256-CWxZ28LdptiMNO2VIk+Ny/DhQXdN604EuqRIb9oaCmI="; }; }; From 3ee9d185f3879a11ce5e3a7b83cee5135b97c532 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 3 Mar 2024 16:01:35 +1300 Subject: [PATCH 092/201] lib.chooseDevOutputs: Remove needless function wrapping Returning the partially applied `map getDev` is the same as `drvs: map getDev drvs`. --- lib/attrsets.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 4f7d795c397f..f470c9a9278d 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -1138,10 +1138,7 @@ rec { Type: chooseDevOutputs :: [Derivation] -> [String] */ - chooseDevOutputs = - # List of packages to pick `dev` outputs from - drvs: - builtins.map getDev drvs; + chooseDevOutputs = builtins.map getDev; /* Make various Nix tools consider the contents of the resulting attribute set when looking for what to build, find, etc. From 4338bfde0949860f33fe4ab0e1b8684d8db34323 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 3 Mar 2024 16:09:40 +1300 Subject: [PATCH 093/201] lib.zipAttrs: Remove needless function wrapping Returning the partially applied `zipAttrsWith fn` is the same as `sets: zipAttrsWith fn sets`. --- lib/attrsets.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 4f7d795c397f..d62d64f6c1d2 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -870,10 +870,7 @@ rec { Type: zipAttrs :: [ AttrSet ] -> AttrSet */ - zipAttrs = - # List of attribute sets to zip together. - sets: - zipAttrsWith (name: values: values) sets; + zipAttrs = zipAttrsWith (name: values: values); /* Merge a list of attribute sets together using the `//` operator. From 34fefe4e16e04e9b3c335e62462a150ebd303baa Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 3 Mar 2024 16:15:31 +1300 Subject: [PATCH 094/201] lib.mapAttrsRecursiveCond: Eliminate intermediate one intermediate variable environment --- lib/attrsets.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 4f7d795c397f..de531616a520 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -731,14 +731,13 @@ rec { set: let recurse = path: - let - g = - name: value: + mapAttrs + (name: value: if isAttrs value && cond value - then recurse (path ++ [name]) value - else f (path ++ [name]) value; - in mapAttrs g; - in recurse [] set; + then recurse (path ++ [ name ]) value + else f (path ++ [ name ]) value); + in + recurse [ ] set; /* Generate an attribute set by mapping a function over a list of From 948e5b841dc979ecf9c82dd432a7bb2280949265 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 3 Mar 2024 16:28:49 +1300 Subject: [PATCH 095/201] lib.getAttrFromPath: Don't use errorMessage variable We can just pass the error message on without creating an environment. --- lib/attrsets.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 4f7d795c397f..c639e8a18dc8 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -216,8 +216,7 @@ rec { attrPath: # The nested attribute set to find the value in. set: - let errorMsg = "cannot find attribute `" + concatStringsSep "." attrPath + "'"; - in attrByPath attrPath (abort errorMsg) set; + attrByPath attrPath (abort ("cannot find attribute `" + concatStringsSep "." attrPath + "'")) set; /* Map each attribute in the given set and merge them into a new attribute set. From b3cc51a20fccb1ed3ec1de7bafd9f645fa73a8d1 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 3 Mar 2024 16:49:32 +1300 Subject: [PATCH 096/201] lib.toInt/toIntBase10: Make more efficient by hoisting up internal strings into higher scope --- lib/strings.nix | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/lib/strings.nix b/lib/strings.nix index 47ee095f1b68..32efc9bdb70e 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -1038,30 +1038,32 @@ rec { toInt "3.14" => error: floating point JSON numbers are not supported */ - toInt = str: + toInt = + let + matchStripInput = match "[[:space:]]*(-?[[:digit:]]+)[[:space:]]*"; + matchLeadingZero = match "0[[:digit:]]+"; + in + str: let # RegEx: Match any leading whitespace, possibly a '-', one or more digits, # and finally match any trailing whitespace. - strippedInput = match "[[:space:]]*(-?[[:digit:]]+)[[:space:]]*" str; + strippedInput = matchStripInput str; # RegEx: Match a leading '0' then one or more digits. - isLeadingZero = match "0[[:digit:]]+" (head strippedInput) == []; + isLeadingZero = matchLeadingZero (head strippedInput) == []; # Attempt to parse input parsedInput = fromJSON (head strippedInput); generalError = "toInt: Could not convert ${escapeNixString str} to int."; - octalAmbigError = "toInt: Ambiguity in interpretation of ${escapeNixString str}" - + " between octal and zero padded integer."; - in # Error on presence of non digit characters. if strippedInput == null then throw generalError # Error on presence of leading zero/octal ambiguity. else if isLeadingZero - then throw octalAmbigError + then throw "toInt: Ambiguity in interpretation of ${escapeNixString str} between octal and zero padded integer." # Error if parse function fails. else if !isInt parsedInput then throw generalError @@ -1089,15 +1091,20 @@ rec { toIntBase10 "3.14" => error: floating point JSON numbers are not supported */ - toIntBase10 = str: + toIntBase10 = + let + matchStripInput = match "[[:space:]]*0*(-?[[:digit:]]+)[[:space:]]*"; + matchZero = match "0+"; + in + str: let # RegEx: Match any leading whitespace, then match any zero padding, # capture possibly a '-' followed by one or more digits, # and finally match any trailing whitespace. - strippedInput = match "[[:space:]]*0*(-?[[:digit:]]+)[[:space:]]*" str; + strippedInput = matchStripInput str; # RegEx: Match at least one '0'. - isZero = match "0+" (head strippedInput) == []; + isZero = matchZero (head strippedInput) == []; # Attempt to parse input parsedInput = fromJSON (head strippedInput); From 07ae70b15d64c613daaf8484a9cacd73d00fab9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Mar 2024 07:03:22 +0000 Subject: [PATCH 097/201] mommy: 1.3.0 -> 1.5.0 --- pkgs/by-name/mo/mommy/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/mo/mommy/package.nix b/pkgs/by-name/mo/mommy/package.nix index 5de85db633df..8d2187068514 100644 --- a/pkgs/by-name/mo/mommy/package.nix +++ b/pkgs/by-name/mo/mommy/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation rec { pname = "mommy"; - version = "1.3.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "FWDekker"; repo = pname; rev = "v${version}"; - hash = "sha256-9i/xKkMKGnRO6u8O2oKn5z1PZhMrwaK9f/BDzusH474="; + hash = "sha256-kNhoEIzrPjCe6RA/GHFB/NtKjYFByM5TpxAwCLo5TDo="; }; nativeBuildInputs = [ makeWrapper ]; From 7a1b9accf3cc820f54d44d807e4a468bc78f7d74 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 4 Mar 2024 08:31:34 +0100 Subject: [PATCH 098/201] python311Packages.aiocomelit: refactor --- pkgs/development/python-modules/aiocomelit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix index 3575b0f93fe3..b9c18196d24a 100644 --- a/pkgs/development/python-modules/aiocomelit/default.nix +++ b/pkgs/development/python-modules/aiocomelit/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aiocomelit"; version = "0.9.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace pyproject.toml \ - --replace " --cov=aiocomelit --cov-report=term-missing:skip-covered" "" + --replace-fail " --cov=aiocomelit --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ From da85f3bb2c8553742e143cdc8d84bc78cbdee423 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 00:18:37 +0000 Subject: [PATCH 099/201] trino-cli: 435 -> 439 --- pkgs/development/tools/database/trino-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/trino-cli/default.nix b/pkgs/development/tools/database/trino-cli/default.nix index c42ab0208b32..899fa72d673a 100644 --- a/pkgs/development/tools/database/trino-cli/default.nix +++ b/pkgs/development/tools/database/trino-cli/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "trino-cli"; - version = "435"; + version = "439"; jarfilename = "${pname}-${version}-executable.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-X+G75KtlQus9mYcGtAMm7MDo7reN2ZTlVvhGhzEu5W4="; + sha256 = "sha256-ANrv3+hpRn00zFAu6FHltk6seQ4lP2esDIhsJrctfY0="; }; dontUnpack = true; From d4ea94737925e734e62bc733bf664a03cd0aa7c1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 5 Mar 2024 14:31:33 +0100 Subject: [PATCH 100/201] slurm: 23.11.3.1 -> 23.11.4.1 --- pkgs/servers/computing/slurm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index d3ef5324db86..6a1afcf4adda 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "23.11.3.1"; + version = "23.11.4.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - hash = "sha256-fSw7LaIEyExsdVgJ9pfWEBhnBUsczdJl0coEPDdKVzA="; + hash = "sha256-oUkFLw1vgPubsA2htzsJ5SfsL7UA6J0ufwjl7vWoX+s="; }; outputs = [ "out" "dev" ]; From bb7c4fc1fdaa28ed1eb56fa865d1428bd3d419df Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 5 Mar 2024 14:44:23 +0100 Subject: [PATCH 101/201] f2c: 20230428 -> 20240130 --- pkgs/development/tools/f2c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/f2c/default.nix b/pkgs/development/tools/f2c/default.nix index 63b3c5ae32eb..da68b27ddeb9 100644 --- a/pkgs/development/tools/f2c/default.nix +++ b/pkgs/development/tools/f2c/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "f2c"; - version = "20230428"; + version = "20240130"; src = fetchurl { url = "https://www.netlib.org/f2c/src.tgz"; - sha256 = "sha256-dLpnwyGjtikhbH7VpIoGHD5cNyKshc6wHczmkTdRcFo="; + sha256 = "sha256-YciR1CbtsFvGR9b3/DRcLn9NzlXQksVKj8Xhr0g6MjU="; }; makeFlags = [ "-f" "makefile.u" ]; From f8ceab72ffa6cbc2bab363d9d5a17136d8dae532 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 26 Feb 2024 00:31:04 -0500 Subject: [PATCH 102/201] blender: formatting - Format to draft RFC 0166 style (via nixfmt-rfc-style) - Alphabetize lists unless there is a somewhat-apparent reason not to - Reorder attrs based roughly on the order they are used by the builder --- pkgs/applications/misc/blender/default.nix | 403 ++++++++++++++------- 1 file changed, 267 insertions(+), 136 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index ec1f11617321..40a5e9066ebb 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,41 +1,104 @@ -{ config, stdenv, lib, fetchurl, fetchzip, fetchpatch, boost, cmake, ffmpeg, gettext, glew -, libepoxy, libXi, libX11, libXext, libXrender -, libjpeg, libpng, libsamplerate, libsndfile -, libtiff, libwebp, libGLU, libGL, openal, opencolorio, openexr, openimagedenoise, openimageio, openjpeg, python310Packages -, openvdb, libXxf86vm, tbb, alembic -, zlib, zstd, fftw, fftwFloat, opensubdiv, freetype, jemalloc, ocl-icd, addOpenGLRunpath -, jackaudioSupport ? false, libjack2 -, cudaSupport ? config.cudaSupport, cudaPackages ? { } -, hipSupport ? false, rocmPackages # comes with a significantly larger closure size -, colladaSupport ? true, opencollada -, spaceNavSupport ? stdenv.isLinux, libspnav -, makeWrapper -, pugixml, llvmPackages, SDL, Cocoa, CoreGraphics, ForceFeedback, OpenAL, OpenGL -, waylandSupport ? stdenv.isLinux, pkg-config, wayland, wayland-protocols, libffi, libdecor, libxkbcommon, dbus -, potrace -, openxr-loader -, embree, gmp, libharu -, openpgl -, mesa -, runCommand -, callPackage +{ + Cocoa, + CoreGraphics, + ForceFeedback, + OpenAL, + OpenGL, + SDL, + addOpenGLRunpath, + alembic, + boost, + callPackage, + cmake, + colladaSupport ? true, + config, + cudaPackages ? { }, + cudaSupport ? config.cudaSupport, + dbus, + embree, + fetchpatch, + fetchurl, + fetchzip, + ffmpeg, + fftw, + fftwFloat, + freetype, + gettext, + glew, + gmp, + hipSupport ? false, + jackaudioSupport ? false, + jemalloc, + lib, + libGL, + libGLU, + libX11, + libXext, + libXi, + libXrender, + libXxf86vm, + libdecor, + libepoxy, + libffi, + libharu, + libjack2, + libjpeg, + libpng, + libsamplerate, + libsndfile, + libspnav, + libtiff, + libwebp, + libxkbcommon, + llvmPackages, + makeWrapper, + mesa, + ocl-icd, + openal, + opencollada, + opencolorio, + openexr, + openimagedenoise, + openimageio, + openjpeg, + openpgl, + opensubdiv, + openvdb, + openxr-loader, + pkg-config, + potrace, + pugixml, + python310Packages, + rocmPackages, # comes with a significantly larger closure size + runCommand, + spaceNavSupport ? stdenv.isLinux, + stdenv, + tbb, + wayland, + wayland-protocols, + waylandSupport ? stdenv.isLinux, + zlib, + zstd, }: let pythonPackages = python310Packages; inherit (pythonPackages) python; - buildEnv = callPackage ./wrapper.nix {}; - optix = fetchzip { - # url taken from the archlinux blender PKGBUILD - url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; - sha256 = "0max1j4822mchj0xpz9lqzh91zkmvsn4py0r174cvqfz8z8ykjk8"; - }; + + buildEnv = callPackage ./wrapper.nix { }; + libdecor' = libdecor.overrideAttrs (old: { # Blender uses private APIs, need to patch to expose them patches = (old.patches or [ ]) ++ [ ./libdecor.patch ]; }); + optix = fetchzip { + # url taken from the archlinux blender PKGBUILD + url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; + sha256 = "0max1j4822mchj0xpz9lqzh91zkmvsn4py0r174cvqfz8z8ykjk8"; + }; in + stdenv.mkDerivation (finalAttrs: rec { pname = "blender"; version = "4.0.2"; @@ -53,101 +116,62 @@ stdenv.mkDerivation (finalAttrs: rec { }) ] ++ lib.optional stdenv.isDarwin ./darwin.patch; - nativeBuildInputs = - [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev - ] - ++ lib.optionals cudaSupport [ - addOpenGLRunpath - cudaPackages.cuda_nvcc - ] - ++ lib.optionals waylandSupport [ pkg-config ]; - buildInputs = - [ boost ffmpeg gettext glew - freetype libjpeg libpng libsamplerate libsndfile libtiff libwebp - opencolorio openexr openimageio openjpeg python zlib zstd fftw fftwFloat jemalloc - alembic - (opensubdiv.override { inherit cudaSupport; }) - tbb - gmp - pugixml - potrace - libharu - libepoxy - openpgl - ] - ++ lib.optionals waylandSupport [ - wayland wayland-protocols libffi libdecor' libxkbcommon dbus - ] - ++ lib.optionals (!stdenv.isAarch64) [ - openimagedenoise - embree - ] - ++ (if (!stdenv.isDarwin) then [ - libXi libX11 libXext libXrender - libGLU libGL openal - libXxf86vm - openxr-loader - # OpenVDB currently doesn't build on darwin - openvdb - ] - else [ - llvmPackages.openmp SDL Cocoa CoreGraphics ForceFeedback OpenAL OpenGL - ]) - ++ lib.optional jackaudioSupport libjack2 - ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] - ++ lib.optional colladaSupport opencollada - ++ lib.optional spaceNavSupport libspnav; - pythonPath = with python310Packages; [ numpy requests zstandard ]; - - postPatch = '' - '' + - (if stdenv.isDarwin then '' - : > build_files/cmake/platform/platform_apple_xcode.cmake - substituteInPlace source/creator/CMakeLists.txt \ - --replace '${"$"}{LIBDIR}/python' \ - '${python}' - substituteInPlace build_files/cmake/platform/platform_apple.cmake \ - --replace '${"$"}{LIBDIR}/python' \ - '${python}' \ - --replace '${"$"}{LIBDIR}/opencollada' \ - '${opencollada}' \ - --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ - '${python310Packages.numpy}/${python.sitePackages}/numpy' - '' else '' - substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' - '') + - (lib.optionalString hipSupport '' + postPatch = + ( + if stdenv.isDarwin then + '' + : > build_files/cmake/platform/platform_apple_xcode.cmake + substituteInPlace source/creator/CMakeLists.txt \ + --replace '${"$"}{LIBDIR}/python' \ + '${python}' + substituteInPlace build_files/cmake/platform/platform_apple.cmake \ + --replace '${"$"}{LIBDIR}/python' \ + '${python}' \ + --replace '${"$"}{LIBDIR}/opencollada' \ + '${opencollada}' \ + --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ + '${python310Packages.numpy}/${python.sitePackages}/numpy' + '' + else + '' + substituteInPlace extern/clew/src/clew.c --replace '"libOpenCL.so"' '"${ocl-icd}/lib/libOpenCL.so"' + '' + ) + + (lib.optionalString hipSupport '' substituteInPlace extern/hipew/src/hipew.c --replace '"/opt/rocm/hip/lib/libamdhip64.so"' '"${rocmPackages.clr}/lib/libamdhip64.so"' substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"' ''); + env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; + cmakeFlags = [ + "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" + "-DPYTHON_LIBPATH=${python}/lib" + "-DPYTHON_LIBRARY=${python.libPrefix}" + "-DPYTHON_NUMPY_INCLUDE_DIRS=${python310Packages.numpy}/${python.sitePackages}/numpy/core/include" + "-DPYTHON_NUMPY_PATH=${python310Packages.numpy}/${python.sitePackages}" + "-DPYTHON_VERSION=${python.pythonVersion}" "-DWITH_ALEMBIC=ON" + "-DWITH_CODEC_FFMPEG=ON" + "-DWITH_CODEC_SNDFILE=ON" + "-DWITH_FFTW3=ON" + "-DWITH_IMAGE_OPENJPEG=ON" + "-DWITH_INSTALL_PORTABLE=OFF" + "-DWITH_MOD_OCEANSIM=ON" + "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" + "-DWITH_OPENCOLORIO=ON" + "-DWITH_OPENSUBDIV=ON" + "-DWITH_OPENVDB=ON" + "-DWITH_PYTHON_INSTALL=OFF" + "-DWITH_PYTHON_INSTALL_NUMPY=OFF" + "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" + "-DWITH_SDL=OFF" + "-DWITH_TBB=ON" + # Blender supplies its own FindAlembic.cmake (incompatible with the Alembic-supplied config file) "-DALEMBIC_INCLUDE_DIR=${lib.getDev alembic}/include" "-DALEMBIC_LIBRARY=${lib.getLib alembic}/lib/libAlembic.so" - "-DWITH_MOD_OCEANSIM=ON" - "-DWITH_CODEC_FFMPEG=ON" - "-DWITH_CODEC_SNDFILE=ON" - "-DWITH_INSTALL_PORTABLE=OFF" - "-DWITH_FFTW3=ON" - "-DWITH_SDL=OFF" - "-DWITH_OPENCOLORIO=ON" - "-DWITH_OPENSUBDIV=ON" - "-DPYTHON_LIBRARY=${python.libPrefix}" - "-DPYTHON_LIBPATH=${python}/lib" - "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" - "-DPYTHON_VERSION=${python.pythonVersion}" - "-DWITH_PYTHON_INSTALL=OFF" - "-DWITH_PYTHON_INSTALL_NUMPY=OFF" - "-DPYTHON_NUMPY_PATH=${python310Packages.numpy}/${python.sitePackages}" - "-DPYTHON_NUMPY_INCLUDE_DIRS=${python310Packages.numpy}/${python.sitePackages}/numpy/core/include" - "-DWITH_PYTHON_INSTALL_REQUESTS=OFF" - "-DWITH_OPENVDB=ON" - "-DWITH_TBB=ON" - "-DWITH_IMAGE_OPENJPEG=ON" - "-DWITH_OPENCOLLADA=${if colladaSupport then "ON" else "OFF"}" ] ++ lib.optionals waylandSupport [ "-DWITH_GHOST_WAYLAND=ON" @@ -155,43 +179,135 @@ stdenv.mkDerivation (finalAttrs: rec { "-DWITH_GHOST_WAYLAND_DYNLOAD=OFF" "-DWITH_GHOST_WAYLAND_LIBDECOR=ON" ] - ++ lib.optionals stdenv.hostPlatform.isAarch64 [ - "-DWITH_CYCLES_EMBREE=OFF" - ] + ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-DWITH_CYCLES_EMBREE=OFF" ] ++ lib.optionals stdenv.isDarwin [ + "-DLIBDIR=/does-not-exist" "-DWITH_CYCLES_OSL=OFF" # requires LLVM "-DWITH_OPENVDB=OFF" # OpenVDB currently doesn't build on darwin - - "-DLIBDIR=/does-not-exist" ] - # Clang doesn't support "-export-dynamic" - ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" + ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic" ++ lib.optional jackaudioSupport "-DWITH_JACK=ON" ++ lib.optionals cudaSupport [ + "-DOPTIX_ROOT_DIR=${optix}" "-DWITH_CYCLES_CUDA_BINARIES=ON" "-DWITH_CYCLES_DEVICE_OPTIX=ON" - "-DOPTIX_ROOT_DIR=${optix}" ]; - env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; + nativeBuildInputs = + [ + cmake + llvmPackages.llvm.dev + makeWrapper + python310Packages.wrapPython + ] + ++ lib.optionals cudaSupport [ + addOpenGLRunpath + cudaPackages.cuda_nvcc + ] + ++ lib.optionals waylandSupport [ pkg-config ]; + + buildInputs = + [ + alembic + boost + ffmpeg + fftw + fftwFloat + freetype + gettext + glew + gmp + jemalloc + libepoxy + libharu + libjpeg + libpng + libsamplerate + libsndfile + libtiff + libwebp + opencolorio + openexr + openimageio + openjpeg + openpgl + (opensubdiv.override { inherit cudaSupport; }) + potrace + pugixml + python + tbb + zlib + zstd + ] + ++ lib.optionals (!stdenv.isAarch64) [ + embree + openimagedenoise + ] + ++ ( + if (!stdenv.isDarwin) then + [ + libGL + libGLU + libX11 + libXext + libXi + libXrender + libXxf86vm + openal + openvdb # OpenVDB currently doesn't build on darwin + openxr-loader + ] + else + [ + Cocoa + CoreGraphics + ForceFeedback + OpenAL + OpenGL + SDL + llvmPackages.openmp + ] + ) + ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] + ++ lib.optionals waylandSupport [ + dbus + libdecor' + libffi + libxkbcommon + wayland + wayland-protocols + ] + ++ lib.optional colladaSupport opencollada + ++ lib.optional jackaudioSupport libjack2 + ++ lib.optional spaceNavSupport libspnav; + + pythonPath = with python310Packages; [ + numpy + requests + zstandard + ]; # Since some dependencies are built with gcc 6, we need gcc 6's # libstdc++ in our RPATH. Sigh. NIX_LDFLAGS = lib.optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib"; blenderExecutable = - placeholder "out" + (if stdenv.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); - postInstall = lib.optionalString stdenv.isDarwin '' - mkdir $out/Applications - mv $out/Blender.app $out/Applications - '' + '' - mv $out/share/blender/${lib.versions.majorMinor version}/python{,-ext} - buildPythonPath "$pythonPath" - wrapProgram $blenderExecutable \ - --prefix PATH : $program_PATH \ - --prefix PYTHONPATH : "$program_PYTHONPATH" \ - --add-flags '--python-use-system-env' - ''; + placeholder "out" + + (if stdenv.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); + + postInstall = + lib.optionalString stdenv.isDarwin '' + mkdir $out/Applications + mv $out/Blender.app $out/Applications + '' + + '' + mv $out/share/blender/${lib.versions.majorMinor version}/python{,-ext} + buildPythonPath "$pythonPath" + wrapProgram $blenderExecutable \ + --prefix PATH : $program_PATH \ + --prefix PYTHONPATH : "$program_PYTHONPATH" \ + --add-flags '--python-use-system-env' + ''; # Set RUNPATH so that libcuda and libnvrtc in /run/opengl-driver(-32)/lib can be # found. See the explanation in libglvnd. @@ -205,7 +321,15 @@ stdenv.mkDerivation (finalAttrs: rec { passthru = { inherit python pythonPackages; - withPackages = f: let packages = f pythonPackages; in buildEnv.override { blender = finalAttrs.finalPackage; extraModules = packages; }; + withPackages = + f: + let + packages = f pythonPackages; + in + buildEnv.override { + blender = finalAttrs.finalPackage; + extraModules = packages; + }; tests = { render = runCommand "${pname}-test" { } '' @@ -251,9 +375,16 @@ stdenv.mkDerivation (finalAttrs: rec { # say: "We've decided to cancel the BL offering for an indefinite period." # OptiX, enabled with cudaSupport, is non-free. license = with licenses; [ gpl2Plus ] ++ optional cudaSupport unfree; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-darwin" + "x86_64-linux" + ]; broken = stdenv.isDarwin; - maintainers = with maintainers; [ goibhniu veprbl ]; + maintainers = with maintainers; [ + goibhniu + veprbl + ]; mainProgram = "blender"; }; }) From bd78a3bfa5e4437822ec89a8642ae25ccdcb1956 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 26 Feb 2024 00:31:20 -0500 Subject: [PATCH 103/201] blender: prefer using alias for desired pythonPackages Otherwise all these references have to be updated whenever the Python version is changed. --- pkgs/applications/misc/blender/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 40a5e9066ebb..e689e0a6b506 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: rec { --replace '${"$"}{LIBDIR}/opencollada' \ '${opencollada}' \ --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ - '${python310Packages.numpy}/${python.sitePackages}/numpy' + '${pythonPackages.numpy}/${python.sitePackages}/numpy' '' else '' @@ -149,8 +149,8 @@ stdenv.mkDerivation (finalAttrs: rec { "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" "-DPYTHON_LIBPATH=${python}/lib" "-DPYTHON_LIBRARY=${python.libPrefix}" - "-DPYTHON_NUMPY_INCLUDE_DIRS=${python310Packages.numpy}/${python.sitePackages}/numpy/core/include" - "-DPYTHON_NUMPY_PATH=${python310Packages.numpy}/${python.sitePackages}" + "-DPYTHON_NUMPY_INCLUDE_DIRS=${pythonPackages.numpy}/${python.sitePackages}/numpy/core/include" + "-DPYTHON_NUMPY_PATH=${pythonPackages.numpy}/${python.sitePackages}" "-DPYTHON_VERSION=${python.pythonVersion}" "-DWITH_ALEMBIC=ON" "-DWITH_CODEC_FFMPEG=ON" @@ -198,7 +198,7 @@ stdenv.mkDerivation (finalAttrs: rec { cmake llvmPackages.llvm.dev makeWrapper - python310Packages.wrapPython + pythonPackages.wrapPython ] ++ lib.optionals cudaSupport [ addOpenGLRunpath @@ -281,7 +281,7 @@ stdenv.mkDerivation (finalAttrs: rec { ++ lib.optional jackaudioSupport libjack2 ++ lib.optional spaceNavSupport libspnav; - pythonPath = with python310Packages; [ + pythonPath = with pythonPackages; [ numpy requests zstandard From 98cecd5f7d8dd5ecd49f0bf4777a2a71831ccec7 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 26 Feb 2024 00:34:26 -0500 Subject: [PATCH 104/201] blender: prefer finalAttrs over rec --- pkgs/applications/misc/blender/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index e689e0a6b506..fec04aaa6dbe 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -99,12 +99,12 @@ let }; in -stdenv.mkDerivation (finalAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "blender"; version = "4.0.2"; src = fetchurl { - url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; + url = "https://download.blender.org/source/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; hash = "sha256-qqDnKdp1kc+/RXcq92NFl32qp7EaCvNdmPkxPiRgd6M="; }; @@ -301,7 +301,7 @@ stdenv.mkDerivation (finalAttrs: rec { mv $out/Blender.app $out/Applications '' + '' - mv $out/share/blender/${lib.versions.majorMinor version}/python{,-ext} + mv $out/share/blender/${lib.versions.majorMinor finalAttrs.version}/python{,-ext} buildPythonPath "$pythonPath" wrapProgram $blenderExecutable \ --prefix PATH : $program_PATH \ @@ -332,7 +332,7 @@ stdenv.mkDerivation (finalAttrs: rec { }; tests = { - render = runCommand "${pname}-test" { } '' + render = runCommand "${finalAttrs.pname}-test" { } '' set -euo pipefail export LIBGL_DRIVERS_PATH=${mesa.drivers}/lib/dri From 3a3758db32b0cbd8841e77ee0f317f55aac31a96 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Mon, 26 Feb 2024 00:36:08 -0500 Subject: [PATCH 105/201] blender: reduce usage of `with` When used, ensure the scope is narrow. https://nix.dev/guides/best-practices#with-scopes --- pkgs/applications/misc/blender/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index fec04aaa6dbe..309170f7487c 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -281,11 +281,15 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional jackaudioSupport libjack2 ++ lib.optional spaceNavSupport libspnav; - pythonPath = with pythonPackages; [ - numpy - requests - zstandard - ]; + pythonPath = + let + ps = pythonPackages; + in + [ + ps.numpy + ps.requests + ps.zstandard + ]; # Since some dependencies are built with gcc 6, we need gcc 6's # libstdc++ in our RPATH. Sigh. @@ -368,20 +372,20 @@ stdenv.mkDerivation (finalAttrs: { }; }; - meta = with lib; { + meta = { description = "3D Creation/Animation/Publishing System"; homepage = "https://www.blender.org"; # They comment two licenses: GPLv2 and Blender License, but they # say: "We've decided to cancel the BL offering for an indefinite period." # OptiX, enabled with cudaSupport, is non-free. - license = with licenses; [ gpl2Plus ] ++ optional cudaSupport unfree; + license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport unfree; platforms = [ "aarch64-linux" "x86_64-darwin" "x86_64-linux" ]; broken = stdenv.isDarwin; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ goibhniu veprbl ]; From 13e7acb2e74255cf499d9ba2cd23f5b38169f7bc Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 1 Mar 2024 09:21:01 -0500 Subject: [PATCH 106/201] blender: add comment for why pythonPackages over python.pkgs --- pkgs/applications/misc/blender/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 309170f7487c..0515866226f4 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -68,7 +68,7 @@ pkg-config, potrace, pugixml, - python310Packages, + python310Packages, # must use instead of python3.pkgs, see https://github.com/NixOS/nixpkgs/issues/211340 rocmPackages, # comes with a significantly larger closure size runCommand, spaceNavSupport ? stdenv.isLinux, From 6d234d9d5e7c58ca479f8ddfa0f52171140a9d8e Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Fri, 1 Mar 2024 09:32:01 -0500 Subject: [PATCH 107/201] blender: remove unnecessary explicit libstdc addition to rpath This seems to no longer be necessary, I can successfully build with cudaSupport and perform a CUDA and OptiX render. --- pkgs/applications/misc/blender/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 0515866226f4..c468341df51e 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -291,10 +291,6 @@ stdenv.mkDerivation (finalAttrs: { ps.zstandard ]; - # Since some dependencies are built with gcc 6, we need gcc 6's - # libstdc++ in our RPATH. Sigh. - NIX_LDFLAGS = lib.optionalString cudaSupport "-rpath ${stdenv.cc.cc.lib}/lib"; - blenderExecutable = placeholder "out" + (if stdenv.isDarwin then "/Applications/Blender.app/Contents/MacOS/Blender" else "/bin/blender"); From 3369061e8e51db3dec29ff132d35c5fbf3b44614 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 3 Mar 2024 19:40:04 -0500 Subject: [PATCH 108/201] blender: inline single-use vars when defining withPackages --- pkgs/applications/misc/blender/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index c468341df51e..fb62ac711450 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -85,8 +85,6 @@ let pythonPackages = python310Packages; inherit (pythonPackages) python; - buildEnv = callPackage ./wrapper.nix { }; - libdecor' = libdecor.overrideAttrs (old: { # Blender uses private APIs, need to patch to expose them patches = (old.patches or [ ]) ++ [ ./libdecor.patch ]; @@ -323,12 +321,9 @@ stdenv.mkDerivation (finalAttrs: { withPackages = f: - let - packages = f pythonPackages; - in - buildEnv.override { + (callPackage ./wrapper.nix { }).override { blender = finalAttrs.finalPackage; - extraModules = packages; + extraModules = (f pythonPackages); }; tests = { From 3605bfff9a6068b1c0957cf10506f9ee1e9b05b8 Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 3 Mar 2024 19:41:47 -0500 Subject: [PATCH 109/201] blender: remove unnecessary fallback for cudaPackages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It’s always defined. --- pkgs/applications/misc/blender/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index fb62ac711450..608fcd3776f8 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -12,7 +12,7 @@ cmake, colladaSupport ? true, config, - cudaPackages ? { }, + cudaPackages, cudaSupport ? config.cudaSupport, dbus, embree, From 9cd71e54a3025c3536528423a29f21a49770dd51 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Thu, 15 Feb 2024 11:46:09 +0100 Subject: [PATCH 110/201] halloy: run under wayland, if available Allows halloy to use it's wayland backend, if available. --- pkgs/applications/networking/irc/halloy/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/irc/halloy/default.nix b/pkgs/applications/networking/irc/halloy/default.nix index 3d7faf5ac348..2231a7bfb396 100644 --- a/pkgs/applications/networking/irc/halloy/default.nix +++ b/pkgs/applications/networking/irc/halloy/default.nix @@ -72,6 +72,15 @@ rustPlatform.buildRustPackage rec { }) ]; + postFixup = lib.optional stdenv.isLinux ( + let + rpathWayland = lib.makeLibraryPath [ wayland vulkan-loader libxkbcommon ]; + in + '' + rpath=$(patchelf --print-rpath $out/bin/halloy) + patchelf --set-rpath "$rpath:${rpathWayland}" $out/bin/halloy + ''); + postInstall = '' install -Dm644 assets/linux/org.squidowl.halloy.png $out/share/icons/hicolor/128x128/apps/org.squidowl.halloy.png ''; From e65fdfa217782646c561ef0199a1d4799441b15e Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Sun, 3 Mar 2024 19:44:16 -0500 Subject: [PATCH 111/201] blender: use SRI hash for OptiX, clarify source --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 608fcd3776f8..8109262129c0 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -91,9 +91,9 @@ let }); optix = fetchzip { - # url taken from the archlinux blender PKGBUILD + # URL from https://gitlab.archlinux.org/archlinux/packaging/packages/blender/-/commit/333add667b43255dcb011215a2d2af48281e83cf#9b9baac1eb9b72790eef5540a1685306fc43fd6c_30_30 url = "https://developer.download.nvidia.com/redist/optix/v7.3/OptiX-7.3.0-Include.zip"; - sha256 = "0max1j4822mchj0xpz9lqzh91zkmvsn4py0r174cvqfz8z8ykjk8"; + hash = "sha256-aMrp0Uff4c3ICRn4S6zedf6Q4Mc0/duBhKwKgYgMXVU="; }; in From c92e91b9f622e3f20b1a009b65f4421ba995cbad Mon Sep 17 00:00:00 2001 From: Andrew Marshall Date: Tue, 5 Mar 2024 08:42:30 -0500 Subject: [PATCH 112/201] blender: rename local python{,Packages} -> python3{,Packages} MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes them match what the fn param names *would* be, making it easier to refactor e.g. to `{ python3Packages, ... }: mkDerivation …` in the future if desired. It also potentially reduces first-glance confusion that it might be Python 2 in-use. Leave the passthru names as-is to preserve backwards-compatibility, but also as there appears to be some precedent for naming them like this. --- pkgs/applications/misc/blender/default.nix | 35 +++++++++++----------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 8109262129c0..ebbc6cc84fef 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -82,8 +82,8 @@ }: let - pythonPackages = python310Packages; - inherit (pythonPackages) python; + python3Packages = python310Packages; + python3 = python3Packages.python; libdecor' = libdecor.overrideAttrs (old: { # Blender uses private APIs, need to patch to expose them @@ -121,14 +121,14 @@ stdenv.mkDerivation (finalAttrs: { : > build_files/cmake/platform/platform_apple_xcode.cmake substituteInPlace source/creator/CMakeLists.txt \ --replace '${"$"}{LIBDIR}/python' \ - '${python}' + '${python3}' substituteInPlace build_files/cmake/platform/platform_apple.cmake \ --replace '${"$"}{LIBDIR}/python' \ - '${python}' \ + '${python3}' \ --replace '${"$"}{LIBDIR}/opencollada' \ '${opencollada}' \ --replace '${"$"}{PYTHON_LIBPATH}/site-packages/numpy' \ - '${pythonPackages.numpy}/${python.sitePackages}/numpy' + '${python3Packages.numpy}/${python3.sitePackages}/numpy' '' else '' @@ -140,16 +140,16 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace extern/hipew/src/hipew.c --replace '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"' ''); - env.NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; + env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}"; cmakeFlags = [ - "-DPYTHON_INCLUDE_DIR=${python}/include/${python.libPrefix}" - "-DPYTHON_LIBPATH=${python}/lib" - "-DPYTHON_LIBRARY=${python.libPrefix}" - "-DPYTHON_NUMPY_INCLUDE_DIRS=${pythonPackages.numpy}/${python.sitePackages}/numpy/core/include" - "-DPYTHON_NUMPY_PATH=${pythonPackages.numpy}/${python.sitePackages}" - "-DPYTHON_VERSION=${python.pythonVersion}" + "-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}" + "-DPYTHON_LIBPATH=${python3}/lib" + "-DPYTHON_LIBRARY=${python3.libPrefix}" + "-DPYTHON_NUMPY_INCLUDE_DIRS=${python3Packages.numpy}/${python3.sitePackages}/numpy/core/include" + "-DPYTHON_NUMPY_PATH=${python3Packages.numpy}/${python3.sitePackages}" + "-DPYTHON_VERSION=${python3.pythonVersion}" "-DWITH_ALEMBIC=ON" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON" @@ -196,7 +196,7 @@ stdenv.mkDerivation (finalAttrs: { cmake llvmPackages.llvm.dev makeWrapper - pythonPackages.wrapPython + python3Packages.wrapPython ] ++ lib.optionals cudaSupport [ addOpenGLRunpath @@ -232,7 +232,7 @@ stdenv.mkDerivation (finalAttrs: { (opensubdiv.override { inherit cudaSupport; }) potrace pugixml - python + python3 tbb zlib zstd @@ -281,7 +281,7 @@ stdenv.mkDerivation (finalAttrs: { pythonPath = let - ps = pythonPackages; + ps = python3Packages; in [ ps.numpy @@ -317,13 +317,14 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - inherit python pythonPackages; + python = python3; + pythonPackages = python3Packages; withPackages = f: (callPackage ./wrapper.nix { }).override { blender = finalAttrs.finalPackage; - extraModules = (f pythonPackages); + extraModules = (f python3Packages); }; tests = { From 8b7a84f3df7706fc1a04e82716ce17b0f4691b3b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 5 Mar 2024 19:26:08 +0100 Subject: [PATCH 113/201] pixelfed: 0.11.12 -> 0.11.13 Changes: https://github.com/pixelfed/pixelfed/releases/tag/v0.11.13 --- pkgs/servers/web-apps/pixelfed/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/web-apps/pixelfed/default.nix b/pkgs/servers/web-apps/pixelfed/default.nix index 537c4c626465..2b1f2e730206 100644 --- a/pkgs/servers/web-apps/pixelfed/default.nix +++ b/pkgs/servers/web-apps/pixelfed/default.nix @@ -10,18 +10,16 @@ php.buildComposerProject (finalAttrs: { pname = "pixelfed"; - version = "0.11.12"; + version = "0.11.13"; src = fetchFromGitHub { owner = "pixelfed"; repo = finalAttrs.pname; rev = "v${finalAttrs.version}"; - hash = "sha256-tHwNchnB5z21Q1I8qwKn2s5rfHFvMxRLAyPkUEhC6qQ="; + hash = "sha256-bEwKaC9fSOGLQbjsuPuIdMMbO3kzvzQxWQR8C2A4mQc="; }; - vendorHash = "sha256-nRCrmF1p+fZI+iyrM5I3bVCSwjQdn8BSW8Jj62lpn8E="; - # Needed because buzz/laravel-h-captcha is pinned to 1.0.4 in composer.json - composerStrictValidation = false; + vendorHash = "sha256-ahQsOq3qOMGt3b0Ebac4xex+MP9knTmjyCy0PSNE4W8="; postInstall = '' mv "$out/share/php/${finalAttrs.pname}"/* $out From f14b23fd8741b98acae803c9372312eea985ccb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 20:08:56 +0000 Subject: [PATCH 114/201] python311Packages.google-cloud-datacatalog: 3.18.2 -> 3.18.3 --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 734e9e7dc649..17f57f943099 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.18.2"; + version = "3.18.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-USo8ldUbfsArvjw5+MOubFDOlXkV4GPowHYVsRHBHrk="; + hash = "sha256-d4MTAZgseV5iI83A7lSkbe/SEgX9ZfQ0pLHfYBStfp4="; }; nativeBuildInputs = [ From e2d8f6dafc720f265fa737c54ba30a8e45e00c2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 20:22:43 +0000 Subject: [PATCH 115/201] code-minimap: 0.6.4 -> 0.6.7 --- pkgs/tools/misc/code-minimap/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/code-minimap/default.nix b/pkgs/tools/misc/code-minimap/default.nix index 33e6ee825b0b..34d8547ebd32 100644 --- a/pkgs/tools/misc/code-minimap/default.nix +++ b/pkgs/tools/misc/code-minimap/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "code-minimap"; - version = "0.6.4"; + version = "0.6.7"; src = fetchFromGitHub { owner = "wfxr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XhewfU3l/n2wiF9pKm1OOKQ7REzz3WzcBiVgOiYnAYU="; + sha256 = "sha256-d9qcSSiRv1I7NYuLrra5ShIUXT2HVeHGD0WPb+dnQCc="; }; - cargoSha256 = "sha256-Z3bc0w8slI9lHbDbrIK65xurtmTK4Y4caF7kxxJBA3Q="; + cargoHash = "sha256-5/UgEzkJw9XDgtS1jKyWh5ijTp3L+UQLuE5CXcyIgTs="; buildInputs = lib.optional stdenv.isDarwin libiconv; From 66d436410743ec977db945e78afc6417f2b04394 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 20:26:29 +0000 Subject: [PATCH 116/201] magic-vlsi: 8.3.460 -> 8.3.463 --- pkgs/applications/science/electronics/magic-vlsi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/magic-vlsi/default.nix b/pkgs/applications/science/electronics/magic-vlsi/default.nix index a6237be645b5..15130deefc58 100644 --- a/pkgs/applications/science/electronics/magic-vlsi/default.nix +++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "magic-vlsi"; - version = "8.3.460"; + version = "8.3.463"; src = fetchurl { url = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz"; - sha256 = "sha256-MiwwCVpbmEuGwY36/ctfD0xK4RL5tolM/YPSHLIzrgk="; + sha256 = "sha256-ba5kTz5ncsEPTh0a0/tbp37qFogUQ+W4p2rPNFLNIAY="; }; nativeBuildInputs = [ python3 ]; From 26591596fc55b46d318113af08b603a4b327f292 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 20:52:53 +0000 Subject: [PATCH 117/201] snac2: 2.47 -> 2.49 --- pkgs/servers/snac2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix index 3770a620b7a8..72a06dc0dfc2 100644 --- a/pkgs/servers/snac2/default.nix +++ b/pkgs/servers/snac2/default.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation rec { pname = "snac2"; - version = "2.47"; + version = "2.49"; src = fetchFromGitea { domain = "codeberg.org"; owner = "grunfink"; repo = pname; rev = version; - hash = "sha256-zK8Ypdp8kP4E3p04BAkTjcMiKtCQTtdDWArK/f1QhJw="; + hash = "sha256-8hIwm/CCghzbLtHhCqnnc3HELJ8KYwFlICqBTKaUb6U="; }; buildInputs = [ curl openssl ]; From cc1d2f5bf5e65c0bddcbc87887bed2f1ff4aa65b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 5 Mar 2024 21:37:06 +0000 Subject: [PATCH 118/201] qemu: 8.2.1 -> 8.2.2 Changes: https://lore.kernel.org/all/1709577077.783602.1474596.nullmailer@tls.msk.ru/T/ --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index f241a553f864..e7da99d561f6 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils"; - version = "8.2.1"; + version = "8.2.2"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-hWJ1EVgXX50YfF8itXVVq+PIcPAyXIztEsNMbZh3Kb4="; + hash = "sha256-hHNGwbgsGlSyw49u29hVSe3rF0MLfU09oSYg4pYrxPM="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] From 1bdb07e19955ecc6b6860effb7eac0eb48004a9c Mon Sep 17 00:00:00 2001 From: Coutinho de Souza Date: Fri, 1 Mar 2024 12:37:53 -0300 Subject: [PATCH 119/201] qbe: enable cross-compilation --- pkgs/development/compilers/qbe/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/qbe/default.nix b/pkgs/development/compilers/qbe/default.nix index aeb739bb84d0..00c91e2671ec 100644 --- a/pkgs/development/compilers/qbe/default.nix +++ b/pkgs/development/compilers/qbe/default.nix @@ -12,7 +12,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-UgtJnZF/YtD54OBy9HzGRAEHx5tC9Wo2YcUidGwrv+s="; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + "CC=${stdenv.cc.targetPrefix}cc" + ]; doCheck = true; From f8b46d2bbd73e4aabdb659d917f30c5744931832 Mon Sep 17 00:00:00 2001 From: Coutinho de Souza Date: Fri, 1 Mar 2024 12:40:06 -0300 Subject: [PATCH 120/201] harec: enable cross-compilation --- pkgs/by-name/ha/harec/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/ha/harec/package.nix b/pkgs/by-name/ha/harec/package.nix index 11470c7f828f..e95ad7ed7095 100644 --- a/pkgs/by-name/ha/harec/package.nix +++ b/pkgs/by-name/ha/harec/package.nix @@ -7,6 +7,11 @@ let platform = lib.toLower stdenv.hostPlatform.uname.system; arch = stdenv.hostPlatform.uname.processor; + qbePlatform = { + x86_64 = "amd64_sysv"; + aarch64 = "arm64"; + riscv64 = "rv64"; + }.${arch}; in stdenv.mkDerivation (finalAttrs: { pname = "harec"; @@ -31,6 +36,10 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=${builtins.placeholder "out"}" "ARCH=${arch}" "VERSION=${finalAttrs.version}-nixpkgs" + "QBEFLAGS=-t${qbePlatform}" + "CC=${stdenv.cc.targetPrefix}cc" + "AS=${stdenv.cc.targetPrefix}as" + "LD=${stdenv.cc.targetPrefix}ld" ]; strictDeps = true; From 344b030e8dd6c51a9f3f42616f0962b9aaab2099 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:01:01 +0000 Subject: [PATCH 121/201] python312Packages.gekko: 1.0.6 -> 1.0.7 --- pkgs/development/python-modules/gekko/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gekko/default.nix b/pkgs/development/python-modules/gekko/default.nix index a623a21eb8c4..d7a906af82b8 100644 --- a/pkgs/development/python-modules/gekko/default.nix +++ b/pkgs/development/python-modules/gekko/default.nix @@ -8,12 +8,12 @@ }: buildPythonPackage rec { pname = "gekko"; - version = "1.0.6"; + version = "1.0.7"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-WNyEdJXBXfhrD1LywBBJ3Ehk+CnUS8VYbJFK8mpKV20="; + hash = "sha256-MXoxrejg+QJgajFv8DgZw44NeJuTHNBBK/lsWgmymJY="; }; nativeBuildInputs = [ From fd9df9ff881edc33220bc67220357b52ec7754e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:13:57 +0000 Subject: [PATCH 122/201] lsp-plugins: 1.2.14 -> 1.2.15 --- pkgs/applications/audio/lsp-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/lsp-plugins/default.nix b/pkgs/applications/audio/lsp-plugins/default.nix index c3df2ecd30d4..aec55c9437ad 100644 --- a/pkgs/applications/audio/lsp-plugins/default.nix +++ b/pkgs/applications/audio/lsp-plugins/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "lsp-plugins"; - version = "1.2.14"; + version = "1.2.15"; src = fetchurl { url = "https://github.com/sadko4u/${pname}/releases/download/${version}/${pname}-src-${version}.tar.gz"; - sha256 = "sha256-GjNZ7ouKgpcb1+nuq+Q/WM5rSkeT2F+xb5exAOTt7po="; + sha256 = "sha256-krku+jFGOvLwixNGd+0jBzE/17k/OU0zAePLhnxd864="; }; outputs = [ "out" "dev" "doc" ]; From 6f27c3cd1ef270f074ddab48fda66a883de8676a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:21:26 +0000 Subject: [PATCH 123/201] protoc-gen-go: 1.32.0 -> 1.33.0 --- pkgs/development/tools/protoc-gen-go/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-go/default.nix b/pkgs/development/tools/protoc-gen-go/default.nix index e1e06182672d..55c0efc62a8a 100644 --- a/pkgs/development/tools/protoc-gen-go/default.nix +++ b/pkgs/development/tools/protoc-gen-go/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-go"; - version = "1.32.0"; + version = "1.33.0"; src = fetchFromGitHub { owner = "protocolbuffers"; repo = "protobuf-go"; rev = "v${version}"; - sha256 = "sha256-7i6neRiC0fdn5wnPDp7vCDPlVglzt7tDR0qtG9V/qZA="; + sha256 = "sha256-hA/UweNQSVzMeauIol73p9yYYCvnLcZNTYMrRWk9dBg="; }; vendorHash = "sha256-nGI/Bd6eMEoY0sBwWEtyhFowHVvwLKjbT4yfzFz6Z3E="; From 7dab93e7477ffed5cf18f59b28934a5a34436682 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:41:24 +0000 Subject: [PATCH 124/201] bacon: 2.14.2 -> 2.15.0 --- pkgs/development/tools/bacon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/bacon/default.nix b/pkgs/development/tools/bacon/default.nix index 89e90a8589f5..4deaf6a6011c 100644 --- a/pkgs/development/tools/bacon/default.nix +++ b/pkgs/development/tools/bacon/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.14.2"; + version = "2.15.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hwzj5RUUj3mYN2XUS5Dt2cbQYJ3oKNj4CZabO6qDt74="; + hash = "sha256-NJ/izdvwTzKIVTymBsSzFUy5SX4Nhh4t/6QoMQWyvAM="; }; - cargoHash = "sha256-gUkh9YpmT+FNv30iOhPRcOAhpaqvd1PavSfoycNox7k="; + cargoHash = "sha256-RhEqEqHQrw1NO6k3acOtZmEFgu3FJ+/r154EfoM4uJI="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From 528495b68e9cea878ee09bdd21595e12c1731c71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:41:28 +0000 Subject: [PATCH 125/201] publii: 0.44.4 -> 0.45.0 --- pkgs/development/web/publii/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/publii/default.nix b/pkgs/development/web/publii/default.nix index 5c5d776516ee..bcc284ad7126 100644 --- a/pkgs/development/web/publii/default.nix +++ b/pkgs/development/web/publii/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "publii"; - version = "0.44.4"; + version = "0.45.0"; src = fetchurl { url = "https://getpublii.com/download/Publii-${version}.deb"; - hash = "sha256-Qk7Ix8VLfrgT4VbSIQFwB5oVfjgeSi8nttQWovptliw="; + hash = "sha256-hnIMg8WzmG29QSMsYP2YfAfM/Rqz2+PqpT7e9chTvlc="; }; dontConfigure = true; From 39392b18f07c8f6cd6faacfd3c0fbb23f4416f48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:55:13 +0000 Subject: [PATCH 126/201] quarto: 1.4.550 -> 1.4.551 --- pkgs/development/libraries/quarto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index c9223aef6550..c61bb41e4484 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.4.550"; + version = "1.4.551"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-cWHd7ZWGBdRTaSHYVa8LuTDA5gefJ5baOGERS2g6Vvg="; + sha256 = "sha256-RUnlLjJOf8hSj7aRCrmDSXFeNHCXnMY/bdbE3fbbThQ="; }; nativeBuildInputs = [ From 6a8d88500c053e0e9fc40f341cbf10eefa7347d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 04:49:27 +0000 Subject: [PATCH 127/201] boundary: 0.15.0 -> 0.15.1 --- pkgs/tools/networking/boundary/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/boundary/default.nix b/pkgs/tools/networking/boundary/default.nix index 66973b17ccba..4480bdbede1f 100644 --- a/pkgs/tools/networking/boundary/default.nix +++ b/pkgs/tools/networking/boundary/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.15.0"; + version = "0.15.1"; src = let @@ -15,10 +15,10 @@ stdenv.mkDerivation rec { aarch64-darwin = "darwin_arm64"; }; sha256 = selectSystem { - x86_64-linux = "sha256-9swvTXPlGXXkHPWzjg54rpH8bsscJ393S2OKRImZGzs="; - aarch64-linux = "sha256-dCmJmL+6l+QxWgZLCbj3ymzarwvJTqkyseQj9dO7DcM="; - x86_64-darwin = "sha256-vZudiEt+Bi0GuW/jVgIniNq2obAkL/mH0EoUS2cwj0U="; - aarch64-darwin = "sha256-dL9SfzN/DZZggpX3x67rIhOJupkOWxcFGdQDMPffecY="; + x86_64-linux = "sha256-LPIvbT934HjetzaljMMVaZslavAY2torE684MLOTvLo="; + aarch64-linux = "sha256-RH8BHo97nTfMSWLfVY6r7qWqMBXcZRCIY5u/9lzrog4="; + x86_64-darwin = "sha256-6jEVffu4bTKzlnT364q5oD8+T6nXyqKZhBVLXv0Pbac="; + aarch64-darwin = "sha256-m+rGK7VbCZNDsumrFI3HNa/CG1eEzKDQTNTbb2ECn7c="; }; in fetchzip { From 9289161fe8fd2f54c34e0b202ed8db60ad102efb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 04:14:53 +0000 Subject: [PATCH 128/201] python312Packages.jwcrypto: 1.5.4 -> 1.5.5 --- pkgs/development/python-modules/jwcrypto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index 4a10cd9fad2a..d9d666c8e60c 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "jwcrypto"; - version = "1.5.4"; + version = "1.5.5"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-CBX7q2E9uZuthWkdpfE2+IYEIzlmZ3KKJkvPpuHbNrA="; + hash = "sha256-WefV5FidGwcXDzaOIMMusyoCORGAapcjsfQ6DYswKNY="; }; nativeBuildInputs = [ From 92cb8dd5c72e5b6f1cc3c536b85f65b0c80b4537 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 5 Mar 2024 22:57:28 +0100 Subject: [PATCH 129/201] paperless-ngx: 2.5.4 -> 2.6.1 https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.6.0 https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.6.1 --- pkgs/applications/office/paperless-ngx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index db6becac38d1..0f77fd1cf358 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -22,13 +22,13 @@ }: let - version = "2.5.4"; + version = "2.6.1"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-F+fZb8Eqw2gHxnv2Zj/xyUOrQu5KIGBIeyhIa1gyayw="; + hash = "sha256-sBzy3C59630moKuv3cmE9YI/FQkoZbF0SoSFbpJdNd8="; }; python = python3; @@ -53,7 +53,7 @@ let cd src-ui ''; - npmDepsHash = "sha256-GXGYfyWy6g1XWKyu3jdbszYYhEk1TzjQIwMGT8Rc0a0="; + npmDepsHash = "sha256-oie1jUFIRrOpdxw1gDtLBgFl1Fb0F5hjvl0wTAd6eYU="; nativeBuildInputs = [ pkg-config From 3904a6e6f739e52ab516651e8060c2e611dde4cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 11:30:49 +0000 Subject: [PATCH 130/201] ssdfs-utils: 4.38 -> 4.39 --- pkgs/tools/filesystems/ssdfs-utils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/ssdfs-utils/default.nix b/pkgs/tools/filesystems/ssdfs-utils/default.nix index 46d2c8ed9293..b4bd62b8b1b5 100644 --- a/pkgs/tools/filesystems/ssdfs-utils/default.nix +++ b/pkgs/tools/filesystems/ssdfs-utils/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation { # as ssdfs-utils, not ssdfs-tools. pname = "ssdfs-utils"; # The version is taken from `configure.ac`, there are no tags. - version = "4.38"; + version = "4.39"; src = fetchFromGitHub { owner = "dubeyko"; repo = "ssdfs-tools"; - rev = "14c0e9eb63f75c100a711493a16665c313c7bcf7"; - hash = "sha256-s8HWuUub7EzDVZTFSitW/Zg2u0PSrXnmb5fnfOyrNL0="; + rev = "24aafdd9ee30247745b36e55e0098fa590ffc26f"; + hash = "sha256-e6Duur7EauvzK1aStbRzClfPMGRR2a7jxGpiyJfQaUk="; }; strictDeps = true; From 3a1c091117e6770ac4f7e9ba2edb7dedf1db0373 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 12:43:47 +0000 Subject: [PATCH 131/201] kubevirt: 1.1.1 -> 1.2.0 --- pkgs/tools/virtualization/kubevirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/tools/virtualization/kubevirt/default.nix index 519ffa83e660..d20168fc7cba 100644 --- a/pkgs/tools/virtualization/kubevirt/default.nix +++ b/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "1.1.1"; + version = "1.2.0"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - hash = "sha256-4r85RDfndLUjpAmipe3oLFcGzD4GRfPgf7wku2unoes="; + hash = "sha256-GQhynbGu3pEYYKOib0l/TfXrrLQ7TkjacWVdwFrlzEo="; }; vendorHash = null; From 6acfd2fb33468986f2fd8e369b824bbfde5553b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 13:00:57 +0000 Subject: [PATCH 132/201] open-policy-agent: 0.62.0 -> 0.62.1 --- pkgs/development/tools/open-policy-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 873d9b19da4a..7346b9bea1d9 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.62.0"; + version = "0.62.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-Afaa6ykGyZQGjzSDYuJ954LF0IOzRDG8rV9hgXVT7YE="; + hash = "sha256-iR3/6tqB6jwjy87D6xkKu/N61oenWzU3tEPTYTeEv7c="; }; vendorHash = null; From 104fab360483d68fc874f21885a830fc869bbfd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elizabeth=20Pa=C5=BA?= Date: Wed, 6 Mar 2024 14:35:06 +0100 Subject: [PATCH 133/201] gleam: 0.34.0 -> 1.0.0 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index 8571950fef3a..d21c4d48f33f 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.34.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-cqJNNSN3x2tr6/i7kXAlvIaU9SfyPWBE4c6twc/p1lY="; + hash = "sha256-gPlRihwK+J7s1SeymfVdVo/KIV+eEqxlLVOgsDWW9yo"; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-mCMfVYbpUik8oc7TLLAXPBmBUchy+quAZLmd9pqCZ7Y="; + cargoHash = "sha256-ouu4Y1085dGSM7kGIWE+hBde6ZUOA1fO0AcHYXPOWzo="; passthru.updateScript = nix-update-script { }; From 0149d86e5c4a6a8ddd49a9d9e067fba3c238b655 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 6 Mar 2024 08:38:25 -0500 Subject: [PATCH 134/201] sing-box: 1.8.7 -> 1.8.8 Diff: https://github.com/SagerNet/sing-box/compare/v1.8.7...v1.8.8 --- 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 8cef901c88bc..dee829021ae8 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.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-SZd67DyDsKZZ9hKgRtbQLJzfft+vl49k9J/+Xv8ghHs="; + hash = "sha256-HbfN9H6mYRZkD1f5CmDSORP29I00u0Ye8l77wrswTE0="; }; - vendorHash = "sha256-9aH8KHn+8brGT/eJS9SWVYBMxDI1R3Q+pORfnjUI7ms="; + vendorHash = "sha256-tOUzshNU6TIjhWVWmlVcw/Ct/V52b+WIJHqs3+weCc0="; tags = [ "with_quic" From 8100cc1f54274cce1f185aa57455942dbf1f842e Mon Sep 17 00:00:00 2001 From: Coutinho de Souza Date: Fri, 1 Mar 2024 13:18:05 -0300 Subject: [PATCH 135/201] hare: enable cross-compilation --- .../ha/hare/002-dont-build-haredoc.patch | 43 +++++++++++++++++++ pkgs/by-name/ha/hare/package.nix | 18 ++++++++ 2 files changed, 61 insertions(+) create mode 100644 pkgs/by-name/ha/hare/002-dont-build-haredoc.patch diff --git a/pkgs/by-name/ha/hare/002-dont-build-haredoc.patch b/pkgs/by-name/ha/hare/002-dont-build-haredoc.patch new file mode 100644 index 000000000000..0e921477766e --- /dev/null +++ b/pkgs/by-name/ha/hare/002-dont-build-haredoc.patch @@ -0,0 +1,43 @@ +diff --git a/Makefile b/Makefile +index 2482be1f..9d58bc81 100644 +--- a/Makefile ++++ b/Makefile +@@ -5,7 +5,7 @@ all: + include config.mk + include makefiles/$(PLATFORM).$(ARCH).mk + +-all: $(BINOUT)/hare $(BINOUT)/haredoc docs ++all: $(BINOUT)/hare docs + + HARE_DEFINES = \ + -D PLATFORM:str='"$(PLATFORM)"' \ +@@ -79,11 +79,10 @@ docs: \ + docs/haredoc.1 \ + docs/hare-run.1 \ + docs/hare-test.1 \ +- docs/haredoc.5 \ + docs/hare-module.5 + +-MAN1 = hare hare-build hare-cache hare-deps haredoc hare-run hare-test +-MAN5 = haredoc hare-module ++MAN1 = hare hare-build hare-cache hare-deps hare-run hare-test ++MAN5 = hare-module + + bootstrap: + @BINOUT=$(BINOUT) ./scripts/genbootstrap +@@ -104,7 +103,6 @@ install-cmd: + '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1' \ + '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man5' + install -m755 '$(BINOUT)/hare' '$(DESTDIR)$(BINDIR)/hare' +- install -m755 '$(BINOUT)/haredoc' '$(DESTDIR)$(BINDIR)/haredoc' + for i in $(MAN1); do install -m644 docs/$$i.1 '$(DESTDIR)$(MANDIR)'/man1/$$i.1; done + for i in $(MAN5); do install -m644 docs/$$i.5 '$(DESTDIR)$(MANDIR)'/man5/$$i.5; done + +@@ -115,7 +113,6 @@ install-mods: + + uninstall: + rm -- '$(DESTDIR)$(BINDIR)/hare' +- rm -- '$(DESTDIR)$(BINDIR)/haredoc' + for i in $(MAN1); do rm -- '$(DESTDIR)$(MANDIR)'/man1/$$i.1; done + for i in $(MAN5); do rm -- '$(DESTDIR)$(MANDIR)'/man5/$$i.5; done + rm -r -- '$(DESTDIR)$(STDLIB)' diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix index 9468e049c4e5..49e4d91db7f5 100644 --- a/pkgs/by-name/ha/hare/package.nix +++ b/pkgs/by-name/ha/hare/package.nix @@ -9,6 +9,7 @@ , scdoc , tzdata , substituteAll +, fetchpatch , callPackage , enableCrossCompilation ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.is64bit) , pkgsCross @@ -32,6 +33,11 @@ in let arch = stdenv.hostPlatform.uname.processor; + qbePlatform = { + x86_64 = "amd64_sysv"; + aarch64 = "arm64"; + riscv64 = "rv64"; + }.${arch}; platform = lib.toLower stdenv.hostPlatform.uname.system; embeddedOnBinaryTools = let @@ -74,6 +80,14 @@ stdenv.mkDerivation (finalAttrs: { src = ./001-tzdata.patch; inherit tzdata; }) + # Use correct comment syntax for debug+riscv64. + (fetchpatch { + url = "https://git.sr.ht/~sircmpwn/hare/commit/80e45e4d931a6e90d999846b86471cac00d2a6d5.patch"; + hash = "sha256-S7nXpiO0tYnKpmpj+fLkolGeHb1TrmgKlMF0+j0qLPQ="; + }) + # Don't build haredoc since it uses the build `hare` bin, which breaks + # cross-compilation. + ./002-dont-build-haredoc.patch ]; nativeBuildInputs = [ @@ -95,6 +109,10 @@ stdenv.mkDerivation (finalAttrs: { "PREFIX=${builtins.placeholder "out"}" "ARCH=${arch}" "VERSION=${finalAttrs.version}-nixpkgs" + "QBEFLAGS=-t${qbePlatform}" + "CC=${stdenv.cc.targetPrefix}cc" + "AS=${stdenv.cc.targetPrefix}as" + "LD=${stdenv.cc.targetPrefix}ld" # Strip the variable of an empty $(SRCDIR)/hare/third-party, since nix does # not follow the FHS. "HAREPATH=$(SRCDIR)/hare/stdlib" From a110dbd8896eb89e82d10a88a8eb689f9ac6ccbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 13:58:59 +0000 Subject: [PATCH 136/201] python312Packages.qdrant-client: 1.7.3 -> 1.8.0 --- pkgs/development/python-modules/qdrant-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qdrant-client/default.nix b/pkgs/development/python-modules/qdrant-client/default.nix index 27b453c497dc..149e6b671e1d 100644 --- a/pkgs/development/python-modules/qdrant-client/default.nix +++ b/pkgs/development/python-modules/qdrant-client/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "qdrant-client"; - version = "1.7.3"; + version = "1.8.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "qdrant"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-VU2/kK7zpiuHbPtt1Qh8pdgen4KoIIKsyC479LATO84="; + hash = "sha256-Q+Iyjru4viAxJLDQdbNtsYctnXj8N4glItt44D9HPd8="; }; nativeBuildInputs = [ From 14aa19d1d37a55176378b65ba2be6d8c12c718ed Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Wed, 6 Mar 2024 19:06:10 +0530 Subject: [PATCH 137/201] difftastic: 0.55.0 -> 0.56.1 Diff: https://github.com/wilfred/difftastic/compare/0.55.0...0.56.1 Changelog: https://github.com/Wilfred/difftastic/blob/0.56.1/CHANGELOG.md Signed-off-by: Muhammad Falak R Wani --- pkgs/tools/text/difftastic/Cargo.lock | 232 ++++++++++--------------- pkgs/tools/text/difftastic/default.nix | 4 +- 2 files changed, 97 insertions(+), 139 deletions(-) diff --git a/pkgs/tools/text/difftastic/Cargo.lock b/pkgs/tools/text/difftastic/Cargo.lock index f0bca647bebb..425b396c8b40 100644 --- a/pkgs/tools/text/difftastic/Cargo.lock +++ b/pkgs/tools/text/difftastic/Cargo.lock @@ -4,24 +4,31 @@ version = 3 [[package]] name = "ahash" -version = "0.7.6" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "d713b3834d76b85304d4d525563c1276e2e30dc97cc67bfb4585a4a29fc2c89f" dependencies = [ - "getrandom", + "cfg-if", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + [[package]] name = "assert_cmd" version = "2.0.5" @@ -61,9 +68,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bstr" @@ -88,9 +95,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecount" @@ -115,15 +122,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "3.1.18" +version = "3.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2dbdf4bdacb33466e854ce889eee8dfd5729abf7ccd7664d0a2d60cd384440b" +checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" dependencies = [ "atty", "bitflags 1.3.2", "clap_lex", "indexmap", - "lazy_static", + "once_cell", "strsim", "termcolor", "terminal_size", @@ -132,9 +139,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.0" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37c35f1112dad5e6e0b1adaff798507497a18fceeb30cceb3bae7d1427b9213" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" dependencies = [ "os_str_bytes", ] @@ -210,7 +217,7 @@ version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" dependencies = [ - "bitflags 2.4.1", + "bitflags 2.4.2", "crossterm_winapi", "libc", "mio", @@ -253,9 +260,8 @@ checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" [[package]] name = "difftastic" -version = "0.55.0" +version = "0.56.1" dependencies = [ - "aho-corasick", "assert_cmd", "bumpalo", "cc", @@ -263,7 +269,7 @@ dependencies = [ "const_format", "crossterm", "glob", - "hashbrown 0.12.3", + "hashbrown 0.14.3", "humansize", "ignore", "itertools 0.11.0", @@ -272,7 +278,6 @@ dependencies = [ "libmimalloc-sys", "line-numbers", "log", - "memchr", "mimalloc", "owo-colors", "predicates", @@ -326,7 +331,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -350,17 +355,6 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "getrandom" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - [[package]] name = "glob" version = "0.3.1" @@ -388,11 +382,12 @@ checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" [[package]] name = "hashbrown" -version = "0.12.3" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ "ahash", + "allocator-api2", ] [[package]] @@ -467,7 +462,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ "hermit-abi 0.3.3", "libc", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -479,7 +474,7 @@ dependencies = [ "hermit-abi 0.3.3", "io-lifetimes", "rustix", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -547,9 +542,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "lock_api" -version = "0.4.9" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -566,9 +561,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memoffset" @@ -596,14 +591,14 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mio" -version = "0.8.5" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", "wasi", - "windows-sys 0.42.0", + "windows-sys", ] [[package]] @@ -643,9 +638,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.17.1" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "os_str_bytes" @@ -680,15 +675,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.6" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys 0.42.0", + "windows-targets", ] [[package]] @@ -755,18 +750,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.32" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -801,22 +796,22 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.16" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "regex" -version = "1.9.4" +version = "1.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.7", + "regex-automata 0.3.9", "regex-syntax", ] @@ -828,9 +823,9 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9" dependencies = [ "aho-corasick", "memchr", @@ -860,7 +855,7 @@ dependencies = [ "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys", ] [[package]] @@ -907,7 +902,7 @@ checksum = "a4e7b8c5dc823e3b90651ff1d3808419cd14e5ad76de04feaf37da114e7a306f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.27", + "syn 2.0.49", ] [[package]] @@ -944,18 +939,18 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] name = "smallvec" -version = "1.10.0" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "strsim" @@ -982,7 +977,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.27", + "syn 2.0.49", ] [[package]] @@ -998,9 +993,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.27" +version = "2.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0" +checksum = "915aea9e586f80826ee59f8453c1101f9d1c4b3964cd2460185ee8e299ada496" dependencies = [ "proc-macro2", "quote", @@ -1018,12 +1013,12 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.1.17" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" dependencies = [ - "libc", - "winapi", + "rustix", + "windows-sys", ] [[package]] @@ -1034,9 +1029,9 @@ checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b" [[package]] name = "textwrap" -version = "0.15.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" +checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" dependencies = [ "terminal_size", ] @@ -1160,21 +1155,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -1190,93 +1170,51 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" -[[package]] -name = "windows_i686_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" - [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" -[[package]] -name = "windows_i686_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -1294,3 +1232,23 @@ name = "yansi" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" + +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.49", +] diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index e5c04d1e4cd3..e1733800cdfe 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -17,13 +17,13 @@ in rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.55.0"; + version = "0.56.1"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - hash = "sha256-ltlgZoR94BrF6FOOUnSNZf3Uagu5AZjxE7yxOwWWMzU="; + hash = "sha256-XQzsLowHtgXIKfUWx1Sj1D0F8scb7fNp33Cwfh5XvJI="; }; cargoLock = { From e671d3bbbda9b2bec8fa119aa1ff46499118ef17 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 6 Mar 2024 08:51:54 -0300 Subject: [PATCH 138/201] Nix docs: remove `with lib;` from example code Following [Best Practices](https://nix.dev/guides/best-practices#with-scopes), `with` is a problematic language construction and should be avoided. Usually it is employed like a "factorization": `[ X.A X.B X.C X.D ]` is written `with X; [ A B C D ]`. However, as shown in the link above, the syntatical rules of `with` are not so intuitive, and this "distributive rule" is very selective, in the sense that `with X; [ A B C D ]` is not equivalent to `[ X.A X.B X.C X.D ]`. However, this factorization is still useful to "squeeze" some code, especially in lists like `meta.maintainers`. On the other hand, it becomes less justifiable in bigger scopes. This is especially true in cases like `with lib;` in the top of expression and in sets like `meta = with lib; { . . . }`. That being said, this patch removes most of example code in the current documentation. The exceptions are, for now - doc/functions/generators.section.md - doc/languages-frameworks/coq.section.md because, well, they are way more complicated, and I couldn't parse them mentally - yet another reason why `with` should be avoided! --- doc/languages-frameworks/dotnet.section.md | 6 +-- doc/languages-frameworks/go.section.md | 6 +-- doc/languages-frameworks/idris.section.md | 6 +-- .../javascript.section.md | 6 +-- doc/languages-frameworks/lua.section.md | 4 +- doc/languages-frameworks/maven.section.md | 6 +-- doc/languages-frameworks/ocaml.section.md | 6 +-- doc/languages-frameworks/python.section.md | 38 +++++++++---------- doc/languages-frameworks/rust.section.md | 10 ++--- doc/languages-frameworks/texlive.section.md | 8 ++-- doc/stdenv/meta.chapter.md | 8 ++-- 11 files changed, 52 insertions(+), 52 deletions(-) diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 7987aa41636c..7466c8cdc228 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -210,11 +210,11 @@ buildDotnetGlobalTool { nugetSha256 = "sha256-ZG2HFyKYhVNVYd2kRlkbAjZJq88OADe3yjxmLuxXDUo="; - meta = with lib; { + meta = { homepage = "https://cmd.petabridge.com/index.html"; changelog = "https://cmd.petabridge.com/articles/RELEASE_NOTES.html"; - license = licenses.unfree; - platforms = platforms.linux; + license = lib.licenses.unfree; + platforms = lib.platforms.linux; }; } ``` diff --git a/doc/languages-frameworks/go.section.md b/doc/languages-frameworks/go.section.md index 7f151c76129f..369eb88d331f 100644 --- a/doc/languages-frameworks/go.section.md +++ b/doc/languages-frameworks/go.section.md @@ -51,11 +51,11 @@ pet = buildGoModule rec { vendorHash = "sha256-ciBIR+a1oaYH+H1PcC8cD8ncfJczk1IiJ8iYNM+R6aA="; - meta = with lib; { + meta = { description = "Simple command-line snippet manager, written in Go"; homepage = "https://github.com/knqyf263/pet"; - license = licenses.mit; - maintainers = with maintainers; [ kalbasit ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kalbasit ]; }; } ``` diff --git a/doc/languages-frameworks/idris.section.md b/doc/languages-frameworks/idris.section.md index 447a3e7bb8a3..e30a849dd456 100644 --- a/doc/languages-frameworks/idris.section.md +++ b/doc/languages-frameworks/idris.section.md @@ -93,11 +93,11 @@ build-idris-package { hash = "sha256-h28F9EEPuvab6zrfeE+0k1XGQJGwINnsJEG8yjWIl7w="; }; - meta = with lib; { + meta = { description = "Idris YAML lib"; homepage = "https://github.com/Heather/Idris.Yaml"; - license = licenses.mit; - maintainers = [ maintainers.brainrape ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.brainrape ]; }; } ``` diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 5d2a6413e104..4dc207f79847 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -184,11 +184,11 @@ buildNpmPackage rec { NODE_OPTIONS = "--openssl-legacy-provider"; - meta = with lib; { + meta = { description = "A modern web UI for various torrent clients with a Node.js backend and React frontend"; homepage = "https://flood.js.org"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ winter ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ winter ]; }; } ``` diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index 23c40409eaa0..136c7194e5cd 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -193,10 +193,10 @@ luaposix = buildLuarocksPackage { disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ bit32 lua std_normalize ]; - meta = with lib; { + meta = { homepage = "https://github.com/luaposix/luaposix/"; description = "Lua bindings for POSIX"; - maintainers = with maintainers; [ vyp lblasc ]; + maintainers = with lib.maintainers; [ vyp lblasc ]; license.fullName = "MIT/X11"; }; }; diff --git a/doc/languages-frameworks/maven.section.md b/doc/languages-frameworks/maven.section.md index b86733a75898..2ec419e010eb 100644 --- a/doc/languages-frameworks/maven.section.md +++ b/doc/languages-frameworks/maven.section.md @@ -34,11 +34,11 @@ maven.buildMavenPackage rec { --add-flags "-jar $out/share/jd-cli/jd-cli.jar" ''; - meta = with lib; { + meta = { description = "Simple command line wrapper around JD Core Java Decompiler project"; homepage = "https://github.com/intoolswetrust/jd-cli"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ majiir ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ majiir ]; }; }: ``` diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index cbdc64bf5dd3..4f3b6e0264f7 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -110,11 +110,11 @@ buildDunePackage rec { hash = "sha256-d5/3KUBAWRj8tntr4RkJ74KWW7wvn/B/m1nx0npnzyc="; }; - meta = with lib; { + meta = { homepage = "https://github.com/flowtype/ocaml-wtf8"; description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; - license = licenses.mit; - maintainers = [ maintainers.eqyiel ]; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.eqyiel ]; }; } ``` diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 4938d3c96616..fa7f3eddf72c 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -130,12 +130,12 @@ buildPythonPackage rec { hypothesis ]; - meta = with lib; { + meta = { changelog = "https://github.com/pytest-dev/pytest/releases/tag/${version}"; description = "Framework for writing tests"; homepage = "https://github.com/pytest-dev/pytest"; - license = licenses.mit; - maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ domenkozar lovek323 madjar lsix ]; }; } ``` @@ -312,7 +312,7 @@ python3Packages.buildPythonApplication rec { python-daemon ]; - meta = with lib; { + meta = { # ... }; } @@ -899,12 +899,12 @@ buildPythonPackage rec { "toolz.dicttoolz" ]; - meta = with lib; { + meta = { changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}"; homepage = "https://github.com/pytoolz/toolz"; description = "List processing tools and functional utilities"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; }; } ``` @@ -1034,12 +1034,12 @@ buildPythonPackage rec { pytest ]; - meta = with lib; { + meta = { changelog = "https://github.com/blaze/datashape/releases/tag/${version}"; homepage = "https://github.com/ContinuumIO/datashape"; description = "A data description language"; - license = licenses.bsd2; - maintainers = with maintainers; [ fridh ]; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fridh ]; }; } ``` @@ -1084,12 +1084,12 @@ buildPythonPackage rec { libxslt ]; - meta = with lib; { + meta = { changelog = "https://github.com/lxml/lxml/releases/tag/lxml-${version}"; description = "Pythonic binding for the libxml2 and libxslt libraries"; homepage = "https://lxml.de"; - license = licenses.bsd3; - maintainers = with maintainers; [ sjourdois ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ sjourdois ]; }; } ``` @@ -1155,12 +1155,12 @@ buildPythonPackage rec { # Tests cannot import pyfftw. pyfftw works fine though. doCheck = false; - meta = with lib; { + meta = { changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${version}"; description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; homepage = "http://hgomersall.github.com/pyFFTW"; - license = with licenses; [ bsd2 bsd3 ]; - maintainers = with maintainers; [ fridh ]; + license = with lib.licenses; [ bsd2 bsd3 ]; + maintainers = with lib.maintainers; [ fridh ]; }; } ``` @@ -1530,12 +1530,12 @@ buildPythonPackage rec { wheel ]; - meta = with lib; { + meta = { changelog = "https://github.com/pytoolz/toolz/releases/tag/${version}"; homepage = "https://github.com/pytoolz/toolz/"; description = "List processing tools and functional utilities"; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; }; } ``` diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 4ba556c69d5a..75e57a8bb574 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -35,10 +35,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jtBw4ahSl88L0iuCXxQgZVm1EcboWRJMNtjxLVTtzts="; - meta = with lib; { + meta = { description = "A fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/BurntSushi/ripgrep"; - license = licenses.unlicense; + license = lib.licenses.unlicense; maintainers = []; }; } @@ -923,11 +923,11 @@ rustPlatform.buildRustPackage rec { doCheck = false; - meta = with lib; { + meta = { description = "A fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/BurntSushi/ripgrep"; - license = with licenses; [ mit unlicense ]; - maintainers = with maintainers; []; + license = with lib.licenses; [ mit unlicense ]; + maintainers = with lib.maintainers; []; }; } ``` diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index 01b59f6f34a9..b6fb1099a4a4 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -181,11 +181,11 @@ let runHook postInstall ''; - meta = with lib; { + meta = { description = "A LaTeX2e class for overhead transparencies"; - license = licenses.unfreeRedistributable; - maintainers = with maintainers; [ veprbl ]; - platforms = platforms.all; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ veprbl ]; + platforms = lib.platforms.all; }; }; diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index c187f0602a1e..4a3b04b8f6e4 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -3,16 +3,16 @@ Nix packages can declare *meta-attributes* that contain information about a package such as a description, its homepage, its license, and so on. For instance, the GNU Hello package has a `meta` declaration like this: ```nix -meta = with lib; { +meta = { description = "A program that produces a familiar, friendly greeting"; longDescription = '' GNU Hello is a program that prints "Hello, world!" when you run it. It is fully customizable. ''; homepage = "https://www.gnu.org/software/hello/manual/"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ eelco ]; - platforms = platforms.all; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ eelco ]; + platforms = lib.platforms.all; }; ``` From 478cff8d326d7848fb9a8a1d242db7fe18688a61 Mon Sep 17 00:00:00 2001 From: Coutinho de Souza Date: Wed, 6 Mar 2024 11:10:27 -0300 Subject: [PATCH 139/201] haredoc: init at 0.24.0 Also add a mention to the release notes of 24.05 about `hare` and `haredoc` being split into different packages. --- .../manual/release-notes/rl-2405.section.md | 2 + pkgs/by-name/ha/haredoc/package.nix | 55 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/by-name/ha/haredoc/package.nix diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index daabca2aee60..c75b062dcfe8 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -152,6 +152,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - `services.homepage-dashboard` now takes it's configuration using native Nix expressions, rather than dumping templated configurations into `/var/lib/homepage-dashboard` where they were previously managed manually. There are now new options which allow the configuration of bookmarks, services, widgets and custom CSS/JS natively in Nix. +- `hare` may now be cross-compiled. For that to work, however, `haredoc` needed to stop being built together with it. Thus, the latter is now its own package with the name of `haredoc`. + - The legacy and long deprecated systemd target `network-interfaces.target` has been removed. Use `network.target` instead. - `services.frp.settings` now generates the frp configuration file in TOML format as [recommended by upstream](https://github.com/fatedier/frp#configuration-files), instead of the legacy INI format. This has also introduced other changes in the configuration file structure and options. diff --git a/pkgs/by-name/ha/haredoc/package.nix b/pkgs/by-name/ha/haredoc/package.nix new file mode 100644 index 000000000000..2476e7d937c5 --- /dev/null +++ b/pkgs/by-name/ha/haredoc/package.nix @@ -0,0 +1,55 @@ +{ lib +, stdenv +, scdoc +, hare +}: +let + arch = stdenv.hostPlatform.uname.processor; +in +stdenv.mkDerivation { + pname = "haredoc"; + outputs = [ "out" "man" ]; + inherit (hare) version src; + + strictDeps = true; + enableParallelBuilding = true; + + nativeBuildInputs = [ + scdoc + hare + ]; + + preBuild = '' + HARECACHE="$(mktemp -d)" + export HARECACHE + ''; + + buildPhase = '' + runHook preBuild + + hare build -qR -a ${arch} -o haredoc ./cmd/haredoc + scdoc haredoc.1 + scdoc haredoc.5 + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm0755 ./haredoc $out/bin/haredoc + install -Dm0644 ./haredoc.1 $out/share/man/man1/haredoc.1 + install -Dm0644 ./haredoc.5 $out/share/man/man5/haredoc.5 + + runHook postInstall + ''; + + meta = { + homepage = "https://harelang.org/"; + description = "Hare's documentation tool"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ onemoresuza ]; + mainProgram = "haredoc"; + inherit (hare.meta) platforms badPlatforms; + }; +} From 9bb1834bfa62466ab67179ceeb2c45cd08ed2934 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 15:23:48 +0000 Subject: [PATCH 140/201] cadical: 1.9.4 -> 1.9.5 --- pkgs/applications/science/logic/cadical/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/cadical/default.nix b/pkgs/applications/science/logic/cadical/default.nix index 49ba06e36cc0..873b3836b73e 100644 --- a/pkgs/applications/science/logic/cadical/default.nix +++ b/pkgs/applications/science/logic/cadical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cadical"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - sha256 = "sha256-cSuvvd7ci8jXzFowS7+V3bor7bXCxaKcGdDU91nIo+k="; + sha256 = "sha256-mAKuz8WjX+ywQ7Sw5hRMPftsbbilTlmQ9qZVowXxs28="; }; outputs = [ "out" "dev" "lib" ]; From bc8675aecc78499b70afafad02839d55e1a6a24b Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 6 Mar 2024 23:24:32 +0800 Subject: [PATCH 141/201] httplab: 0.4.0 -> 0.4.2 --- pkgs/tools/networking/httplab/default.nix | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/pkgs/tools/networking/httplab/default.nix b/pkgs/tools/networking/httplab/default.nix index 6e1be43ac5f5..c78f32d05650 100644 --- a/pkgs/tools/networking/httplab/default.nix +++ b/pkgs/tools/networking/httplab/default.nix @@ -1,25 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "httplab"; - version = "0.4.0"; + version = "0.4.2"; src = fetchFromGitHub { owner = "qustavo"; repo = "httplab"; rev = "v${version}"; - hash = "sha256-+qcECfQo9Wa4JQ09ujhKjQndmcFn03hTfII636+1ghA="; + hash = "sha256-UL1i8JpgofXUB+jtW2EtSR1pM/Fdqnbg2EXPJAjc0H0="; }; - vendorHash = null; - - patches = [ - # Add Go Modules support - (fetchpatch { - url = "https://github.com/qustavo/httplab/commit/80680bebc83f1ed19216f60339c62cd9213d736b.patch"; - hash = "sha256-y4KO3FGwKNAfM+4uR3KDbV90d/4JeBGvWtfirDJrWZk="; - }) - ]; + vendorHash = "sha256-vL3a9eO5G0WqnqcIjA9D2XM7iQ87JH0q+an2nLcG28A="; ldflags = [ "-s" "-w" ]; From 4c58fe237160f2e1fa82d233c1473dfb591231f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 15:32:07 +0000 Subject: [PATCH 142/201] debianutils: 5.16 -> 5.17 --- pkgs/by-name/de/debianutils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index 9d7952c8d379..0f39abac3269 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; - version = "5.16"; + version = "5.17"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debianutils"; rev = "debian/${finalAttrs.version}"; - hash = "sha256-v0sEk0xnFjWsBoDBge57kbANn8afP2EAImgwFihq7bI="; + hash = "sha256-lm5pjofLm5RRntvtV+8GVyWZqMhmPs2iGHyvvKDQCvg="; }; nativeBuildInputs = [ From e2be8075739fff6df297fb3d14ec40553147a9fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 15:42:31 +0000 Subject: [PATCH 143/201] jql: 7.1.5 -> 7.1.6 --- pkgs/development/tools/jql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jql/default.nix b/pkgs/development/tools/jql/default.nix index 4a66256235bd..db0d159aa4f1 100644 --- a/pkgs/development/tools/jql/default.nix +++ b/pkgs/development/tools/jql/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "jql"; - version = "7.1.5"; + version = "7.1.6"; src = fetchFromGitHub { owner = "yamafaktory"; repo = pname; rev = "jql-v${version}"; - hash = "sha256-bNFCfT758ZvIe5AiKsa8/rvyz4s1NUfIfwNM2x6LzRE="; + hash = "sha256-xYPJG5wuBv1APMDG0mqO1ZvNctp1HA7Z26dVXfAKfco="; }; - cargoHash = "sha256-Y2Mjj83I/FHf4njI4AfXxoEhzI5mcItfjwxDLIrnES0="; + cargoHash = "sha256-kNDHT2DgeesnDmiXaXHN+DBXc/Pg5ZKRNJxHL6NA6GM="; meta = with lib; { description = "A JSON Query Language CLI tool built with Rust"; From c0ee7bee6ccefdaea9defc3f4ea056de56a0065d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 16:43:23 +0100 Subject: [PATCH 144/201] exploitdb: 2024-03-04 -> 2024-03-06 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2024-03-04...2024-03-06 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index c0a596550eb5..97939778f19d 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-03-04"; + version = "2024-03-06"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-3i4Hzz5rcGNWpIJeMPEQMRy6Dxk8lafusEk9Plhfx8U="; + hash = "sha256-0BWwxnhcU72ytbwSSsae0dH4uftdSq8sCoJLE0cLJ1Y="; }; nativeBuildInputs = [ From 49488e13cc81dcba337b8094a2bded16248c67a1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 16:44:29 +0100 Subject: [PATCH 145/201] python311Packages.botocore-stubs: 1.34.55 -> 1.34.56 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index 9d2ba7735b96..b153b2c98417 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.55"; + version = "1.34.56"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-hYAQjqR3KksDv4gogKL2O7p2Z0d9FwjwbMZSSViZNHE="; + hash = "sha256-AY4AHjrdXrGCjvREtF+4yfr2leCDNAMb8tloU82a9wM="; }; nativeBuildInputs = [ From 65da22f5d5e136e6b78b5e1316279be2fd567b34 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 16:46:01 +0100 Subject: [PATCH 146/201] python311Packages.griffe: 0.41.2 -> 0.41.3 Diff: https://github.com/mkdocstrings/griffe/compare/refs/tags/0.41.2...0.41.3 Changelog: https://github.com/mkdocstrings/griffe/blob/0.41.3/CHANGELOG.md --- pkgs/development/python-modules/griffe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix index 8802b5b4cae4..562fc92a2851 100644 --- a/pkgs/development/python-modules/griffe/default.nix +++ b/pkgs/development/python-modules/griffe/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "griffe"; - version = "0.41.2"; + version = "0.41.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mkdocstrings"; repo = "griffe"; rev = "refs/tags/${version}"; - hash = "sha256-SelsCh72tcvOfiH6tGxXK0X9mNuB2mFBBqJ+Ji5uCSs="; + hash = "sha256-bRg7pqoGrsSO7wQLA0FKMmIBcYPNGIUueOfXjuvazrE="; }; nativeBuildInputs = [ From 1d9206d7d09c041831d359d74b8c5919fd4d954a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 15:46:08 +0000 Subject: [PATCH 147/201] cargo-component: 0.9.0 -> 0.9.1 --- pkgs/development/tools/rust/cargo-component/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-component/default.nix b/pkgs/development/tools/rust/cargo-component/default.nix index 2e875938754c..88cecd3e0043 100644 --- a/pkgs/development/tools/rust/cargo-component/default.nix +++ b/pkgs/development/tools/rust/cargo-component/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-component"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "cargo-component"; rev = "v${version}"; - hash = "sha256-zJ3fV6GOYcbLvOjZKrSOxGPc8GSQGridInvOZFruXks="; + hash = "sha256-hST3mQqL+RNG/R/ewNjtk9KNTbjD5GwKPmx++Tv/LkE="; }; - cargoHash = "sha256-ixk9ui/vS6DynCTF086JBFEw/JC8jpixvUkwIi5Hr0A="; + cargoHash = "sha256-JoVwaqtSoaHH4h2ViqDYD4XDUtiH9jsHhCUAxPdsIps="; nativeBuildInputs = [ pkg-config From e3a8050ee5485733cfe1668a8581fafd5643b0ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 16:47:45 +0100 Subject: [PATCH 148/201] python311Packages.google-cloud-iam-logging: 1.3.2 -> 1.3.3 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-iam-logging-v1.3.3/packages/google-cloud-iam-logging/CHANGELOG.md --- .../python-modules/google-cloud-iam-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix index e94dc4086ded..bea85e028389 100644 --- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-iam-logging"; - version = "1.3.2"; + version = "1.3.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-qJcZHghAWG04PogbCY2JHsoPEoifHVOzsfUbemo5pi4="; + hash = "sha256-99YYGGrI8zg+cwdVKqFVneL0jTzO7GJq91O/Kk0lGJM="; }; nativeBuildInputs = [ From 59b85b6fc9da9defa3b52d9b0b0fe6927a979968 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 16:48:10 +0100 Subject: [PATCH 149/201] python311Packages.google-cloud-bigquery-logging: 1.4.2 -> 1.4.3 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-logging-v1.4.3/packages/google-cloud-bigquery-logging/CHANGELOG.md --- .../python-modules/google-cloud-bigquery-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix index 185f451babe6..da43db7a3cc4 100644 --- a/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-logging"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-e9jlI/utitWKBZ/IMEtrFBw5k6FGdIxtmoujUFBcwPs="; + hash = "sha256-7RqwaSthQcwGebhi5F/V//WxBIp5upVS0ToDDsjyURY="; }; nativeBuildInputs = [ From 10869cd4cf10c2d62ec7c38e29dc22c470638309 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 16:49:42 +0100 Subject: [PATCH 150/201] python311Packages.google-ai-generativelanguage: 0.5.3 -> 0.5.4 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-ai-generativelanguage-v0.5.4/packages/google-ai-generativelanguage/CHANGELOG.md --- .../python-modules/google-ai-generativelanguage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix index 59994f85ed96..7b58f851acdc 100644 --- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix +++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-ai-generativelanguage"; - version = "0.5.3"; + version = "0.5.4"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-s1RcPVKt99sX3kS12mRf3G3Q2Sg7Z3rvANZMFKyvceM="; + hash = "sha256-XBhXXrzbIiKoFPew/UdUD673AUPb96rm9LudyVcY3H8="; }; propagatedBuildInputs = [ From 51521bcc6fc8f5c39c94dd5a4208a289c82f6206 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 16:54:06 +0100 Subject: [PATCH 151/201] python311Packages.losant-rest: 1.19.4 -> 1.19.5 Diff: https://github.com/Losant/losant-rest-python/compare/v1.19.4...v1.19.5 --- pkgs/development/python-modules/losant-rest/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/losant-rest/default.nix b/pkgs/development/python-modules/losant-rest/default.nix index 6587f99d8118..3d14dbf313e0 100644 --- a/pkgs/development/python-modules/losant-rest/default.nix +++ b/pkgs/development/python-modules/losant-rest/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "losant-rest"; - version = "1.19.4"; + version = "1.19.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Losant"; repo = "losant-rest-python"; rev = "v${version}"; - hash = "sha256-aVOviCeYi/oj1Xv7I0d4U+JBU0w3wbjORXOim/g5S7U="; + hash = "sha256-oYwbCpX2mD1RMk/0ymxaA8NF9kaJ+pGQdUKk3l5Jmrs="; }; propagatedBuildInputs = [ From ecc5bce5b280c150898f040d3ed65159e8fd4d66 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 16:54:47 +0100 Subject: [PATCH 152/201] python311Packages.peaqevcore: 19.7.2 -> 19.7.7 Changelog: https://github.com/elden1337/peaqev-core/releases/tag/19.7.7 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 720cb3f5a650..16b73cb1792b 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "19.7.2"; + version = "19.7.7"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-k9MiYJZN4TLY+HP1NfJER3upnQ//JBgrsERJ2JF+Xvw="; + hash = "sha256-HJ+8EpxcMhUPJILapNk9esA0iUm8PiHPDm3MmBQDny4="; }; postPatch = '' From 67b54c6298ed175192dc556bd3d568a93434e135 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 16:56:16 +0100 Subject: [PATCH 153/201] gotestwaf: 0.4.14 -> 0.4.15 Diff: https://github.com/wallarm/gotestwaf/compare/refs/tags/v0.4.14...v0.4.15 Changelog: https://github.com/wallarm/gotestwaf/releases/tag/v0.4.15 --- pkgs/tools/security/gotestwaf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gotestwaf/default.nix b/pkgs/tools/security/gotestwaf/default.nix index fe72e598306f..c9fbe9f699eb 100644 --- a/pkgs/tools/security/gotestwaf/default.nix +++ b/pkgs/tools/security/gotestwaf/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gotestwaf"; - version = "0.4.14"; + version = "0.4.15"; src = fetchFromGitHub { owner = "wallarm"; repo = "gotestwaf"; rev = "refs/tags/v${version}"; - hash = "sha256-c8eFndK84ckwKcvu5BbIuH6SXNVyBiwEjHsHTkgwaPU="; + hash = "sha256-C5lDiHDSSweUZh83AOv5WIQ4JuC9OiCvpHshgius51k="; }; vendorHash = null; From 79a80302eaa8f30e47838b2174e8a48948e2df9b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 6 Mar 2024 16:51:09 +0100 Subject: [PATCH 154/201] python311Packages.dask-awkward: 2024.2.0 -> 2024.3.0 Diff: https://github.com/dask-contrib/dask-awkward/compare/refs/tags/2024.2.0...2024.3.0 Changelog: https://github.com/dask-contrib/dask-awkward/releases/tag/2024.3.0 --- pkgs/development/python-modules/dask-awkward/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix index c1a944414f6d..e24b06a23b68 100644 --- a/pkgs/development/python-modules/dask-awkward/default.nix +++ b/pkgs/development/python-modules/dask-awkward/default.nix @@ -1,6 +1,7 @@ { lib , awkward , buildPythonPackage +, cachetools , dask , dask-histogram , distributed @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "dask-awkward"; - version = "2024.2.0"; + version = "2024.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "dask-contrib"; repo = "dask-awkward"; rev = "refs/tags/${version}"; - hash = "sha256-oBGja1dt9UbHym0c5K/pAMXNErryr3u6IhDRuhwTvG0="; + hash = "sha256-Lkbp/XrDHOekMpT71pbxtuozgzU9iiGF2GJZ+tuV/yM="; }; pythonRelaxDeps = [ @@ -43,6 +44,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ awkward + cachetools dask typing-extensions ]; From 224bfbe8943c26ccd2a54d7f036bd8fabdf58363 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 16:32:06 +0000 Subject: [PATCH 155/201] spicedb: 1.29.2 -> 1.29.5 --- pkgs/servers/spicedb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/spicedb/default.nix b/pkgs/servers/spicedb/default.nix index a43042c26d2f..ca90f78acf4e 100644 --- a/pkgs/servers/spicedb/default.nix +++ b/pkgs/servers/spicedb/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "spicedb"; - version = "1.29.2"; + version = "1.29.5"; src = fetchFromGitHub { owner = "authzed"; repo = "spicedb"; rev = "v${version}"; - hash = "sha256-vag9TtQzLrquD/b1XX1ys6ijEn3ytZsIEKN/ii3rDL8="; + hash = "sha256-93+o2pLilHAad794Bae83spLsC+pdvOgS6WRNSWrei4="; }; - vendorHash = "sha256-T8fJgPsJLinQlZwjxkfKObypeXETvjgBLwVA5fS4O38="; + vendorHash = "sha256-MfpXYvgUjfNZkAA19FWM0X8A9mbDhcYCM5L9PLL4En0="; subPackages = [ "cmd/spicedb" ]; From 7539b209a7b126d8a9440acb2f1190b0a64dac5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 16:32:29 +0000 Subject: [PATCH 156/201] python312Packages.lxmf: 0.4.0 -> 0.4.1 --- pkgs/development/python-modules/lxmf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix index c3e58923497d..2ce4565ecf82 100644 --- a/pkgs/development/python-modules/lxmf/default.nix +++ b/pkgs/development/python-modules/lxmf/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "lxmf"; - version = "0.4.0"; + version = "0.4.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "markqvist"; repo = "lxmf"; rev = "refs/tags/${version}"; - hash = "sha256-d0D12nnvLzrWoYTAF+kLMciDNkBtaRHwUAR9jrNsx1k="; + hash = "sha256-sEim7bCLLkHo6A1onbDQruyNigVKtim5DDAQI8CYUVo="; }; nativeBuildInputs = [ From bb37c1da19566cec9fef3be64450966cac32b9f8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 18:26:57 +0100 Subject: [PATCH 157/201] python311Packages.aliyun-python-sdk-core: 2.14.0 -> 2.15.0 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-core/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix index 1ab81cd86b52..1ead4ce1427c 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-core/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-core"; - version = "2.14.0"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yAaBWkj/24lMxbzhW4JZuaMBLMDNoBvi89+7hE8/TyE="; + hash = "sha256-7cRVVIjYqfHGG9QZx74nsjl0sqBSlxtGFPzSKerus4I="; }; nativeBuildInputs = [ From 4a21310bae669e942698dd14d41a5b07f1b79183 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 18:27:46 +0100 Subject: [PATCH 158/201] python311Packages.avidtools: 0.1.1.2 -> 0.1.2 --- pkgs/development/python-modules/avidtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/avidtools/default.nix b/pkgs/development/python-modules/avidtools/default.nix index c0edd6033de7..bcb1ba01c819 100644 --- a/pkgs/development/python-modules/avidtools/default.nix +++ b/pkgs/development/python-modules/avidtools/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "avidtools"; - version = "0.1.1.2"; + version = "0.1.2"; pyproject = true; disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; - hash = "sha256-t+ohPjOBwY8i+g7VC30ehEu6SFIsn1SwGR/ICkV9blg="; + hash = "sha256-2YtX+kUryTwaQ4QvExw5OJ4Rx8JoTzBeC8VSyNEL7OY="; }; postPatch = '' From 0effc1df9102fc57deecc613cea1fd2aef76473c Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Tue, 5 Mar 2024 14:51:33 -0800 Subject: [PATCH 159/201] pict-rs: Mark broken on darwin A lot of build failures when testing: ``` pict-rs> Executing cargoCheckHook pict-rs> ++ cargo test -j 20 --profile release --target aarch64-apple-darwin --frozen -- --test-threads=20 pict-rs> Compiling ring v0.17.8 pict-rs> Compiling io-uring v0.5.13 pict-rs> Compiling socket2 v0.4.10 pict-rs> Compiling scoped-tls v1.0.1 pict-rs> error[E0425]: cannot find value `MAP_POPULATE` in crate `libc` pict-rs> --> /private/tmp/nix-build-pict-rs-0.5.7.drv-0/pict-rs-0.5.7-vendor.tar.gz/io-uring/src/util.rs:19:42 pict-rs> | pict-rs> 19 | libc::MAP_SHARED | libc::MAP_POPULATE, pict-rs> | ^^^^^^^^^^^^ help: a constant with a similar name exists: `MAP_PRIVATE` pict-rs> | pict-rs> ::: /private/tmp/nix-build-pict-rs-0.5.7.drv-0/pict-rs-0.5.7-vendor.tar.gz/libc/src/unix/bsd/apple/mod.rs:3314:1 ``` --- pkgs/servers/web-apps/pict-rs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index 82a701e02167..55437c7926db 100644 --- a/pkgs/servers/web-apps/pict-rs/default.nix +++ b/pkgs/servers/web-apps/pict-rs/default.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { PROTOC_INCLUDE = "${protobuf}/include"; nativeBuildInputs = [ makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks ]; + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; postInstall = '' wrapProgram "$out/bin/pict-rs" \ @@ -40,6 +40,7 @@ rustPlatform.buildRustPackage rec { passthru.tests = { inherit (nixosTests) pict-rs; }; meta = with lib; { + broken = stdenv.isDarwin; description = "A simple image hosting service"; homepage = "https://git.asonix.dog/asonix/pict-rs"; license = with licenses; [ agpl3Plus ]; From 2f4e74ebec11ebdcc6d7d873e82cd00ab36a5825 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Wed, 6 Mar 2024 19:12:49 +0100 Subject: [PATCH 160/201] google-cloud-sql-proxy: 2.8.2 -> 2.9.0 --- pkgs/tools/misc/google-cloud-sql-proxy/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix index 01a1db8fdb77..1043b4982018 100644 --- a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix @@ -1,22 +1,22 @@ { lib -, buildGoModule +, buildGo122Module , fetchFromGitHub }: -buildGoModule rec { +buildGo122Module rec { pname = "google-cloud-sql-proxy"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${version}"; - hash = "sha256-ZCUBr7K7mGpV/oCS4X6cteUGRjMjqAAA3saPfZ6Vowk="; + hash = "sha256-V1Q6DFWSIIff2FuOyE5XwtJN8RObGlhpW/nMWFmNoxI="; }; subPackages = [ "." ]; - vendorHash = "sha256-ScGfP5HdXkMlU2PQmlQxuRC7a+iadf3dOKpFFi2EaAY="; + vendorHash = "sha256-sAVMmDeHXEgQXb/Xi4nXYztXjuykE0TFebkeubMTZ3k="; preCheck = '' buildFlagsArray+="-short" From afbd6ce7ffac55dc21cbd3b74275562f0d0dfb1d Mon Sep 17 00:00:00 2001 From: a-kenji Date: Wed, 6 Mar 2024 20:12:49 +0100 Subject: [PATCH 161/201] halloy: fix darwin -> add build dependency `Cocoa` --- pkgs/applications/networking/irc/halloy/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/irc/halloy/default.nix b/pkgs/applications/networking/irc/halloy/default.nix index 2231a7bfb396..ab4dfb54ec51 100644 --- a/pkgs/applications/networking/irc/halloy/default.nix +++ b/pkgs/applications/networking/irc/halloy/default.nix @@ -49,6 +49,7 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.AppKit darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.CoreGraphics + darwin.apple_sdk.frameworks.Cocoa darwin.apple_sdk.frameworks.Foundation darwin.apple_sdk.frameworks.Metal darwin.apple_sdk.frameworks.QuartzCore From ada8356d5a63b03369ccfef91db417c6fadd5aea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 20:51:28 +0100 Subject: [PATCH 162/201] checkov: 3.2.31 -> 3.2.32 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.31...3.2.32 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.32 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index effd832f84ce..09bb334659ce 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.31"; + version = "3.2.32"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-GJh58fTBtjhOsSlwu9687qVdceGF9iMkZ2VViH2Wmp4="; + hash = "sha256-brebisU7YhbLHEojJUu5Ei0F6hMHg1lsYjppBAXewYQ="; }; patches = [ From ba515dec26df406b4ffc903cb557ee40a6b5edae Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 6 Mar 2024 12:10:09 -0800 Subject: [PATCH 163/201] Avoid `with lib;` at the top level in maintainers/scripts/find-tarballs.nix Tested with ``` nix-instantiate --readonly-mode --eval --strict --show-trace --json ./maintainers/scripts/find-tarballs.nix --arg expr 'import ./maintainers/scripts/all-tarballs.nix' ``` --- maintainers/scripts/find-tarballs.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix index c47b5168abd9..cae4bec201ce 100644 --- a/maintainers/scripts/find-tarballs.nix +++ b/maintainers/scripts/find-tarballs.nix @@ -1,11 +1,22 @@ # This expression returns a list of all fetchurl calls used by ‘expr’. -with import ../.. { }; -with lib; - -{ expr }: +{ expr, lib ? import ../../lib }: let + inherit (lib) + addErrorContext + attrNames + concatLists + const + filter + genericClosure + isAttrs + isDerivation + isList + mapAttrsToList + optional + optionals + ; root = expr; From 60de328a9ebad861174cb3b7f6ebc343f095d2f3 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 6 Mar 2024 12:21:00 -0800 Subject: [PATCH 164/201] Avoid top-level `with ...;` in maintainers/scripts/eval-release.nix Tested with ``` nix-instantiate --eval --strict --show-trace ./maintainers/scripts/eval-release.nix ``` --- maintainers/scripts/eval-release.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/maintainers/scripts/eval-release.nix b/maintainers/scripts/eval-release.nix index 4f0ca2465025..10acfe328447 100644 --- a/maintainers/scripts/eval-release.nix +++ b/maintainers/scripts/eval-release.nix @@ -1,9 +1,8 @@ -# Evaluate `release.nix' like Hydra would. Too bad nix-instantiate -# can't to do this. - -with import ../../lib; +# Evaluate `release.nix' like Hydra would. Too bad nix-instantiate can't to do this. let + inherit (import ../../lib) isDerivation mapAttrs; + trace = if builtins.getEnv "VERBOSE" == "1" then builtins.trace else (x: y: y); rel = removeAttrs (import ../../pkgs/top-level/release.nix { }) [ "tarball" "unstable" "xbursttools" ]; From 732944001bb4fd0af331bf8dd015f99c60dc44ec Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 6 Mar 2024 21:32:37 +0100 Subject: [PATCH 165/201] symfony-cli: move to `pkgs/by-name` --- .../default.nix => by-name/sy/symfony-cli/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/symfony-cli/default.nix => by-name/sy/symfony-cli/package.nix} (100%) diff --git a/pkgs/development/tools/symfony-cli/default.nix b/pkgs/by-name/sy/symfony-cli/package.nix similarity index 100% rename from pkgs/development/tools/symfony-cli/default.nix rename to pkgs/by-name/sy/symfony-cli/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85a35a22b721..5bc91f15a86a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19961,8 +19961,6 @@ with pkgs; swiftformat = callPackage ../development/tools/swiftformat { }; - symfony-cli = callPackage ../development/tools/symfony-cli { }; - swiftshader = callPackage ../development/libraries/swiftshader { }; systemfd = callPackage ../development/tools/systemfd { }; From f9968592cc71c0fd3681474fe781daca0de3b94a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 6 Mar 2024 21:33:52 +0100 Subject: [PATCH 166/201] phosh-mobile-settings: fix homepage and changelog --- .../window-managers/phosh/phosh-mobile-settings.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix index 5bc0765f0fe8..71d051159de1 100644 --- a/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix +++ b/pkgs/applications/window-managers/phosh/phosh-mobile-settings.nix @@ -63,8 +63,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A settings app for mobile specific things"; - homepage = "https://gitlab.gnome.org/guidog/phosh-mobile-settings"; - changelog = "https://gitlab.gnome.org/guidog/phosh-mobile-settings/-/blob/v${version}/debian/changelog"; + homepage = "https://gitlab.gnome.org/World/Phosh/phosh-mobile-settings"; + changelog = "https://gitlab.gnome.org/World/Phosh/phosh-mobile-settings/-/blob/v${version}/debian/changelog"; license = licenses.gpl3Plus; maintainers = with maintainers; [ rvl ]; platforms = platforms.linux; From f250290d9a6214d34eb9700a80ea280302169a4e Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 15:25:50 +0100 Subject: [PATCH 167/201] nixops_unstable: 2023-12-17 -> 2024-02-28 --- pkgs/applications/networking/cluster/nixops/unwrapped.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/unwrapped.nix b/pkgs/applications/networking/cluster/nixops/unwrapped.nix index e8cb998b52c7..34cbf0949154 100644 --- a/pkgs/applications/networking/cluster/nixops/unwrapped.nix +++ b/pkgs/applications/networking/cluster/nixops/unwrapped.nix @@ -13,14 +13,14 @@ buildPythonApplication rec { pname = "nixops"; - version = "unstable-2023-12-17"; + version = "unstable-2024-02-28"; pyproject = true; src = fetchFromGitHub { owner = "NixOS"; repo = "nixops"; - rev = "053668e849bb369973cf265b7e8f38e66ef70138"; - hash = "sha256-Kus1Ls1tT8fVGLX0NakRXmjuz5/J/tfqU4TLOkiZqvo="; + rev = "08feccb14074c5434f3e483d19a7f7d9bfcdb669"; + hash = "sha256-yWeF5apQJdChjYVSOyH6LYjJYGa1RL68LRHrSgZ9l8U="; }; postPatch = '' From e57a1b2d0ebe01f41b69c9b4f328b9f629f22cdf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 22:29:26 +0100 Subject: [PATCH 168/201] python311Packages.google-cloud-asset: 3.24.2 -> 3.24.3 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-asset-v3.24.3/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 86cfdb0f7076..3fa39efec8d5 100644 --- a/pkgs/development/python-modules/google-cloud-asset/default.nix +++ b/pkgs/development/python-modules/google-cloud-asset/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "3.24.2"; + version = "3.24.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-/sRsJZDbwTxFXGQI/s8fKwWPGTdS5vSQ+bl8znKp7fI="; + hash = "sha256-owRdxr4Kr6VehuHl/mZuZo7XqixX2glWwJ3F/tq82bc="; }; nativeBuildInputs = [ From 86ae7a6243810da69ee04483a48cac17a9e49448 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Wed, 6 Mar 2024 13:35:43 -0800 Subject: [PATCH 169/201] Remove top level `with lib;` in docs (#293829) --- doc/functions/generators.section.md | 3 ++- doc/languages-frameworks/coq.section.md | 8 +++++++- nixos/doc/manual/development/replace-modules.section.md | 3 +-- nixos/doc/manual/development/writing-modules.chapter.md | 7 ++----- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/doc/functions/generators.section.md b/doc/functions/generators.section.md index 8b3ae6843a22..dbfc302a3abf 100644 --- a/doc/functions/generators.section.md +++ b/doc/functions/generators.section.md @@ -6,8 +6,9 @@ All generators follow a similar call interface: `generatorName configFunctions d Generators can be fine-tuned to produce exactly the file format required by your application/service. One example is an INI-file format which uses `: ` as separator, the strings `"yes"`/`"no"` as boolean values and requires all string values to be quoted: ```nix -with lib; let + inherit (lib) generators isString; + customToINI = generators.toINI { # specifies how to format a key/value pair mkKeyValue = generators.mkKeyValueDefault { diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index 6ca199708377..db3724773345 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -55,7 +55,13 @@ Here is a simple package example. It is a pure Coq library, thus it depends on C ```nix { lib, mkCoqDerivation, version ? null , coq, mathcomp, mathcomp-finmap, mathcomp-bigenough }: -with lib; mkCoqDerivation { + +let + inherit (lib) licenses maintainers switch; + inherit (lib.versions) range; +in + +mkCoqDerivation { /* namePrefix leads to e.g. `name = coq8.11-mathcomp1.11-multinomials-1.5.2` */ namePrefix = [ "coq" "mathcomp" ]; pname = "multinomials"; diff --git a/nixos/doc/manual/development/replace-modules.section.md b/nixos/doc/manual/development/replace-modules.section.md index ac9f5adbaf98..45e2adbc2608 100644 --- a/nixos/doc/manual/development/replace-modules.section.md +++ b/nixos/doc/manual/development/replace-modules.section.md @@ -47,9 +47,8 @@ without having to know its implementation details. ```nix { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) mkIf mkOption types; cfg = config.programs.man; in diff --git a/nixos/doc/manual/development/writing-modules.chapter.md b/nixos/doc/manual/development/writing-modules.chapter.md index e07b899e6df7..20157a21e890 100644 --- a/nixos/doc/manual/development/writing-modules.chapter.md +++ b/nixos/doc/manual/development/writing-modules.chapter.md @@ -104,9 +104,8 @@ functions system environment substitution should *not* be disabled explicitly. ```nix { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) concatStringsSep mkIf mkOption optionalString types; cfg = config.services.locate; in { options.services.locate = { @@ -163,9 +162,7 @@ in { ::: {#exec-escaping-example .example} ### Escaping in Exec directives ```nix -{ config, lib, pkgs, utils, ... }: - -with lib; +{ config, pkgs, utils, ... }: let cfg = config.services.echo; From 8818dbbc5ebacf6902cc8b55ccf636a2aa7db444 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 22:39:01 +0100 Subject: [PATCH 170/201] python311Packages.google-cloud-datacatalog: 3.18.2 -> 3.18.3 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-datacatalog-v3.18.3/packages/google-cloud-datacatalog/CHANGELOG.md --- .../python-modules/google-cloud-datacatalog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix index 734e9e7dc649..17f57f943099 100644 --- a/pkgs/development/python-modules/google-cloud-datacatalog/default.nix +++ b/pkgs/development/python-modules/google-cloud-datacatalog/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-datacatalog"; - version = "3.18.2"; + version = "3.18.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-USo8ldUbfsArvjw5+MOubFDOlXkV4GPowHYVsRHBHrk="; + hash = "sha256-d4MTAZgseV5iI83A7lSkbe/SEgX9ZfQ0pLHfYBStfp4="; }; nativeBuildInputs = [ From f4d20036c7de30426724e2c5becd398120d382ea Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 22:39:46 +0100 Subject: [PATCH 171/201] python311Packages.google-cloud-dataproc: 5.9.2 -> 5.9.3 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-dataproc-v5.9.3/packages/google-cloud-dataproc/CHANGELOG.md --- .../python-modules/google-cloud-dataproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/pkgs/development/python-modules/google-cloud-dataproc/default.nix index cacadba2180b..6e22cb60c267 100644 --- a/pkgs/development/python-modules/google-cloud-dataproc/default.nix +++ b/pkgs/development/python-modules/google-cloud-dataproc/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "5.9.2"; + version = "5.9.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-E1LjzE4UbbHwn6QodVkkjIs9nAz+zqVsJcP09j1Y5Pg="; + hash = "sha256-l9ZHiR5/TNJfa4Oa5XzTVYCd8so5ZlPtJK9itO8C9BI="; }; nativeBuildInputs = [ From 9c4ab2fb60da9669bf74ae3d0aee42e4b5f0698a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 22:47:02 +0100 Subject: [PATCH 172/201] python311Packages.google-cloud-language: 2.13.2 -> 2.13.3 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-language-v2.13.3/packages/google-cloud-language/CHANGELOG.md --- .../python-modules/google-cloud-language/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-language/default.nix b/pkgs/development/python-modules/google-cloud-language/default.nix index 993cc62ac19c..98f4355facbd 100644 --- a/pkgs/development/python-modules/google-cloud-language/default.nix +++ b/pkgs/development/python-modules/google-cloud-language/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-language"; - version = "2.13.2"; + version = "2.13.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-gTrT3dypeJBxAJjnatSMN+pj6joUoPbX9CRsb7FcsqU="; + hash = "sha256-Vp01Jgr5Bt4luOKna2Nk4FgJuEU6/Ynac41KT8uQhG8="; }; nativeBuildInputs = [ From 4a29e5442d66d939abf6216894bedfdb79ae3a15 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 15:49:46 +0100 Subject: [PATCH 173/201] nixops_unstable -> nixops_unstable_minimal.withPlugins Providing the whole set by default is not feasible, and anything smaller than that would be too arbitrary. The aliases.nix error message puts users on the right path to get exactly the plugins they need. nixops_unstable_full probably won't be in a buildable state, so we can't recommend it. It may be useful for CI. --- .../networking/cluster/nixops/default.nix | 28 +++++++++++-------- pkgs/top-level/aliases.nix | 6 +++- pkgs/top-level/all-packages.nix | 6 +++- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 3fef75313b00..da9783b9a6eb 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -43,14 +43,20 @@ let inherit withPlugins python; }; })); -in withPlugins (ps: [ - ps.nixops-aws - ps.nixops-digitalocean - ps.nixops-encrypted-links - ps.nixops-gce - ps.nixops-hercules-ci - ps.nixops-hetzner - ps.nixops-hetznercloud - ps.nixops-libvirtd - ps.nixops-vbox -]) + +in { + nixops_unstable_minimal = withPlugins (ps: []); + + # Not recommended; too fragile. + nixops_unstable_full = withPlugins (ps: [ + ps.nixops-aws + ps.nixops-digitalocean + ps.nixops-encrypted-links + ps.nixops-gce + ps.nixops-hercules-ci + ps.nixops-hetzner + ps.nixops-hetznercloud + ps.nixops-libvirtd + ps.nixops-vbox + ]); +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index be6927bc33ed..fc9248b519a8 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -782,8 +782,12 @@ mapAliases ({ nix_2_4 = nixVersions.nix_2_4; nix_2_5 = nixVersions.nix_2_5; nix_2_6 = nixVersions.nix_2_6; - nixops = throw "'nixops' has been removed. Please use 'nixops_unstable' for the time being."; # Added 2023-10-26 + nixops = throw "'nixops' has been removed. Please use 'nixops_unstable_minimal' for the time being. E.g. nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ])"; # Added 2023-10-26 nixopsUnstable = nixops_unstable; # Added 2022-03-03 + + # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable. + nixops_unstable = throw "nixops_unstable has been replaced. Please use for example 'nixops_unstable_minimal.withPlugins (ps: [ ps.nixops-gce ps.nixops-encrypted-links ])' instead"; # Added 2024-02-28 + nixosTest = testers.nixosTest; # Added 2022-05-05 nmap-unfree = nmap; # Added 2021-04-06 nodejs_14 = throw "nodejs_14 has been removed as it is EOL."; # Added 2023-10-30 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 85a35a22b721..7d4b1cc17e14 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40205,7 +40205,11 @@ with pkgs; nixStatic = pkgsStatic.nix; - nixops_unstable = callPackage ../applications/networking/cluster/nixops { }; + inherit (callPackages ../applications/networking/cluster/nixops { }) + nixops_unstable_minimal + + # Not recommended; too fragile + nixops_unstable_full; /* Evaluate a NixOS configuration using this evaluation of Nixpkgs. From 663b3d4be79ebb31ab277a55c0fe4b975cfa17c2 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 16:22:34 +0100 Subject: [PATCH 174/201] nixops_unstable*: Make withPlugins.*.tests.nixos behave correctly --- nixos/tests/nixops/default.nix | 2 +- .../applications/networking/cluster/nixops/default.nix | 10 ++++++++-- .../networking/cluster/nixops/unwrapped.nix | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/nixos/tests/nixops/default.nix b/nixos/tests/nixops/default.nix index 6501d13a2ed3..acfe6feee9d1 100644 --- a/nixos/tests/nixops/default.nix +++ b/nixos/tests/nixops/default.nix @@ -9,7 +9,7 @@ let # - Alternatively, blocked on a NixOps 2 release # https://github.com/NixOS/nixops/issues/1242 # stable = testsLegacyNetwork { nixopsPkg = pkgs.nixops; }; - unstable = testsForPackage { nixopsPkg = pkgs.nixops_unstable; }; + unstable = testsForPackage { nixopsPkg = pkgs.nixops_unstable_minimal; }; # inherit testsForPackage; }; diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index da9783b9a6eb..6bdbebb8eb6d 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -28,8 +28,8 @@ let # selector is a function mapping pythonPackages to a list of plugins # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) withPlugins = selector: let - selected = selector (plugins python.pkgs); - in python.pkgs.toPythonApplication (python.pkgs.nixops.overridePythonAttrs (old: { + selected = selector (plugins python.pkgs); + r = python.pkgs.toPythonApplication (python.pkgs.nixops.overridePythonAttrs (old: { propagatedBuildInputs = old.propagatedBuildInputs ++ selected; # Propagating dependencies leaks them through $PYTHONPATH which causes issues @@ -41,8 +41,14 @@ let passthru = old.passthru // { plugins = plugins python.pkgs; inherit withPlugins python; + tests = old.passthru.tests // { + nixos = old.passthru.tests.nixos.passthru.override { + nixopsPkg = r; + }; + }; }; })); + in r; in { nixops_unstable_minimal = withPlugins (ps: []); diff --git a/pkgs/applications/networking/cluster/nixops/unwrapped.nix b/pkgs/applications/networking/cluster/nixops/unwrapped.nix index 34cbf0949154..058f7f2d2c1c 100644 --- a/pkgs/applications/networking/cluster/nixops/unwrapped.nix +++ b/pkgs/applications/networking/cluster/nixops/unwrapped.nix @@ -50,7 +50,7 @@ buildPythonApplication rec { pythonImportsCheck = [ "nixops" ]; passthru = { - tests.nixops = nixosTests.nixops.unstable; + tests.nixos = nixosTests.nixops.unstable; updateScript = unstableGitUpdater {}; }; From 8d9f5ca31a0315c99584dc3d0d642354ca1c67aa Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 16:29:27 +0100 Subject: [PATCH 175/201] nixops_unstable_*: Memoize availablePlugins --- pkgs/applications/networking/cluster/nixops/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 6bdbebb8eb6d..abaa62a8bfdb 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -25,10 +25,12 @@ let nixopsvbox = nixops-vbox; }; + withPlugins = withPlugins' { availablePlugins = plugins python.pkgs; }; + # selector is a function mapping pythonPackages to a list of plugins # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) - withPlugins = selector: let - selected = selector (plugins python.pkgs); + withPlugins' = { availablePlugins }: selector: let + selected = selector availablePlugins; r = python.pkgs.toPythonApplication (python.pkgs.nixops.overridePythonAttrs (old: { propagatedBuildInputs = old.propagatedBuildInputs ++ selected; @@ -39,7 +41,7 @@ let ''; passthru = old.passthru // { - plugins = plugins python.pkgs; + plugins = availablePlugins; inherit withPlugins python; tests = old.passthru.tests // { nixos = old.passthru.tests.nixos.passthru.override { From bc2a13998c7576ae1ccb00ad98f765b6f828e50c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 16:31:40 +0100 Subject: [PATCH 176/201] nixops_unstable_*: Internal rename --- pkgs/applications/networking/cluster/nixops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index abaa62a8bfdb..92a38618e662 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -30,9 +30,9 @@ let # selector is a function mapping pythonPackages to a list of plugins # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) withPlugins' = { availablePlugins }: selector: let - selected = selector availablePlugins; + selectedPlugins = selector availablePlugins; r = python.pkgs.toPythonApplication (python.pkgs.nixops.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ selected; + propagatedBuildInputs = old.propagatedBuildInputs ++ selectedPlugins; # Propagating dependencies leaks them through $PYTHONPATH which causes issues # when used in nix-shell. From 695f75a8a3d4c1fbdf1e9dadd249f41e8619f832 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 16:32:36 +0100 Subject: [PATCH 177/201] nixops_unstable_*: Rename plugins attribute to availablePlugins --- pkgs/applications/networking/cluster/nixops/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 92a38618e662..e07d83a1cbf5 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -41,7 +41,7 @@ let ''; passthru = old.passthru // { - plugins = availablePlugins; + inherit availablePlugins; inherit withPlugins python; tests = old.passthru.tests // { nixos = old.passthru.tests.nixos.passthru.override { From c5180c311eb26a913815eed888b51932235ab03c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 16:32:52 +0100 Subject: [PATCH 178/201] nixops_unstable_*: Add selectedPlugins attribute --- pkgs/applications/networking/cluster/nixops/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index e07d83a1cbf5..7b3383e6e3ea 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -41,7 +41,7 @@ let ''; passthru = old.passthru // { - inherit availablePlugins; + inherit availablePlugins selectedPlugins; inherit withPlugins python; tests = old.passthru.tests // { nixos = old.passthru.tests.nixos.passthru.override { From 76fc2db1f59c526bbfa4cbfb2c2ccddf71f20ca3 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 17:14:27 +0100 Subject: [PATCH 179/201] nixosTests.nixops_unstable: Set memorySize to 2G Give the evaluator some breathing room. --- nixos/tests/nixops/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/nixops/default.nix b/nixos/tests/nixops/default.nix index acfe6feee9d1..8477e5059fca 100644 --- a/nixos/tests/nixops/default.nix +++ b/nixos/tests/nixops/default.nix @@ -32,6 +32,7 @@ let pkgs.hello pkgs.figlet ]; + virtualisation.memorySize = 2048; # TODO: make this efficient, https://github.com/NixOS/nixpkgs/issues/180529 system.includeBuildDependencies = true; From de55e7313fe2778b27a3f46da4911d5b6e55db28 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 17:15:21 +0100 Subject: [PATCH 180/201] nixops_unstable_minimal.tests.withAPlugin: init This way ofborg will do a better job if we only specify nixops_unstable as a prefix. --- pkgs/applications/networking/cluster/nixops/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 7b3383e6e3ea..e6a8a69cc4c7 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -1,4 +1,4 @@ -{ python3 }: +{ lib, python3 }: let python = python3.override { @@ -47,6 +47,12 @@ let nixos = old.passthru.tests.nixos.passthru.override { nixopsPkg = r; }; + } + # Make sure we also test with a configuration that's been extended with a plugin. + // lib.optionalAttrs (selectedPlugins == []) { + withAPlugin = + lib.recurseIntoAttrs + (withPlugins (ps: with ps; [ nixops-encrypted-links ])).tests; }; }; })); From 60618cc6973102eea2b983bc7eb2a31e655095b4 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 17:19:30 +0100 Subject: [PATCH 181/201] nixops_unstablePlugins: init --- pkgs/top-level/all-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d4b1cc17e14..2e652d3b4e69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -40211,6 +40211,9 @@ with pkgs; # Not recommended; too fragile nixops_unstable_full; + # Useful with ofborg, e.g. commit prefix `nixops_unstablePlugins.nixops-aws: ...` to trigger automatically. + nixops_unstablePlugins = recurseIntoAttrs nixops_unstable_minimal.availablePlugins; + /* Evaluate a NixOS configuration using this evaluation of Nixpkgs. From 27b08a25ccef11709250163a5121ea3607115b2c Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 17:23:21 +0100 Subject: [PATCH 182/201] pkgs/applications/networking/cluster/nixops/default.nix: Format --- .../networking/cluster/nixops/default.nix | 57 ++++++++++--------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index e6a8a69cc4c7..ea0f2af2b4fc 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -29,37 +29,40 @@ let # selector is a function mapping pythonPackages to a list of plugins # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) - withPlugins' = { availablePlugins }: selector: let - selectedPlugins = selector availablePlugins; - r = python.pkgs.toPythonApplication (python.pkgs.nixops.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ selectedPlugins; + withPlugins' = { availablePlugins }: selector: + let + selectedPlugins = selector availablePlugins; + r = python.pkgs.toPythonApplication (python.pkgs.nixops.overridePythonAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ selectedPlugins; - # Propagating dependencies leaks them through $PYTHONPATH which causes issues - # when used in nix-shell. - postFixup = '' - rm $out/nix-support/propagated-build-inputs - ''; + # Propagating dependencies leaks them through $PYTHONPATH which causes issues + # when used in nix-shell. + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; - passthru = old.passthru // { - inherit availablePlugins selectedPlugins; - inherit withPlugins python; - tests = old.passthru.tests // { - nixos = old.passthru.tests.nixos.passthru.override { - nixopsPkg = r; + passthru = old.passthru // { + inherit availablePlugins selectedPlugins; + inherit withPlugins python; + tests = old.passthru.tests // { + nixos = old.passthru.tests.nixos.passthru.override { + nixopsPkg = r; + }; + } + # Make sure we also test with a configuration that's been extended with a plugin. + // lib.optionalAttrs (selectedPlugins == [ ]) { + withAPlugin = + lib.recurseIntoAttrs + (withPlugins (ps: with ps; [ nixops-encrypted-links ])).tests; + }; }; - } - # Make sure we also test with a configuration that's been extended with a plugin. - // lib.optionalAttrs (selectedPlugins == []) { - withAPlugin = - lib.recurseIntoAttrs - (withPlugins (ps: with ps; [ nixops-encrypted-links ])).tests; - }; - }; - })); - in r; + })); + in + r; -in { - nixops_unstable_minimal = withPlugins (ps: []); +in +{ + nixops_unstable_minimal = withPlugins (ps: [ ]); # Not recommended; too fragile. nixops_unstable_full = withPlugins (ps: [ From 48150e79c52b4f212ddf608d85b242c0a957fc2b Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 22:33:48 +0100 Subject: [PATCH 183/201] nixops_unstable_*: Use explicit fixpoint with encapsulation No change in behavior. Just explicit recursion that's not taken advantage of. (This is working towards a managable setup for adding a bunch of overriding methods that make life easier for external plugin packagers.) --- .../networking/cluster/nixops/default.nix | 123 ++++++++++-------- 1 file changed, 69 insertions(+), 54 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index ea0f2af2b4fc..ad3caf0d9dbf 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -1,71 +1,86 @@ { lib, python3 }: let - python = python3.override { - packageOverrides = self: super: { - nixops = self.callPackage ./unwrapped.nix { }; - } // (plugins self); - }; + inherit (lib) extends; - plugins = ps: with ps; rec { - nixops-aws = callPackage ./plugins/nixops-aws.nix { }; - nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; - nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; - nixops-gce = callPackage ./plugins/nixops-gce.nix { }; - nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { }; - nixops-hetzner = callPackage ./plugins/nixops-hetzner.nix { }; - nixops-hetznercloud = callPackage ./plugins/nixops-hetznercloud.nix { }; - nixops-libvirtd = callPackage ./plugins/nixops-libvirtd.nix { }; - nixops-vbox = callPackage ./plugins/nixops-vbox.nix { }; - nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { }; - - # aliases for backwards compatibility - nixops-gcp = nixops-gce; - nixops-virtd = nixops-libvirtd; - nixopsvbox = nixops-vbox; - }; - - withPlugins = withPlugins' { availablePlugins = plugins python.pkgs; }; - - # selector is a function mapping pythonPackages to a list of plugins - # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) - withPlugins' = { availablePlugins }: selector: + # doc: https://github.com/NixOS/nixpkgs/pull/158781/files#diff-854251fa1fe071654921224671c8ba63c95feb2f96b2b3a9969c81676780053a + encapsulate = layerZero: let - selectedPlugins = selector availablePlugins; - r = python.pkgs.toPythonApplication (python.pkgs.nixops.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ selectedPlugins; + fixed = layerZero ({ extend = f: encapsulate (extends f layerZero); } // fixed); + in fixed.public; - # Propagating dependencies leaks them through $PYTHONPATH which causes issues - # when used in nix-shell. - postFixup = '' - rm $out/nix-support/propagated-build-inputs - ''; + nixopsContextBase = this: { - passthru = old.passthru // { - inherit availablePlugins selectedPlugins; - inherit withPlugins python; - tests = old.passthru.tests // { - nixos = old.passthru.tests.nixos.passthru.override { - nixopsPkg = r; + python = python3.override { + packageOverrides = self: super: { + nixops = self.callPackage ./unwrapped.nix { }; + } // (this.plugins self); + }; + + plugins = ps: with ps; rec { + nixops-aws = callPackage ./plugins/nixops-aws.nix { }; + nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; + nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; + nixops-gce = callPackage ./plugins/nixops-gce.nix { }; + nixops-hercules-ci = callPackage ./plugins/nixops-hercules-ci.nix { }; + nixops-hetzner = callPackage ./plugins/nixops-hetzner.nix { }; + nixops-hetznercloud = callPackage ./plugins/nixops-hetznercloud.nix { }; + nixops-libvirtd = callPackage ./plugins/nixops-libvirtd.nix { }; + nixops-vbox = callPackage ./plugins/nixops-vbox.nix { }; + nixos-modules-contrib = callPackage ./plugins/nixos-modules-contrib.nix { }; + + # aliases for backwards compatibility + nixops-gcp = nixops-gce; + nixops-virtd = nixops-libvirtd; + nixopsvbox = nixops-vbox; + }; + + withPlugins = this.withPlugins' { availablePlugins = this.plugins this.python.pkgs; }; + + # selector is a function mapping pythonPackages to a list of plugins + # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) + withPlugins' = { availablePlugins }: selector: + let + selectedPlugins = selector availablePlugins; + r = this.python.pkgs.toPythonApplication (this.python.pkgs.nixops.overridePythonAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ selectedPlugins; + + # Propagating dependencies leaks them through $PYTHONPATH which causes issues + # when used in nix-shell. + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; + + passthru = old.passthru // { + inherit availablePlugins selectedPlugins; + inherit (this) withPlugins python; + tests = old.passthru.tests // { + nixos = old.passthru.tests.nixos.passthru.override { + nixopsPkg = r; + }; + } + # Make sure we also test with a configuration that's been extended with a plugin. + // lib.optionalAttrs (selectedPlugins == [ ]) { + withAPlugin = + lib.recurseIntoAttrs + (this.withPlugins (ps: with ps; [ nixops-encrypted-links ])).tests; }; - } - # Make sure we also test with a configuration that's been extended with a plugin. - // lib.optionalAttrs (selectedPlugins == [ ]) { - withAPlugin = - lib.recurseIntoAttrs - (withPlugins (ps: with ps; [ nixops-encrypted-links ])).tests; }; - }; - })); - in - r; + })); + in + r; + + public = this.withPlugins (ps: []); + }; + + minimal = encapsulate nixopsContextBase; in { - nixops_unstable_minimal = withPlugins (ps: [ ]); + nixops_unstable_minimal = minimal; # Not recommended; too fragile. - nixops_unstable_full = withPlugins (ps: [ + nixops_unstable_full = minimal.withPlugins (ps: [ ps.nixops-aws ps.nixops-digitalocean ps.nixops-encrypted-links From f5f2ef33fad2f550a833d754edc96686be66adf8 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 22:38:45 +0100 Subject: [PATCH 184/201] nixops_unstable_*: Remove ad-hoc availablePlugins overriding state --- .../applications/networking/cluster/nixops/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index ad3caf0d9dbf..f8373efdfecf 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -35,13 +35,13 @@ let nixopsvbox = nixops-vbox; }; - withPlugins = this.withPlugins' { availablePlugins = this.plugins this.python.pkgs; }; + availablePlugins = this.plugins this.python.pkgs; # selector is a function mapping pythonPackages to a list of plugins # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) - withPlugins' = { availablePlugins }: selector: + withPlugins = selector: let - selectedPlugins = selector availablePlugins; + selectedPlugins = selector this.availablePlugins; r = this.python.pkgs.toPythonApplication (this.python.pkgs.nixops.overridePythonAttrs (old: { propagatedBuildInputs = old.propagatedBuildInputs ++ selectedPlugins; @@ -52,8 +52,8 @@ let ''; passthru = old.passthru // { - inherit availablePlugins selectedPlugins; - inherit (this) withPlugins python; + inherit selectedPlugins; + inherit (this) availablePlugins withPlugins python; tests = old.passthru.tests // { nixos = old.passthru.tests.nixos.passthru.override { nixopsPkg = r; From 576be941f8cceed14a6a937a61e42814a553312d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 22:53:49 +0100 Subject: [PATCH 185/201] nixops_unstable_*: Remove ad-hoc selectedPlugins overriding state --- .../networking/cluster/nixops/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index f8373efdfecf..8bcd0f9db630 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -37,13 +37,19 @@ let availablePlugins = this.plugins this.python.pkgs; + selectedPlugins = []; + # selector is a function mapping pythonPackages to a list of plugins # e.g. nixops_unstable.withPlugins (ps: with ps; [ nixops-aws ]) withPlugins = selector: - let + this.extend (this: _old: { selectedPlugins = selector this.availablePlugins; + }); + + rawPackage = + let r = this.python.pkgs.toPythonApplication (this.python.pkgs.nixops.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ selectedPlugins; + propagatedBuildInputs = old.propagatedBuildInputs ++ this.selectedPlugins; # Propagating dependencies leaks them through $PYTHONPATH which causes issues # when used in nix-shell. @@ -52,15 +58,14 @@ let ''; passthru = old.passthru // { - inherit selectedPlugins; - inherit (this) availablePlugins withPlugins python; + inherit (this) selectedPlugins availablePlugins withPlugins python; tests = old.passthru.tests // { nixos = old.passthru.tests.nixos.passthru.override { nixopsPkg = r; }; } # Make sure we also test with a configuration that's been extended with a plugin. - // lib.optionalAttrs (selectedPlugins == [ ]) { + // lib.optionalAttrs (this.selectedPlugins == [ ]) { withAPlugin = lib.recurseIntoAttrs (this.withPlugins (ps: with ps; [ nixops-encrypted-links ])).tests; @@ -70,7 +75,7 @@ let in r; - public = this.withPlugins (ps: []); + public = this.rawPackage; }; minimal = encapsulate nixopsContextBase; From 88e807a141d2d5e9049083381ec2a9ac9148455a Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 22:55:30 +0100 Subject: [PATCH 186/201] nixops_unstable_*: Remove unnecessary r fixpoint --- .../networking/cluster/nixops/default.nix | 46 +++++++++---------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 8bcd0f9db630..4d61e019a33e 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -46,34 +46,30 @@ let selectedPlugins = selector this.availablePlugins; }); - rawPackage = - let - r = this.python.pkgs.toPythonApplication (this.python.pkgs.nixops.overridePythonAttrs (old: { - propagatedBuildInputs = old.propagatedBuildInputs ++ this.selectedPlugins; + rawPackage = this.python.pkgs.toPythonApplication (this.python.pkgs.nixops.overridePythonAttrs (old: { + propagatedBuildInputs = old.propagatedBuildInputs ++ this.selectedPlugins; - # Propagating dependencies leaks them through $PYTHONPATH which causes issues - # when used in nix-shell. - postFixup = '' - rm $out/nix-support/propagated-build-inputs - ''; + # Propagating dependencies leaks them through $PYTHONPATH which causes issues + # when used in nix-shell. + postFixup = '' + rm $out/nix-support/propagated-build-inputs + ''; - passthru = old.passthru // { - inherit (this) selectedPlugins availablePlugins withPlugins python; - tests = old.passthru.tests // { - nixos = old.passthru.tests.nixos.passthru.override { - nixopsPkg = r; - }; - } - # Make sure we also test with a configuration that's been extended with a plugin. - // lib.optionalAttrs (this.selectedPlugins == [ ]) { - withAPlugin = - lib.recurseIntoAttrs - (this.withPlugins (ps: with ps; [ nixops-encrypted-links ])).tests; - }; + passthru = old.passthru // { + inherit (this) selectedPlugins availablePlugins withPlugins python; + tests = old.passthru.tests // { + nixos = old.passthru.tests.nixos.passthru.override { + nixopsPkg = rawPackage; }; - })); - in - r; + } + # Make sure we also test with a configuration that's been extended with a plugin. + // lib.optionalAttrs (this.selectedPlugins == [ ]) { + withAPlugin = + lib.recurseIntoAttrs + (this.withPlugins (ps: with ps; [ nixops-encrypted-links ])).tests; + }; + }; + })); public = this.rawPackage; }; From 8b9543baac8c68e46382edc92ff3c65294af1310 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 23:16:59 +0100 Subject: [PATCH 187/201] nixops_unstable_*: Forward overrideAttrs --- .../networking/cluster/nixops/default.nix | 38 +++++++++++-------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 4d61e019a33e..058400c2d94d 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -54,24 +54,30 @@ let postFixup = '' rm $out/nix-support/propagated-build-inputs ''; - - passthru = old.passthru // { - inherit (this) selectedPlugins availablePlugins withPlugins python; - tests = old.passthru.tests // { - nixos = old.passthru.tests.nixos.passthru.override { - nixopsPkg = rawPackage; - }; - } - # Make sure we also test with a configuration that's been extended with a plugin. - // lib.optionalAttrs (this.selectedPlugins == [ ]) { - withAPlugin = - lib.recurseIntoAttrs - (this.withPlugins (ps: with ps; [ nixops-encrypted-links ])).tests; - }; - }; })); - public = this.rawPackage; + # Extra package attributes that aren't derivation attributes, just like `mkDerivation`'s `passthru`. + extraPackageAttrs = { + inherit (this) selectedPlugins availablePlugins withPlugins python; + tests = this.rawPackage.tests // { + nixos = this.rawPackage.tests.nixos.passthru.override { + nixopsPkg = this.rawPackage; + }; + } + # Make sure we also test with a configuration that's been extended with a plugin. + // lib.optionalAttrs (this.selectedPlugins == [ ]) { + withAPlugin = + lib.recurseIntoAttrs + (this.withPlugins (ps: with ps; [ nixops-encrypted-links ])).tests; + }; + overrideAttrs = f: this.extend (this: oldThis: { + rawPackage = oldThis.rawPackage.overrideAttrs f; + }); + }; + + package = lib.lazyDerivation { outputs = [ "out" "dist" ]; derivation = this.rawPackage; } // this.extraPackageAttrs; + + public = this.package; }; minimal = encapsulate nixopsContextBase; From 5a1285c2163173217d2adc5f56a4b7bd5234b714 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 23:38:47 +0100 Subject: [PATCH 188/201] nixops_unstable_*: Add addAvailablePlugins --- .../networking/cluster/nixops/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 058400c2d94d..d3efd3ed2448 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -14,10 +14,10 @@ let python = python3.override { packageOverrides = self: super: { nixops = self.callPackage ./unwrapped.nix { }; - } // (this.plugins self); + } // (this.plugins self super); }; - plugins = ps: with ps; rec { + plugins = ps: _super: with ps; rec { nixops-aws = callPackage ./plugins/nixops-aws.nix { }; nixops-digitalocean = callPackage ./plugins/nixops-digitalocean.nix { }; nixops-encrypted-links = callPackage ./plugins/nixops-encrypted-links.nix { }; @@ -35,7 +35,8 @@ let nixopsvbox = nixops-vbox; }; - availablePlugins = this.plugins this.python.pkgs; + # We should not reapply the overlay, but it tends to work out. (It's been this way since poetry2nix was dropped.) + availablePlugins = this.plugins this.python.pkgs this.python.pkgs; selectedPlugins = []; @@ -73,6 +74,15 @@ let overrideAttrs = f: this.extend (this: oldThis: { rawPackage = oldThis.rawPackage.overrideAttrs f; }); + /** + * nixops.addAvailablePlugins: Overlay -> Package + * + * Add available plugins to the package. You probably also want to enable + * them with the `withPlugins` method. + */ + addAvailablePlugins = newPlugins: this.extend (finalThis: oldThis: { + plugins = lib.composeExtensions oldThis.plugins newPlugins; + }); }; package = lib.lazyDerivation { outputs = [ "out" "dist" ]; derivation = this.rawPackage; } // this.extraPackageAttrs; From 114af421c5a708a6dedf0c4f27f8bca0502267a8 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 23:48:57 +0100 Subject: [PATCH 189/201] nixops_unstable_*: Test addAvailablePlugins and withPlugins commute Actually the lack of instantiation is the main purpose, but it's nice to test commutativity too. (Even if it's just one example...) --- pkgs/applications/networking/cluster/nixops/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index d3efd3ed2448..1e086bb5c571 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -1,4 +1,4 @@ -{ lib, python3 }: +{ lib, python3, emptyFile }: let inherit (lib) extends; @@ -64,6 +64,13 @@ let nixos = this.rawPackage.tests.nixos.passthru.override { nixopsPkg = this.rawPackage; }; + commutative_addAvailablePlugins_withPlugins = + assert + (this.public.addAvailablePlugins (self: super: { inherit emptyFile; })).withPlugins (ps: [ emptyFile ]) + == + # Note that this value proves that the package is not instantiated until the end, where it's valid again. + (this.public.withPlugins (ps: [ emptyFile ])).addAvailablePlugins (self: super: { inherit emptyFile; }); + emptyFile; } # Make sure we also test with a configuration that's been extended with a plugin. // lib.optionalAttrs (this.selectedPlugins == [ ]) { From 5e1bf24bc97568fbab49156b1b8396c4a61d0b35 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 23:57:23 +0100 Subject: [PATCH 190/201] nixops_unstable_*: Expose internals politely --- pkgs/applications/networking/cluster/nixops/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/cluster/nixops/default.nix b/pkgs/applications/networking/cluster/nixops/default.nix index 1e086bb5c571..75902de1b9f6 100644 --- a/pkgs/applications/networking/cluster/nixops/default.nix +++ b/pkgs/applications/networking/cluster/nixops/default.nix @@ -90,6 +90,9 @@ let addAvailablePlugins = newPlugins: this.extend (finalThis: oldThis: { plugins = lib.composeExtensions oldThis.plugins newPlugins; }); + + # For those who need or dare. + internals = this; }; package = lib.lazyDerivation { outputs = [ "out" "dist" ]; derivation = this.rawPackage; } // this.extraPackageAttrs; From e63713d2b70cddcec7886ac138b00c2704c1e9d5 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Thu, 29 Feb 2024 02:12:20 +0100 Subject: [PATCH 191/201] nixops_unstablePlugins.nixops-aws: 2023-08-09 -> 2024-02-29 --- .../networking/cluster/nixops/plugins/nixops-aws.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix b/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix index 06d8135bc9ff..78b9bc879aaa 100644 --- a/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix +++ b/pkgs/applications/networking/cluster/nixops/plugins/nixops-aws.nix @@ -12,14 +12,14 @@ buildPythonPackage { pname = "nixops-aws"; - version = "unstable-2023-08-09"; + version = "unstable-2024-02-29"; pyproject = true; src = fetchFromGitHub { owner = "NixOS"; repo = "nixops-aws"; - rev = "8802d1cda9004ec1362815292c2a8ab95e6d64e8"; - hash = "sha256-i0KjFrwpDHRch9jorccdVwnjAQiORClDUqm2R2xvwuU="; + rev = "d173b2f14ec767d782ceab45fb22b32fe3b5a1f7"; + hash = "sha256-ocTtc7POt1bugb9Bki2ew2Eh5uc933GftNw1twoOJsc="; }; postPatch = '' From 76cc7837fb3b7e6ae2a21a21021ef154fe7dc54d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 22:53:11 +0100 Subject: [PATCH 192/201] python311Packages.google-cloud-resource-manager: 1.12.2 -> 1.12.3 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-resource-manager-v1.12.3/packages/google-cloud-resource-manager/CHANGELOG.md --- .../python-modules/google-cloud-resource-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix index 8c1f92159b7b..299f2f1f3a80 100644 --- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-resource-manager"; - version = "1.12.2"; + version = "1.12.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Lt5EalCHsjbw4fs5zKN5G66X6w2RJQV0AUVLGQ1Vcu4="; + hash = "sha256-gJhRgkEZg05PIxCyxPOGIcHRayuxTVufEy5px501Xn8="; }; nativeBuildInputs = [ From 0bdfbc9e6a721f2299dfb0d072d5052d4b287802 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron <886074+teto@users.noreply.github.com> Date: Wed, 14 Feb 2024 21:27:57 +0100 Subject: [PATCH 193/201] doc/lua.section.md: update lua documentation --- doc/languages-frameworks/lua.section.md | 26 ++++++++----------------- 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/doc/languages-frameworks/lua.section.md b/doc/languages-frameworks/lua.section.md index 136c7194e5cd..a6577a56a436 100644 --- a/doc/languages-frameworks/lua.section.md +++ b/doc/languages-frameworks/lua.section.md @@ -1,8 +1,8 @@ -# User’s Guide to Lua Infrastructure {#users-guide-to-lua-infrastructure} +# Lua {#lua} -## Using Lua {#using-lua} +## Using Lua {#lua-userguide} -### Overview of Lua {#overview-of-lua} +### Overview of Lua {#lua-overview} Several versions of the Lua interpreter are available: luajit, lua 5.1, 5.2, 5.3. The attribute `lua` refers to the default interpreter, it is also possible to refer to specific versions, e.g. `lua5_2` refers to Lua 5.2. @@ -118,7 +118,7 @@ Again, it is possible to launch the interpreter from the shell. The Lua interpreter has the attribute `pkgs` which contains all Lua libraries for that specific interpreter. -## Developing with Lua {#developing-with-lua} +## Developing with lua {#lua-developing} Now that you know how to get a working Lua environment with Nix, it is time to go forward and start actually developing with Lua. There are two ways to @@ -234,30 +234,20 @@ The `lua.withPackages` takes a function as an argument that is passed the set of Using the `withPackages` function, the previous example for the luafilesystem environment can be written like this: ```nix -with import {}; - lua.withPackages (ps: [ps.luafilesystem]) ``` `withPackages` passes the correct package set for the specific interpreter version as an argument to the function. In the above example, `ps` equals `luaPackages`. -But you can also easily switch to using `lua5_2`: +But you can also easily switch to using `lua5_1`: ```nix -with import {}; - -lua5_2.withPackages (ps: [ps.lua]) +lua5_1.withPackages (ps: [ps.lua]) ``` -Now, `ps` is set to `lua52Packages`, matching the version of the interpreter. +Now, `ps` is set to `lua5_1.pkgs`, matching the version of the interpreter. -### Possible Todos {#possible-todos} - -* export/use version specific variables such as `LUA_PATH_5_2`/`LUAROCKS_CONFIG_5_2` -* let luarocks check for dependencies via exporting the different rocktrees in temporary config - -### Lua Contributing guidelines {#lua-contributing-guidelines} +### Lua Contributing guidelines {#lua-contributing} Following rules should be respected: -* Make sure libraries build for all Lua interpreters. * Commit names of Lua libraries should reflect that they are Lua libraries, so write for example `luaPackages.luafilesystem: 1.11 -> 1.12`. From 7a860365e77649c734a8a6705c4838dd2a423a3c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 22:54:12 +0100 Subject: [PATCH 194/201] python311Packages.google-cloud-secret-manager: 2.18.2 -> 2.18.3 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-secret-manager-v2.18.3/packages/google-cloud-secret-manager/CHANGELOG.md --- .../python-modules/google-cloud-secret-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix index 679d8631aaee..69009eb54678 100644 --- a/pkgs/development/python-modules/google-cloud-secret-manager/default.nix +++ b/pkgs/development/python-modules/google-cloud-secret-manager/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-secret-manager"; - version = "2.18.2"; + version = "2.18.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-oA1iEVpwCD6GsdRMp+vK4EGzakTMYupX3kAFcx+NPIg="; + hash = "sha256-HbL0CTJFNuNPmFCB04njl0yjo2aN94RcrQvgOrjA+n0="; }; nativeBuildInputs = [ From c49f58c5518a004bbafae8c8a793d5baf3bcae06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 22:57:57 +0100 Subject: [PATCH 195/201] python311Packages.google-cloud-speech: 2.25.0 -> 2.25.1 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-speech-v2.25.1/packages/google-cloud-speech/CHANGELOG.md --- .../python-modules/google-cloud-speech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-speech/default.nix b/pkgs/development/python-modules/google-cloud-speech/default.nix index f0e3fe9dbdbc..1fc4624e8509 100644 --- a/pkgs/development/python-modules/google-cloud-speech/default.nix +++ b/pkgs/development/python-modules/google-cloud-speech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.25.0"; + version = "2.25.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Bwt6c3Ndhxzc9VkCOOnE/1m7X1JBcodrpVZGtcXrhrg="; + hash = "sha256-W3RwqUn1p3xAURw2ZKwzn+CkcESC+bazorpVS30rLNw="; }; nativeBuildInputs = [ From dd152966e88d81ed38f48d4ece8f212794fd013c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 22:59:38 +0100 Subject: [PATCH 196/201] python311Packages.google-cloud-tasks: 2.16.2 -> 2.16.3 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-tasks-v2.16.3/packages/google-cloud-tasks/CHANGELOG.md --- .../development/python-modules/google-cloud-tasks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-tasks/default.nix b/pkgs/development/python-modules/google-cloud-tasks/default.nix index 55d8957f632a..a76e4e50f7f0 100644 --- a/pkgs/development/python-modules/google-cloud-tasks/default.nix +++ b/pkgs/development/python-modules/google-cloud-tasks/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-tasks"; - version = "2.16.2"; + version = "2.16.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-L1wVxYEVHZE9hA/KNI3JpfvRzBbsUR4/ZrL8agHwbjg="; + hash = "sha256-2JH+cAbbTWEig4qm3krKbgB3urIk7crmhGZq4+MDxF8="; }; nativeBuildInputs = [ From 858a73c54554115f88ccfc6fe9ce1eeff3fe9119 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 23:01:11 +0100 Subject: [PATCH 197/201] python311Packages.google-cloud-texttospeech: 2.16.2 -> 2.16.3 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-texttospeech-v2.16.3/packages/google-cloud-texttospeech/CHANGELOG.md --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 58b16639fcab..76b0c2a1f269 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.16.2"; + version = "2.16.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-6qyAnZp9B8XJ61hhORZULLL6UsFPnzHaf/SYn3F/jgw="; + hash = "sha256-+rwxUDLRN9oHELtMJoc00zYhLY+oMWsjsnfdOoTOchw="; }; nativeBuildInputs = [ From 98b06075cd2f91980c862a15e9bbb5e5b5fbecb7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 23:06:14 +0100 Subject: [PATCH 198/201] python311Packages.google-cloud-trace: 1.13.2 -> 1.13.3 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-trace-v1.13.3/packages/google-cloud-trace/CHANGELOG.md --- .../development/python-modules/google-cloud-trace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-trace/default.nix b/pkgs/development/python-modules/google-cloud-trace/default.nix index ad8f2998a7bc..4a276b5f05a7 100644 --- a/pkgs/development/python-modules/google-cloud-trace/default.nix +++ b/pkgs/development/python-modules/google-cloud-trace/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "1.13.2"; + version = "1.13.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3Iy7ke+2sH+S/xkjjfD4snLRt9B0Zew52qcwSryyDNU="; + hash = "sha256-NqwuM94NsBf/0vY9jWTct1vpETzPpN5JYvRzfv1srIA="; }; nativeBuildInputs = [ From 541c6ceafd4c54fa4b02726706803c5097f8a790 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 23:08:49 +0100 Subject: [PATCH 199/201] python311Packages.google-cloud-videointelligence: 2.13.2 -> 2.13.3 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-videointelligence-v2.13.3/packages/google-cloud-videointelligence/CHANGELOG.md --- .../python-modules/google-cloud-videointelligence/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix index 8e06398a0ec1..d7d39587fe5a 100644 --- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix +++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "2.13.2"; + version = "2.13.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-wHfiVZmhB/GMfgV8pmHzdgCxtxxl2Q1s9cQgQ9rcjbE="; + hash = "sha256-FGByHYEgZhxHfAGvDt09sDhFhX9SFGpKOfFrSs+zb20="; }; nativeBuildInputs = [ From 8d2ce944f7723974a93feecfbff132710ea3b0a3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 6 Mar 2024 14:50:56 -0800 Subject: [PATCH 200/201] python311Packages.trytond: 7.0.7 -> 7.0.8 (#286220) --- pkgs/development/python-modules/trytond/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index eb1665bf0bf2..d9cc9ae10312 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -25,14 +25,14 @@ buildPythonPackage rec { pname = "trytond"; - version = "7.0.7"; + version = "7.0.8"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cxh9Aqn5gNVXJ2ArQPVSAX8joSnwyXakY4KE9d1VREk="; + hash = "sha256-ZpK3+DZi2U4TK7dHwIJnw5u/lFrvtBD+MhRLkdO8DLI="; }; propagatedBuildInputs = [ @@ -80,7 +80,7 @@ buildPythonPackage rec { modularity, scalability and security. ''; homepage = "http://www.tryton.org/"; - changelog = "https://hg.tryton.org/trytond/file/${version}/CHANGELOG"; + changelog = "https://foss.heptapod.net/tryton/tryton/-/blob/trytond-${version}/trytond/CHANGELOG?ref_type=tags"; license = licenses.gpl3Plus; maintainers = with maintainers; [ udono johbo ]; }; From 6431075d1aa223e540f2f4f9de66b9e5bd0babe3 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 6 Mar 2024 18:44:26 -0500 Subject: [PATCH 201/201] python311Packages.dask-histogram: 2024.2.0 -> 2024.3.0 (#293837) --- pkgs/development/python-modules/dask-histogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix index 0931cf6060c0..a1a7c6419717 100644 --- a/pkgs/development/python-modules/dask-histogram/default.nix +++ b/pkgs/development/python-modules/dask-histogram/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "dask-histogram"; - version = "2024.2.0"; + version = "2024.3.0"; pyproject = true; src = fetchFromGitHub { owner = "dask-contrib"; repo = "dask-histogram"; rev = "refs/tags/${version}"; - hash = "sha256-YU5i7mGOZxj/pvpkZLwohoSuHJgS3zkHYVuj1Vtyrj4="; + hash = "sha256-RqZMAEGFqEXNmNv7SWCyQw9cI+I+Oa6s8O/7Jp+9id8="; }; nativeBuildInputs = [