From 3e53f2b569c3463d314311c4c96947f0a1b9f8b9 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 23 Dec 2023 10:31:58 +0100 Subject: [PATCH 001/444] 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/444] 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/444] 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/444] 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/444] 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/444] 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/444] 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/444] 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/444] 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/444] 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/444] 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/444] 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/444] 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/444] 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/444] 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/444] 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 0d13278ba64ddd244f25b7ee0d9daee2ce6a2925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 28 Jan 2024 11:06:48 -0800 Subject: [PATCH 017/444] vorta: 0.8.12 -> 0.9.1 Diff: https://github.com/borgbase/vorta/compare/v0.8.12...v0.9.1 Changelog: https://github.com/borgbase/vorta/releases/tag/v0.9.1 --- pkgs/applications/backup/vorta/default.nix | 54 ++++++++++------------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 25 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/backup/vorta/default.nix b/pkgs/applications/backup/vorta/default.nix index 6ce761e8677f..b620459f3c73 100644 --- a/pkgs/applications/backup/vorta/default.nix +++ b/pkgs/applications/backup/vorta/default.nix @@ -3,44 +3,43 @@ , fetchFromGitHub , wrapQtAppsHook , borgbackup -, qt5 +, qtbase +, qtwayland , stdenv +, makeFontsConf }: python3Packages.buildPythonApplication rec { pname = "vorta"; - version = "0.8.12"; + version = "0.9.1"; + pyproject = true; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - hash = "sha256-nLdLTh1qSKvOR2cE9HWQrIWQ9L+ynX4qF+lTtKn/Ubs="; + hash = "sha256-wGlnldS2p92NAYAyRPqKjSneIlbdsOiJ0N42n/mMGFI="; }; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ + python3Packages.setuptools + wrapQtAppsHook + ]; buildInputs = lib.optionals stdenv.isLinux [ - qt5.qtwayland + qtwayland ]; propagatedBuildInputs = with python3Packages; [ peewee - pyqt5 - python-dateutil + pyqt6 psutil - qdarkstyle secretstorage - appdirs setuptools platformdirs ]; postPatch = '' - substituteInPlace setup.cfg \ - --replace setuptools_git "" \ - --replace pytest-runner "" - substituteInPlace src/vorta/assets/metadata/com.borgbase.Vorta.desktop \ --replace com.borgbase.Vorta "com.borgbase.Vorta-symbolic" ''; @@ -63,33 +62,28 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - preCheck = '' + preCheck = let + fontsConf = makeFontsConf { + fontDirectories = [ ]; + }; + in '' export HOME=$(mktemp -d) + export FONTCONFIG_FILE=${fontsConf}; # For tests/test_misc.py::test_autostart mkdir -p $HOME/.config/autostart - export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" + export QT_PLUGIN_PATH="${qtbase}/${qtbase.qtPluginPrefix}" export QT_QPA_PLATFORM=offscreen ''; disabledTestPaths = [ - "tests/test_archives.py" - "tests/test_borg.py" - "tests/test_lock.py" - "tests/test_notifications.py" - ]; - - disabledTests = [ - "diff_archives_dict_issue-Users" - "diff_archives-test" - "test_repo_unlink" - "test_repo_add_success" - "test_ssh_dialog" - "test_create" - "test_scheduler_create_backup" + # QObject::connect: No such signal QPlatformNativeInterface::systemTrayWindowChanged(QScreen*) + "tests/test_excludes.py" + "tests/integration" + "tests/unit" ]; meta = with lib; { - changelog = "https://github.com/borgbase/vorta/releases/tag/v0.8.10"; + changelog = "https://github.com/borgbase/vorta/releases/tag/${src.rev}"; description = "Desktop Backup Client for Borg"; homepage = "https://vorta.borgbase.com/"; license = licenses.gpl3Only; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef7ee1bd9ebd..35b2e5beb7ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7861,7 +7861,7 @@ with pkgs; (callPackage ../development/libraries/volk { }) ; - vorta = libsForQt5.callPackage ../applications/backup/vorta { }; + vorta = qt6Packages.callPackage ../applications/backup/vorta { }; vowpal-wabbit = callPackage ../applications/science/machine-learning/vowpal-wabbit { }; From e7a2d8aa18770a1ac2a2073a563ee298e7e7d90a Mon Sep 17 00:00:00 2001 From: MinerSebas Date: Fri, 2 Feb 2024 14:41:45 +0100 Subject: [PATCH 018/444] prometheus-restic-exporter: 1.4.0 -> 1.5.0 --- .../services/monitoring/prometheus/exporters/restic.nix | 4 ++-- pkgs/by-name/pr/prometheus-restic-exporter/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix index 5b32c93a666d..fabcff0430ed 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix @@ -108,8 +108,8 @@ in toRcloneVal = v: if lib.isBool v then lib.boolToString v else v; in { - RESTIC_REPO_URL = cfg.repository; - RESTIC_REPO_PASSWORD_FILE = cfg.passwordFile; + RESTIC_REPOSITORY = cfg.repository; + RESTIC_PASSWORD_FILE = cfg.passwordFile; LISTEN_ADDRESS = cfg.listenAddress; LISTEN_PORT = toString cfg.port; REFRESH_INTERVAL = toString cfg.refreshInterval; diff --git a/pkgs/by-name/pr/prometheus-restic-exporter/package.nix b/pkgs/by-name/pr/prometheus-restic-exporter/package.nix index 4e3736a573b6..603650a66ab6 100644 --- a/pkgs/by-name/pr/prometheus-restic-exporter/package.nix +++ b/pkgs/by-name/pr/prometheus-restic-exporter/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "prometheus-restic-exporter"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "ngosang"; repo = "restic-exporter"; rev = version; - hash = "sha256-Qwhlecginl5+V+iddN/vIHfJA1kQOZtscECsoD4LJPE="; + hash = "sha256-SC2ZCIQ33RaFI9+l/WI6edNzGEtsxJ2bBdeGNMHuyqY="; }; buildInputs = [ @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { install -D -m0755 restic-exporter.py $out/bin/restic-exporter.py - substituteInPlace $out/bin/restic-exporter.py --replace \"restic\" \"${lib.makeBinPath [ restic ]}/restic\" + substituteInPlace $out/bin/restic-exporter.py --replace-fail \"restic\" \"${lib.makeBinPath [ restic ]}/restic\" patchShebangs $out/bin/restic-exporter.py From de306fb3d64f5086fbf63fec1d104f7187512b0d Mon Sep 17 00:00:00 2001 From: MinerSebas Date: Fri, 2 Feb 2024 14:43:22 +0100 Subject: [PATCH 019/444] nixos/prometheus-restic-exporter: Use LoadCredential for password file --- .../monitoring/prometheus/exporters/restic.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix index fabcff0430ed..977bd42e9812 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/restic.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/restic.nix @@ -93,12 +93,14 @@ in }; serviceOpts = { + script = '' + export RESTIC_PASSWORD_FILE=$CREDENTIALS_DIRECTORY/RESTIC_PASSWORD_FILE + ${pkgs.prometheus-restic-exporter}/bin/restic-exporter.py \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; serviceConfig = { - ExecStart = '' - ${pkgs.prometheus-restic-exporter}/bin/restic-exporter.py \ - ${concatStringsSep " \\\n " cfg.extraFlags} - ''; EnvironmentFile = mkIf (cfg.environmentFile != null) cfg.environmentFile; + LoadCredential = [ "RESTIC_PASSWORD_FILE:${cfg.passwordFile}" ]; }; environment = let @@ -109,7 +111,6 @@ in in { RESTIC_REPOSITORY = cfg.repository; - RESTIC_PASSWORD_FILE = cfg.passwordFile; LISTEN_ADDRESS = cfg.listenAddress; LISTEN_PORT = toString cfg.port; REFRESH_INTERVAL = toString cfg.refreshInterval; From c8fb7e02dbf5477a6c834eeaa519816475897c8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 5 Feb 2024 05:23:16 +0000 Subject: [PATCH 020/444] nwg-drawer: 0.4.3 -> 0.4.5 --- pkgs/by-name/nw/nwg-drawer/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nw/nwg-drawer/package.nix b/pkgs/by-name/nw/nwg-drawer/package.nix index 976f99158c04..9f1d2f85e0ef 100644 --- a/pkgs/by-name/nw/nwg-drawer/package.nix +++ b/pkgs/by-name/nw/nwg-drawer/package.nix @@ -12,16 +12,16 @@ let pname = "nwg-drawer"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "nwg-drawer"; rev = "v${version}"; - hash = "sha256-1iylXR3WP39E/0L/vBe5LxXOKV+KisgUr2rxBEHahMo="; + hash = "sha256-TtCn93AyCSa0AlwwbtTdHwwteGbhaFL5OCohGOxn4Bg="; }; - vendorHash = "sha256-8s8+ukMQpciQmKt77fNE7r+3cm/UDxO8VtkrNYdKhM8="; + vendorHash = "sha256-w27zoC0BwTkiKyGVfNWG0k4tyTm5IIAthKqOyIMYBZQ="; in buildGoModule { inherit pname version src vendorHash; From 93d4c4b42cf410dc996e7d333dbcfc62117ac2d5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Feb 2024 10:38:34 +0000 Subject: [PATCH 021/444] 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 8d7dfcdc171c5e936bd15b73b156008843664d32 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 12 Feb 2024 16:48:16 +0100 Subject: [PATCH 022/444] python311Packages.unicode-rbnf: 1.0.0 -> 1.1.0 https://github.com/rhasspy/unicode-rbnf/blob/v1.1.0/CHANGELOG.md --- pkgs/development/python-modules/unicode-rbnf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix index 934f51c67ddf..6dd4e813312e 100644 --- a/pkgs/development/python-modules/unicode-rbnf/default.nix +++ b/pkgs/development/python-modules/unicode-rbnf/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "unicode-rbnf"; - version = "1.0.0"; + version = "1.1.0"; pyproject = true; src = fetchFromGitHub { owner = "rhasspy"; repo = "unicode-rbnf"; rev = "v${version}"; - hash = "sha256-xwnfqWwQJKCJ4G+8eVaySTJAHxhwKYAqLHaCsxtBIl0="; + hash = "sha256-PquPoiaO1rEDMz7jaN9MUB0UQGH07M0O9mlrUCsfhm4="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ buildPythonPackage rec { ]; meta = with lib; { - changelog = "https://github.com/rhasspy/unicode-rbnf/v${version}/master/CHANGELOG.md"; + changelog = "https://github.com/rhasspy/unicode-rbnf/blob/v${version}/CHANGELOG.md"; description = "A pure Python implementation of ICU's rule-based number format engine"; homepage = "https://github.com/rhasspy/unicode-rbnf"; license = licenses.mit; From 2d8effb0fc5d0abd1ccad3e857239ba92f860b46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Feb 2024 08:16:47 +0000 Subject: [PATCH 023/444] 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 024/444] 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 025/444] 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 026/444] 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 027/444] 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 028/444] 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 e42524f702e017754691fb1cb90fe42cf8788b0e Mon Sep 17 00:00:00 2001 From: Patka Date: Fri, 16 Feb 2024 17:13:29 +0100 Subject: [PATCH 029/444] python311Packages.plux: 1.4.0 -> 1.5.0 --- pkgs/development/python-modules/plux/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/plux/default.nix b/pkgs/development/python-modules/plux/default.nix index 567aff8f51b0..b778a2dd1721 100644 --- a/pkgs/development/python-modules/plux/default.nix +++ b/pkgs/development/python-modules/plux/default.nix @@ -10,26 +10,17 @@ buildPythonPackage rec { pname = "plux"; - version = "1.4.0"; - format = "pyproject"; + version = "1.5.0"; + pyproject = true; # Tests are not available from PyPi src = fetchFromGitHub { owner = "localstack"; repo = "plux"; rev = "refs/tags/v${version}"; - hash = "sha256-AybMHkCUNJsL51XwiskkIltEtqZ27fGHrpyct8IUjmo="; + hash = "sha256-XHRQTgvxXJCjCD/9Invf/5OCtp12A5poRUv8tR9DJsk="; }; - patches = [ - # https://github.com/localstack/plux/pull/8 - (fetchpatch { - name = "remove-pytest-runner.patch"; - url = "https://github.com/localstack/plux/commit/3cda22e51f43a86304d0dedd7e554b21aa82c8b0.patch"; - hash = "sha256-ZFHUTkUYFSTgKbx+c74JQzre0la+hFW9gNOxOehvVoE="; - }) - ]; - nativeBuildInputs = [ setuptools wheel From f95591df2c33a60aa91df1ee28e4f4dfd91f2609 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Feb 2024 05:50:54 +0000 Subject: [PATCH 030/444] 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 031/444] 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 032/444] 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 033/444] 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 034/444] 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 035/444] 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 036/444] 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 037/444] 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 038/444] 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 039/444] 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 040/444] 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 041/444] 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 042/444] 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 043/444] 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 044/444] 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 045/444] 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 046/444] 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 047/444] 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 048/444] 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 049/444] 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 050/444] 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 051/444] 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 052/444] 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 053/444] 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 054/444] 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 055/444] 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 056/444] 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 057/444] 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 058/444] 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 059/444] 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 060/444] 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 061/444] 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 062/444] 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 063/444] 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 064/444] 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 065/444] 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 066/444] 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 067/444] 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 068/444] 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 069/444] 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 0d053d7ca63519b5ba35e9607f353c95275c5376 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 08:59:59 +0000 Subject: [PATCH 070/444] python312Packages.pyvo: 1.5 -> 1.5.1 --- pkgs/development/python-modules/pyvo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix index c2058a374a31..6ebabd1b7340 100644 --- a/pkgs/development/python-modules/pyvo/default.nix +++ b/pkgs/development/python-modules/pyvo/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "pyvo"; - version = "1.5"; + version = "1.5.1"; format = "setuptools"; disabled = pythonOlder "3.8"; # according to setup.cfg src = fetchPypi { inherit pname version; - hash = "sha256-heTWWyxmRaDlI9NHzZab5OLOBIbVdb45v67Rq5ckzc8="; + hash = "sha256-ByCBD+e3ZrpT0Q6dnkuyO8lnwVGm85LiKmy/4NRTpjI="; }; nativeBuildInputs = [ From 7d96b43f5f2c45d5a482ce292d6e3a803ac115b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 09:14:31 +0000 Subject: [PATCH 071/444] vscode-extensions.contextmapper.context-mapper-vscode-extension: 6.7.0 -> 6.11.0 --- .../contextmapper.context-mapper-vscode-extension/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix b/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix index 077b522b59e2..6d5e53be1cbf 100644 --- a/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix +++ b/pkgs/applications/editors/vscode/extensions/contextmapper.context-mapper-vscode-extension/default.nix @@ -9,8 +9,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "context-mapper-vscode-extension"; publisher = "contextmapper"; - version = "6.7.0"; - sha256 = "sha256-vlDVqn1Je0eo5Nf2gyotSvhIa07tWCINe79RZSyMzcA="; + version = "6.11.0"; + sha256 = "sha256-TvApcBBI+Egu7t4tJuEYTs6mhvABOY2eXVb57O4gWfs="; }; nativeBuildInputs = [ From 6af7d9276d1e04b6155c08d8c39e372f4314a0d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 09:59:46 +0000 Subject: [PATCH 072/444] 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 073/444] 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 074/444] 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 075/444] 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 fbf3520fe74b527263ad6fca3f3dcdafa0fb614f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 13:27:38 +0000 Subject: [PATCH 076/444] ocamlPackages.lua-ml: 0.9.1 -> 0.9.2 --- pkgs/development/ocaml-modules/lua-ml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/lua-ml/default.nix b/pkgs/development/ocaml-modules/lua-ml/default.nix index 523e453b7d48..5c48b763fc51 100644 --- a/pkgs/development/ocaml-modules/lua-ml/default.nix +++ b/pkgs/development/ocaml-modules/lua-ml/default.nix @@ -7,13 +7,13 @@ else stdenv.mkDerivation rec { pname = "lua-ml"; name = "ocaml${ocaml.version}-${pname}-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "lindig"; repo = pname; rev = version; - sha256 = "04lv98nxmzanvyn4c0k6k0ax29f5xfdl8qzpf5hwadslq213a044"; + sha256 = "sha256-xkjsjKD89W7Y5XK8kfL/ZErYKS14z0u0QCARN0DbTC8="; }; nativeBuildInputs = [ opaline ocaml findlib ocamlbuild ]; From b9cd71f1602c65053c1b81ca8be4aead2845306f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 13:29:04 +0000 Subject: [PATCH 077/444] kubernetes-helmPlugins.helm-git: 0.10.0 -> 0.15.1 --- .../applications/networking/cluster/helm/plugins/helm-git.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix index d72b152cc5bf..196be4a1524a 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-git.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "helm-git"; - version = "0.10.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "aslafy-z"; repo = pname; rev = "v${version}"; - sha256 = "0hvycqibmlw2zw3nm8rn73v5x1zcgm2jrfdlljbvc1n4n5vnzdrg"; + sha256 = "sha256-k8kPuB5GIBjOISL4AM/I4PPrYbrdgYIwVgosMpunZpQ="; }; nativeBuildInputs = [ makeWrapper ]; From b2378d4262aac26d3c3a1f33ca8132e2f8a145d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 13:40:24 +0000 Subject: [PATCH 078/444] 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 a25dbb0cf7da9ab7afdc179944f8ac91fa7169d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 14:56:30 +0000 Subject: [PATCH 079/444] ocamlPackages.iso8601: 0.2.4 -> 0.2.5 --- pkgs/development/ocaml-modules/iso8601/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index ff9ce94bbbd4..5c6d4104b6a3 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ocaml-iso8601"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "sagotch"; repo = "ISO8601.ml"; rev = version; - sha256 = "sha256-sXnYAJcU88797orzzfbA2XG91Lk8mDV677J1Am5o7Xo="; + sha256 = "sha256-QWjZ+2AjvXnnRVenbyCG/hSjfW53bHiftQUtWpK/7I8="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild ]; From 5f870a1c4dcb6dff024a316890bcd000e2991e21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 15:25:25 +0000 Subject: [PATCH 080/444] python311Packages.pygmo: 2.19.5 -> 2.19.6 --- pkgs/development/python-modules/pygmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pygmo/default.nix b/pkgs/development/python-modules/pygmo/default.nix index d311df0a4530..c829ff91f696 100644 --- a/pkgs/development/python-modules/pygmo/default.nix +++ b/pkgs/development/python-modules/pygmo/default.nix @@ -18,13 +18,13 @@ toPythonModule (stdenv.mkDerivation rec { pname = "pygmo"; - version = "2.19.5"; + version = "2.19.6"; src = fetchFromGitHub { owner = "esa"; repo = "pygmo2"; rev = "refs/tags/v${version}"; - hash = "sha256-szQyw5kYfrQEeXRQzjQ0hzULuzTfmGod6ZxG9PDRj5M="; + hash = "sha256-umXK8LGJJ6Xj6UbJ5k/DM/nYayjl+jBXtjar5/dWqFM="; }; cmakeFlags = [ From 17cd479aeeb1437582895b2873d86a497e9166e3 Mon Sep 17 00:00:00 2001 From: Noah Snelson Date: Sun, 3 Sep 2023 17:03:22 -0700 Subject: [PATCH 081/444] 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 082/444] 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 083/444] 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 084/444] 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 085/444] 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 086/444] 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 087/444] 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 088/444] 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 089/444] 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 03b6fa7416dcefc181dc27e0bab9c2d764e21b51 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 27 Feb 2024 10:00:42 -0500 Subject: [PATCH 090/444] way-displays: fix cross compilation, unset DESTDIR --- pkgs/tools/wayland/way-displays/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/wayland/way-displays/default.nix b/pkgs/tools/wayland/way-displays/default.nix index 192e8aecc4fa..50ffefd1a6f9 100644 --- a/pkgs/tools/wayland/way-displays/default.nix +++ b/pkgs/tools/wayland/way-displays/default.nix @@ -31,7 +31,12 @@ stdenv.mkDerivation rec { libinput ]; - makeFlags = [ "DESTDIR=$(out) PREFIX= PREFIX_ETC= ROOT_ETC=$(out)/etc"]; + makeFlags = [ + "PREFIX=${placeholder "out"}" + "PREFIX_ETC=${placeholder "out"}" + "CC:=$(CC)" + "CXX:=$(CXX)" + ]; meta = with lib; { homepage = "https://github.com/alex-courtis/way-displays"; From cbf7ad12a77efe34bb89b49649c870d2f96c15da Mon Sep 17 00:00:00 2001 From: Niklas Gollenstede Date: Tue, 27 Feb 2024 17:08:40 +0100 Subject: [PATCH 091/444] 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 092/444] 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 093/444] 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 094/444] 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 095/444] 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 612dcbe11ebc4d8739dba5c4d6c98504388c0fda Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 28 Feb 2024 23:01:43 +0100 Subject: [PATCH 096/444] lib.lazyDerivation: Support multi-output derivations --- lib/derivations.nix | 64 ++++++++++++++++++++++++++++++++++++++++----- lib/tests/misc.nix | 18 +++++++++++++ 2 files changed, 75 insertions(+), 7 deletions(-) diff --git a/lib/derivations.nix b/lib/derivations.nix index 44b727ee31cc..6867458f9e87 100644 --- a/lib/derivations.nix +++ b/lib/derivations.nix @@ -1,7 +1,20 @@ { lib }: let - inherit (lib) throwIfNot; + inherit (lib) + genAttrs + isString + throwIfNot + ; + + showMaybeAttrPosPre = prefix: attrName: v: + let pos = builtins.unsafeGetAttrPos attrName v; + in if pos == null then "" else "${prefix}${pos.file}:${toString pos.line}:${toString pos.column}"; + + showMaybePackagePosPre = prefix: pkg: + if pkg?meta.position && isString pkg.meta.position + then "${prefix}${pkg.meta.position}" + else ""; in { /* @@ -64,6 +77,11 @@ in # # This can be used for adding package attributes, such as `tests`. passthru ? { } + , # Optional list of assumed outputs. Default: ["out"] + # + # This must match the set of outputs that the returned derivation has. + # You must use this when the derivation has multiple outputs. + outputs ? [ "out" ] }: let # These checks are strict in `drv` and some `drv` attributes, but the @@ -71,11 +89,40 @@ in # Instead, the individual derivation attributes do depend on it. checked = throwIfNot (derivation.type or null == "derivation") - "lazySimpleDerivation: input must be a derivation." + "lazyDerivation: input must be a derivation." throwIfNot - (derivation.outputs == [ "out" ]) - # Supporting multiple outputs should be a matter of inheriting more attrs. - "The derivation ${derivation.name or ""} has multiple outputs. This is not supported by lazySimpleDerivation yet. Support could be added, and be useful as long as the set of outputs is known in advance, without evaluating the actual derivation." + # NOTE: Technically we could require our outputs to be a subset of the + # actual ones, or even leave them unchecked and fail on a lazy basis. + # However, consider the case where an output is added in the underlying + # derivation, such as dev. lazyDerivation would remove it and cause it + # to fail as a buildInputs item, without any indication as to what + # happened. Hence the more stringent condition. We could consider + # adding a flag to control this behavior if there's a valid case for it, + # but the documentation must have a note like this. + (derivation.outputs == outputs) + '' + lib.lazyDerivation: The derivation ${derivation.name or ""} has outputs that don't match the assumed outputs. + + Assumed outputs passed to lazyDerivation${showMaybeAttrPosPre ",\n at " "outputs" args}: + ${lib.generators.toPretty { multiline = false; } outputs}; + + Actual outputs of the derivation${showMaybePackagePosPre ",\n defined at " derivation}: + ${lib.generators.toPretty { multiline = false; } derivation.outputs} + + If the outputs are known ahead of evaluating the derivation, + then update the lazyDerivation call to match the actual outputs, in the same order. + If lazyDerivation is passed a literal value, just change it to the actual outputs. + As a result it will work as before / as intended. + + Otherwise, when the outputs are dynamic and can't be known ahead of time, it won't + be possible to add laziness, but lib.lazyDerivation may still be useful for trimming + the attributes. + If you want to keep trimming the attributes, make sure that the package is in a + variable (don't evaluate it twice!) and pass the variable and its outputs attribute + to lib.lazyDerivation. This largely defeats laziness, but keeps the trimming. + If none of the above works for you, replace the lib.lazyDerivation call by the + expression in the derivation argument. + '' derivation; in { @@ -92,12 +139,15 @@ in # A fixed set of derivation values, so that `lazyDerivation` can return # its attrset before evaluating `derivation`. # This must only list attributes that are available on _all_ derivations. - inherit (checked) outputs out outPath outputName drvPath name system; + inherit (checked) outPath outputName drvPath name system; + inherit outputs; # The meta attribute can either be taken from the derivation, or if the # `lazyDerivation` caller knew a shortcut, be taken from there. meta = args.meta or checked.meta; - } // passthru; + } + // genAttrs outputs (outputName: checked.${outputName}) + // passthru; /* Conditionally set a derivation attribute. diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 193e68a96933..0f90b173fb34 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -1973,6 +1973,24 @@ runTests { }).drvPath; }; + testLazyDerivationMultiOutputReturnsDerivationAttrs = let + derivation = { + type = "derivation"; + outputs = ["out" "dev"]; + dev = "test dev"; + out = "test out"; + outPath = "test outPath"; + outputName = "out"; + drvPath = "test drvPath"; + name = "test name"; + system = "test system"; + meta.position = "/hi:23"; + }; + in { + expr = lazyDerivation { inherit derivation; outputs = ["out" "dev"]; passthru.meta.position = "/hi:23"; }; + expected = derivation; + }; + testTypeDescriptionInt = { expr = (with types; int).description; expected = "signed integer"; From 200a35c8c45b5e9debce8c7b954f0e867d59271f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Feb 2024 14:09:33 +0000 Subject: [PATCH 097/444] 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 098/444] 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 099/444] 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 100/444] 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 101/444] 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 dfd3ba16dc2774949addd5663764947579999852 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 29 Feb 2024 18:07:58 -0300 Subject: [PATCH 102/444] k3s: k3s_1_28 -> k3s_1_29 Changelog & upgrade notes: https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes Tracking issue: https://github.com/NixOS/nixpkgs/pull/292418 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 37a6bfb96058..bd2ea65ca7d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32679,7 +32679,7 @@ with pkgs; }) k3s_1_26 k3s_1_27 k3s_1_28; inherit (callPackage ../applications/networking/cluster/k3s { }) k3s_1_29; - k3s = k3s_1_28; + k3s = k3s_1_29; k3sup = callPackage ../applications/networking/cluster/k3sup { }; From 09390b5cfec7baa0263f8a276d720611aa1068b2 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 29 Feb 2024 18:36:56 -0300 Subject: [PATCH 103/444] nixos/doc: release note for k3s_1_29 --- nixos/doc/manual/release-notes/rl-2405.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 84314f4becc0..0477e8dac15a 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -113,6 +113,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - The `power.ups` module now generates `upsd.conf`, `upsd.users` and `upsmon.conf` automatically from a set of new configuration options. This breaks compatibility with existing `power.ups` setups where these files were created manually. Back up these files before upgrading NixOS. +- `k3s` was updated to [v1.29](https://github.com/k3s-io/k3s/releases/tag/v1.29.1%2Bk3s2). See [changelog and upgrade notes](https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.29.md#urgent-upgrade-notes) for more information. + - `k9s` was updated to v0.31. There have been various breaking changes in the config file format, check out the changelog of [v0.29](https://github.com/derailed/k9s/releases/tag/v0.29.0), [v0.30](https://github.com/derailed/k9s/releases/tag/v0.30.0) and From ab2a497ffc983d48fdb2a1fef507a7957ae9abc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Feb 2024 22:57:52 +0000 Subject: [PATCH 104/444] 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 89508a7f1fb5f22fec0c5f979b09a3786e8bc09f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 29 Feb 2024 22:58:13 +0000 Subject: [PATCH 105/444] hyx: 2021.06.09 -> 2024.02.29 --- pkgs/tools/text/hyx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/hyx/default.nix b/pkgs/tools/text/hyx/default.nix index 28b4765ede4a..f599d067f094 100644 --- a/pkgs/tools/text/hyx/default.nix +++ b/pkgs/tools/text/hyx/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hyx"; - version = "2021.06.09"; + version = "2024.02.29"; src = fetchurl { url = "https://yx7.cc/code/hyx/hyx-${lib.replaceStrings [ "-" ] [ "." ] version}.tar.xz"; - sha256 = "sha256-jU8U5YWE1syPBOQ8o4BC7tIYiCo4kknCCwhnMCVtpes="; + sha256 = "sha256-dufx3zsabeet7Rp0d60MIuNqisIQd6UgE7WDZYNHl3E="; }; postPatch = lib.optionalString stdenv.isDarwin '' From 333ad51f5c7ee6f8d72f7194a95e473becaf90a0 Mon Sep 17 00:00:00 2001 From: Marcel Date: Sat, 17 Feb 2024 19:40:41 +0100 Subject: [PATCH 106/444] listmonk: 2.5.1 -> 3.0.0 listmonk switched their frontend toolchain to vite the existing past usage of yarn2nix did not work using the new toolchain setup. Therefore, I migrated the derivation to the "normal" yarn2nix. --- pkgs/servers/mail/listmonk/default.nix | 18 +++------ pkgs/servers/mail/listmonk/frontend.nix | 41 +++++++++------------ pkgs/servers/mail/listmonk/package.json | 49 ++++++++++++------------- 3 files changed, 46 insertions(+), 62 deletions(-) diff --git a/pkgs/servers/mail/listmonk/default.nix b/pkgs/servers/mail/listmonk/default.nix index 24f97afa348d..3ac3522a861e 100644 --- a/pkgs/servers/mail/listmonk/default.nix +++ b/pkgs/servers/mail/listmonk/default.nix @@ -1,25 +1,17 @@ -{ lib, buildGoModule, fetchFromGitHub, callPackage, stuffbin, nixosTests, fetchpatch }: +{ lib, buildGoModule, fetchFromGitHub, callPackage, stuffbin, nixosTests }: buildGoModule rec { pname = "listmonk"; - version = "2.5.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "knadh"; repo = "listmonk"; rev = "v${version}"; - sha256 = "sha256-gCnIblc83CmG1auvYYxqW/xBl6Oy1KHGkqSY/3yIm3I="; + sha256 = "sha256-eNX+2ens+mz2V8ZBHtFFHDVbi64AAiiREElMjh67Dd8="; }; - patches = [ - # Ensure that listmonk supports Go 1.20 - (fetchpatch { - url = "https://github.com/knadh/listmonk/commit/25513b81044803b104ada63c0be57a913960484e.patch"; - hash = "sha256-SYACM8r+NgeSWn9VJV4+wkm+6s/MhNGwn5zyc2tw7FU="; - }) - ]; - - vendorHash = "sha256-0sgC1+ueZTUCP+7JwI/OKLktfMHQq959GEk1mC0TQgE="; + vendorHash = "sha256-XAm2VfX1nHWTuAV2COEn8qrqPNv0xbaWgTYCpjrEfMw="; nativeBuildInputs = [ stuffbin @@ -50,7 +42,7 @@ buildGoModule rec { ''; passthru = { - frontend = callPackage ./frontend.nix { inherit meta; }; + frontend = callPackage ./frontend.nix { inherit meta version src; }; tests = { inherit (nixosTests) listmonk; }; }; diff --git a/pkgs/servers/mail/listmonk/frontend.nix b/pkgs/servers/mail/listmonk/frontend.nix index 647f5cfd9f6a..928092038c12 100644 --- a/pkgs/servers/mail/listmonk/frontend.nix +++ b/pkgs/servers/mail/listmonk/frontend.nix @@ -1,40 +1,33 @@ -{ yarn2nix-moretea -, fetchFromGitHub +{ mkYarnPackage , fetchYarnDeps , meta +, version +, src }: -yarn2nix-moretea.mkYarnPackage rec { +mkYarnPackage { pname = "listmonk-frontend"; - version = "2.5.1"; - - src = fetchFromGitHub { - owner = "knadh"; - repo = "listmonk"; - rev = "v${version}"; - sha256 = "sha256-gCnIblc83CmG1auvYYxqW/xBl6Oy1KHGkqSY/3yIm3I="; - }; + inherit version; + src = "${src}/frontend"; packageJSON = ./package.json; - yarnLock = "${src}/frontend/yarn.lock"; offlineCache = fetchYarnDeps { - inherit yarnLock; - hash = "sha256-KKNk4lrM7unMFClkY6F3nqhKx5xfx87Ac+rug9sOwvI="; + yarnLock = "${src}/frontend/yarn.lock"; + hash = "sha256-TdrglyRtb2Q8SFtoiCoDj/zBV2+7DwzIm/Fzlt0ZvSo="; }; - # For Node.js v17+, this is necessary. - NODE_OPTIONS = "--openssl-legacy-provider"; + configurePhase = '' + ln -s $node_modules node_modules + ''; + + buildPhase = '' + yarn --offline build + ''; installPhase = '' - runHook preInstall - - cd deps/listmonk-frontend/frontend - npm run build - - mv dist $out - - runHook postInstall + mkdir $out + cp -R dist/* $out ''; doDist = false; diff --git a/pkgs/servers/mail/listmonk/package.json b/pkgs/servers/mail/listmonk/package.json index 6e981fefc8b3..25018ef265dd 100644 --- a/pkgs/servers/mail/listmonk/package.json +++ b/pkgs/servers/mail/listmonk/package.json @@ -1,46 +1,45 @@ { - "name": "listmonk-frontend", + "name": "listmonk", "version": "0.1.0", "private": true, "scripts": { - "serve": "vue-cli-service serve", - "build": "vue-cli-service build", - "build-report": "vue-cli-service build --report", - "lint": "vue-cli-service lint" + "dev": "vite", + "build": "vite build", + "serve": "vite preview", + "lint": "eslint --ext .js,.vue --ignore-path .gitignore src", + "prebuild": "eslint --ext .js,.vue --ignore-path .gitignore src" }, "dependencies": { "@tinymce/tinymce-vue": "^3", - "axios": "^0.27.2", - "buefy": "^0.9.10", - "c3": "^0.7.20", + "axios": "^1.6.2", + "buefy": "^0.9.25", + "bulma": "^0.9.4", + "chart.js": "^4.4.1", "codeflask": "^1.4.1", - "core-js": "^3.12.1", - "dayjs": "^1.10.4", + "dayjs": "^1.11.10", "indent.js": "^0.3.5", "qs": "^6.10.1", "textversionjs": "^1.1.3", - "tinymce": "^5.10.7", - "turndown": "^7.0.0", - "vue": "^2.6.12", - "vue-i18n": "^8.22.2", + "tinymce": "^5.10.9", + "turndown": "^7.1.2", + "vue": "^2.7.14", + "vue-chartjs": "^5.3.0", + "vue-i18n": "^8.28.2", "vue-router": "^3.2.0", "vuex": "^3.6.2" }, "devDependencies": { - "@vue/cli-plugin-babel": "~5.0.8", - "@vue/cli-plugin-eslint": "~5.0.8", - "@vue/cli-plugin-router": "~5.0.8", - "@vue/cli-plugin-vuex": "~5.0.8", - "@vue/cli-service": "~5.0.8", - "@vue/eslint-config-airbnb": "^5.3.0", - "babel-eslint": "^10.1.0", - "cypress": "10.10.0", + "@vitejs/plugin-vue2": "^2.3.1", + "@vue/eslint-config-airbnb": "^7.0.1", + "cypress": "13.6.1", "cypress-file-upload": "^5.0.2", - "eslint": "^7.27.0", + "eslint": "^8.56.0", + "eslint-define-config": "^2.0.0", "eslint-plugin-import": "^2.23.3", - "eslint-plugin-vue": "^7.9.0", + "eslint-plugin-vue": "^9.19.2", "sass": "^1.34.0", - "sass-loader": "^10.2.0", + "vite": "^5.0.12", + "vue-eslint-parser": "^9.3.2", "vue-template-compiler": "^2.6.12" } } From 896a4d62d8c7e36ef19e2d40b6cc26adcc89fe03 Mon Sep 17 00:00:00 2001 From: Marcel Date: Sat, 17 Feb 2024 19:46:53 +0100 Subject: [PATCH 107/444] listmonk: ensure correct application of data migration --- nixos/modules/services/mail/listmonk.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/mail/listmonk.nix b/nixos/modules/services/mail/listmonk.nix index 945eb436c1f2..d6399304cc10 100644 --- a/nixos/modules/services/mail/listmonk.nix +++ b/nixos/modules/services/mail/listmonk.nix @@ -187,7 +187,11 @@ in { # Indeed, it will try to create all the folders and realize one of them already exist. # Therefore, we have to create it ourselves. ''${pkgs.coreutils}/bin/mkdir -p "''${STATE_DIRECTORY}/listmonk/uploads"'' - "${cfg.package}/bin/listmonk --config ${cfgFile} --idempotent --install --upgrade --yes" + # setup database if not already done + "${cfg.package}/bin/listmonk --config ${cfgFile} --idempotent --install --yes" + # apply db migrations (setup and migrations can not be done in one step + # with "--install --upgrade" listmonk ignores the upgrade) + "${cfg.package}/bin/listmonk --config ${cfgFile} --upgrade --yes" "${updateDatabaseConfigScript}/bin/update-database-config.sh" ]; ExecStart = "${cfg.package}/bin/listmonk --config ${cfgFile}"; From 1d399850788fb5d313ccee1309ccdd5c20225831 Mon Sep 17 00:00:00 2001 From: Marcel Date: Fri, 1 Mar 2024 10:47:33 +0100 Subject: [PATCH 108/444] listmonk: move to pkgs/by-name --- pkgs/{servers/mail => by-name/li}/listmonk/frontend.nix | 0 pkgs/{servers/mail => by-name/li}/listmonk/package.json | 0 .../listmonk/default.nix => by-name/li/listmonk/package.nix} | 0 pkgs/{servers/mail => by-name/li}/listmonk/stuffbin.nix | 0 pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 2 deletions(-) rename pkgs/{servers/mail => by-name/li}/listmonk/frontend.nix (100%) rename pkgs/{servers/mail => by-name/li}/listmonk/package.json (100%) rename pkgs/{servers/mail/listmonk/default.nix => by-name/li/listmonk/package.nix} (100%) rename pkgs/{servers/mail => by-name/li}/listmonk/stuffbin.nix (100%) diff --git a/pkgs/servers/mail/listmonk/frontend.nix b/pkgs/by-name/li/listmonk/frontend.nix similarity index 100% rename from pkgs/servers/mail/listmonk/frontend.nix rename to pkgs/by-name/li/listmonk/frontend.nix diff --git a/pkgs/servers/mail/listmonk/package.json b/pkgs/by-name/li/listmonk/package.json similarity index 100% rename from pkgs/servers/mail/listmonk/package.json rename to pkgs/by-name/li/listmonk/package.json diff --git a/pkgs/servers/mail/listmonk/default.nix b/pkgs/by-name/li/listmonk/package.nix similarity index 100% rename from pkgs/servers/mail/listmonk/default.nix rename to pkgs/by-name/li/listmonk/package.nix diff --git a/pkgs/servers/mail/listmonk/stuffbin.nix b/pkgs/by-name/li/listmonk/stuffbin.nix similarity index 100% rename from pkgs/servers/mail/listmonk/stuffbin.nix rename to pkgs/by-name/li/listmonk/stuffbin.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5ece348a9304..28e5bdbcc809 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26344,8 +26344,6 @@ with pkgs; lighttpd = callPackage ../servers/http/lighttpd { }; - listmonk = callPackage ../servers/mail/listmonk { }; - linx-server = callPackage ../servers/web-apps/linx-server { }; livepeer = callPackage ../servers/livepeer { }; From 038eedd6cb4d45f853dafaa5edf2d3f302e38182 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Fri, 1 Mar 2024 15:58:51 +0100 Subject: [PATCH 109/444] 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 110/444] 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 8db6d06e11417ec3252257d65dd543df4136977a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 1 Mar 2024 22:24:13 +0100 Subject: [PATCH 111/444] python311Packages.constanly: update hash A change of the git_refnames variable in constantly/_version.py is part of the new tarball. No functional changes. Closes: #292658 --- pkgs/development/python-modules/constantly/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/constantly/default.nix b/pkgs/development/python-modules/constantly/default.nix index bee00f7d4fa2..a4bce3f399e4 100644 --- a/pkgs/development/python-modules/constantly/default.nix +++ b/pkgs/development/python-modules/constantly/default.nix @@ -23,7 +23,7 @@ let owner = "twisted"; repo = "constantly"; rev = "refs/tags/${version}"; - hash = "sha256-HTj6zbrCrxvh0PeSkeCSOCloTrVGUX6+o57snrKf6PA="; + hash = "sha256-yXPHQP4B83PuRNvDBnRTx/MaPaQxCl1g5Xrle+N/d7I="; }; nativeBuildInputs = [ From 13f7a8352210fac95110075e6b1b1b931b5b046b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Mar 2024 21:40:28 +0000 Subject: [PATCH 112/444] vscode-extensions.chenglou92.rescript-vscode: 1.16.0 -> 1.42.0 --- .../vscode/extensions/chenglou92.rescript-vscode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index b6273ff3a584..9c82b2ef60f8 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, vscode-utils, callPackage }: let - version = "1.16.0"; + version = "1.42.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = if stdenv.isLinux then "linux" @@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - sha256 = "sha256-JoC9+NkbLAZXkOKDDMB0Xgzmn+w90pHcokerMrdACi4="; + sha256 = "sha256-Po7zuppr8EHSfg2sDzkNn0KARncsiNVPoRsd25zc/xg="; }; postPatch = '' rm -r ${analysisDir} From d0a2096488f2f16105cd487cbd85e5564223d498 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Mar 2024 08:56:01 +0000 Subject: [PATCH 113/444] vscode-extensions.ms-toolsai.jupyter: 2023.2.1000411022 -> 2024.2.0 --- .../editors/vscode/extensions/ms-toolsai.jupyter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix index 9d157bb7b2e0..072d91a7505d 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-toolsai.jupyter/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "jupyter"; publisher = "ms-toolsai"; - version = "2023.2.1000411022"; - sha256 = "sha256-gMK/t/rLXYN3rlHxxVeW0W/FWEP0ZCiEwzM8DY14vYg="; + version = "2024.2.0"; + sha256 = "sha256-QavZ8NNeu0FHLvorhHybzfmdQqKnyXD6MYA8AzabPQw="; }; nativeBuildInputs = [ From 20398d6b56a5b287d22715e05469923a29e39198 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Mar 2024 16:52:59 +0000 Subject: [PATCH 114/444] 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 115/444] 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 116/444] 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 117/444] 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 118/444] 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 119/444] 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 120/444] 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 eee8663094d53d13d50251ea7bd855a17fd31f18 Mon Sep 17 00:00:00 2001 From: Kiskae Date: Sun, 3 Mar 2024 16:22:55 +0100 Subject: [PATCH 121/444] python3Packages.pynvml: remove dependency on cudatoolkit --- pkgs/development/python-modules/pynvml/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/pynvml/default.nix b/pkgs/development/python-modules/pynvml/default.nix index 7a280bfed903..b18fac7652f9 100644 --- a/pkgs/development/python-modules/pynvml/default.nix +++ b/pkgs/development/python-modules/pynvml/default.nix @@ -3,7 +3,6 @@ , fetchPypi , substituteAll , pythonOlder -, cudatoolkit , addOpenGLRunpath }: @@ -25,8 +24,6 @@ buildPythonPackage rec { }) ]; - propagatedBuildInputs = [ cudatoolkit ]; - doCheck = false; # no tests in PyPi dist pythonImportsCheck = [ "pynvml" "pynvml.smi" ]; From 7a1b9accf3cc820f54d44d807e4a468bc78f7d74 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 4 Mar 2024 08:31:34 +0100 Subject: [PATCH 122/444] 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 a5a28bc41e383bc571284412a90e8cf916584479 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 4 Mar 2024 14:47:48 +0100 Subject: [PATCH 123/444] python311Packages.sqlalchemy_1_4: 1.4.51 -> 1.4.52 https://github.com/sqlalchemy/sqlalchemy/releases/tag/rel_1_4_52 --- pkgs/development/python-modules/sqlalchemy/1_4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy/1_4.nix b/pkgs/development/python-modules/sqlalchemy/1_4.nix index 06ffcab2ae32..a630b110314d 100644 --- a/pkgs/development/python-modules/sqlalchemy/1_4.nix +++ b/pkgs/development/python-modules/sqlalchemy/1_4.nix @@ -35,14 +35,14 @@ buildPythonPackage rec { pname = "sqlalchemy"; - version = "1.4.51"; + version = "1.4.52"; pyproject = true; src = fetchFromGitHub { owner = "sqlalchemy"; repo = "sqlalchemy"; rev = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-KhLSKlQ4xfSh1nsAt+cRO+adh2aj/h/iqV6YmDbz39k="; + hash = "sha256-3JiPDOI6KDQwtBtISvHi3d+Rdm0pz1d9cnZu3+f4jYE="; }; postPatch = '' From b69d32b23ccfe0a0d3161edfa4988d88ae32c69d Mon Sep 17 00:00:00 2001 From: Patka Date: Mon, 4 Mar 2024 15:59:16 +0100 Subject: [PATCH 124/444] phpPackages.castor: 0.11.1 -> 0.13.1 Diff: https://github.com/jolicode/castor/compare/v0.11.1...v0.13.1 --- pkgs/development/php-packages/castor/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/php-packages/castor/default.nix b/pkgs/development/php-packages/castor/default.nix index 70d07c1b8c70..241980e93d6f 100644 --- a/pkgs/development/php-packages/castor/default.nix +++ b/pkgs/development/php-packages/castor/default.nix @@ -8,26 +8,25 @@ php.buildComposerProject (finalAttrs: { pname = "castor"; - version = "0.11.1"; + version = "0.13.1"; src = fetchFromGitHub { owner = "jolicode"; repo = "castor"; rev = "v${finalAttrs.version}"; - hash = "sha256-FqFCKvhOEtDERNRLB3613geEiNDOlQuLeCa5uVvoMdM="; + hash = "sha256-Sm6I306iKVr66sBp+ADeTZAKGToVMc+Y/BCymUdszNc="; }; - vendorHash = "sha256-+ORwa3+tkVJ9KU+9URg+1lyHoL1swxg6DG5ex8HjigE="; + vendorHash = "sha256-KbmovAnejShyVclF4IcZ9ckUOWysfEz3DFqE8OxlzI0="; nativeBuildInputs = [ installShellFiles ]; # install shell completions postInstall = '' - echo "yes" | ${php}/bin/php $out/share/php/castor/bin/castor installShellCompletion --cmd castor \ - --bash <(${php}/bin/php $out/share/php/castor/bin/castor completion bash) \ - --fish <(${php}/bin/php $out/share/php/castor/bin/castor completion fish) \ - --zsh <(${php}/bin/php $out/share/php/castor/bin/castor completion zsh) + --bash <($out/bin/castor completion bash) \ + --fish <($out/bin/castor completion fish) \ + --zsh <($out/bin/castor completion zsh) ''; passthru = { From 91797cc880858c297a25182dbde96348bda520f9 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 27 Feb 2024 23:16:16 +0200 Subject: [PATCH 125/444] ut1999: init at 469d --- pkgs/by-name/ut/ut1999/package.nix | 98 ++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 pkgs/by-name/ut/ut1999/package.nix diff --git a/pkgs/by-name/ut/ut1999/package.nix b/pkgs/by-name/ut/ut1999/package.nix new file mode 100644 index 000000000000..92cb223d5467 --- /dev/null +++ b/pkgs/by-name/ut/ut1999/package.nix @@ -0,0 +1,98 @@ +{ lib, stdenv, requireFile, autoPatchelfHook, fetchurl, makeDesktopItem, copyDesktopItems, imagemagick +, runCommand, libgcc, wxGTK32, innoextract, libGL, SDL2, openal, libmpg123, libxmp }: + +let + unpackGog = runCommand "ut1999-gog" { + src = requireFile rec { + name = "setup_ut_goty_2.0.0.5.exe"; + sha256 = "00v8jbqhgb1fry7jvr0i3mb5jscc19niigzjc989qrcp9pamghjc"; + message = '' + Unreal Tournament 1999 requires the official GOG package, version 2.0.0.5. + + Once you download the file, run the following command: + + nix-prefetch-url file://\$PWD/${name} + ''; + }; + + buildInputs = [ innoextract ]; + } '' + innoextract --extract --exclude-temp "$src" + mkdir $out + cp -r app/* $out + ''; +in stdenv.mkDerivation rec { + name = "ut1999"; + version = "469d"; + sourceRoot = "."; + src = fetchurl { + url = "https://github.com/OldUnreal/UnrealTournamentPatches/releases/download/v${version}/OldUnreal-UTPatch${version}-Linux-amd64.tar.bz2"; + hash = "sha256-aoGzWuakwN/OL4+xUq8WEpd2c1rrNN/DkffI2vDVGjs="; + }; + + buildInputs = [ + libgcc + wxGTK32 + SDL2 + libGL + openal + libmpg123 + libxmp + stdenv.cc.cc + ]; + + nativeBuildInputs = [ + copyDesktopItems + autoPatchelfHook + imagemagick + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r ./* $out + + # Remove bundled libraries to use native versions instead + rm $out/System64/libmpg123.so* \ + $out/System64/libopenal.so* \ + $out/System64/libSDL2* \ + $out/System64/libxmp.so* + + chmod -R 755 $out + + ln -s ${unpackGog}/Music $out + ln -s ${unpackGog}/Sounds $out + cp -n ${unpackGog}/Textures/* $out/Textures || true + ln -s ${unpackGog}/Maps $out + cp -n ${unpackGog}/System/*.{u,int} $out/System || true + + ln -s "$out/System64/ut-bin" "$out/bin/ut1999" + ln -s "$out/System64/ucc-bin" "$out/bin/ut1999-ucc" + + convert "${unpackGog}/gfw_high.ico" "ut1999.png" + install -D ut1999-5.png "$out/share/icons/hicolor/256x256/apps/ut1999.png" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ut1999"; + desktopName = "Unreal Tournament GOTY (1999)"; + exec = "ut1999"; + icon = "ut1999"; + comment = "Unreal Tournament GOTY (1999) with the OldUnreal patch."; + categories = [ "Game" ]; + }) + ]; + + meta = with lib; { + description = "Unreal Tournament GOTY (1999) with the OldUnreal patch."; + license = licenses.unfree; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ eliandoran ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "ut1999"; + }; +} From 698efa940c7082844faf2f7f33b79b7794ef099a Mon Sep 17 00:00:00 2001 From: stuebinm Date: Tue, 5 Mar 2024 00:43:29 +0100 Subject: [PATCH 126/444] libidn: add meta.mainProgram --- pkgs/development/libraries/libidn/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index da37ef781b35..59cacfc4466e 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { included. ''; + mainProgram = "idn"; license = lib.licenses.lgpl2Plus; pkgConfigModules = [ "libidn" ]; platforms = lib.platforms.all; From 5440907bd7af21dcffe754f36afe93102f15ad29 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Tue, 5 Mar 2024 00:43:58 +0100 Subject: [PATCH 127/444] libidn2: add meta.mainProgram --- pkgs/development/libraries/libidn2/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libidn2/default.nix b/pkgs/development/libraries/libidn2/default.nix index 8fcbe42650fc..bfe9c2a24264 100644 --- a/pkgs/development/libraries/libidn2/default.nix +++ b/pkgs/development/libraries/libidn2/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { detailed information. ''; + mainProgram = "idn2"; license = with lib.licenses; [ lgpl3Plus gpl2Plus gpl3Plus ]; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ fpletz ]; From 99628aa20617c739c6134c3eff96b0a8d3ad2a18 Mon Sep 17 00:00:00 2001 From: stuebinm Date: Tue, 5 Mar 2024 00:44:12 +0100 Subject: [PATCH 128/444] libidn2: preserve meta information in non-bootstrap version currently, this is lost, resulting in both lib.getExe being wrong and missing package information on e.g. search.nixos.org. --- pkgs/development/libraries/libidn2/no-bootstrap-reference.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix b/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix index e5922073437d..216beb5c48bd 100644 --- a/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix +++ b/pkgs/development/libraries/libidn2/no-bootstrap-reference.nix @@ -8,6 +8,7 @@ runCommandLocal passthru = { inherit (libidn2) out info devdoc; # no need to touch these store paths }; + inherit (libidn2) meta; } '' cp -r '${libidn2.bin}' "$bin" From da85f3bb2c8553742e143cdc8d84bc78cbdee423 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 00:18:37 +0000 Subject: [PATCH 129/444] 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 391ceda581b00e841be7ef49378e656a6334a832 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Tue, 5 Mar 2024 11:27:17 +1100 Subject: [PATCH 130/444] python3Packages.pygame: skip failing tests Fixes #293186 --- .../python-modules/pygame/default.nix | 7 ++--- .../pygame/skip-surface-tests.patch | 26 +++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/python-modules/pygame/skip-surface-tests.patch diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix index ab5727b33add..6bc41339d927 100644 --- a/pkgs/development/python-modules/pygame/default.nix +++ b/pkgs/development/python-modules/pygame/default.nix @@ -59,12 +59,14 @@ buildPythonPackage rec { "${lib.getLib dep}/lib" ]) buildInputs); }) + # Skip tests that should be disabled without video driver + ./skip-surface-tests.patch ]; postPatch = '' substituteInPlace src_py/sysfont.py \ - --replace 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \ - --replace /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list + --replace-fail 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \ + --replace-fail /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list ''; nativeBuildInputs = [ @@ -102,7 +104,6 @@ buildPythonPackage rec { # No audio or video device in test environment export SDL_VIDEODRIVER=dummy export SDL_AUDIODRIVER=disk - export SDL_DISKAUDIOFILE=/dev/null ${python.interpreter} -m pygame.tests -v --exclude opengl,timing --time_out 300 diff --git a/pkgs/development/python-modules/pygame/skip-surface-tests.patch b/pkgs/development/python-modules/pygame/skip-surface-tests.patch new file mode 100644 index 000000000000..21d9c9060f3b --- /dev/null +++ b/pkgs/development/python-modules/pygame/skip-surface-tests.patch @@ -0,0 +1,26 @@ +diff --git a/test/surface_test.py b/test/surface_test.py +index 5ce78b6e..8b8f7ed5 100644 +--- a/test/surface_test.py ++++ b/test/surface_test.py +@@ -1091,6 +1091,10 @@ class GeneralSurfaceTests(unittest.TestCase): + finally: + pygame.display.quit() + ++ @unittest.skipIf( ++ os.environ.get("SDL_VIDEODRIVER") == "dummy", ++ 'requires a non-"dummy" SDL_VIDEODRIVER', ++ ) + def test_convert_init(self): + """Ensure initialization exceptions are raised + for surf.convert().""" +@@ -1118,6 +1122,10 @@ class GeneralSurfaceTests(unittest.TestCase): + finally: + pygame.display.quit() + ++ @unittest.skipIf( ++ os.environ.get("SDL_VIDEODRIVER") == "dummy", ++ 'requires a non-"dummy" SDL_VIDEODRIVER', ++ ) + def test_convert_alpha_init(self): + """Ensure initialization exceptions are raised + for surf.convert_alpha().""" From 113cc2d08679acec1c4e9424a8613682d46781a3 Mon Sep 17 00:00:00 2001 From: Alois Wohlschlager Date: Tue, 5 Mar 2024 09:06:39 +0100 Subject: [PATCH 131/444] kdePackages.baloo: fix systemd unit to actually work The kde-systemd-start-condition binary is not part of baloo. Hence the condition check would fail and baloo would not start automatically. Use a proper path instead. --- pkgs/kde/frameworks/baloo/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/kde/frameworks/baloo/default.nix b/pkgs/kde/frameworks/baloo/default.nix index 517e5285a4e0..40ab00ebd193 100644 --- a/pkgs/kde/frameworks/baloo/default.nix +++ b/pkgs/kde/frameworks/baloo/default.nix @@ -6,5 +6,10 @@ mkKdeDerivation { pname = "baloo"; + # kde-systemd-start-condition is not part of baloo + postPatch = '' + substituteInPlace src/file/kde-baloo.service.in --replace-fail @KDE_INSTALL_FULL_BINDIR@/kde-systemd-start-condition /run/current-system/sw/bin/kde-systemd-start-condition + ''; + extraBuildInputs = [qtdeclarative lmdb]; } From f436504b4abb5d25826021ee2ec4d908e713cd1a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 5 Mar 2024 07:49:45 -0300 Subject: [PATCH 132/444] jasper: does not split outputs when Darwin --- pkgs/by-name/ja/jasper/package.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index cd61d3b9be52..3bbaef90f536 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -23,7 +23,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-SE3zB+8zZuuT+W6QYTuQhM+dBgYuFzYK4a7QaquGB60="; }; - outputs = [ "out" "dev" "doc" "lib" "man" ]; + # Splitting outputs going bad on Darwin + outputs = if stdenv.isDarwin + then [ "out" ] + else [ "out" "dev" "doc" "lib" "man" ]; nativeBuildInputs = [ cmake From ee3d9ef0a91e125d05b0ec5f723ee747af72ebf1 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 5 Mar 2024 07:50:10 -0300 Subject: [PATCH 133/444] jasper: cosmetic reword on meta --- pkgs/by-name/ja/jasper/package.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 3bbaef90f536..88665973596a 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -78,12 +78,13 @@ stdenv.mkDerivation (finalAttrs: { was chosen primarily due to the availability of C development environments for most computing platforms when JasPer was first developed, circa 1999. ''; - license = lib.licenses.mit; + license = with lib.licenses; [ mit ]; mainProgram = "jasper"; maintainers = with lib.maintainers; [ AndersonTorres ]; platforms = lib.platforms.unix; - - # The value of __STDC_VERSION__ cannot be automatically determined when cross-compiling. + # The value of __STDC_VERSION__ cannot be automatically determined when + # cross-compiling. broken = stdenv.buildPlatform != stdenv.hostPlatform; }; }) +# TODO: investigate opengl support From 14a12caecffdba81e6ccba5cba9cd3b38cb4571e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 2 Feb 2024 12:10:19 +0100 Subject: [PATCH 134/444] python38: remove The end of life for Python 3.8 is scheduled for 2024/10. As such it cannot be a part of NixOS 24.05, because its support cycle goes past that. --- doc/languages-frameworks/python.section.md | 2 -- .../compilers/gcc-arm-embedded/11/default.nix | 8 ++++---- .../compilers/gcc-arm-embedded/12/default.nix | 8 ++++---- .../compilers/gcc-arm-embedded/13/default.nix | 8 ++++---- pkgs/development/interpreters/python/default.nix | 13 ------------- .../development/libraries/qt-5/modules/qtwebkit.nix | 4 ++-- pkgs/top-level/all-packages.nix | 13 +++---------- 7 files changed, 17 insertions(+), 39 deletions(-) diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 6634dced6eb7..4938d3c96616 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -7,7 +7,6 @@ | Package | Aliases | Interpreter | |------------|-----------------|-------------| | python27 | python2, python | CPython 2.7 | -| python38 | | CPython 3.8 | | python39 | | CPython 3.9 | | python310 | | CPython 3.10 | | python311 | python3 | CPython 3.11 | @@ -60,7 +59,6 @@ sets are * `pkgs.python27Packages` * `pkgs.python3Packages` -* `pkgs.python38Packages` * `pkgs.python39Packages` * `pkgs.python310Packages` * `pkgs.python311Packages` diff --git a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix index ad132f5bbf6c..4ed1ac9b99b0 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/11/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/11/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses5 -, python38 +, python39 , libxcrypt-legacy , runtimeShell }: @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true done ''; @@ -48,8 +48,8 @@ stdenv.mkDerivation rec { mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped cat < $out/bin/arm-none-eabi-gdb #!${runtimeShell} - export PYTHONPATH=${python38}/lib/python3.8 - export PYTHONHOME=${python38}/bin/python3.8 + export PYTHONPATH=${python39}/lib/python3.9 + export PYTHONHOME=${python39.interpreter} exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" EOF chmod +x $out/bin/arm-none-eabi-gdb diff --git a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix index 8f18579f93f6..0407cfa71e09 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/12/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/12/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses5 -, python38 +, python39 , libxcrypt-legacy , runtimeShell }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true done ''; @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped cat < $out/bin/arm-none-eabi-gdb #!${runtimeShell} - export PYTHONPATH=${python38}/lib/python3.8 - export PYTHONHOME=${python38}/bin/python3.8 + export PYTHONPATH=${python39}/lib/python3.9 + export PYTHONHOME=${python39.interpreter} exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" EOF chmod +x $out/bin/arm-none-eabi-gdb diff --git a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix index 14d7d215a00d..a16348dad02c 100644 --- a/pkgs/development/compilers/gcc-arm-embedded/13/default.nix +++ b/pkgs/development/compilers/gcc-arm-embedded/13/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchurl , ncurses5 -, python38 +, python39 , libxcrypt-legacy , runtimeShell }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { find $out -type f | while read f; do patchelf "$f" > /dev/null 2>&1 || continue patchelf --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) "$f" || true - patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python38 libxcrypt-legacy ]} "$f" || true + patchelf --set-rpath ${lib.makeLibraryPath [ "$out" stdenv.cc.cc ncurses5 python39 libxcrypt-legacy ]} "$f" || true done ''; @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { mv $out/bin/arm-none-eabi-gdb $out/bin/arm-none-eabi-gdb-unwrapped cat < $out/bin/arm-none-eabi-gdb #!${runtimeShell} - export PYTHONPATH=${python38}/lib/python3.8 - export PYTHONHOME=${python38}/bin/python3.8 + export PYTHONPATH=${python39}/lib/python3.9 + export PYTHONHOME=${python39.interpreter} exec $out/bin/arm-none-eabi-gdb-unwrapped "\$@" EOF chmod +x $out/bin/arm-none-eabi-gdb diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 95d2ca33558d..12050f319fc0 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -42,19 +42,6 @@ in { inherit passthruFun; }; - python38 = callPackage ./cpython { - self = __splicedPackages.python38; - sourceVersion = { - major = "3"; - minor = "8"; - patch = "18"; - suffix = ""; - }; - hash = "sha256-P/txzTSaMmunsvrcfn34a6V33ZxJF+UqhAGtvadAXj8="; - inherit (darwin) configd; - inherit passthruFun; - }; - python39 = callPackage ./cpython { self = __splicedPackages.python39; sourceVersion = { diff --git a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix index 9c5d347d110b..bd05954ddb35 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix @@ -2,7 +2,7 @@ , qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel , fontconfig, libwebp, libxml2, libxslt , sqlite, systemd, glib, gst_all_1, cmake -, bison, flex, gdb, gperf, perl, pkg-config, python38, ruby +, bison, flex, gdb, gperf, perl, pkg-config, python3, ruby , ICU, OpenGL }: @@ -26,7 +26,7 @@ qtModule { ++ lib.optional stdenv.isDarwin qtmultimedia; buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base hyphen ] ++ lib.optionals stdenv.isDarwin [ ICU OpenGL ]; - nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python38 ruby cmake ]; + nativeBuildInputs = [ bison flex gdb gperf perl pkg-config python3 ruby cmake ]; cmakeFlags = [ "-DPORT=Qt" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d41b1143bf1f..71326224b1a9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8718,7 +8718,7 @@ with pkgs; google-clasp = callPackage ../development/tools/google-clasp { }; - google-compute-engine = with python38.pkgs; toPythonApplication google-compute-engine; + google-compute-engine = with python3.pkgs; toPythonApplication google-compute-engine; google-guest-oslogin = callPackage ../tools/virtualization/google-guest-oslogin { }; @@ -17708,12 +17708,6 @@ with pkgs; bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; x11Support = true; }; - python38Full = python38.override { - self = python38Full; - pythonAttr = "python38Full"; - bluezSupport = lib.meta.availableOn stdenv.hostPlatform bluez; - x11Support = true; - }; python39Full = python39.override { self = python39Full; pythonAttr = "python39Full"; @@ -17746,13 +17740,12 @@ with pkgs; }; pythonInterpreters = callPackage ./../development/interpreters/python { }; - inherit (pythonInterpreters) python27 python38 python39 python310 python311 python312 python313 python3Minimal pypy27 pypy310 pypy39 rustpython; + inherit (pythonInterpreters) python27 python39 python310 python311 python312 python313 python3Minimal pypy27 pypy310 pypy39 rustpython; # List of extensions with overrides to apply to all Python package sets. pythonPackagesExtensions = [ ]; # Python package sets. python27Packages = python27.pkgs // { __attrsFailEvaluation = true; }; - python38Packages = python38.pkgs // { __attrsFailEvaluation = true; }; python39Packages = python39.pkgs // { __attrsFailEvaluation = true; }; python310Packages = python310.pkgs // { __attrsFailEvaluation = true; }; python311Packages = recurseIntoAttrs python311.pkgs // { pythonPackages = python311.pkgs // { __attrsFailEvaluation = true; }; }; @@ -25179,7 +25172,7 @@ with pkgs; vale = callPackage ../tools/text/vale { }; valhalla = callPackage ../development/libraries/valhalla { - boost = boost.override { enablePython = true; python = python38; }; + boost = boost.override { enablePython = true; python = python3; }; protobuf = protobuf_21.override { abseil-cpp = abseil-cpp_202103.override { cxxStandard = "17"; From 43c71c9329cd5f640c5f0942b168e6a83f40e884 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 12:19:17 +0000 Subject: [PATCH 135/444] ashuffle: 3.14.3 -> 3.14.7 --- pkgs/applications/audio/ashuffle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ashuffle/default.nix b/pkgs/applications/audio/ashuffle/default.nix index dca87485913d..475ecd26e706 100644 --- a/pkgs/applications/audio/ashuffle/default.nix +++ b/pkgs/applications/audio/ashuffle/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ashuffle"; - version = "3.14.3"; + version = "3.14.7"; src = fetchFromGitHub { owner = "joshkunz"; repo = "ashuffle"; rev = "v${version}"; - hash = "sha256-C7LClzVganE2DvucHw6euNRw2r36vhhCQlhWlkwWPwk="; + hash = "sha256-id55Ss/7PLBPn55RikAlqr3VkNzgm8NiL/ruFGAmH30="; fetchSubmodules = true; }; From b23b5142c0bb81e7fab2660bcbb60bb6c342543c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 12:19:43 +0000 Subject: [PATCH 136/444] swaysome: 2.1.0 -> 2.1.1 --- pkgs/tools/wayland/swaysome/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/swaysome/default.nix b/pkgs/tools/wayland/swaysome/default.nix index 308592e450f9..a4f042d99161 100644 --- a/pkgs/tools/wayland/swaysome/default.nix +++ b/pkgs/tools/wayland/swaysome/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "swaysome"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitLab { owner = "hyask"; repo = pname; rev = version; - sha256 = "sha256-U5W/9VL1t1/R4ADPxseBV6CMKx04I4vbp7sFmSqRZXk="; + sha256 = "sha256-HRLMfpnqjDgkOIaH/7DxeYzoZn/0c0KUAmir8XIwesg="; }; - cargoHash = "sha256-QA3EQsYgjwx8QX50yaxiJyAPDlpYYqiqLiXco1kJmw0="; + cargoHash = "sha256-e5B90tIiXxuaRseok69EN4xuoRlCyiTVgEcAqvVg/dM="; meta = with lib; { description = "Helper to make sway behave more like awesomewm"; From ba19ffaa8f187d4b785a62884c7c8c4e065ab220 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 12:22:12 +0000 Subject: [PATCH 137/444] krr: 1.7.0 -> 1.7.1 --- pkgs/by-name/kr/krr/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/kr/krr/package.nix b/pkgs/by-name/kr/krr/package.nix index d1819a749943..d48fe1b2d480 100644 --- a/pkgs/by-name/kr/krr/package.nix +++ b/pkgs/by-name/kr/krr/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonPackage rec { pname = "krr"; - version = "1.7.0"; + version = "1.7.1"; pyproject = true; src = fetchFromGitHub { owner = "robusta-dev"; repo = "krr"; rev = "refs/tags/v${version}"; - hash = "sha256-8K97v/8lsLqr88MSOT3peOy0GZp1so9GaipG/t2uR88="; + hash = "sha256-Bc1Ql3z/UmOXE2RJYC5/sE4a3MFdE06I3HwKY+SdSlk="; }; postPatch = '' From 6b84bc1cc75b85e43d13cf2b8e1660b06ca4a8a7 Mon Sep 17 00:00:00 2001 From: Jan Votava Date: Tue, 5 Mar 2024 13:42:19 +0100 Subject: [PATCH 138/444] timoni: 0.17.0 -> 0.20.0 --- .../applications/networking/cluster/timoni/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/cluster/timoni/default.nix b/pkgs/applications/networking/cluster/timoni/default.nix index 4ae26898e51c..0efc9bb50055 100644 --- a/pkgs/applications/networking/cluster/timoni/default.nix +++ b/pkgs/applications/networking/cluster/timoni/default.nix @@ -1,21 +1,21 @@ { lib -, buildGoModule +, buildGo122Module , fetchFromGitHub , installShellFiles }: -buildGoModule rec { +buildGo122Module rec { pname = "timoni"; - version = "0.17.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "stefanprodan"; repo = "timoni"; rev = "v${version}"; - hash = "sha256-KhDig31BGMmKVrLVFcTXNKjsyAUTb6KEX5PJV2rkMgM="; + hash = "sha256-zQawfzwQNQvtta7lIOtePGI67Y4iXzEBGqd5YiOKAVY="; }; - vendorHash = "sha256-3RbWHLQLLh/omGttY2wWv2nsuuTE8ALAqgQaiJY/EjI="; + vendorHash = "sha256-xQgSABaWY5FWHh2kcBB36fm3povFNpU18PjD4J6M4QM="; subPackages = [ "cmd/timoni" ]; nativeBuildInputs = [ installShellFiles ]; From d4ea94737925e734e62bc733bf664a03cd0aa7c1 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 5 Mar 2024 14:31:33 +0100 Subject: [PATCH 139/444] 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 5c74ce2762a35516409095f4534db7224bc91b8f Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 5 Mar 2024 14:32:49 +0100 Subject: [PATCH 140/444] mkKdeDerivation: set the expected UTF-8 environment --- pkgs/kde/lib/mk-kde-derivation.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/kde/lib/mk-kde-derivation.nix b/pkgs/kde/lib/mk-kde-derivation.nix index 80508eebb7d4..042c7531f07e 100644 --- a/pkgs/kde/lib/mk-kde-derivation.nix +++ b/pkgs/kde/lib/mk-kde-derivation.nix @@ -100,6 +100,8 @@ in cmakeFlags = ["-DQT_MAJOR_VERSION=6"] ++ extraCmakeFlags; separateDebugInfo = true; + + env.LANG = "C.UTF-8"; }; cleanArgs = builtins.removeAttrs args [ From d73e602b444013792cefd116d98126aa51830994 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 5 Mar 2024 14:38:54 +0100 Subject: [PATCH 141/444] gromacs: 2024 -> 2024.1 --- .../science/molecular-dynamics/gromacs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index fe4d965b7778..6ab9ec5d9cc3 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -45,8 +45,8 @@ let } else { - version = "2024"; - hash = "sha256-BNIm1SBmqLw6QuANYhPec3tOwpLiZwMGWST/AZVoAeI="; + version = "2024.1"; + hash = "sha256-k32PEqNv/78q963XGtu1qlxVN4ktRsmnavvsqxqgqsc="; }; in stdenv.mkDerivation rec { From bb7c4fc1fdaa28ed1eb56fa865d1428bd3d419df Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Tue, 5 Mar 2024 14:44:23 +0100 Subject: [PATCH 142/444] 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 143/444] 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 144/444] 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 145/444] 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 146/444] 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 147/444] 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 148/444] 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 149/444] 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 150/444] 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 de1ff3a0079472eae27799ea5d3feb6e20ff4a77 Mon Sep 17 00:00:00 2001 From: Martin Landa Date: Tue, 5 Mar 2024 15:45:03 +0100 Subject: [PATCH 151/444] grass: remove default configure options --- pkgs/applications/gis/grass/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/applications/gis/grass/default.nix b/pkgs/applications/gis/grass/default.nix index 7dbe74703766..c100c9dd1441 100644 --- a/pkgs/applications/gis/grass/default.nix +++ b/pkgs/applications/gis/grass/default.nix @@ -93,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-blas" - "--with-fftw" "--with-geos" # It complains about missing libmysqld but doesn't really seem to need it "--with-mysql" @@ -107,10 +106,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-proj-share=${proj}/share/proj" "--with-pthread" "--with-readline" - "--with-zstd" "--without-opengl" - ] ++ lib.optionals stdenv.isLinux [ - "--with-pdal" ] ++ lib.optionals stdenv.isDarwin [ "--without-cairo" "--without-freetype" From 9cd71e54a3025c3536528423a29f21a49770dd51 Mon Sep 17 00:00:00 2001 From: a-kenji Date: Thu, 15 Feb 2024 11:46:09 +0100 Subject: [PATCH 152/444] 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 153/444] 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 154/444] 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 e4244a024a0a4d399926dfe918858bd0d671806e Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 5 Mar 2024 19:01:46 +0400 Subject: [PATCH 155/444] =?UTF-8?q?mqttui:=200.19.0=20=E2=86=92=200.20.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/networking/mqttui/Cargo.lock | 1771 ++++++++++++++++++++++ pkgs/tools/networking/mqttui/default.nix | 19 +- 2 files changed, 1785 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/networking/mqttui/Cargo.lock diff --git a/pkgs/tools/networking/mqttui/Cargo.lock b/pkgs/tools/networking/mqttui/Cargo.lock new file mode 100644 index 000000000000..fd3db1ec8702 --- /dev/null +++ b/pkgs/tools/networking/mqttui/Cargo.lock @@ -0,0 +1,1771 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "addr2line" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + +[[package]] +name = "ahash" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d713b3834d76b85304d4d525563c1276e2e30dc97cc67bfb4585a4a29fc2c89f" +dependencies = [ + "cfg-if", + "once_cell", + "version_check", + "zerocopy", +] + +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "android-tzdata" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" + +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + +[[package]] +name = "anstream" +version = "0.6.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96b09b5178381e0874812a9b157f7fe84982617e48f71f4e3235482775e5b540" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + +[[package]] +name = "anyhow" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" + +[[package]] +name = "async-tungstenite" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1e9efbe14612da0a19fb983059a0b621e9cf6225d7018ecab4f9988215540dc" +dependencies = [ + "futures-io", + "futures-util", + "log", + "pin-project-lite", + "rustls-native-certs", + "tokio", + "tokio-rustls", + "tungstenite", +] + +[[package]] +name = "async_io_stream" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" +dependencies = [ + "futures", + "pharos", + "rustc_version", + "tokio", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "backtrace" +version = "0.3.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + +[[package]] +name = "base64" +version = "0.21.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" + +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + +[[package]] +name = "bumpalo" +version = "3.15.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + +[[package]] +name = "bytes" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" + +[[package]] +name = "cassowary" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" + +[[package]] +name = "castaway" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a17ed5635fc8536268e5d4de1e22e81ac34419e5f052d4d51f4e01dcc263fcc" +dependencies = [ + "rustversion", +] + +[[package]] +name = "cc" +version = "1.0.88" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "chrono" +version = "0.4.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +dependencies = [ + "android-tzdata", + "iana-time-zone", + "num-traits", + "windows-targets 0.52.3", +] + +[[package]] +name = "clap" +version = "4.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim", + "terminal_size", +] + +[[package]] +name = "clap_complete" +version = "4.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_derive" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "clap_lex" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" + +[[package]] +name = "clap_mangen" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1dd95b5ebb5c1c54581dd6346f3ed6a79a3eef95dd372fc2ac13d535535300e" +dependencies = [ + "clap", + "roff", +] + +[[package]] +name = "colorchoice" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" + +[[package]] +name = "compact_str" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +dependencies = [ + "castaway", + "cfg-if", + "itoa", + "ryu", + "static_assertions", +] + +[[package]] +name = "core-foundation" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "core-foundation-sys" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" + +[[package]] +name = "cpufeatures" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +dependencies = [ + "libc", +] + +[[package]] +name = "crossterm" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df" +dependencies = [ + "bitflags 2.4.2", + "crossterm_winapi", + "libc", + "mio", + "parking_lot", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + +[[package]] +name = "data-encoding" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" + +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + +[[package]] +name = "ego-tree" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a68a4904193147e0a8dec3314640e6db742afd5f6e634f428a6af230d9b3591" + +[[package]] +name = "either" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" + +[[package]] +name = "errno" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "flume" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" +dependencies = [ + "futures-core", + "futures-sink", + "spin", +] + +[[package]] +name = "fnv" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" + +[[package]] +name = "form_urlencoded" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" +dependencies = [ + "percent-encoding", +] + +[[package]] +name = "futures" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-channel" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" + +[[package]] +name = "futures-executor" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" +dependencies = [ + "futures-core", + "futures-task", + "futures-util", +] + +[[package]] +name = "futures-io" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" + +[[package]] +name = "futures-macro" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "futures-sink" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" + +[[package]] +name = "futures-task" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" + +[[package]] +name = "futures-util" +version = "0.3.30" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check", +] + +[[package]] +name = "getrandom" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +dependencies = [ + "cfg-if", + "libc", + "wasi", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" + +[[package]] +name = "hashbrown" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +dependencies = [ + "ahash", + "allocator-api2", +] + +[[package]] +name = "heck" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" + +[[package]] +name = "http" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + +[[package]] +name = "httparse" +version = "1.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" + +[[package]] +name = "iana-time-zone" +version = "0.1.60" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + +[[package]] +name = "indoc" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" + +[[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.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" + +[[package]] +name = "js-sys" +version = "0.3.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +dependencies = [ + "wasm-bindgen", +] + +[[package]] +name = "libc" +version = "0.2.153" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" + +[[package]] +name = "linux-raw-sys" +version = "0.4.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + +[[package]] +name = "log" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" + +[[package]] +name = "lru" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" +dependencies = [ + "hashbrown", +] + +[[package]] +name = "memchr" +version = "2.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" + +[[package]] +name = "miniz_oxide" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +dependencies = [ + "adler", +] + +[[package]] +name = "mio" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.48.0", +] + +[[package]] +name = "mqttui" +version = "0.20.0" +dependencies = [ + "anyhow", + "chrono", + "clap", + "clap_complete", + "clap_mangen", + "crossterm", + "ego-tree", + "rand", + "ratatui", + "ratatui-binary-data-widget", + "rmpv", + "rumqttc", + "rustls", + "rustls-native-certs", + "rustls-pemfile", + "serde_json", + "tui-tree-widget", + "url", +] + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +dependencies = [ + "autocfg", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +dependencies = [ + "memchr", +] + +[[package]] +name = "once_cell" +version = "1.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" + +[[package]] +name = "openssl-probe" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets 0.48.5", +] + +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + +[[package]] +name = "percent-encoding" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" + +[[package]] +name = "pharos" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" +dependencies = [ + "futures", + "rustc_version", +] + +[[package]] +name = "pin-project-lite" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + +[[package]] +name = "ppv-lite86" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" + +[[package]] +name = "proc-macro2" +version = "1.0.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +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 = "ratatui" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bcb12f8fbf6c62614b0d56eb352af54f6a22410c3b079eb53ee93c7b97dd31d8" +dependencies = [ + "bitflags 2.4.2", + "cassowary", + "compact_str", + "crossterm", + "indoc", + "itertools", + "lru", + "paste", + "stability", + "strum", + "unicode-segmentation", + "unicode-width", +] + +[[package]] +name = "ratatui-binary-data-widget" +version = "0.1.0" +source = "git+https://github.com/EdJoPaTo/ratatui-binary-data-widget?branch=main#dcc0ef5e9492b6e638d0bf0ca0e9eb94f47e3795" +dependencies = [ + "ratatui", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if", + "getrandom", + "libc", + "spin", + "untrusted", + "windows-sys 0.52.0", +] + +[[package]] +name = "rmp" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +dependencies = [ + "byteorder", + "num-traits", + "paste", +] + +[[package]] +name = "rmpv" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e0e0214a4a2b444ecce41a4025792fc31f77c7bb89c46d253953ea8c65701ec" +dependencies = [ + "num-traits", + "rmp", +] + +[[package]] +name = "roff" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" + +[[package]] +name = "rumqttc" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8d8941c6791801b667d52bfe9ff4fc7c968d4f3f9ae8ae7abdaaa1c966feafc8" +dependencies = [ + "async-tungstenite", + "bytes", + "flume", + "futures-util", + "http", + "log", + "rustls-native-certs", + "rustls-pemfile", + "rustls-webpki", + "thiserror", + "tokio", + "tokio-rustls", + "ws_stream_tungstenite", +] + +[[package]] +name = "rustc-demangle" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" + +[[package]] +name = "rustc_version" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +dependencies = [ + "semver", +] + +[[package]] +name = "rustix" +version = "0.38.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys", + "windows-sys 0.52.0", +] + +[[package]] +name = "rustls" +version = "0.21.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + +[[package]] +name = "rustls-native-certs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" +dependencies = [ + "openssl-probe", + "rustls-pemfile", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" + +[[package]] +name = "schannel" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] +name = "sct" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" +dependencies = [ + "ring", + "untrusted", +] + +[[package]] +name = "security-framework" +version = "2.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-foundation-sys", + "libc", + "security-framework-sys", +] + +[[package]] +name = "security-framework-sys" +version = "2.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +dependencies = [ + "core-foundation-sys", + "libc", +] + +[[package]] +name = "semver" +version = "1.0.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" + +[[package]] +name = "serde" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.197" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "serde_json" +version = "1.0.114" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + +[[package]] +name = "signal-hook" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" +dependencies = [ + "libc", +] + +[[package]] +name = "slab" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg", +] + +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + +[[package]] +name = "socket2" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" +dependencies = [ + "lock_api", +] + +[[package]] +name = "stability" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" +dependencies = [ + "quote", + "syn 1.0.109", +] + +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + +[[package]] +name = "strsim" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" + +[[package]] +name = "strum" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.51", +] + +[[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.51" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ab617d94515e94ae53b8406c628598680aa0c9587474ecbe58188f7b345d66c" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "terminal_size" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" +dependencies = [ + "rustix", + "windows-sys 0.48.0", +] + +[[package]] +name = "thiserror" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.57" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "tinyvec" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +dependencies = [ + "backtrace", + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2", + "tokio-macros", + "windows-sys 0.48.0", +] + +[[package]] +name = "tokio-macros" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "tokio-rustls" +version = "0.24.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tracing" +version = "0.1.40" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +dependencies = [ + "pin-project-lite", + "tracing-attributes", + "tracing-core", +] + +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", +] + +[[package]] +name = "tracing-core" +version = "0.1.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +dependencies = [ + "once_cell", +] + +[[package]] +name = "tui-tree-widget" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb0c6f924587e719c50b8f83485afbe4d4c16edca6b641d5d9a3204edeba5cf0" +dependencies = [ + "ratatui", + "unicode-width", +] + +[[package]] +name = "tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http", + "httparse", + "log", + "rand", + "rustls", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "unicode-bidi" +version = "0.3.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" + +[[package]] +name = "unicode-ident" +version = "1.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" + +[[package]] +name = "unicode-normalization" +version = "0.1.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "unicode-segmentation" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" + +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +dependencies = [ + "form_urlencoded", + "idna", + "percent-encoding", +] + +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "version_check" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" + +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + +[[package]] +name = "wasm-bindgen" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2", + "quote", + "syn 2.0.51", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.51", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.91" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" + +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-core" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +dependencies = [ + "windows-targets 0.52.3", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.3", +] + +[[package]] +name = "windows-targets" +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", +] + +[[package]] +name = "windows-targets" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" +dependencies = [ + "windows_aarch64_gnullvm 0.52.3", + "windows_aarch64_msvc 0.52.3", + "windows_i686_gnu 0.52.3", + "windows_i686_msvc 0.52.3", + "windows_x86_64_gnu 0.52.3", + "windows_x86_64_gnullvm 0.52.3", + "windows_x86_64_msvc 0.52.3", +] + +[[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_gnullvm" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" + +[[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_gnu" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_i686_msvc" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" + +[[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_gnu" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" + +[[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_gnullvm" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" + +[[package]] +name = "ws_stream_tungstenite" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e283cc794a890f5bdc01e358ad7c34535025f79ba83c1b5c7e01e5d6c60b336d" +dependencies = [ + "async-tungstenite", + "async_io_stream", + "bitflags 2.4.2", + "futures-core", + "futures-io", + "futures-sink", + "futures-util", + "pharos", + "rustc_version", + "tokio", + "tracing", + "tungstenite", +] + +[[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.51", +] diff --git a/pkgs/tools/networking/mqttui/default.nix b/pkgs/tools/networking/mqttui/default.nix index e457fa7479b1..73253a86d752 100644 --- a/pkgs/tools/networking/mqttui/default.nix +++ b/pkgs/tools/networking/mqttui/default.nix @@ -7,16 +7,25 @@ rustPlatform.buildRustPackage rec { pname = "mqttui"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "EdJoPaTo"; - repo = pname; + repo = "mqttui"; rev = "refs/tags/v${version}"; - hash = "sha256-cezG9hdHOeTExX4OJwJ22e/PvfdySPzQGwxumavV++Q="; + hash = "sha256-NfRPuZFZMZl1ulEGD5oQkS25oJdBVyLiN3QCQWrDej8="; }; - cargoHash = "sha256-vSlziZtjyzsd346qUBEPEl8I3UlPhWHRu4+FiD1XqOo="; + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "ratatui-binary-data-widget-0.1.0" = "sha256-4/8ZZag7vpEXnh6wJvZkgGLrOQNJXsnek3gFG/F0+zY="; + }; + }; + + postPatch = '' + ln -sf ${./Cargo.lock} Cargo.lock + ''; buildInputs = lib.optional stdenv.isDarwin Security; @@ -25,7 +34,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/EdJoPaTo/mqttui"; changelog = "https://github.com/EdJoPaTo/mqttui/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3Only; - maintainers = with maintainers; [ fab ]; + maintainers = with maintainers; [ fab sikmir ]; mainProgram = "mqttui"; }; } From 29e93ac454e0dd760a5e257771184f8f6eac7e73 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 5 Mar 2024 19:07:08 +0400 Subject: [PATCH 156/444] mqttui: migrate to by-name --- pkgs/{tools/networking => by-name/mq}/mqttui/Cargo.lock | 0 .../mqttui/default.nix => by-name/mq/mqttui/package.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) rename pkgs/{tools/networking => by-name/mq}/mqttui/Cargo.lock (100%) rename pkgs/{tools/networking/mqttui/default.nix => by-name/mq/mqttui/package.nix} (90%) diff --git a/pkgs/tools/networking/mqttui/Cargo.lock b/pkgs/by-name/mq/mqttui/Cargo.lock similarity index 100% rename from pkgs/tools/networking/mqttui/Cargo.lock rename to pkgs/by-name/mq/mqttui/Cargo.lock diff --git a/pkgs/tools/networking/mqttui/default.nix b/pkgs/by-name/mq/mqttui/package.nix similarity index 90% rename from pkgs/tools/networking/mqttui/default.nix rename to pkgs/by-name/mq/mqttui/package.nix index 73253a86d752..6c7ca4cb4629 100644 --- a/pkgs/tools/networking/mqttui/default.nix +++ b/pkgs/by-name/mq/mqttui/package.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , rustPlatform -, Security +, darwin }: rustPlatform.buildRustPackage rec { @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec { ln -sf ${./Cargo.lock} Cargo.lock ''; - buildInputs = lib.optional stdenv.isDarwin Security; + buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; meta = with lib; { description = "Terminal client for MQTT"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a52ea0f43ace..5b3782730a82 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23781,10 +23781,6 @@ with pkgs; mqttmultimeter = callPackage ../tools/networking/mqttmultimeter { }; - mqttui = callPackage ../tools/networking/mqttui { - inherit (darwin.apple_sdk.frameworks) Security; - }; - msgpack = callPackage ../development/libraries/msgpack { }; msgpack-c = callPackage ../development/libraries/msgpack-c { }; From 573e79f45d2c6db7b14d430353f6be2480aeb250 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 15:07:31 +0000 Subject: [PATCH 157/444] python312Packages.bugsnag: 4.6.1 -> 4.6.2 --- pkgs/development/python-modules/bugsnag/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index c97947a28596..a20770673fb5 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "4.6.1"; + version = "4.6.2"; format = "setuptools"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - hash = "sha256-GzpupL+wE2JJPT92O6yZNWZowo6fXzUvkuBDtKL1Hao="; + hash = "sha256-UwlT4a0jzp6vo5ZpB/o3MKJAFHpaDJBcaQvFoctS120="; }; propagatedBuildInputs = [ From 3034110d446465919ab77cdcb36cbb84c4b19457 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 15:29:22 +0000 Subject: [PATCH 158/444] python312Packages.libarchive-c: 5.0 -> 5.1 --- pkgs/development/python-modules/libarchive-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libarchive-c/default.nix b/pkgs/development/python-modules/libarchive-c/default.nix index 43f2e11ef3df..da2f4525e3d6 100644 --- a/pkgs/development/python-modules/libarchive-c/default.nix +++ b/pkgs/development/python-modules/libarchive-c/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "libarchive-c"; - version = "5.0"; + version = "5.1"; format = "setuptools"; src = fetchFromGitHub { owner = "Changaco"; repo = "python-${pname}"; rev = "refs/tags/${version}"; - sha256 = "sha256-8e3Tnek5q5NJneSVIrbFNTQPjHZ7Ieb14uiKjQwufTE="; + sha256 = "sha256-CO9llPIbVTuE74AeohrMAu5ICkuT/MorRlYEEFne6Uk="; }; LC_ALL="en_US.UTF-8"; From a8f26bea8c42e5a3401189148df6e03010cdf078 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 15:29:28 +0000 Subject: [PATCH 159/444] cpp-utilities: 5.24.6 -> 5.24.7 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 54a8637ebe21..49ebc34fbcf2 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.24.6"; + version = "5.24.7"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Lzt/lINfYvzabBbEUdNbF4Ta767WgMre2dxBkMbQnp0="; + sha256 = "sha256-gfyvWnvUXgjocid0nvp3lWhdPb7MYm+1GJRP5RYInEY="; }; nativeBuildInputs = [ cmake ]; From d1be512863f83fd328ad8ac7fbd503c5863aec1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 15:29:31 +0000 Subject: [PATCH 160/444] circleci-cli: 0.1.30163 -> 0.1.30401 --- pkgs/development/tools/misc/circleci-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index ec4cf5fd31cc..5b3ac8eeb27f 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.30163"; + version = "0.1.30401"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RxXqlOwcnA/ibii+x/pP3OtJngfibrsaDd0RD3dNK+Y="; + sha256 = "sha256-ebZEZ24KQgGOimCIRHlI5Uwv1dO1W7s0dTrY/n3y9Ao="; }; - vendorHash = "sha256-Ko2y/3h/SZk5aDympMT7nkZqXU1JsvKOaztKm8A8YXQ="; + vendorHash = "sha256-GOC1ZL0F/VwLuQ5d8OpAczw59lnyindp8LKmBd+jwgI="; nativeBuildInputs = [ installShellFiles ]; From 1cc12af83ea967f29ad12d6705eee3b781050599 Mon Sep 17 00:00:00 2001 From: Mike cm Date: Tue, 5 Mar 2024 15:50:04 +0000 Subject: [PATCH 161/444] python311Packages.wsgi-intercept: 1.12.1->1.13.0 --- .../python-modules/wsgi-intercept/default.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/wsgi-intercept/default.nix b/pkgs/development/python-modules/wsgi-intercept/default.nix index 6e943a0b34f7..fcc8551f7294 100644 --- a/pkgs/development/python-modules/wsgi-intercept/default.nix +++ b/pkgs/development/python-modules/wsgi-intercept/default.nix @@ -7,22 +7,27 @@ , pytestCheckHook , pythonOlder , requests +, setuptools , urllib3 }: buildPythonPackage rec { pname = "wsgi-intercept"; - version = "1.12.1"; - format = "setuptools"; + version = "1.13.0"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { pname = "wsgi_intercept"; inherit version; - hash = "sha256-StUxEN91fU7qoptH9iKJFpZWIBIOtIe6S4gvdBgN48E="; + hash = "sha256-daA+HQHdtCAC+1a4Ss0qeo7OJe/dIGREoTqfH7z6k0w="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ six ]; @@ -36,6 +41,9 @@ buildPythonPackage rec { ]; disabledTests = [ + # Tests require network access + "test_urllib3" + "test_requests" "test_http_not_intercepted" "test_https_not_intercepted" "test_https_no_ssl_verification_not_intercepted" @@ -49,6 +57,6 @@ buildPythonPackage rec { description = "Module that acts as a WSGI application in place of a real URI for testing"; homepage = "https://github.com/cdent/wsgi-intercept"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ mikecm ]; }; } From 2b194563932b4321d2fdb37012fa0ec3dbcf5d46 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 16:01:54 +0000 Subject: [PATCH 162/444] libsForQt5.qtutilities: 6.13.4 -> 6.13.5 --- pkgs/development/libraries/qtutilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 797e9fb891b6..8d385afc148d 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "qtutilities"; - version = "6.13.4"; + version = "6.13.5"; src = fetchFromGitHub { owner = "Martchus"; repo = "qtutilities"; rev = "v${finalAttrs.version}"; - hash = "sha256-AlDPu2mD2OrjBq3tUxQBAoqD32L9MiSjcUNGWzpj/xc="; + hash = "sha256-ZPfyJAQHtE5ae/X9f8s/69UNiB4CnyACPLvYp8RgpKg="; }; nativeBuildInputs = [ From 8139f5f67dbac0947e0932fc4f96c728a5d4e402 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 16:06:31 +0000 Subject: [PATCH 163/444] mongoc: 1.26.0 -> 1.26.1 --- pkgs/development/libraries/mongoc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 85b41061228e..576c2e7a9ed4 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.26.0"; + version = "1.26.1"; src = fetchFromGitHub { owner = "mongodb"; repo = "mongo-c-driver"; rev = "refs/tags/${version}"; - hash = "sha256-uXHCd7KDnx3n6KO0opoITpf8LtUS67bc94tPHioeb4o="; + hash = "sha256-LUtKOAlQVpN5Y+mHsNTlgDSeCjodG4RDleO1eXzTdMg="; }; nativeBuildInputs = [ From 1118547fa6bef3d80bb7fba5acd80e2241206f28 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 6 Mar 2024 00:06:55 +0800 Subject: [PATCH 164/444] glide-media-player: 0.6.1 -> 0.6.2 --- pkgs/by-name/gl/glide-media-player/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gl/glide-media-player/package.nix b/pkgs/by-name/gl/glide-media-player/package.nix index dc2475c768d6..62839033383c 100644 --- a/pkgs/by-name/gl/glide-media-player/package.nix +++ b/pkgs/by-name/gl/glide-media-player/package.nix @@ -19,25 +19,29 @@ stdenv.mkDerivation rec { pname = "glide-media-player"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "philn"; repo = "glide"; rev = version; - hash = "sha256-dIXuWaoTeyVBhzr6VWxYBsn+CnUYG/KzhzNJtLLdRuI="; + hash = "sha256-SN/1Yf4fHlDbJ2X6DGktsn1GFW8bbkeznlO1S8sBZyg="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-azvxW40fuKuF/N0qwzofFk1bZiNxyTN6YBFU5qHQkCA="; + hash = "sha256-2Ma7ZAKFiAQXFWFze4RLwGu33d/vC6FVW6fJdqwED20="; }; postPatch = '' substituteInPlace scripts/meson_post_install.py \ - --replace "gtk-update-icon-cache" "gtk4-update-icon-cache" - patchShebangs --build scripts/meson_post_install.py + --replace-warn "gtk-update-icon-cache" "gtk4-update-icon-cache" + substituteInPlace data/net.baseart.Glide.desktop \ + --replace-warn "Icon=net.baseart.Glide.svg" "Icon=net.baseart.Glide" + patchShebangs --build \ + scripts/meson_post_install.py \ + build-aux/cargo-build.py '' + lib.optionalString stdenv.isDarwin '' sed -i "/wayland,x11egl,x11glx/d" meson.build ''; From 43fdeb06f405f1e59fa273c5664fbc17c00e004d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 17:44:12 +0000 Subject: [PATCH 165/444] syncthingtray: 1.4.13 -> 1.5.0 --- pkgs/applications/misc/syncthingtray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 0badd7997603..c51f4aa861d5 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -33,14 +33,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: stdenv.mkDerivation (finalAttrs: { - version = "1.4.13"; + version = "1.5.0"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-RysX2IAzhGz/L65nDEL2UQLXIjdkQRmMs7bqNQIR+eA="; + sha256 = "sha256-O8FLjse2gY8KNWGXpUeZ83cNk0ZuRAZJJ3Am33/ABVw="; }; buildInputs = [ From 8b7a84f3df7706fc1a04e82716ce17b0f4691b3b Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Tue, 5 Mar 2024 19:26:08 +0100 Subject: [PATCH 166/444] 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 b2b2a5c81036b61da087ff0d3f63128efc5e580b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 18:53:01 +0000 Subject: [PATCH 167/444] fanficfare: 4.31.0 -> 4.32.3 --- pkgs/tools/text/fanficfare/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index ba20910e1b8d..149082cc995f 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "FanFicFare"; - version = "4.31.0"; + version = "4.32.3"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-6AdiyL51UzK/f7wGn2UekAglGPIs4vfyYbC/MdD0aEk="; + hash = "sha256-Qfe24Ees3LLnSuU4kjn+dwtKjLBSYgF22U1YAtpw1po="; }; nativeBuildInputs = with python3Packages; [ From dd524ff40ae62c1b179fda2889f1d1ffb4c3e8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 5 Mar 2024 11:09:16 -0800 Subject: [PATCH 168/444] postfix: 3.8.5 -> 3.8.6 Changelog: https://www.postfix.org/announcements/postfix-3.8.6.html --- pkgs/servers/mail/postfix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mail/postfix/default.nix b/pkgs/servers/mail/postfix/default.nix index 61b69359d3c8..e40c30ff79fa 100644 --- a/pkgs/servers/mail/postfix/default.nix +++ b/pkgs/servers/mail/postfix/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "postfix"; - version = "3.8.5"; + version = "3.8.6"; src = fetchurl { - url = "https://de.postfix.org/ftpmirror/official/${pname}-${version}.tar.gz"; - hash = "sha256-8+gnorLkEDWa0l0xNBlwQ0qwfjYTn5ou+TmBsOxWTIU="; + url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz"; + hash = "sha256-S24XyCbMQ4zDAWqcClXqfnfGy6+6fdVyQdgbaQsOl3Q="; }; nativeBuildInputs = [ makeWrapper m4 ]; From 6284603ca6c904a3b521a88e5180ae1c2eee0243 Mon Sep 17 00:00:00 2001 From: Christoph Heiss Date: Tue, 5 Mar 2024 20:17:47 +0100 Subject: [PATCH 169/444] sourcehut: add override for python3 flask dependency flask was recently updated to it's latest version 3.0.1, which in turn breaks the override for flask-sqlalchemy 2.5.1, as this requires flask 2.x. At the end, this then breaks (building) sourcehut. Fixes: a24d9a6a54fb ("python311Packages.flask: 2.3.3 -> 3.0.1") Signed-off-by: Christoph Heiss --- .../version-management/sourcehut/default.nix | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/sourcehut/default.nix b/pkgs/applications/version-management/sourcehut/default.nix index b951a34e8916..4a1311d578be 100644 --- a/pkgs/applications/version-management/sourcehut/default.nix +++ b/pkgs/applications/version-management/sourcehut/default.nix @@ -31,6 +31,7 @@ let # sourcehut is not (yet) compatible with SQLAlchemy 2.x sqlalchemy = super.sqlalchemy_1_4; + # sourcehut is not (yet) compatible with flask-sqlalchemy 3.x flask-sqlalchemy = super.flask-sqlalchemy.overridePythonAttrs (oldAttrs: rec { version = "2.5.1"; format = "setuptools"; @@ -45,6 +46,26 @@ let ]; }); + # flask-sqlalchemy 2.x requires flask 2.x + flask = super.flask.overridePythonAttrs (oldAttrs: rec { + version = "2.3.3"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-CcNHqSqn/0qOfzIGeV8w2CZlS684uHPQdEzVccpgnvw="; + }; + }); + + # flask 2.x requires werkzeug 2.x + werkzeug = super.werkzeug.overridePythonAttrs (oldAttrs: rec { + version = "2.3.8"; + src = fetchPypi { + inherit (oldAttrs) pname; + inherit version; + hash = "sha256-VUslfHS763oNJUFgpPj/4YUkP1KlIDUGC3Ycpi2XfwM="; + }; + }); + # sourcehut is not (yet) compatible with factory-boy 3.x factory-boy = super.factory-boy.overridePythonAttrs (oldAttrs: rec { version = "2.12.0"; @@ -55,11 +76,11 @@ let }; nativeCheckInputs = (with super; [ django - flask mongoengine pytestCheckHook ]) ++ (with self; [ sqlalchemy + flask flask-sqlalchemy ]); postPatch = ""; From d597b3c3eeff999ec3eef23dafc600f3e0061d02 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 5 Mar 2024 20:18:56 +0100 Subject: [PATCH 170/444] keep-sorted: 0.3.1 -> 0.4.0 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/ke/keep-sorted/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ke/keep-sorted/package.nix b/pkgs/by-name/ke/keep-sorted/package.nix index c103e77dd0fc..e88b70668afe 100644 --- a/pkgs/by-name/ke/keep-sorted/package.nix +++ b/pkgs/by-name/ke/keep-sorted/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "keep-sorted"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "google"; repo = "keep-sorted"; rev = "v${version}"; - hash = "sha256-wXR471Iuo+4oZUNa2MN4N5q0n7vEpYtoTaJHvdGIDHw="; + hash = "sha256-yeps+StUA7h12Jlra24Po2zNzjIPNIQCOyWLazC8F8M="; }; vendorHash = "sha256-tPTWWvr+/8wWUnQcI4Ycco2OEgA2mDQt15OGCk/ZjrQ="; From ac3b8fd1170fcf04113163a23ea7ca45866e8440 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 5 Mar 2024 20:20:15 +0100 Subject: [PATCH 171/444] keep-sorted: add update script Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/by-name/ke/keep-sorted/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/ke/keep-sorted/package.nix b/pkgs/by-name/ke/keep-sorted/package.nix index e88b70668afe..1ee3c5bcf608 100644 --- a/pkgs/by-name/ke/keep-sorted/package.nix +++ b/pkgs/by-name/ke/keep-sorted/package.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, nix-update-script }: buildGoModule rec { @@ -25,6 +26,8 @@ buildGoModule rec { "-skip=^TestGoldens" ]; + passthru.updateScript = nix-update-script { }; + meta = { changelog = "https://github.com/google/keep-sorted/releases/tag/v${version}"; description = "Language-agnostic formatter that sorts lines between two markers in a larger file"; From 821ea0b581af65fa8d20732aada11d830acd7212 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 19:34:21 +0000 Subject: [PATCH 172/444] llama-cpp: 2294 -> 2346 --- pkgs/by-name/ll/llama-cpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index ebb9c29e75bd..7da6c5c305a1 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -69,13 +69,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "2294"; + version = "2346"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-uZi4Bj03PgfFV+jS5M+A1sMCWC/GMY5IyyrlR1b4Sh4="; + hash = "sha256-s937fAOUjid2H+6OQEMicdkFQVqPJ37GR+DMrCV1ky4="; }; postPatch = '' From e3ffdcc0c3ffbbae43e98bb8535d9a3602002c13 Mon Sep 17 00:00:00 2001 From: aleksana Date: Wed, 6 Mar 2024 03:31:33 +0800 Subject: [PATCH 173/444] waylyrics: 0.2.4 -> 0.2.12 --- pkgs/applications/audio/waylyrics/Cargo.lock | 1021 +++++++++-------- pkgs/applications/audio/waylyrics/default.nix | 10 +- 2 files changed, 565 insertions(+), 466 deletions(-) diff --git a/pkgs/applications/audio/waylyrics/Cargo.lock b/pkgs/applications/audio/waylyrics/Cargo.lock index 57d6ffa347c5..2c87d54dd27a 100644 --- a/pkgs/applications/audio/waylyrics/Cargo.lock +++ b/pkgs/applications/audio/waylyrics/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ "getrandom", "once_cell", @@ -38,10 +38,19 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.79" +name = "ansi_term" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi", +] + +[[package]] +name = "anyhow" +version = "1.0.80" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" [[package]] name = "arrayvec" @@ -49,6 +58,12 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +[[package]] +name = "assert_float_eq" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cea652ffbedecf29e9cd41bb4c066881057a42c0c119040f022802b26853e77" + [[package]] name = "async-channel" version = "2.2.0" @@ -70,7 +85,18 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.50", +] + +[[package]] +name = "atty" +version = "0.2.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +dependencies = [ + "hermit-abi 0.1.19", + "libc", + "winapi", ] [[package]] @@ -94,23 +120,11 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - [[package]] name = "base64" -version = "0.13.1" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" - -[[package]] -name = "base64" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "bitflags" @@ -120,9 +134,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bitvec" @@ -137,10 +151,16 @@ dependencies = [ ] [[package]] -name = "borsh" -version = "1.2.0" +name = "block" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + +[[package]] +name = "borsh" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667" dependencies = [ "borsh-derive", "cfg_aliases", @@ -148,29 +168,29 @@ dependencies = [ [[package]] name = "borsh-derive" -version = "1.2.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" +checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd" dependencies = [ "once_cell", - "proc-macro-crate 2.0.0", + "proc-macro-crate", "proc-macro2", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.50", "syn_derive", ] [[package]] name = "bumpalo" -version = "3.14.0" +version = "3.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" +checksum = "a3b1be7772ee4501dba05acbe66bb1e8760f6a6c474a36035631638e4415f130" [[package]] name = "bytecheck" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627" +checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2" dependencies = [ "bytecheck_derive", "ptr_meta", @@ -179,9 +199,9 @@ dependencies = [ [[package]] name = "bytecheck_derive" -version = "0.6.11" +version = "0.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" +checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659" dependencies = [ "proc-macro2", "quote 1.0.35", @@ -200,7 +220,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2650f66005301bd33cc486dec076e1293c4cecf768bc7ba9bf5d2b1be339b99c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "cairo-sys-rs", "glib", "libc", @@ -220,18 +240,15 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" -dependencies = [ - "libc", -] +checksum = "7f9fa1897e4325be0d68d48df6aa1a71ac2ed4d27723887e7754192705350730" [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "fa50868b64a9a6fda9d593ce778849ea8715cd2a3d2cc17ffdb4a2f2f2f1961d" dependencies = [ "smallvec", "target-lexicon", @@ -249,6 +266,21 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "clap" +version = "2.34.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +dependencies = [ + "ansi_term", + "atty", + "bitflags 1.3.2", + "strsim 0.8.0", + "textwrap", + "unicode-width", + "vec_map", +] + [[package]] name = "concurrent-queue" version = "2.4.0" @@ -258,55 +290,49 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - [[package]] name = "cookie" -version = "0.15.2" +version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc6e25dfc584d06a3dbf775d207ff00d7de98d824c952dd2233dfbb261889a42" +checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ - "time 0.2.27", + "percent-encoding", + "time", "version_check", ] [[package]] name = "cookie" -version = "0.16.2" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb" +checksum = "3cd91cf61412820176e137621345ee43b3f4423e589e7ae4e50d601d93e35ef8" dependencies = [ - "percent-encoding", - "time 0.3.29", + "time", "version_check", ] [[package]] name = "cookie_store" -version = "0.16.2" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d606d0fba62e13cf04db20536c05cb7f13673c161cb47a47a82b9b9e7d3f1daa" +checksum = "387461abbc748185c3a6e1673d826918b450b87ff22639429c694619a83b6cf6" dependencies = [ - "cookie 0.16.2", - "idna 0.2.3", + "cookie 0.17.0", + "idna 0.3.0", "log", "publicsuffix", "serde", "serde_derive", "serde_json", - "time 0.3.29", + "time", "url", ] [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -314,9 +340,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "crossbeam-utils" @@ -344,7 +370,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote 1.0.35", - "strsim", + "strsim 0.10.0", "syn 1.0.109", ] @@ -370,6 +396,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "dbus-codegen" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a49da9fdfbe872d4841d56605dc42efa5e6ca3291299b87f44e1cde91a28617c" +dependencies = [ + "clap", + "dbus", + "xml-rs", +] + [[package]] name = "dbus-dummy" version = "0.1.0" @@ -377,10 +414,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22d24c4c449e488b022f58a19817ffcedc637d67237076068da883e0fc8f7159" [[package]] -name = "deranged" -version = "0.3.8" +name = "dbus-tree" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "f456e698ae8e54575e19ddb1f9b7bce2298568524f215496b248eb9498b4f508" +dependencies = [ + "dbus", +] + +[[package]] +name = "deranged" +version = "0.3.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] [[package]] name = "derivative" @@ -405,10 +454,25 @@ dependencies = [ ] [[package]] -name = "discard" -version = "1.0.4" +name = "documented" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" +checksum = "e2f2016be31b2ee8ca5950d0b985e53d2802bbe646634e41cdf70f668fc66049" +dependencies = [ + "documented-derive", + "phf", + "thiserror", +] + +[[package]] +name = "documented-derive" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83095afc77f3f21d50be46d608d0a1cfa463cc97e4f3aedab871d6e0baf91870" +dependencies = [ + "quote 1.0.35", + "syn 2.0.50", +] [[package]] name = "encoding_rs" @@ -438,19 +502,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ "libc", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "event-listener" -version = "5.0.0" +version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72557800024fabbaa2449dd4bf24e37b93702d457a4d4f2b0dd1f0f039f20c1" +checksum = "b7ad6fd685ce13acd6d9541a30f6db6567a7a24c9ffd4ba2955d29e3f22c8b27" dependencies = [ "concurrent-queue", "parking", @@ -480,7 +544,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38e2275cc4e4fc009b0669731a1e5ab7ebf11f469eaede2bab9309a5b4d6057f" dependencies = [ "memoffset", - "rustc_version 0.4.0", + "rustc_version", ] [[package]] @@ -542,24 +606,24 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", ] [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -568,38 +632,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-core", "futures-macro", @@ -668,9 +732,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -678,10 +742,30 @@ dependencies = [ ] [[package]] -name = "gimli" -version = "0.28.0" +name = "gettext-rs" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "e49ea8a8fad198aaa1f9655a2524b64b70eb06b2f3ff37da407566c93054f364" +dependencies = [ + "gettext-sys", + "locale_config", +] + +[[package]] +name = "gettext-sys" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c63ce2e00f56a206778276704bbe38564c8695249fdc8f354b4ef71c57c3839d" +dependencies = [ + "cc", + "temp-dir", +] + +[[package]] +name = "gimli" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "gio" @@ -720,7 +804,7 @@ version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab9e86540b5d8402e905ad4ce7d6aa544092131ab564f3102175af176b90a053" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "futures-channel", "futures-core", "futures-executor", @@ -743,10 +827,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" dependencies = [ "heck 0.4.1", - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -852,7 +936,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8b86439e9896f6f3f47c3d8077c5c8205174078760afdabd9098a8e9e937d97" dependencies = [ "anyhow", - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote 1.0.35", @@ -908,9 +992,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.1" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" [[package]] name = "heck" @@ -929,9 +1013,18 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.3.3" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "hermit-abi" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" [[package]] name = "hex" @@ -941,9 +1034,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -952,9 +1045,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -975,9 +1068,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -990,7 +1083,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -1016,17 +1109,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.3.0" @@ -1049,35 +1131,53 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "233cf39063f058ea2caae4091bf4a3ef70a653afbc026f5c4a4135d114e3c177" dependencies = [ "equivalent", - "hashbrown 0.14.1", + "hashbrown 0.14.3", ] [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" dependencies = [ "wasm-bindgen", ] +[[package]] +name = "ksni" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b31b9cf486bcd22bcd09900b44538cf87b00f526fcd087d671a632dc0d271d0c" +dependencies = [ + "dbus", + "dbus-codegen", + "dbus-tree", + "thiserror", +] + +[[package]] +name = "ksni-dummy" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "705305cfe9604f3081b8c33e03c351da01eedd7dff89a86f7fbc486f025a2f37" + [[package]] name = "lazy_static" version = "1.4.0" @@ -1112,15 +1212,28 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" + +[[package]] +name = "locale_config" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d2c35b16f4483f6c26f0e4e9550717a2f6575bcd6f12a53ff0c490a94a6934" +dependencies = [ + "lazy_static", + "objc", + "objc-foundation", + "regex", + "winapi", +] [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -1144,6 +1257,15 @@ dependencies = [ "thiserror", ] +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + [[package]] name = "matchers" version = "0.1.0" @@ -1153,12 +1275,6 @@ dependencies = [ "regex-automata 0.1.10", ] -[[package]] -name = "matches" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" - [[package]] name = "md5" version = "0.7.0" @@ -1180,15 +1296,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memory-cache-rs" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a4098b4f50a8fe57ad06b9a125812c9b1e04b3f226f29642b7219e75ba33b1d" -dependencies = [ - "once_cell", -] - [[package]] name = "mimalloc" version = "0.1.39" @@ -1212,18 +1319,18 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "wasi", @@ -1264,12 +1371,11 @@ dependencies = [ [[package]] name = "ncmapi" version = "0.1.13" -source = "git+https://github.com/waylyrics/ncmapi-rs.git?rev=394e9c2#394e9c2e3b9669728018c3b1348c08a056361b81" +source = "git+https://github.com/waylyrics/ncmapi-rs.git?rev=51b4d121#51b4d121235823e8040feb3a9c9052da0559fe75" dependencies = [ - "base64 0.13.1", - "cookie 0.15.2", + "base64", + "cookie 0.18.0", "hex", - "memory-cache-rs", "openssl", "phf", "rand", @@ -1303,10 +1409,16 @@ dependencies = [ ] [[package]] -name = "num-traits" -version = "0.2.17" +name = "num-conv" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" + +[[package]] +name = "num-traits" +version = "0.2.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" dependencies = [ "autocfg", ] @@ -1317,15 +1429,44 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.6", "libc", ] [[package]] -name = "object" -version = "0.32.1" +name = "objc" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" +dependencies = [ + "malloc_buf", +] + +[[package]] +name = "objc-foundation" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" +dependencies = [ + "block", + "objc", + "objc_id", +] + +[[package]] +name = "objc_id" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" +dependencies = [ + "objc", +] + +[[package]] +name = "object" +version = "0.32.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] @@ -1338,11 +1479,11 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.60" +version = "0.10.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79a4c6c3a2b158f7f8f2a2fc5a969fa3a068df6fc9dbb4a43845436e3af7c800" +checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "cfg-if", "foreign-types", "libc", @@ -1359,7 +1500,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -1370,18 +1511,18 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.2+3.2.1" +version = "300.2.3+3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bbfad0063610ac26ee79f7484739e2b07555a75c42453b89263830b5c8103bc" +checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" dependencies = [ "cc", ] [[package]] name = "openssl-sys" -version = "0.9.96" +version = "0.9.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3812c071ba60da8b5677cc12bcb1d42989a65553772897a7e0355545a819838f" +checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" dependencies = [ "cc", "libc", @@ -1438,9 +1579,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", @@ -1457,20 +1598,19 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" -version = "0.9.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ac8b67553a7ca9457ce0e526948cad581819238f4a9d1ea74545851fa24f37" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" dependencies = [ "phf_macros", "phf_shared", - "proc-macro-hack", ] [[package]] name = "phf_generator" -version = "0.9.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43f3220d96e0080cc9ea234978ccd80d904eafb17be31bb0f76daaea6493082" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" dependencies = [ "phf_shared", "rand", @@ -1478,23 +1618,22 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.9.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b706f5936eb50ed880ae3009395b43ed19db5bff2ebd459c95e7bf013a89ab86" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ "phf_generator", "phf_shared", - "proc-macro-hack", "proc-macro2", "quote 1.0.35", - "syn 1.0.109", + "syn 2.0.50", ] [[package]] name = "phf_shared" -version = "0.9.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a68318426de33640f02be62b4ae8eb1261be2efbc337b60c54d845bf4484e0d9" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ "siphasher", ] @@ -1517,21 +1656,18 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +[[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 = "proc-macro-crate" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" -dependencies = [ - "toml_edit 0.20.2", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -1565,17 +1701,11 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - [[package]] name = "proc-macro2" -version = "1.0.76" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -1679,9 +1809,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] @@ -1732,22 +1862,22 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rend" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" +checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c" dependencies = [ "bytecheck", ] [[package]] name = "reqwest" -version = "0.11.23" +version = "0.11.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" +checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" dependencies = [ - "base64 0.21.4", + "base64", "bytes", - "cookie 0.16.2", + "cookie 0.17.0", "cookie_store", "encoding_rs", "futures-core", @@ -1765,9 +1895,11 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", + "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", + "sync_wrapper", "system-configuration", "tokio", "tokio-native-tls", @@ -1781,12 +1913,13 @@ dependencies = [ [[package]] name = "rkyv" -version = "0.7.42" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58" +checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ "bitvec", "bytecheck", + "bytes", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -1798,9 +1931,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.42" +version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d" +checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ "proc-macro2", "quote 1.0.35", @@ -1809,9 +1942,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.34.0" +version = "1.34.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7de2711cae7bdec993f4d2319352599ceb0d003e9f7900ea7c6ef4c5fc16831" +checksum = "b39449a79f45e8da28c57c341891b69a183044b29518bb8f86dbac9df60bb7df" dependencies = [ "arrayvec", "borsh", @@ -1825,9 +1958,9 @@ dependencies = [ [[package]] name = "rust_decimal_macros" -version = "1.34.0" +version = "1.34.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69deb21b04afa2c06038f75bbbb5670a320e62ee005d91a00cf13fbf20161886" +checksum = "e418701588729bef95e7a655f2b483ad64bb97c46e8e79fde83efd92aaab6d82" dependencies = [ "quote 1.0.35", "rust_decimal", @@ -1839,50 +1972,56 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.20", + "semver", ] [[package]] name = "rustix" -version = "0.38.19" +version = "0.38.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" +checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "errno", "libc", "linux-raw-sys", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] -name = "ryu" -version = "1.0.15" +name = "rustls-pemfile" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64", +] + +[[package]] +name = "rustversion" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" + +[[package]] +name = "ryu" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -1922,50 +2061,35 @@ dependencies = [ [[package]] name = "semver" -version = "0.9.0" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" [[package]] name = "serde" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.196" +version = "1.0.197" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" +checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" dependencies = [ "proc-macro2", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] name = "serde_json" -version = "1.0.113" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" +checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" dependencies = [ "itoa", "ryu", @@ -1974,20 +2098,20 @@ dependencies = [ [[package]] name = "serde_repr" -version = "0.1.16" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00" +checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb" dependencies = [ "proc-macro2", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -2004,21 +2128,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha1" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" -dependencies = [ - "sha1_smol", -] - -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sharded-slab" version = "0.1.7" @@ -2064,16 +2173,6 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" -[[package]] -name = "socket2" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "socket2" version = "0.5.5" @@ -2085,62 +2184,20 @@ dependencies = [ ] [[package]] -name = "standback" -version = "0.2.17" +name = "sorensen" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" +checksum = "f480a5525538a706e6cb343127173f9b2fc402dea20cfdbbe6e91df018baedb8" dependencies = [ - "version_check", + "assert_float_eq", + "hashbrown 0.12.3", ] [[package]] -name = "stdweb" -version = "0.4.20" +name = "strsim" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote 1.0.35", - "serde", - "serde_derive", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote 1.0.35", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn 1.0.109", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" +checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" [[package]] name = "strsim" @@ -2148,6 +2205,28 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strum" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f" +dependencies = [ + "strum_macros", +] + +[[package]] +name = "strum_macros" +version = "0.26.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" +dependencies = [ + "heck 0.4.1", + "proc-macro2", + "quote 1.0.35", + "rustversion", + "syn 2.0.50", +] + [[package]] name = "syn" version = "0.11.11" @@ -2172,9 +2251,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.48" +version = "2.0.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" +checksum = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" dependencies = [ "proc-macro2", "quote 1.0.35", @@ -2190,9 +2269,15 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.50", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "synom" version = "0.11.3" @@ -2225,9 +2310,9 @@ dependencies = [ [[package]] name = "system-deps" -version = "6.1.2" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94af52f9402f94aac4948a2518b43359be8d9ce6cd9efc1c4de3b2f7b7e897d6" +checksum = "2a2d580ff6a20c55dfb86be5f9c238f67835d0e81cbdea8bf5680e0897320331" dependencies = [ "cfg-expr", "heck 0.4.1", @@ -2244,48 +2329,62 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" + +[[package]] +name = "temp-dir" +version = "0.1.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", "fastrand", - "redox_syscall", "rustix", - "windows-sys 0.48.0", + "windows-sys 0.52.0", +] + +[[package]] +name = "textwrap" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +dependencies = [ + "unicode-width", ] [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" dependencies = [ "proc-macro2", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] name = "thread_local" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" dependencies = [ "cfg-if", "once_cell", @@ -2293,30 +2392,17 @@ dependencies = [ [[package]] name = "time" -version = "0.2.27" +version = "0.3.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" -dependencies = [ - "const_fn", - "libc", - "standback", - "stdweb", - "time-macros 0.1.1", - "version_check", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe" +checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" dependencies = [ "deranged", "itoa", + "num-conv", + "powerfmt", "serde", "time-core", - "time-macros 0.2.15", + "time-macros", ] [[package]] @@ -2327,36 +2413,14 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.1.1" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" +checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" dependencies = [ + "num-conv", "time-core", ] -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote 1.0.35", - "standback", - "syn 1.0.109", -] - [[package]] name = "tinyvec" version = "1.6.0" @@ -2374,9 +2438,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.35.1" +version = "1.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" +checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" dependencies = [ "backtrace", "bytes", @@ -2386,7 +2450,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.5", + "socket2", "tokio-macros", "windows-sys 0.48.0", ] @@ -2399,7 +2463,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -2414,9 +2478,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -2428,14 +2492,14 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.2" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "9a9aad4a3066010876e8dcf5a8a06e70a558751117a145c6ce2b82c2e2054290" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.22.6", ] [[package]] @@ -2447,19 +2511,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - [[package]] name = "toml_edit" version = "0.21.1" @@ -2468,7 +2519,20 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap", "toml_datetime", - "winnow", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c1b5fd4128cc8d3e0cb74d4ed9a9cc7c7284becd4df68f5f940e1ad123606f6" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow 0.6.2", ] [[package]] @@ -2496,7 +2560,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.50", ] [[package]] @@ -2551,15 +2615,15 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -2569,18 +2633,24 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" + +[[package]] +name = "unicode-width" +version = "0.1.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -2601,9 +2671,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.4.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" +checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" [[package]] name = "valuable" @@ -2617,6 +2687,12 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +[[package]] +name = "vec_map" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" + [[package]] name = "version-compare" version = "0.1.1" @@ -2646,9 +2722,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2656,24 +2732,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.50", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" dependencies = [ "cfg-if", "js-sys", @@ -2683,9 +2759,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" dependencies = [ "quote 1.0.35", "wasm-bindgen-macro-support", @@ -2693,26 +2769,26 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" dependencies = [ "proc-macro2", "quote 1.0.35", - "syn 2.0.48", + "syn 2.0.50", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" [[package]] name = "waylyrics" -version = "0.2.4" +version = "0.2.12" dependencies = [ "anyhow", "async-channel", @@ -2720,9 +2796,12 @@ dependencies = [ "dbus", "dbus-dummy", "derivative", + "documented", + "gettext-rs", "glib-macros", "gtk4", - "libc", + "ksni", + "ksni-dummy", "lrc-nom", "md5", "mimalloc", @@ -2737,9 +2816,12 @@ dependencies = [ "rust_decimal_macros", "serde", "serde_json", + "sorensen", + "strum", "thiserror", "tokio", "toml", + "toml_edit 0.22.6", "tracing", "tracing-journald", "tracing-subscriber", @@ -2749,9 +2831,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" dependencies = [ "js-sys", "wasm-bindgen", @@ -2913,9 +2995,18 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.16" +version = "0.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037711d82167854aff2018dfd193aa0fef5370f456732f0d5a0c59b0f1b4b907" +checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" +dependencies = [ + "memchr", +] + +[[package]] +name = "winnow" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a4191c47f15cc3ec71fcb4913cb83d58def65dd3787610213c649283b5ce178" dependencies = [ "memchr", ] @@ -2944,3 +3035,9 @@ name = "xdg" version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" + +[[package]] +name = "xml-rs" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" diff --git a/pkgs/applications/audio/waylyrics/default.nix b/pkgs/applications/audio/waylyrics/default.nix index 6cacebede392..f22f4f1e8203 100644 --- a/pkgs/applications/audio/waylyrics/default.nix +++ b/pkgs/applications/audio/waylyrics/default.nix @@ -9,19 +9,19 @@ rustPlatform.buildRustPackage rec { pname = "waylyrics"; - version = "0.2.4"; + version = "0.2.12"; src = fetchFromGitHub { owner = "poly000"; repo = "waylyrics"; rev = "v${version}"; - hash = "sha256-Tpsk1KL+QSiv8aWl8N5hextKnhMulI3YWtQvB6IIdmQ="; + hash = "sha256-sUhFT3Vq/IjbMir7/AVCU8FyfmoNiZsn2zkqdJkOMFo="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "ncmapi-0.1.13" = "sha256-wh9RsyuS1L7rnz1jh2A27s6wUvyH8cNgUywPORIimmg="; + "ncmapi-0.1.13" = "sha256-NxgF1TV+3hK5oE/DfJnWyc+XmPX3U1UeD+xTkcvDzIA="; "qqmusic-rs-0.1.0" = "sha256-woLsO0n+m3EBUI+PRLio7iLp0UPQSliWK0djCSZEaZc="; }; }; @@ -33,7 +33,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; buildInputs = [ openssl dbus ]; - doCheck = false; # Requires network access + checkFlags = [ + "--skip=tests::netease_lyric::get_netease_lyric" # Requires network access + ]; WAYLYRICS_THEME_PRESETS_DIR = "${placeholder "out"}/share/waylyrics/themes"; From eb787006d739947f662894139400a9d0115ed80d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 5 Mar 2024 20:27:47 +0100 Subject: [PATCH 174/444] nixos/doc/running-nixos-tests: Describe system requirements --- .../manual/development/running-nixos-tests.section.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/doc/manual/development/running-nixos-tests.section.md b/nixos/doc/manual/development/running-nixos-tests.section.md index 33076f5dc2a7..b8191ebd313c 100644 --- a/nixos/doc/manual/development/running-nixos-tests.section.md +++ b/nixos/doc/manual/development/running-nixos-tests.section.md @@ -18,3 +18,13 @@ you can view a log of the test: ```ShellSession $ nix-store --read-log result ``` + +## System Requirements {#sec-running-nixos-tests-requirements} + +NixOS tests require virtualization support. +This means that the machine must have `kvm` in its [system features](https://nixos.org/manual/nix/stable/command-ref/conf-file.html?highlight=system-features#conf-system-features) list, or `apple-virt` in case of macOS. +These features are autodetected locally, but `apple-virt` is only autodetected since Nix 2.19.0. + +Features of **remote builders** must additionally be configured manually on the client, e.g. on NixOS with [`nix.buildMachines.*.supportedFeatures`](https://search.nixos.org/options?show=nix.buildMachines.*.supportedFeatures&sort=alpha_asc&query=nix.buildMachines) or through general [Nix configuration](https://nixos.org/manual/nix/stable/advanced-topics/distributed-builds). + +If you run the tests on a **macOS** machine, you also need a "remote" builder for Linux; possibly a VM. [nix-darwin](https://daiderd.com/nix-darwin/) users may enable [`nix.linux-builder.enable`](https://daiderd.com/nix-darwin/manual/index.html#opt-nix.linux-builder.enable) to launch such a VM. From f14b23fd8741b98acae803c9372312eea985ccb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 20:08:56 +0000 Subject: [PATCH 175/444] 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 33c109bd29ec9e6b948dd25c8897875f7296a402 Mon Sep 17 00:00:00 2001 From: Paul Meyer <49727155+katexochen@users.noreply.github.com> Date: Tue, 5 Mar 2024 20:03:36 +0100 Subject: [PATCH 176/444] go_1_22: 1.22.0 -> 1.22.1 Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com> --- pkgs/development/compilers/go/1.22.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index d5fc4ae0bdd7..ddab1d422b2c 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "go"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz"; - hash = "sha256-TRlsPUGg1sHfxk0E48wfYIsMQ2vYe3Bgzj4jI04fTVw="; + hash = "sha256-ecm5HX8QlRWiX8Ps2q0SXWfmvbVPbU2YWA9GeZyuoyE="; }; strictDeps = true; From e2d8f6dafc720f265fa737c54ba30a8e45e00c2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 20:22:43 +0000 Subject: [PATCH 177/444] 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 178/444] 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 179/444] 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 f515ffec26d39a8d5b866a8d4829d276f9dd1d9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 21:21:39 +0000 Subject: [PATCH 180/444] go-critic: 0.11.1 -> 0.11.2 --- pkgs/by-name/go/go-critic/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/go/go-critic/package.nix b/pkgs/by-name/go/go-critic/package.nix index df2116150dd1..ea5912541063 100644 --- a/pkgs/by-name/go/go-critic/package.nix +++ b/pkgs/by-name/go/go-critic/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "go-critic"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "go-critic"; repo = "go-critic"; rev = "v${version}"; - hash = "sha256-8dRgPhYedEPwK4puP8hJWhjub2NkOl3OWNRb43AH3xc="; + hash = "sha256-xej9ROsJYrjvlitxnAjUKPsp0kb8INvFnkdNfYiycz8="; }; - vendorHash = "sha256-0Y9yMcgyRgXQUie7oj0bRy4+eGfQOa9QXux2AoRc6pw="; + vendorHash = "sha256-pYdnZjCGx+skF/kqA1QO3NuVqOfsMJNVhFBpwtdZhIA="; subPackages = [ "cmd/gocritic" From b70b3a6f7b1d714e5819ca7ef1334d541fa0319d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Mar 2024 22:24:01 +0100 Subject: [PATCH 181/444] python311Packages.llama-parse: 0.3.5 -> 0.3.6 --- pkgs/development/python-modules/llama-parse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix index d5df83113dac..e7c07a62c3fa 100644 --- a/pkgs/development/python-modules/llama-parse/default.nix +++ b/pkgs/development/python-modules/llama-parse/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "llama-parse"; - version = "0.3.5"; + version = "0.3.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_parse"; inherit version; - hash = "sha256-c2qA5PxZcLnL7xBIFxkIAh69Jr5D8HuAaInw0bs4df4="; + hash = "sha256-mAk+YCJeer1ReluiRagiQy00XRNqX5iLS029oFdYAqE="; }; nativeBuildInputs = [ From cc1d2f5bf5e65c0bddcbc87887bed2f1ff4aa65b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 5 Mar 2024 21:37:06 +0000 Subject: [PATCH 182/444] 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 0ce9aacffe65db64af135c2850ec6fb6e95633d4 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 5 Mar 2024 20:06:14 +0100 Subject: [PATCH 183/444] python3Packages.django-allauth: 0.60.0 -> 0.61.1 https://github.com/pennersr/django-allauth/blob/main/ChangeLog.rst#0610-2024-02-07 https://github.com/pennersr/django-allauth/blob/main/ChangeLog.rst#0611-2024-02-09 --- pkgs/development/python-modules/django-allauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-allauth/default.nix b/pkgs/development/python-modules/django-allauth/default.nix index 31a704369365..8a1f6dc8ac06 100644 --- a/pkgs/development/python-modules/django-allauth/default.nix +++ b/pkgs/development/python-modules/django-allauth/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "django-allauth"; - version = "0.60.0"; + version = "0.61.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "pennersr"; repo = "django-allauth"; rev = "refs/tags/${version}"; - hash = "sha256-hkzZl2eZKti6m06LTtBqVXmsj6IFztsV2Of6tPiej+I="; + hash = "sha256-C9SYlL1yMnSb+Zpi2opvDw1stxAHuI9/XKHyvkM36Cg="; }; nativeBuildInputs = [ From b2af238d31a267e93c20238161104858455aa9e1 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Tue, 5 Mar 2024 21:52:55 +0100 Subject: [PATCH 184/444] build-support/php: update `composer validate` steps --- .../php/hooks/php-script-utils.bash | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/php/hooks/php-script-utils.bash b/pkgs/build-support/php/hooks/php-script-utils.bash index 60afacbed0af..9b5978865634 100644 --- a/pkgs/build-support/php/hooks/php-script-utils.bash +++ b/pkgs/build-support/php/hooks/php-script-utils.bash @@ -13,7 +13,28 @@ setComposeRootVersion() { } checkComposerValidate() { - if ! composer validate --strict --no-ansi --no-interaction; then + if ! composer validate --strict --no-ansi --no-interaction --quiet --no-check-all --no-check-lock; then + if [ "1" == "${composerStrictValidation-}" ]; then + echo + echo -e "\e[31mERROR: composer files validation failed\e[0m" + echo + echo -e '\e[31mThe validation of the composer.json failed.\e[0m' + echo -e '\e[31mMake sure that the file composer.json is valid.\e[0m' + echo + exit 1 + else + echo + echo -e "\e[33mWARNING: composer files validation failed\e[0m" + echo + echo -e '\e[33mThe validation of the composer.json failed.\e[0m' + echo -e '\e[33mMake sure that the file composer.json is valid.\e[0m' + echo + echo -e '\e[33mThis check is not blocking, but it is recommended to fix the issue.\e[0m' + echo + fi + fi + + if ! composer validate --strict --no-ansi --no-interaction --quiet --no-check-all --check-lock; then if [ "1" == "${composerStrictValidation-}" ]; then echo echo -e "\e[31mERROR: composer files validation failed\e[0m" From 04d33b98e1e36bb5a32926d6969e49fac742d26a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 5 Mar 2024 22:58:29 +0100 Subject: [PATCH 185/444] treewide: stop using deprecated git.io shortlink service --- nixos/modules/services/monitoring/mackerel-agent.nix | 2 +- pkgs/data/themes/adapta-kde/default.nix | 2 +- pkgs/data/themes/arc-kde/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/monitoring/mackerel-agent.nix b/nixos/modules/services/monitoring/mackerel-agent.nix index 5915634ed26f..d1e84c0359dc 100644 --- a/nixos/modules/services/monitoring/mackerel-agent.nix +++ b/nixos/modules/services/monitoring/mackerel-agent.nix @@ -81,7 +81,7 @@ in { include = mkDefault "/etc/mackerel-agent/conf.d/*.conf"; }; - # upstream service file in https://git.io/JUt4Q + # upstream service file in https://github.com/mackerelio/mackerel-agent/blob/master/packaging/rpm/src/mackerel-agent.service systemd.services.mackerel-agent = { description = "mackerel.io agent"; wants = [ "network-online.target" ]; diff --git a/pkgs/data/themes/adapta-kde/default.nix b/pkgs/data/themes/adapta-kde/default.nix index a93e78480b00..be9367106d4d 100644 --- a/pkgs/data/themes/adapta-kde/default.nix +++ b/pkgs/data/themes/adapta-kde/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A port of the Adapta theme for Plasma"; - homepage = "https://git.io/adapta-kde"; + homepage = "https://github.com/PapirusDevelopmentTeam/adapta-kde"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.tadfisher ]; platforms = lib.platforms.all; diff --git a/pkgs/data/themes/arc-kde/default.nix b/pkgs/data/themes/arc-kde/default.nix index 2b41baa63494..79467e1743ef 100644 --- a/pkgs/data/themes/arc-kde/default.nix +++ b/pkgs/data/themes/arc-kde/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { description = "A port of the arc theme for Plasma"; - homepage = "https://git.io/arc-kde"; + homepage = "https://github.com/PapirusDevelopmentTeam/arc-kde"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.nixy ]; platforms = lib.platforms.all; From e20a2dfe2c019495f4affdb982ade9efed6f5e1c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 5 Mar 2024 23:13:35 +0100 Subject: [PATCH 186/444] home-assistant-custom-lovelace-modules.mushroom: 3.4.2 -> 3.5.0 https://github.com/piitaya/lovelace-mushroom/releases/tag/v3.5.0 --- .../custom-lovelace-modules/mushroom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix index 9515fac0792d..7c91fbcf905d 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mushroom"; - version = "3.4.2"; + version = "3.5.0"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-OUcOCBLEU8V+eadHuyA6F0uT8fJLRe1Xd9/X5ULCZVc="; + hash = "sha256-qLJQ4Mrngd6I3Y5iS4eZGPxla14pQaTnCNH+m69d+yY="; }; - npmDepsHash = "sha256-oIee6iJ18EBztje1aw4xzWa1wSIbgau4q0MyVx0T41I="; + npmDepsHash = "sha256-qO3FC+ONfAbEGPD76RBtJjoZ7vC33Bg3tGl4N7AZPzo="; installPhase = '' runHook preInstall From 913fb1519ce38da9786574d41cd149b084eeab93 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 5 Mar 2024 22:28:48 +0000 Subject: [PATCH 187/444] yacreader: add mainProgram --- pkgs/applications/graphics/yacreader/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index b70fdfc9d74c..bb0c1a0e5084 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -22,6 +22,7 @@ mkDerivation rec { description = "A comic reader for cross-platform reading and managing your digital comic collection"; homepage = "http://www.yacreader.com"; license = lib.licenses.gpl3; + mainProgram = "YACReader"; maintainers = with lib.maintainers; [ ]; }; } From 99d55fd3f0f8620de6279140b84c5baff2dd6aee Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Mar 2024 23:31:04 +0100 Subject: [PATCH 188/444] python311Packages.reptor: 0.11 -> 0.12 Diff: https://github.com/Syslifters/reptor/compare/refs/tags/0.11...0.12 Changelog: https://github.com/Syslifters/reptor/releases/tag/0.12 --- pkgs/development/python-modules/reptor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/reptor/default.nix b/pkgs/development/python-modules/reptor/default.nix index 800966352d08..db85c6b3edcb 100644 --- a/pkgs/development/python-modules/reptor/default.nix +++ b/pkgs/development/python-modules/reptor/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "reptor"; - version = "0.11"; + version = "0.12"; pyproject = true; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = "Syslifters"; repo = "reptor"; rev = "refs/tags/${version}"; - hash = "sha256-OJcg/e+ZC5Hf4dkP1dhsR9A+5lWvuFeuNLXyW8Hw6ko="; + hash = "sha256-8XjEWs+LKKc7ztNchNVmW+YGdYpmi5ee4eOoXIUBoM8="; }; pythonRelaxDeps = true; From 5a4abe8f77eb866300e591e268fb76f75b78e129 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 5 Mar 2024 22:40:55 +0100 Subject: [PATCH 189/444] python3Packages.dj-rest-auth: add patch to support django-allauth 0.61.0 --- .../python-modules/dj-rest-auth/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/dj-rest-auth/default.nix b/pkgs/development/python-modules/dj-rest-auth/default.nix index 4c6751d8f43b..e415977d8637 100644 --- a/pkgs/development/python-modules/dj-rest-auth/default.nix +++ b/pkgs/development/python-modules/dj-rest-auth/default.nix @@ -5,6 +5,7 @@ , djangorestframework , djangorestframework-simplejwt , fetchFromGitHub +, fetchpatch , python , pythonOlder , responses @@ -26,6 +27,15 @@ buildPythonPackage rec { hash = "sha256-TqeNpxXn+v89fEiJ4AVNhp8blCfYQKFQfYmZ6/QlRbQ="; }; + patches = [ + # https://github.com/iMerica/dj-rest-auth/pull/597 + (fetchpatch { + name = "disable-email-confirmation-ratelimit-in-tests-to-support-new-allauth.patch"; + url = "https://github.com/iMerica/dj-rest-auth/commit/c8f19e18a93f4959da875f9c5cdd32f7d9363bba.patch"; + hash = "sha256-Y/YBjV+c5Gw1wMR5r/4VnyV/ewUVG0z4pjY/MB4ca9Y="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "==" ">=" From e9228b248350939ac86eb497dbc3bab04a6cb52f Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 5 Mar 2024 22:32:13 +0000 Subject: [PATCH 190/444] python3Packages.ecos: drop redundant `disable-warnings-if-gcc13` --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05759673e9c7..618b0b8ea57b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3601,7 +3601,7 @@ self: super: with self; { ecoaliface = callPackage ../development/python-modules/ecoaliface { }; - ecos = pkgs.disable-warnings-if-gcc13 (callPackage ../development/python-modules/ecos { }); + ecos = callPackage ../development/python-modules/ecos { }; ecpy = callPackage ../development/python-modules/ecpy { }; From 4adf95957acfc4f86cdda37974e4161a4471cccd Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 5 Mar 2024 22:38:35 +0000 Subject: [PATCH 191/444] python3Packages.gmsh: drop redundant `disable-warnings-if-gcc13` --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05759673e9c7..1e75c802dc82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4716,9 +4716,9 @@ self: super: with self; { gmpy = callPackage ../development/python-modules/gmpy { }; - gmsh = pkgs.disable-warnings-if-gcc13 (toPythonModule (callPackage ../applications/science/math/gmsh { + gmsh = toPythonModule (callPackage ../applications/science/math/gmsh { enablePython = true; - })); + }); gntp = callPackage ../development/python-modules/gntp { }; From ec4f9669f7b702115cfce16d6adb1e6b80d48340 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 5 Mar 2024 23:48:12 +0100 Subject: [PATCH 192/444] python311Packages.llama-index-readers-file: decouple from llama-index-core --- .../python-modules/llama-index-readers-file/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/llama-index-readers-file/default.nix b/pkgs/development/python-modules/llama-index-readers-file/default.nix index 05bbdec8f258..4c5503c66071 100644 --- a/pkgs/development/python-modules/llama-index-readers-file/default.nix +++ b/pkgs/development/python-modules/llama-index-readers-file/default.nix @@ -6,13 +6,15 @@ , poetry-core , pymupdf , pypdf +, pytestCheckHook , pythonRelaxDepsHook }: buildPythonPackage rec { pname = "llama-index-readers-file"; + version = "0.1.7"; - inherit (llama-index-core) version src meta; + inherit (llama-index-core) src meta; pyproject = true; @@ -40,6 +42,10 @@ buildPythonPackage rec { pypdf ]; + nativeCheckInputs = [ + pytestCheckHook + ]; + pythonImportsCheck = [ "llama_index.readers.file" ]; From 1bdb07e19955ecc6b6860effb7eac0eb48004a9c Mon Sep 17 00:00:00 2001 From: Coutinho de Souza Date: Fri, 1 Mar 2024 12:37:53 -0300 Subject: [PATCH 193/444] 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 194/444] 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 7f222991f58519eee33a6d15ccc2407d91233bed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 00:07:41 +0100 Subject: [PATCH 195/444] audiness: 0.2.1 -> 0.3.0 Diff: https://github.com/audiusGmbH/audiness/compare/refs/tags/0.2.1...0.3.0 Changelog: https://github.com/audiusGmbH/audiness/releases/tag/0.3.0 --- pkgs/by-name/au/audiness/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix index 3fe2b2491184..28ab75b6dd79 100644 --- a/pkgs/by-name/au/audiness/package.nix +++ b/pkgs/by-name/au/audiness/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "audiness"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "audiusGmbH"; repo = "audiness"; rev = "refs/tags/${version}"; - hash = "sha256-QznJdm9wSmxdWxaRYgiaUqFfRs2apLuQOIr226eFIGA="; + hash = "sha256-PkzYsfEhwrMoB+a2eJMmt/PRCbjASQRm38reA8PP4aI="; }; nativeBuildInputs = with python3.pkgs; [ From d2faa08fd630488188af8f8d2e386f034fff812c Mon Sep 17 00:00:00 2001 From: Lena <126529524+acuteenvy@users.noreply.github.com> Date: Wed, 6 Mar 2024 00:11:10 +0100 Subject: [PATCH 196/444] nushell: 0.90.1 -> 0.91.0 --- pkgs/shells/nushell/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix index 33089063e68a..bdc3e1a0da7a 100644 --- a/pkgs/shells/nushell/default.nix +++ b/pkgs/shells/nushell/default.nix @@ -24,7 +24,7 @@ }: let - version = "0.90.1"; + version = "0.91.0"; in rustPlatform.buildRustPackage { @@ -35,10 +35,10 @@ rustPlatform.buildRustPackage { owner = "nushell"; repo = "nushell"; rev = version; - hash = "sha256-MODd2BT2g6g5H6/1EG5OjIoYm18yBSvYTR83RuYDMec="; + hash = "sha256-X3D+JRvnk6HMKWJMTNR16Fmhu+gYd8Ip+7PZQoLIoEU="; }; - cargoHash = "sha256-35KPY5t4aozHIcukmeS00g6tzZA9ZsS/44u9vpZ3oGQ="; + cargoHash = "sha256-Xj4P/qd4GvmhWGwGaPvY23cQwdjdf6cSb1xyRZLN0tQ="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ] From 16c9831ad5114c91c4f034c37bef92ddf5ddcf39 Mon Sep 17 00:00:00 2001 From: Lena <126529524+acuteenvy@users.noreply.github.com> Date: Wed, 6 Mar 2024 00:20:01 +0100 Subject: [PATCH 197/444] nushellPlugins: update to nushell 0.91.0 --- pkgs/shells/nushell/plugins/formats.nix | 2 +- pkgs/shells/nushell/plugins/gstat.nix | 2 +- pkgs/shells/nushell/plugins/query.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/plugins/formats.nix b/pkgs/shells/nushell/plugins/formats.nix index 1e3a3a5b2a03..fad270fb8df5 100644 --- a/pkgs/shells/nushell/plugins/formats.nix +++ b/pkgs/shells/nushell/plugins/formats.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_formats"; inherit (nushell) version src; - cargoHash = "sha256-lMxI+tw5B6Q/ZXW1ANl+Oi/x37ds2IEuOkdPIV1zXLA="; + cargoHash = "sha256-sEc+Oa2s8d3/9mye/9cHipjamPmLj6P38Jh24VrpfXM="; env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; diff --git a/pkgs/shells/nushell/plugins/gstat.nix b/pkgs/shells/nushell/plugins/gstat.nix index 20edc7fd7b22..8a11be39ef59 100644 --- a/pkgs/shells/nushell/plugins/gstat.nix +++ b/pkgs/shells/nushell/plugins/gstat.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { pname = "nushell_plugin_gstat"; inherit (nushell) version src; - cargoHash = "sha256-/viATLt2CixUCUa45YWo4fod2/iI/qvqB/BP8L8qrvY="; + cargoHash = "sha256-wtw4S5fbZPh6OXmbbQu8oXpo0/rXWdOGHspx+z8Fjns="; env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; diff --git a/pkgs/shells/nushell/plugins/query.nix b/pkgs/shells/nushell/plugins/query.nix index dedd7944cdb8..daee91a6e919 100644 --- a/pkgs/shells/nushell/plugins/query.nix +++ b/pkgs/shells/nushell/plugins/query.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage { pname = "nushell_plugin_query"; inherit (nushell) version src; - cargoHash = "sha256-pDsjKpb4c9nnYA81sQm4RCYhIoKJe+vcV1hs8KCSP9Q="; + cargoHash = "sha256-u6etPrtq/q37CvJ2rkoFvVDBgu/YyVugeGOJbeHcSek="; env = lib.optionalAttrs stdenv.cc.isClang { LIBCLANG_PATH = "${libclang.lib}/lib"; From 8f7f11daef2bfd448877af9964fc34e2dbff936a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Mar 2024 15:57:46 +0000 Subject: [PATCH 198/444] buildbot: 3.11.0 -> 3.11.1 --- .../buildbot/master.nix | 4 ++-- .../continuous-integration/buildbot/pkg.nix | 2 +- .../buildbot/plugins.nix | 22 +++++++++---------- .../buildbot/worker.nix | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index d2554713109c..98626ed36bf4 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -70,14 +70,14 @@ let package = buildPythonApplication rec { pname = "buildbot"; - version = "3.11.0"; + version = "3.11.1"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-0TW14K0Cp3Ylk+JDNV9x7a8Ul7EC5FTTVvSGccXv6JU="; + hash = "sha256-ruYW1sVoGvFMi+NS+xiNsn0Iq2RmKlax4bxHgYrj6ZY="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix index 80c417066428..4ccdb66d7b11 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/pkg.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-ImXiBIFSj0of2SFX01sXB5BI4TYA2IAGmfPofC8ERZQ="; + hash = "sha256-cfPsNnR0gEgz1y/GNR6faixk2HyuHaRh1E9nGHjCb58="; }; postPatch = '' diff --git a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix index 4d2253c54d61..b84e42c1bee7 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/plugins.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/plugins.nix @@ -8,7 +8,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-bu22WXJ2yBGe89GL3RBxkUN/yPu2GEYURk6C+2LIpns="; + hash = "sha256-5q4N76XHUhvc2lIqup0dYwrEdI5bR/96N7m2rhvPJh4="; }; # Remove unnecessary circular dependency on buildbot @@ -35,7 +35,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-WDtw4wSAPsmIRcoZS1PIRzQR4OJnHVyc19Q7MnU5VSs="; + hash = "sha256-kjow5WksdBzeo8nwXk5Djm/4tym8XvMo+VgiqSSAyKk="; }; # Remove unnecessary circular dependency on buildbot @@ -62,7 +62,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-HGlKu9ptej35GJYBBWted/YtsH/uigckAoFAjYTh3gY="; + hash = "sha256-IrXDwO0YSpiZfw6B/lorEQdbAIZ5qCja75L/PFRmJms="; }; buildInputs = [ buildbot-pkg ]; @@ -84,7 +84,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-oFbR4NvI/6oPXY8TospkHS1j/5KzXd1fguazFtDPIko="; + hash = "sha256-ZkUsAN56OEI/SphQydv4HkVV6Eobd0pd+UbXa23mBfQ="; }; buildInputs = [ buildbot-pkg ]; @@ -106,7 +106,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-O4scYAKpoEOXsPIodkKUrfwCGNYHlOGfvDnguaM12U0="; + hash = "sha256-qL1+bpgxflcRTFPOvDHKdHilio28bbHClqy1Um4Se+o="; }; buildInputs = [ buildbot-pkg ]; @@ -128,7 +128,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-DlYqK32lVdZ8qby/1+JCo6m81/0dsxqiAfWMIZ1OAPQ="; + hash = "sha256-5D0N/5Sf8YNQBKt8GzAk1htdEY/xOmE5Abt5y7P9h34="; }; buildInputs = [ buildbot-pkg ]; @@ -150,7 +150,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-cK+uZU7rG423IT8xvwrpMPiUXfu1oPpGB5onmWNK4fs="; + hash = "sha256-snyJbQZqSIqOk6dTJidSv1VmE/Gn+pblcZs8BpZ+fdA="; }; buildInputs = [ buildbot-pkg ]; @@ -172,7 +172,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-Gbc0T1fsmke1pO/LiXCzQYrjWzYG1WhHZgypLyzhfok="; + hash = "sha256-0Ggm3NQn1ZZfMsMqf1qdCD1+HkJZmM1p+TqOPF0Q9CE="; }; buildInputs = [ buildbot-pkg ]; @@ -194,7 +194,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-eFfOYhKw575VWlwD5dKRnqjSUV6kdPrv3UXBs/3AREo="; + hash = "sha256-rBUrYSeAWrxn5mlXaAAtE58jIZVLs/q69ARY2u6rTsI="; }; buildInputs = [ buildbot-pkg ]; @@ -216,7 +216,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-0CCD1Zrj1xodUITvLzTDrLgLGaEVqt8y26f+exsP4N8="; + hash = "sha256-U0DHWFMmvTKFBW1C5bnoemjMOKpw1H3GXnBn/AU52vY="; }; buildInputs = [ buildbot-pkg ]; @@ -238,7 +238,7 @@ src = fetchPypi { inherit pname version; - hash = "sha256-FNMspluhQlGgQ4X7gJisakHTTmn/5PtQ+obK26PrXdg="; + hash = "sha256-7t4E7twn4TeJJCE5Vn83UzIRE2Okvcox2us1d8j50Os="; }; buildInputs = [ buildbot-pkg ]; diff --git a/pkgs/development/tools/continuous-integration/buildbot/worker.nix b/pkgs/development/tools/continuous-integration/buildbot/worker.nix index eb613858f463..1b73737e42cb 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/worker.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/worker.nix @@ -28,7 +28,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - hash = "sha256-7zpf1Xl5dYPJk8V5PQCx/v+sE9kH23UWM9QbE0fH4tA="; + hash = "sha256-hRsmgP8IiWg5+YCqMVYgZc4ljWwz7YWfAFrmMHx8wBY="; }; postPatch = '' From 0873ccf9d78be52df6cc9d69565397933dd7296a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 6 Mar 2024 09:36:25 +1000 Subject: [PATCH 199/444] buildbot: add buildbot-plugins.react-wsgi-dashboards to update script should have been added in 3be0f4c18aae0e174fe57160029060642d12a107 --- pkgs/development/tools/continuous-integration/buildbot/update.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/continuous-integration/buildbot/update.sh b/pkgs/development/tools/continuous-integration/buildbot/update.sh index dbefba28b55f..3936594617c1 100755 --- a/pkgs/development/tools/continuous-integration/buildbot/update.sh +++ b/pkgs/development/tools/continuous-integration/buildbot/update.sh @@ -14,4 +14,5 @@ nix-update --version=skip buildbot-plugins.react-waterfall-view nix-update --version=skip buildbot-plugins.grid-view nix-update --version=skip buildbot-plugins.react-grid-view nix-update --version=skip buildbot-plugins.wsgi-dashboards +nix-update --version=skip buildbot-plugins.react-wsgi-dashboards nix-update --version=skip buildbot-plugins.badges From 9fbb5dfae22fba790cbde2816baf8f0cc2911fe8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:15:57 +0000 Subject: [PATCH 200/444] terraform-providers.aci: 2.13.0 -> 2.13.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 13bedc388d8d..ec70ddca722b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1,10 +1,10 @@ { "aci": { - "hash": "sha256-1N9Ya8WWb2gL84jYj4B8zllB5jQxRneVSNESYeRhj+c=", + "hash": "sha256-Xe6RDA9Ijq6BnrTzlXHt+6hfNf7CkrJ4TY6dp4TUm4E=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.13.0", + "rev": "v2.13.2", "spdx": "MPL-2.0", "vendorHash": null }, From 8d5518ef9eb659503eabe688b5d0a76ecb703c89 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:16:38 +0000 Subject: [PATCH 201/444] terraform-providers.acme: 2.19.1 -> 2.20.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ec70ddca722b..320260c55beb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -9,14 +9,14 @@ "vendorHash": null }, "acme": { - "hash": "sha256-wyDlI8G1MxZsoYPBjqQ32+/gK8DqQMXZWgTkATaOztQ=", + "hash": "sha256-ZhL5u6v7ZraajKaSK6hwzXbXr+ySdFmBSJnmsOhOJok=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "proxyVendor": true, "repo": "terraform-provider-acme", - "rev": "v2.19.1", + "rev": "v2.20.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-PoykgWxMKmQzKUSojFICwjDucukfHYxHdgn60uD+UQ8=" + "vendorHash": "sha256-eiWGI8sp+gGL8UiRBG6lHmCATVUebYwdXJbLNGfi6xY=" }, "age": { "hash": "sha256-bJrzjvkrCX93bNqCA+FdRibHnAw6cb61StqtwUY5ok4=", From 2a77704900d436709aa394c37ffef865aad1a419 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:16:58 +0000 Subject: [PATCH 202/444] terraform-providers.akamai: 5.5.0 -> 5.6.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 320260c55beb..86dc82075229 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -37,13 +37,13 @@ "vendorHash": "sha256-rIyAhe4YQ9XG3nODCSxZRohHgNIPQ94pDLrh7+4Rj1k=" }, "akamai": { - "hash": "sha256-CBBrX0mm6hyobOdhbDaud4HKupIMnDTJp7+kWSej+NI=", + "hash": "sha256-j1UTi4ygixwSfu9Wp//JzKe58xSV/tZM3kRo1ikBo3Y=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v5.5.0", + "rev": "v5.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Y30DSv7gAW7JzaTYt0XGwLhTArFILPPnxYmP2mKe9Sc=" + "vendorHash": "sha256-/gW1vxaDaUMpm0QSghd/Glo3S/XVa5t9x3QrIs4Bqyk=" }, "alicloud": { "hash": "sha256-LgpEooWXTefhH4HLVO1BIBUXXZBMO11ZS6NwsEbbnog=", From 7beaca88d22981c7aeedb4c3a21575285acb8f92 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:17:12 +0000 Subject: [PATCH 203/444] terraform-providers.alicloud: 1.215.0 -> 1.217.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 86dc82075229..1db9e88065f5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -46,11 +46,11 @@ "vendorHash": "sha256-/gW1vxaDaUMpm0QSghd/Glo3S/XVa5t9x3QrIs4Bqyk=" }, "alicloud": { - "hash": "sha256-LgpEooWXTefhH4HLVO1BIBUXXZBMO11ZS6NwsEbbnog=", + "hash": "sha256-YD9q4sjX9Bmp1k6MIy7EKIT2fY0e9Mb939hJ5w1Hh2Y=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.215.0", + "rev": "v1.217.2", "spdx": "MPL-2.0", "vendorHash": null }, From f6a15cfd5f97f2bf1773f2a56c951f44c62c708b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:17:29 +0000 Subject: [PATCH 204/444] terraform-providers.artifactory: 10.1.2 -> 10.1.5 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1db9e88065f5..013640998057 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -82,11 +82,11 @@ "vendorHash": "sha256-q9PO9tMbaXTs3nBLElwU05GcDZMZqNmLVVGDmiSRSfo=" }, "artifactory": { - "hash": "sha256-hcdd762uNBYJx2KL4kouR8qWuSZBtGO2egUwaWufOMg=", + "hash": "sha256-W8IWBc9tWmj4Rkp4CgZV9tsAL41EOnEhH+iTImP/+D4=", "homepage": "https://registry.terraform.io/providers/jfrog/artifactory", "owner": "jfrog", "repo": "terraform-provider-artifactory", - "rev": "v10.1.2", + "rev": "v10.1.5", "spdx": "Apache-2.0", "vendorHash": "sha256-J/+OcqRtcHaqoDkrWIDpPlBHQ/UWupwchA1aeSoHSh4=" }, From f698d525676bf7e4fd413a34754e94a938f34315 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:17:39 +0000 Subject: [PATCH 205/444] terraform-providers.auth0: 1.1.2 -> 1.2.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 013640998057..92812972a58f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -91,13 +91,13 @@ "vendorHash": "sha256-J/+OcqRtcHaqoDkrWIDpPlBHQ/UWupwchA1aeSoHSh4=" }, "auth0": { - "hash": "sha256-6VwjKNX24r93EgVED+NK17dY577HL4tT76jSCgVIpHg=", + "hash": "sha256-Yoje6btftS0slz2newORBbb9kTjWXaXzbP94YKT6+3E=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.1.2", + "rev": "v1.2.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-t40UZ9LF7PNhIqdEK6puuNeSDapTpC0+BTQgXQlMPTs=" + "vendorHash": "sha256-kBLyk8glOuvgpbGLUUwtzKecqDDU8VS3JxN6tPIhMro=" }, "avi": { "hash": "sha256-EGpHajrTTOx7LrFHzsrrkGMqsuUEJLJAN6AJ48QdJis=", From a40b73cea229cae2539296b8a600495d3b716ffa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:18:19 +0000 Subject: [PATCH 206/444] terraform-providers.aws: 5.34.0 -> 5.39.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 92812972a58f..5259487cbf23 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -118,13 +118,13 @@ "vendorHash": null }, "aws": { - "hash": "sha256-UI1ECQ1bHxwjxtBzpgwbyZLexRH+7L6rjrEcyxSed0g=", + "hash": "sha256-/KJMoRsEKA4cqY/TpSWQDBpNjtqmZcqnpMSLf2E0LXY=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v5.34.0", + "rev": "v5.39.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-sccfJ5EUY9XTjDYah9/0R9L53Zzdfi06kWi5QaFp+og=" + "vendorHash": "sha256-q5Tsm7JLrX5OK4fKV0SBRgK6ZHogG16OtMFeJrR0bBc=" }, "azuread": { "hash": "sha256-lumXl3orK5Jq5+qnRfiIA94NjK2bCjd3LhRzHmW1h8I=", From 644dbcdf4c9d94acb91676f330e09decc21c3787 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:18:43 +0000 Subject: [PATCH 207/444] terraform-providers.azurerm: 3.89.0 -> 3.94.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5259487cbf23..027647ec7816 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -136,11 +136,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-QNaTyyz7H5jf7znPOv6ZTUnaI2zPNHnfZXp2ns3Nv00=", + "hash": "sha256-HPbEbFw99HM6+a+EAbkwE6hvzh4/FU/cAbl6DT1dbp0=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.89.0", + "rev": "v3.94.0", "spdx": "MPL-2.0", "vendorHash": null }, From 36bdcbab03b19385e4d121678d067d37fafc797a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:19:00 +0000 Subject: [PATCH 208/444] terraform-providers.baiducloud: 1.19.31 -> 1.19.37 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 027647ec7816..e47d2badad78 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -155,13 +155,13 @@ }, "baiducloud": { "deleteVendor": true, - "hash": "sha256-+/QLVhVzT80IYwoXvRoxHok3PAw+ZPQhH+b5YARFFLU=", + "hash": "sha256-wPfWcc4OD3KXEfe9IsK/4NPdX/4bQNKTiGBsKL0OZC8=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.19.31", + "rev": "v1.19.37", "spdx": "MPL-2.0", - "vendorHash": "sha256-7FA5bhb22C/OUhcHrcZK2D4esj+su/HLB7pTyX7ot44=" + "vendorHash": "sha256-puTQKvIvyBRgdZZTZCXEAdc8HYNgtoSmzjpqHCIEAKk=" }, "bigip": { "hash": "sha256-itRFSpaso9AJpjsXNpVxUgoG13Ys7dSuG5XCcuCkuMk=", From d427bc25ea49830de6060efb8a48f557bd203144 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:19:06 +0000 Subject: [PATCH 209/444] terraform-providers.bigip: 1.20.2 -> 1.21.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e47d2badad78..f1e46299f817 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -164,11 +164,11 @@ "vendorHash": "sha256-puTQKvIvyBRgdZZTZCXEAdc8HYNgtoSmzjpqHCIEAKk=" }, "bigip": { - "hash": "sha256-itRFSpaso9AJpjsXNpVxUgoG13Ys7dSuG5XCcuCkuMk=", + "hash": "sha256-GrHd9plKhe7BdCBgsnTv+CM82F7oDPWamtXxOpiwKPE=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.20.2", + "rev": "v1.21.0", "spdx": "MPL-2.0", "vendorHash": null }, From 3d618cf7997786f7c185260df433819645487278 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:19:15 +0000 Subject: [PATCH 210/444] terraform-providers.bitbucket: 2.38.0 -> 2.40.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f1e46299f817..dcacec16775d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -173,13 +173,13 @@ "vendorHash": null }, "bitbucket": { - "hash": "sha256-jrxCUTqR6knktDIX3sFDtIP6OD9cJGdV+JgwSgoDfMo=", + "hash": "sha256-rapsVhYfyASIn9zVQTwhAF4A2Taw9djYlh+sJXCpJNA=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.38.0", + "rev": "v2.40.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2s8ATVlSVa6n/OSay0oTdJXGdfnCwX6da3Pcu/xYcPY=" + "vendorHash": "sha256-oDMKf39uNMO9/kyiZ1IuZlj2yIF1q5Z3wewxEBh3yso=" }, "brightbox": { "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", From f40ea6638ca53cc8a306738092f0b0b4eb1232d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:19:28 +0000 Subject: [PATCH 211/444] terraform-providers.buildkite: 1.3.0 -> 1.5.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index dcacec16775d..097071564bcf 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -191,13 +191,13 @@ "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" }, "buildkite": { - "hash": "sha256-gq6GvSSQny5o3bzF33p/6SE8Wi44xCZtAJ4wcmnIJ1c=", + "hash": "sha256-3r2vxoPRTehKTswcNoAkVKuLbo6OFuyLy1WEyjw2zO8=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.3.0", + "rev": "v1.5.0", "spdx": "MIT", - "vendorHash": "sha256-/nwLZWPg8sGshoEg2wcXRVzf8wwsnthrmd8HiGcvvZ8=" + "vendorHash": "sha256-21OyBnW86A3Tm0OAHilCM+pgJcgx2a+P9up3/jeA8qg=" }, "checkly": { "hash": "sha256-PaQDHK/T3H2W+Ah4cYdP0VOOMSiK/9UgJDmmHHiYEsI=", From 9b6a3f64c69b83f7cbd5bae7f198544328fda5e7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:19:41 +0000 Subject: [PATCH 212/444] terraform-providers.checkly: 1.7.3 -> 1.7.6 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 097071564bcf..7e5da81bc5ca 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -200,13 +200,13 @@ "vendorHash": "sha256-21OyBnW86A3Tm0OAHilCM+pgJcgx2a+P9up3/jeA8qg=" }, "checkly": { - "hash": "sha256-PaQDHK/T3H2W+Ah4cYdP0VOOMSiK/9UgJDmmHHiYEsI=", + "hash": "sha256-Wxw87/9BG/bTDGqgKdle6WF38oDoHkrc0HIKjJlaQOQ=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.7.3", + "rev": "v1.7.6", "spdx": null, - "vendorHash": "sha256-bP2qfEOP3CPTkr6Dq/o4PCCVnAm+ujsp+pogmuUX4ZM=" + "vendorHash": "sha256-zxlKKA2bi+PV0T+znLAFEbTe5ynGfl0bE913GWojwEo=" }, "ciscoasa": { "hash": "sha256-xzc44FEy2MPo51Faq/VFwg411JK9e0kQucpt0vdN8yg=", From f063658ea25d1034f3abd95a7d787b95fdc458a6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:19:56 +0000 Subject: [PATCH 213/444] terraform-providers.cloudamqp: 1.29.3 -> 1.29.4 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7e5da81bc5ca..1359de9bc1d4 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -218,13 +218,13 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-TWBilEfRrLUk1PIAO/Vq1wed1BTALKApeBGTa5WtN5g=", + "hash": "sha256-aEbGvGPYvW3NOO+Q89/ebcJWNrXIoNQkqAIbv9ikiI8=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.29.3", + "rev": "v1.29.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-+HZzsAsEJuzEZ61ARaNYC1WxI3M6UwFEf+8q3Bd/JWA=" + "vendorHash": "sha256-cI3brJwN+7FTceOMwR0HMbZCNHhwvm31OXqjAEvrzrs=" }, "cloudflare": { "hash": "sha256-ftpfjKjW+60n+mmwdx/ivpge4Nt2H1I3ElSk3AhPevY=", From bb7b4bcbad017ff230267be700040dbf5f41906a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:20:08 +0000 Subject: [PATCH 214/444] terraform-providers.cloudflare: 4.23.0 -> 4.25.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1359de9bc1d4..fd180bc0c93d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -227,13 +227,13 @@ "vendorHash": "sha256-cI3brJwN+7FTceOMwR0HMbZCNHhwvm31OXqjAEvrzrs=" }, "cloudflare": { - "hash": "sha256-ftpfjKjW+60n+mmwdx/ivpge4Nt2H1I3ElSk3AhPevY=", + "hash": "sha256-b9qsA0V/ncQPiP2SQyFpVDaQdEyAMBQp4WfCQlcd9xk=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v4.23.0", + "rev": "v4.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-F+6bk+Lc0ziRJ/LBhrb5bS8oMN9zT7WqzPZKVUReNU4=" + "vendorHash": "sha256-TBELRtWlzXqP64fPM3e1pn/w8FVERQ3BLf+kRoahNXk=" }, "cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", From 84821ead47ef9905f52d588622dd921cfeed350d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:20:29 +0000 Subject: [PATCH 215/444] terraform-providers.cloudscale: 4.2.2 -> 4.2.3 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fd180bc0c93d..3478f8e2e2bc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -255,11 +255,11 @@ "vendorHash": "sha256-MFhKJEuylDnyj9ltugxGXgfIxBT3/mYaxB0JmTJxK3M=" }, "cloudscale": { - "hash": "sha256-SDivLkP1y/qBVNSiyCjV6zPTbLUplxzD3gNxzkjC51M=", + "hash": "sha256-GjtWkty9mNMnTzXUf9U56b9HkjrjUdouA41ZptXMKeQ=", "homepage": "https://registry.terraform.io/providers/cloudscale-ch/cloudscale", "owner": "cloudscale-ch", "repo": "terraform-provider-cloudscale", - "rev": "v4.2.2", + "rev": "v4.2.3", "spdx": "MIT", "vendorHash": null }, From 1a052cd675b1ba61061e30231faf9a5c0042ff15 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:20:49 +0000 Subject: [PATCH 216/444] terraform-providers.datadog: 3.35.0 -> 3.37.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3478f8e2e2bc..4270ff1b1e7d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -292,13 +292,13 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-JH0QDASZLFU9beexGze0vg1qrQutgAeGSExwHnYRyKs=", + "hash": "sha256-gmFD9VG9mcxw7lpt25bz8z2RnmeCSbd2EkFJHbZNP0Y=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.35.0", + "rev": "v3.37.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-eGOUtinVIi6R1R19nosw60I+DfdJNxmw3pBrS171tRI=" + "vendorHash": "sha256-20ANWw/0rqhCVhkl2r1PusXKOAKrvpxgvpGKmKMzbZM=" }, "dexidp": { "hash": "sha256-3UgiOeAGpGG2mkImPDvb24WjV2mavhY0E12j7W+SJs8=", From ea0ccc2f631b21785dd96064312f71bdce88613c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:21:10 +0000 Subject: [PATCH 217/444] terraform-providers.doppler: 1.4.0 -> 1.6.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4270ff1b1e7d..129542756ddb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -365,11 +365,11 @@ "vendorHash": "sha256-XxltOTtCgmJ9wZX8Yw39HkwVVZb58kZjAH7jfKPhjKM=" }, "doppler": { - "hash": "sha256-YOJbeMFwEF+r4vOdKM5txdqPeYV1/8N/DKwlMjQiT6w=", + "hash": "sha256-FJS1lPYieTWI/AX7pBbFmGtJw5kPD7MCZp+LWWIsnus=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.4.0", + "rev": "v1.6.2", "spdx": "Apache-2.0", "vendorHash": "sha256-qJ1mOuMyJ/f2/yCns7qY8zUt2lgDuBgzN0w1HCKBk7E=" }, From d526116f7f80c35c212843298a01a14259d5c911 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:21:30 +0000 Subject: [PATCH 218/444] terraform-providers.exoscale: 0.55.0 -> 0.56.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 129542756ddb..f0799e5e4992 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -392,11 +392,11 @@ "vendorHash": "sha256-vMmHoQEXXPbFS/q+wy35SQd5+yEXLQFVWX9AKsmbTn4=" }, "exoscale": { - "hash": "sha256-SDvW6VC8MwrAWhFGNFMNXA55FbMwSBs9BjX9gnqesZ8=", + "hash": "sha256-t1yZmayoZkDImcIr+VkNhQRzlfteGuvgcjSDOmmCF5I=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.55.0", + "rev": "v0.56.0", "spdx": "MPL-2.0", "vendorHash": null }, From 41a51ed990a1b55d2416f03c1fd2ed526008bf8f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:21:40 +0000 Subject: [PATCH 219/444] terraform-providers.external: 2.3.2 -> 2.3.3 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f0799e5e4992..49325df5da90 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -401,13 +401,13 @@ "vendorHash": null }, "external": { - "hash": "sha256-rmCdTtyYv3jZDXWWqRLV8AgnnZ0Hqp8Ofq8BoLBkDhs=", + "hash": "sha256-NCHG3lE+PuKm/8ox+d+zDSoKMXjSCCwi2JWTOn7NezE=", "homepage": "https://registry.terraform.io/providers/hashicorp/external", "owner": "hashicorp", "repo": "terraform-provider-external", - "rev": "v2.3.2", + "rev": "v2.3.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-mkopDoGhGZSJyxWYtR8OU9BU1GYwhLe3xwNkUKwlBNI=" + "vendorHash": "sha256-qeKXdjrDPJWO4xW8by6djJReeYbCjh8VzQmE5/65zII=" }, "fastly": { "hash": "sha256-T3iQ0QIB3lfzcTx1K7WkgUdKsl/hls2+eorPa0O19g8=", From 5569a36d080c979ec37475d9400a6e1a25729be5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:21:47 +0000 Subject: [PATCH 220/444] terraform-providers.fastly: 5.6.0 -> 5.7.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 49325df5da90..ad02a4ef5239 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -410,11 +410,11 @@ "vendorHash": "sha256-qeKXdjrDPJWO4xW8by6djJReeYbCjh8VzQmE5/65zII=" }, "fastly": { - "hash": "sha256-T3iQ0QIB3lfzcTx1K7WkgUdKsl/hls2+eorPa0O19g8=", + "hash": "sha256-trDTXsZZTSxYe8ybFYpw8FkjxWJhTjyavT21c8wN0y0=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v5.6.0", + "rev": "v5.7.0", "spdx": "MPL-2.0", "vendorHash": null }, From e4227ce6e3454ccce84f059cda546ada7cd1ced2 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:22:04 +0000 Subject: [PATCH 221/444] terraform-providers.fortios: 1.18.1 -> 1.19.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ad02a4ef5239..b0c479554cef 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -428,12 +428,12 @@ "vendorHash": "sha256-hpoeXO3RfnI49UAqtF4rmX75DXCfsl4XTjIPGFyI/Nc=" }, "fortios": { - "hash": "sha256-3fcbUH3/LjsdNbomN2tl2WN/P0rpf0ZsILVkAOLUbt0=", + "hash": "sha256-SENWlcDkb6S73yKratGSlT151wWuR43B40SoK7Hb6Qs=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", "proxyVendor": true, "repo": "terraform-provider-fortios", - "rev": "1.18.1", + "rev": "1.19.0", "spdx": "MPL-2.0", "vendorHash": "sha256-DwRfbD4AqB+4KLuYtqY5fUdzRrEpTIvL4VAM7nieJJA=" }, From 66179066a4f78d15d60206fd1c1a4be2de31fd34 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:22:14 +0000 Subject: [PATCH 222/444] terraform-providers.github: 5.43.0 -> 6.0.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b0c479554cef..1430cd41fe79 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -447,11 +447,11 @@ "vendorHash": "sha256-EiTWJ4bw8IwsRTD9Lt28Up2DXH0oVneO2IaO8VqWtkw=" }, "github": { - "hash": "sha256-VBKjk8dimVBLyuhCMTGE6oH7zdiBAzAERzm85YZ4Gkg=", + "hash": "sha256-y8DMpNSySMbe7E+sGVQcQdEyulq4Wnp5ryYD7FQO/fc=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v5.43.0", + "rev": "v6.0.0", "spdx": "MIT", "vendorHash": null }, From 0e277ab0320ce1080ced4b7f1e1dbcce34820617 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:22:36 +0000 Subject: [PATCH 223/444] terraform-providers.google: 5.13.0 -> 5.19.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1430cd41fe79..ff1d557b6975 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -465,14 +465,14 @@ "vendorHash": "sha256-dfsIEyLyTTJJxMPXWyo0YuSaRrjL+qGL654TAgECWPM=" }, "google": { - "hash": "sha256-oGd2r/qCpiX/+vLDUlMhBBatZHmX0V+28jkhwy1zga4=", + "hash": "sha256-mP2/XDQX/AagEmmUMDGzS6ATJpuJU21lmEvs2wFe7Tg=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v5.13.0", + "rev": "v5.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-1VdjxH20jZw6u33TLVMw/qxTHdviqF45SmWiKald2yw=" + "vendorHash": "sha256-0yCgFgRDGaJLGFEX3lZxoqrS1xWjqmRfYaYdMVpI2KI=" }, "google-beta": { "hash": "sha256-Q7hQff48vpGoiUPDWF+IuiJYDRMJgajqc7Jzgb4aUj4=", From 24dd1c92fed14781b4be5e8f271f5f07a86b61f9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:22:52 +0000 Subject: [PATCH 224/444] terraform-providers.google-beta: 5.13.0 -> 5.19.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ff1d557b6975..bd58a6309645 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -475,14 +475,14 @@ "vendorHash": "sha256-0yCgFgRDGaJLGFEX3lZxoqrS1xWjqmRfYaYdMVpI2KI=" }, "google-beta": { - "hash": "sha256-Q7hQff48vpGoiUPDWF+IuiJYDRMJgajqc7Jzgb4aUj4=", + "hash": "sha256-Hx9/hGT0cqNYkn1xojeolWrvFPWhh1gsKl/qxeejBzA=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v5.13.0", + "rev": "v5.19.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-1VdjxH20jZw6u33TLVMw/qxTHdviqF45SmWiKald2yw=" + "vendorHash": "sha256-0yCgFgRDGaJLGFEX3lZxoqrS1xWjqmRfYaYdMVpI2KI=" }, "googleworkspace": { "hash": "sha256-dedYnsKHizxJZibuvJOMbJoux0W6zgKaK5fxIofKqCY=", From 838118195704bea2044f36949076c254b2ab1746 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:23:06 +0000 Subject: [PATCH 225/444] terraform-providers.grafana: 2.10.0 -> 2.12.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bd58a6309645..72ae2f55e678 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -494,13 +494,13 @@ "vendorHash": "sha256-fqVBnAivVekV+4tpkl+E6eNA3wi8mhLevJRCs3W7L2g=" }, "grafana": { - "hash": "sha256-hC87cIbDqK9rTK/SOuLy4qBVpMUCPxrFb+ReDkGhU1o=", + "hash": "sha256-FcoWovmdPUcX4LcSF9MLpxvwK1ObFejump4ha0Fmdbw=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v2.10.0", + "rev": "v2.12.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-/cS4skB/p4QMeRqxpgp7JjnkTnTHVtb5M9YEVA1X+k0=" + "vendorHash": "sha256-lbtWI96iAjHNRbhJw2e8yWSGJD7hsMqy4ZGCScSH8ME=" }, "gridscale": { "hash": "sha256-nOuckOEiHTMUOSjRwTHaitLOosraEl2mbU4gafi3gi4=", From f6b06c1c76e9bfd5fc5c00488b13766ecc399deb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:23:13 +0000 Subject: [PATCH 226/444] terraform-providers.gridscale: 1.23.0 -> 1.23.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 72ae2f55e678..abbceca98345 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -503,11 +503,11 @@ "vendorHash": "sha256-lbtWI96iAjHNRbhJw2e8yWSGJD7hsMqy4ZGCScSH8ME=" }, "gridscale": { - "hash": "sha256-nOuckOEiHTMUOSjRwTHaitLOosraEl2mbU4gafi3gi4=", + "hash": "sha256-5gidBMUfJ4DPKuRx/pF5Rlff7DPkIXBJ7qzCIy6bZm8=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.23.0", + "rev": "v1.23.2", "spdx": "MPL-2.0", "vendorHash": null }, From 78fd9912e85f93feff8fe365c5e85159c7bcf493 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:23:32 +0000 Subject: [PATCH 227/444] terraform-providers.http: 3.4.1 -> 3.4.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index abbceca98345..b012a68ce3cc 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -558,13 +558,13 @@ "vendorHash": "sha256-+D8HxLRUSh7bCN6j+NSkPZTabvqknY7uJ9F5JxefomA=" }, "http": { - "hash": "sha256-cD38F0IzYRQB43lLrlm8m6XeH0GL9nNFgqImtH5wjU8=", + "hash": "sha256-druSExXZeZMNWFIJQoQ/Xh0gCQQx0AnKbIAJQlRi8Po=", "homepage": "https://registry.terraform.io/providers/hashicorp/http", "owner": "hashicorp", "repo": "terraform-provider-http", - "rev": "v3.4.1", + "rev": "v3.4.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-1gWC+HAwb9kzyhxlgQG7bky2VjGzCzFUFQGQzbrmmPg=" + "vendorHash": "sha256-GDeuiT3PV92t3CsD60CAmN8ED9j8UzDbRlk59SSCVCM=" }, "huaweicloud": { "hash": "sha256-r9JZjOOy1HT7A3Ds90z77ql/xfP3oDcS6kNrK2g94SI=", From 2dacb167e62d7baa47ff44bc71ff1393fdef62e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:23:42 +0000 Subject: [PATCH 228/444] terraform-providers.huaweicloud: 1.60.1 -> 1.62.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b012a68ce3cc..9a4439169949 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -567,11 +567,11 @@ "vendorHash": "sha256-GDeuiT3PV92t3CsD60CAmN8ED9j8UzDbRlk59SSCVCM=" }, "huaweicloud": { - "hash": "sha256-r9JZjOOy1HT7A3Ds90z77ql/xfP3oDcS6kNrK2g94SI=", + "hash": "sha256-gNMeblhzUWa2YTvy0bmMzP0NQ3Qe0Ibec4tEKHyTHR0=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.60.1", + "rev": "v1.62.0", "spdx": "MPL-2.0", "vendorHash": null }, From e0ba916def759018b8b0a1451407f858a5c103cb Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:24:00 +0000 Subject: [PATCH 229/444] terraform-providers.incus: 0.0.2 -> 0.1.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 9a4439169949..ed62c48fb8f1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -612,13 +612,13 @@ "vendorHash": null }, "incus": { - "hash": "sha256-FWQaU2C1cRo+3SqnesJl5EXfEYR/ssSHHZ9/09zRSTQ=", + "hash": "sha256-0KCP5ll6TszSTP2J9+dDK6qqNcVCPgLQrdMMrfVhmds=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v0.0.2", + "rev": "v0.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-KdyhF1RUZoycsNqRnkME9Q7bTkV2xuNERx24+/p+j1w=" + "vendorHash": "sha256-pKWKef0MtW90HBhDVtQlETt9TqnHnfW6Ck4gXShJVF0=" }, "infoblox": { "hash": "sha256-rjqtqfmQQoJIhMtP6sFOu/XfJ691E77P0Bf9gjml2yg=", From 7ce0969d96b9bff5073cad804fed10aa813a4139 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:24:16 +0000 Subject: [PATCH 230/444] terraform-providers.kafka: 0.5.4 -> 0.6.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ed62c48fb8f1..3a59e0a287e3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -639,13 +639,13 @@ "vendorHash": "sha256-NEGjgtrn6ZowqSF6NAK1NnSjYVUvfWuH/4R5ZPdTZSs=" }, "kafka": { - "hash": "sha256-cWFPuKU7CQU8TYy125N88saBGPkrGa+7mKLi3TlnM2I=", + "hash": "sha256-EECV3JMile7Lif/GuC5330OcAGm5ylc6k43fY4jRy80=", "homepage": "https://registry.terraform.io/providers/Mongey/kafka", "owner": "Mongey", "repo": "terraform-provider-kafka", - "rev": "v0.5.4", + "rev": "v0.6.0", "spdx": "MIT", - "vendorHash": "sha256-gWomOX/NaYdcqspquqpRjqGnzLRY3iIUJALACf78TV8=" + "vendorHash": "sha256-DKyDjcj7tovmlZeKjzun5YsCffTAJirp0z49kcOBq54=" }, "kafka-connect": { "hash": "sha256-PiSVfzNPEXAgONb/eaVAN4yPudn5glcHL0BLqE5PWsw=", From e73346ac165b0558076dc01da5c7c689d430b4ea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:24:36 +0000 Subject: [PATCH 231/444] terraform-providers.kubernetes: 2.25.2 -> 2.26.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3a59e0a287e3..04ec8092bfa5 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -675,13 +675,13 @@ "vendorHash": "sha256-lXQHo66b9X0jZhoF+5Ix5qewQGyI82VPJ7gGzc2CHao=" }, "kubernetes": { - "hash": "sha256-1MPVP9DTC5pIe5rzO/N3hcN8De+PMH/1WDiq5e1GRtA=", + "hash": "sha256-CxzBTixyvsSSjZDv8GrxAB1oeRjJBB9nRAuKoASeKbI=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v2.25.2", + "rev": "v2.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-1EpDTVVxmz4icLClRlJQiy2kZpZMHR9f9rAoFaZ25XY=" + "vendorHash": "sha256-mVC3Uf+4zWM7lXHXOfVI+okXI8gP1W5VyZyH+qVNX7o=" }, "launchdarkly": { "hash": "sha256-AxnMBygXEkgnGfVRqpIFcGdjED3S+OryzIutFzWM+fY=", From df9c270a9fca0f8652210a837e913cac5ab21c99 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:24:48 +0000 Subject: [PATCH 232/444] terraform-providers.launchdarkly: 2.17.0 -> 2.18.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 04ec8092bfa5..6bb4703b175c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -684,13 +684,13 @@ "vendorHash": "sha256-mVC3Uf+4zWM7lXHXOfVI+okXI8gP1W5VyZyH+qVNX7o=" }, "launchdarkly": { - "hash": "sha256-AxnMBygXEkgnGfVRqpIFcGdjED3S+OryzIutFzWM+fY=", + "hash": "sha256-rv/jgGrjJrUzGBpUnkc0n/x/msxAc/45n/JKCrGPWMA=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.17.0", + "rev": "v2.18.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-hGlgqLXpVUoATd7GihX+RMoUvGkqXr5F/uwAY3n+57Y=" + "vendorHash": "sha256-JbrecA5pNIifikBHwqFL72hRfRFHHl29mFKE4nDdbkY=" }, "libvirt": { "hash": "sha256-yGlNBbixrQxjh7zgZoK3YXpUmr1vrLiLZhKpXvQULYg=", From 45861b47c76dd1c2e5285a2117bd4e5f081bec27 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:25:03 +0000 Subject: [PATCH 233/444] terraform-providers.linode: 2.13.0 -> 2.16.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6bb4703b175c..81407a0834bb 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -702,13 +702,13 @@ "vendorHash": "sha256-K/PH8DAi6Wj+isPx9xefQcLPKnrimfItZFSPfktTias=" }, "linode": { - "hash": "sha256-AGRSwQ96CNvP1QXcUW34+B6yZLhjb9Yfu/DQWM9UdkQ=", + "hash": "sha256-ZhZ6Y8hPLL3ZxemCgDdGNC8waxNEKLMVtv3cNZtAoic=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v2.13.0", + "rev": "v2.16.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-wCQ/qbM382HgN+AT4nmt0Bn8iZrmsd+ln+kkp5/4kqs=" + "vendorHash": "sha256-rwto/tgKfmUYCNNMZpBpZ3vHyl9I8RrgLVmPogkMYe8=" }, "linuxbox": { "hash": "sha256-MzasMVtXO7ZeZ+qEx2Z+7881fOIA0SFzSvXVHeEROtg=", From 641c3ef68b75c1f2bce028d4f029c10d91555033 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:25:42 +0000 Subject: [PATCH 234/444] terraform-providers.mongodbatlas: 1.14.0 -> 1.15.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 81407a0834bb..dc32486db27f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -783,13 +783,13 @@ "vendorHash": "sha256-aIIkj0KpkIR+CsgPk4NCfhG7BMKaAQZy/49unQx4nWQ=" }, "mongodbatlas": { - "hash": "sha256-49DqsvrRw0Md9fJS3GVvSKJOQAMcL494fjuuOPf/u7k=", + "hash": "sha256-6XLPk4UNZVQLpY44MIVXabmHtkoQQ58WNfhmhW+/4Ow=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.14.0", + "rev": "v1.15.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-ySk+zivqynxdOIVtwzRJ31U2u8rxMJLXRxZw2rmtoaM=" + "vendorHash": "sha256-LBgZmVuBkeKNTPIk274owej+E4Ir0xcGkL4L05PhZUg=" }, "namecheap": { "hash": "sha256-NqY3dELdpYahbdK7wpTJ9BMTIesUpwOvISbArDOPj/4=", From a0038fce790825761678d7c45515c97e3c968c52 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:25:48 +0000 Subject: [PATCH 235/444] terraform-providers.namecheap: 2.1.1 -> 2.1.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index dc32486db27f..e38e73cfb4e8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -792,11 +792,11 @@ "vendorHash": "sha256-LBgZmVuBkeKNTPIk274owej+E4Ir0xcGkL4L05PhZUg=" }, "namecheap": { - "hash": "sha256-NqY3dELdpYahbdK7wpTJ9BMTIesUpwOvISbArDOPj/4=", + "hash": "sha256-g3i7jZBOl2umsyRk1z7Radv8a9Ry6oQ8oorv3YbY7Xo=", "homepage": "https://registry.terraform.io/providers/namecheap/namecheap", "owner": "namecheap", "repo": "terraform-provider-namecheap", - "rev": "v2.1.1", + "rev": "v2.1.2", "spdx": "Apache-2.0", "vendorHash": null }, From 1c1a0739c4ecdd7041a6dc48d6795fb752f19606 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:26:00 +0000 Subject: [PATCH 236/444] terraform-providers.newrelic: 3.29.0 -> 3.32.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e38e73cfb4e8..e074b4fc7c86 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -810,13 +810,13 @@ "vendorHash": null }, "newrelic": { - "hash": "sha256-9oYJTB4GYnLqw7paELFA8MdhLa5C9+aTCbzHOqrX+Io=", + "hash": "sha256-4/MFR8AJanto5OuY0J3Yce3zI62D5bx2UklrTccpvP0=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.29.0", + "rev": "v3.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-GwvO9w1WikBseQpGMJXZ4G6E4eyTxrpNWmFWpWGC4Vs=" + "vendorHash": "sha256-QluXNbTBc/EXCO3PmnBOSwSERK3t5NhCS4Jnz5hU97k=" }, "nomad": { "hash": "sha256-MEQK/HF9SNEKehLIUMBm2P0WdR5yISJ8DCpI0fVP/DA=", From 437a857d18d8e1437aa227f05a66a5828355d35f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:26:11 +0000 Subject: [PATCH 237/444] terraform-providers.nomad: 2.1.0 -> 2.1.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e074b4fc7c86..6be93add6c4d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -819,13 +819,13 @@ "vendorHash": "sha256-QluXNbTBc/EXCO3PmnBOSwSERK3t5NhCS4Jnz5hU97k=" }, "nomad": { - "hash": "sha256-MEQK/HF9SNEKehLIUMBm2P0WdR5yISJ8DCpI0fVP/DA=", + "hash": "sha256-KHbdP5kAs65Z31Fe7EjwUVlFaezgjCqECryF/hSXXXs=", "homepage": "https://registry.terraform.io/providers/hashicorp/nomad", "owner": "hashicorp", "repo": "terraform-provider-nomad", - "rev": "v2.1.0", + "rev": "v2.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-vK+xErFvVj59lcSGUcMK0qdEFjC2cg77BI8EQ6Na83Y=" + "vendorHash": "sha256-+0UAB4ZQfIyoCopQkm1hTCxDIa/J4gLDGwv4iInN4os=" }, "ns1": { "hash": "sha256-UHoOVITbfwZ7tviDuZ1Tp9aVgRpB9ZnCzk5EOZeH/Eo=", From 667c0db2fe9b04e7a2db4c79445d178a8508fc60 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:26:35 +0000 Subject: [PATCH 238/444] terraform-providers.oci: 5.26.0 -> 5.31.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6be93add6c4d..5dcd157951c8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -856,11 +856,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-WpBYrIm0Holm3ynEZjC7Pkqk8w4jGXu9Q7iOmKN8h/g=", + "hash": "sha256-X7/v25Ges3F69LQs1SEXNLwiCkHX+/VrJ7y2XtE+2bg=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v5.26.0", + "rev": "v5.31.0", "spdx": "MPL-2.0", "vendorHash": null }, From f5faa966437da78b55caae3fa19b918fb6eff156 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:26:47 +0000 Subject: [PATCH 239/444] terraform-providers.okta: 4.6.3 -> 4.8.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5dcd157951c8..5f1ee69a6fbe 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -865,13 +865,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-+lwR0/Q2lbBCDwQ0Hurhw8VhXOQzHqfMtD/dnedHIvU=", + "hash": "sha256-PaiLWAvEW7YKAWgd6n0ZaLFrkq+5GxV+O2eF5nPZAeE=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v4.6.3", + "rev": "v4.8.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-sF/jKuP7d5nafda9UfwtvdSsoJAxyI10o+70vadwAHs=" + "vendorHash": "sha256-LDKnlCxp1NWSWjb0vujoq3npeQXfyT+dJK6gp1gMQDc=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", From e1c68fa53b6bd8e234776388a13bbf51f4058a1d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:27:02 +0000 Subject: [PATCH 240/444] terraform-providers.openstack: 1.53.0 -> 1.54.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 5f1ee69a6fbe..33eb30009b6f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -892,13 +892,13 @@ "vendorHash": "sha256-Hd6vh4ihuR1rRk5yIu1mPuDMb4Not4soKld10MfOuGU=" }, "openstack": { - "hash": "sha256-sFv7n5tf3aAwe6R1XeJdU3XMDF9ZMCM3t/vVLegZaXM=", + "hash": "sha256-kD1UfsnSLMFBzPZNguT3XaIXk0+Tp4qCPfNV3FonaIo=", "homepage": "https://registry.terraform.io/providers/terraform-provider-openstack/openstack", "owner": "terraform-provider-openstack", "repo": "terraform-provider-openstack", - "rev": "v1.53.0", + "rev": "v1.54.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-hVsqlWTZoYAMWMeismKhiqFxSFbkTBSIEMSLZx5stnQ=" + "vendorHash": "sha256-WHsYDcvLE1i+wCHGNF6eE8yVpPbP5SLG7ZK1AL7xMXI=" }, "opentelekomcloud": { "hash": "sha256-4AsU4O5YxyqUvxBPwQw56dPGXoEsHBxJfHc5tnEPz4Q=", From f0a7254dad8a15f4c2722b833c8fb274fd5f5df0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:27:14 +0000 Subject: [PATCH 241/444] terraform-providers.opentelekomcloud: 1.36.0 -> 1.36.2 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 33eb30009b6f..40c08555133d 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -901,13 +901,13 @@ "vendorHash": "sha256-WHsYDcvLE1i+wCHGNF6eE8yVpPbP5SLG7ZK1AL7xMXI=" }, "opentelekomcloud": { - "hash": "sha256-4AsU4O5YxyqUvxBPwQw56dPGXoEsHBxJfHc5tnEPz4Q=", + "hash": "sha256-ZDZ5sOWpmsGc+ESWkib2gws8XOeN35WEpi9/R2262yg=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.0", + "rev": "v1.36.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-2XxpNnJkmXFd8CHETUlj1T3eQWDssFqPKzrWAbOOYzk=" + "vendorHash": "sha256-2gZ3+XK5FF4hQ2zGjULrPj3QYrCG9MNFLdcVdxgzX9s=" }, "opsgenie": { "hash": "sha256-ZssKhfwFrzCjvlebEmKAHWBInN5daVqxbmVFoA92dv8=", From 691e8c3d5c079058c06222f3d0d59a5818065b9a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:27:22 +0000 Subject: [PATCH 242/444] terraform-providers.ovh: 0.36.1 -> 0.37.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 40c08555133d..605b1b4d7cc7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -919,11 +919,11 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-TJ5PIRBgiJYT/JsWgHUXdRyaTdkO4ORHj5YDyyvt+tk=", + "hash": "sha256-jQ+eitK5kX12yso+cSltZWRPc/3P2v4W4H2+TbPKvNI=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.36.1", + "rev": "v0.37.0", "spdx": "MPL-2.0", "vendorHash": null }, From 28ea198e2b045f1cf12321faa33761c8412ea7a1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:27:29 +0000 Subject: [PATCH 243/444] terraform-providers.pagerduty: 3.6.0 -> 3.9.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 605b1b4d7cc7..af05c15c8a60 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -928,11 +928,11 @@ "vendorHash": null }, "pagerduty": { - "hash": "sha256-PgMG1TfeJ5vMmp+DxjFKL3UdHpHmPUwF6GG/y36Km+s=", + "hash": "sha256-WjRfkMMgGuqSpJd4514heDQD4SaiH7gIkZwJzzqxoZk=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.6.0", + "rev": "v3.9.0", "spdx": "MPL-2.0", "vendorHash": null }, From c7716815f877ab764a1b5ba8269c9cdff53d5046 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:27:46 +0000 Subject: [PATCH 244/444] terraform-providers.postgresql: 1.21.0 -> 1.22.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index af05c15c8a60..e856937d15ba 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -955,13 +955,13 @@ "vendorHash": "sha256-pbJk35O8EowCa2dgLCrPDgakR0EJVaAnEvePGnrl/YQ=" }, "postgresql": { - "hash": "sha256-r1Im4bhAakBe0PoDTpiQWPfnoFBtMCrAyL7qBa1yTQc=", + "hash": "sha256-UNnAe5alro4dEZ9x2ZDsjybOgHq2IVs8w9rMcMJBm8w=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", "repo": "terraform-provider-postgresql", - "rev": "v1.21.0", + "rev": "v1.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-bTgxH5KUFCLDxwY5JIG+rQtDq0uFXOsbuS1FxF3hJeU=" + "vendorHash": "sha256-omJjWeCLIdHIySQW8tcDPQ1XPmfWbPDOGwPUedrb8Bw=" }, "powerdns": { "hash": "sha256-NtJs2oNJbjUYNFsbrfo2RYhqOlKA15GJt9gi1HuTIw0=", From 0c26579b568723e445efafb13baac6a6cbfd5cc8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:27:57 +0000 Subject: [PATCH 245/444] terraform-providers.project: 1.3.4 -> 1.4.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e856937d15ba..1864df1ba931 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -973,13 +973,13 @@ "vendorHash": null }, "project": { - "hash": "sha256-bLzJT+ZyBtnehpiR02tyCcI5xOC2vJxBlYW1cLX7yqI=", + "hash": "sha256-ZE3OW83tz2DfcwFn8KfZZYQuWdl335zJecC3Qzn0xPg=", "homepage": "https://registry.terraform.io/providers/jfrog/project", "owner": "jfrog", "repo": "terraform-provider-project", - "rev": "v1.3.4", + "rev": "v1.4.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-ZDscj89bnLiubB+cxWjK1v9DXc5RX21pxfksJd6pQxk=" + "vendorHash": "sha256-i7wota4ezfBA2AoSGO8OdbJcZQizXrPRJYE/WJSTFss=" }, "proxmox": { "hash": "sha256-ikXLLNoAjrnGGGI3fHTKFXm8YwqNazE/U39JTjOBsW4=", From d802fc717b841e7dfbe92cc14572441b0bb1e0cf Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:28:20 +0000 Subject: [PATCH 246/444] terraform-providers.rancher2: 3.2.0 -> 4.0.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1864df1ba931..53746e9f644c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1000,13 +1000,13 @@ "vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI=" }, "rancher2": { - "hash": "sha256-ww4ZT0XobDZ2616wkpO2IQPlwU4oz/vXzy4Y6iXslV8=", + "hash": "sha256-k4lJszOUxeOmpBX8wFiIg6MmVUWqH6OTuj0/OJgr0ZA=", "homepage": "https://registry.terraform.io/providers/rancher/rancher2", "owner": "rancher", "repo": "terraform-provider-rancher2", - "rev": "v3.2.0", + "rev": "v4.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-2uNawlNPmByjoIjufl3yMfo2MdV+MsXqSRVEWursHKc=" + "vendorHash": "sha256-8XBsQuzEtg8nybJOFHkkr4nfp4WxnmgXqt0ci7q0CbI=" }, "random": { "hash": "sha256-8RRfoxDXa9pScyZ8CXBuWODlahd3lH0IzPaV0yb7GpI=", From 14a7c11422b41b7484b57e301f97d050aa2ccc7f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:28:40 +0000 Subject: [PATCH 247/444] terraform-providers.scaleway: 2.36.0 -> 2.37.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 53746e9f644c..7d6667a09af7 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1036,13 +1036,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-xJpCu2/7pf6kkZVPhozAXfeU5mbzdVDYT2DvDmjajCc=", + "hash": "sha256-ygCr2kxnVoR2IvtvQI483Urd5sLU6U+TCHYW1FXy1Tc=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.36.0", + "rev": "v2.37.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-E/qBdcSPq/hpG0b0pmeY6ugItNrtu0HUdlJxpakAVwE=" + "vendorHash": "sha256-JXSXDJqRGZDk1xyyWhv+S9Jl5duBN9RR71eukDc6ODQ=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", From ce43804d6666da1230149478b34ea89edde4da5f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:29:02 +0000 Subject: [PATCH 248/444] terraform-providers.signalfx: 9.0.1 -> 9.1.1 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7d6667a09af7..76759e92d330 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1081,13 +1081,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-kUubyCd00VhB72JEvWDBLF4/uglzkBmijcbotTyQgyA=", + "hash": "sha256-n8IpbCt8DKl4AIurIy5NnoZ3vWJyqrQvYEho6UEDmWc=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.0.1", + "rev": "v9.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-PQU4VC5wHcB70UkZaRT8jtz+qOAONU2SxtRrTmml9vY=" + "vendorHash": "sha256-aw1q9iCQKu4SynnbTRI8Tx+UbKWjG+2PFS5iDIirgh8=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", From b7dc09de366e8c1b4d5d311da6890af6475bf084 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:29:21 +0000 Subject: [PATCH 249/444] terraform-providers.snowflake: 0.84.1 -> 0.87.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 76759e92d330..0395e8222519 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1108,13 +1108,13 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "snowflake": { - "hash": "sha256-uMXU/0LqOMBRaIOw1hxCdWuogrkWW9r/28YHniOxCbA=", + "hash": "sha256-ZPqKctqmAaF7obRDdK2Jn5kGihjyPZhl8IoAprcXuUI=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.84.1", + "rev": "v0.87.0", "spdx": "MIT", - "vendorHash": "sha256-nT/zEQgHWnCrlm6TL/DnXIvwDxEs147OfXn/qnlvIH0=" + "vendorHash": "sha256-hvaZBOeAVutoKv46BLE1ud1Ox0K0InpTSG5G2WwTj5s=" }, "sops": { "hash": "sha256-ZastswL5AVurQY3xn6yx3M1BMvQ9RjfcZdXX0S/oZqw=", From 44f18a7c5446d589075d4bd3007fa2788dd9bca3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:29:36 +0000 Subject: [PATCH 250/444] terraform-providers.spotinst: 1.160.0 -> 1.162.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0395e8222519..6adf6e9e9a42 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1126,13 +1126,13 @@ "vendorHash": "sha256-8W1PK4T98iK1N6EB6AVjvr1P9Ja51+kSOmYAEosxrh8=" }, "spotinst": { - "hash": "sha256-cLP/I54ClS0aQ14cWrtV57WrDJzBO3fpOMjd9GPR/Z0=", + "hash": "sha256-9hSrU4pSlbcGM0HHKg/xIPz4DTvds6+yIFYbQ+xmPrA=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.160.0", + "rev": "v1.162.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xsV1Co7kSDUrhT6wL6WAzNV/ciHyinW2V6svsezY3/s=" + "vendorHash": "sha256-lOLX/ZcBbh7TzsKO9w/dB1gm0KD9ezlXNjWRBBQVgsQ=" }, "stackpath": { "hash": "sha256-aCaoRxlV/UxYobHC5OqFO8nt9oQgyug1AuJffhnwauc=", From 1a8473b3d883513f323d8bc9ae493660dfd09b19 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:29:53 +0000 Subject: [PATCH 251/444] terraform-providers.sumologic: 2.28.1 -> 2.28.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6adf6e9e9a42..1d62b908cf43 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1153,11 +1153,11 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic": { - "hash": "sha256-LQ+EDvnQVuNhMMAlU27R9aytWsfdyaHHiGLF4zBs4d0=", + "hash": "sha256-fO7EsELdBElvosfbyKYnun7pJhoy5tTADGgYHqi9nEQ=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v2.28.1", + "rev": "v2.28.2", "spdx": "MPL-2.0", "vendorHash": "sha256-iNBM4Y24vDGPKyb5cppSogk145F0/pAFmOzEeiWgfLI=" }, From 4cd895f186118390b02de3c840b180c1c3cd58d0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:31:23 +0000 Subject: [PATCH 252/444] terraform-providers.tencentcloud: 1.81.71 -> 1.81.77 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1d62b908cf43..ec27f0334d23 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1180,11 +1180,11 @@ "vendorHash": "sha256-FWwHAaUKUw7DyNs4sAlkLkGNj48wMJgpFvfQgbp8lFs=" }, "tencentcloud": { - "hash": "sha256-miYELvWd/b33JUe74j3pYmyDIRrOI+8PEv4mJ+MfhNE=", + "hash": "sha256-vcq7DvYv4dHd7nO4iwCWePuPwM2mIMfC438FkpG/Iwo=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.81.71", + "rev": "v1.81.77", "spdx": "MPL-2.0", "vendorHash": null }, From 899c58298546e007e097dc687cad7a845fc7cf8f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:31:35 +0000 Subject: [PATCH 253/444] terraform-providers.tfe: 0.51.1 -> 0.52.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ec27f0334d23..3b78bc93061a 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1189,13 +1189,13 @@ "vendorHash": null }, "tfe": { - "hash": "sha256-dbraY0A8z2YI09FWFqIsOcWshGn1/ZlPLeWdjWWbgmc=", + "hash": "sha256-/YEDeDH+6J1p/p0myonruRx4BiYao2zy40kMMb+Jv6o=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.51.1", + "rev": "v0.52.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-lxXTiJeZ/8psry2dxrecB+o0xElSQrCjwZ9zXijI9Bs=" + "vendorHash": "sha256-kDR4CB3RAvGC/NkT4PJ7BxI2v8WSfI2mfGSW+d1J2ZI=" }, "thunder": { "hash": "sha256-ezolcZ652YUV/CDoNKNRZkiRpRoa5AMqHxeYLxluA5A=", From 445705644868f29d7bc46a703b537e6ddf63242f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:31:49 +0000 Subject: [PATCH 254/444] terraform-providers.turbot: 1.10.0 -> 1.10.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 3b78bc93061a..58955d842456 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1235,11 +1235,11 @@ "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk=" }, "turbot": { - "hash": "sha256-oG6Mme9Q4T/IgQF1jheL0SaV3NDCEGHvw5fbXIcgwPE=", + "hash": "sha256-OmhNZZcCw6tGsL3Ha4cdg76GHqMjKeRB6aOXfqkIOjQ=", "homepage": "https://registry.terraform.io/providers/turbot/turbot", "owner": "turbot", "repo": "terraform-provider-turbot", - "rev": "v1.10.0", + "rev": "v1.10.1", "spdx": "MPL-2.0", "vendorHash": null }, From 9a94d9f5443b7595f5502bec1687c8661cb04630 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:32:10 +0000 Subject: [PATCH 255/444] terraform-providers.ucloud: 1.38.3 -> 1.38.6 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 58955d842456..0f3faae3bd7c 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1244,11 +1244,11 @@ "vendorHash": null }, "ucloud": { - "hash": "sha256-D6nrIjw4m2loeZRKNvrmgNQ4oaHKEc2xjxrWcgE8LNw=", + "hash": "sha256-OFnNEmODAluhEzVvQ22jblUhpzIlIvjsYZZmtepAcX8=", "homepage": "https://registry.terraform.io/providers/ucloud/ucloud", "owner": "ucloud", "repo": "terraform-provider-ucloud", - "rev": "v1.38.3", + "rev": "v1.38.6", "spdx": "MPL-2.0", "vendorHash": null }, From aea44593f31c52ecd2083f7cc34328969c86d63e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:32:58 +0000 Subject: [PATCH 256/444] terraform-providers.utils: 1.15.0 -> 1.18.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0f3faae3bd7c..08fca6adf4fe 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1253,13 +1253,13 @@ "vendorHash": null }, "utils": { - "hash": "sha256-7o3pVJvwnO80bXPJ5i0wfgz9mVqmXJRvGsVWj7N92gA=", + "hash": "sha256-DW2O1tou+HfOgzSca/SS3tFeo0efGt1ATVs5SmwUvmk=", "homepage": "https://registry.terraform.io/providers/cloudposse/utils", "owner": "cloudposse", "repo": "terraform-provider-utils", - "rev": "1.15.0", + "rev": "1.18.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-jz1eQG7pyeYt96KndzY1iR8n5Xm/1NNM7AD5eR8W/k0=" + "vendorHash": "sha256-srhu8iepW/JmPrJ7PuXyk0GEWMwzpNpkny33z7ZdrdM=" }, "vault": { "hash": "sha256-nFthtHwWuWEgtrw6mhqDlXW5sOuxqHlMyReHvYNcasQ=", From 437737e9229536faa5c0f4e436314620db6cdf42 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:33:24 +0000 Subject: [PATCH 257/444] terraform-providers.vault: 3.24.0 -> 3.25.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 08fca6adf4fe..1262dcdf45ac 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1262,13 +1262,13 @@ "vendorHash": "sha256-srhu8iepW/JmPrJ7PuXyk0GEWMwzpNpkny33z7ZdrdM=" }, "vault": { - "hash": "sha256-nFthtHwWuWEgtrw6mhqDlXW5sOuxqHlMyReHvYNcasQ=", + "hash": "sha256-hxEy9S6BH4pjHzmGu7LMFuV/dXc9oJ4PKLX4TYlxAJo=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v3.24.0", + "rev": "v3.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-SjKFRIrIQD9rsoHkoBxNDdCd8iBF1aHdJodII1ml7Ds=" + "vendorHash": "sha256-cKD8+YiclFNR9xWr68F17mQjtxhAsPBpXhT6luvXp3I=" }, "vcd": { "hash": "sha256-TP9COMofx4c2GZ0dQkfopn4iq8ddfV3WwuNjTu6yQnU=", From 5866fd2dddadf6d1be55088e231ce17478d7ba46 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:33:51 +0000 Subject: [PATCH 258/444] terraform-providers.venafi: 0.17.2 -> 0.18.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 1262dcdf45ac..41a307a712db 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1280,11 +1280,11 @@ "vendorHash": "sha256-IqmmlLr+bwfSRJtKbK/fiBdbf2vX61+6h6rZizD1vw8=" }, "venafi": { - "hash": "sha256-OQNeDmsXC1Fr9bTZ07HELZznU9n4ttSkFbNOC6ooxnk=", + "hash": "sha256-GkbBD6oDtHy18utI2dsDWmVIUiU8bILg6rsXEX7gfbI=", "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", "repo": "terraform-provider-venafi", - "rev": "v0.17.2", + "rev": "v0.18.0", "spdx": "MPL-2.0", "vendorHash": "sha256-Afe3fzzdQi4fvliAb42sP47BYlpefu9zeeI0o814j40=" }, From 75b569f0a1bf5a6686bf1a4eca234b75e18d67a3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 23:34:48 +0000 Subject: [PATCH 259/444] terraform-providers.yandex: 0.106.0 -> 0.110.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 41a307a712db..fb56fa5e8741 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1343,12 +1343,12 @@ "vendorHash": "sha256-GRnVhGpVgFI83Lg34Zv1xgV5Kp8ioKTFV5uaqS80ATg=" }, "yandex": { - "hash": "sha256-B0gc1PfAlwq//JvfEx4r+QUBDE1eO4ACJO6H2/TZvz8=", + "hash": "sha256-utRegZYS19yjd1Gnqnet+XKaLop81JrNO+Oq7Gzms1M=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.106.0", + "rev": "v0.110.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6GLzXkRrDAsTxdrzz+sWf2AxkTHdyjfu72l4s0KwndY=" + "vendorHash": "sha256-eE8gYyIGVBmw02I6j9GoEm2TiOmHGWhOs5pcqj/6PaA=" } } From bb4f1f0422ef43ddc7221ceb47f6a2a8324c4d4a Mon Sep 17 00:00:00 2001 From: Peter Retzlaff Date: Wed, 6 Mar 2024 01:09:11 +0100 Subject: [PATCH 260/444] squirreldisk: add missing desktop item --- pkgs/by-name/sq/squirreldisk/package.nix | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix index 6a0f2a639e56..d274abae5e35 100644 --- a/pkgs/by-name/sq/squirreldisk/package.nix +++ b/pkgs/by-name/sq/squirreldisk/package.nix @@ -13,6 +13,8 @@ rustPlatform, lib, stdenv, + copyDesktopItems, + makeDesktopItem, }: let pname = "squirreldisk"; version = "0.3.4"; @@ -37,7 +39,7 @@ dontInstall = true; }; in - rustPlatform.buildRustPackage { + rustPlatform.buildRustPackage rec { inherit version src pname; sourceRoot = "${src.name}/src-tauri"; @@ -63,7 +65,7 @@ in cp ${parallel-disk-usage}/bin/pdu bin/pdu-${stdenv.hostPlatform.config} ''; - nativeBuildInputs = [pkg-config wrapGAppsHook]; + nativeBuildInputs = [pkg-config wrapGAppsHook copyDesktopItems]; buildInputs = [dbus openssl freetype libsoup gtk3 webkitgtk]; # Disable checkPhase, since the project doesn't contain tests @@ -71,6 +73,10 @@ in postInstall = '' mv $out/bin/squirreldisk-tauri $out/bin/squirreldisk + install -DT icons/256x256.png $out/share/icons/hicolor/256x256/apps/squirrel-disk.png + install -DT icons/128x128@2x.png $out/share/icons/hicolor/128x128@2/apps/squirrel-disk.png + install -DT icons/128x128.png $out/share/icons/hicolor/128x128/apps/squirrel-disk.png + install -DT icons/32x32.png $out/share/icons/hicolor/32x32/apps/squirrel-disk.png ''; # WEBKIT_DISABLE_COMPOSITING_MODE essential in NVIDIA + compositor https://github.com/NixOS/nixpkgs/issues/212064#issuecomment-1400202079 @@ -79,6 +85,16 @@ in --set WEBKIT_DISABLE_COMPOSITING_MODE 1 ''; + desktopItems = [ + (makeDesktopItem { + name = "SquirrelDisk"; + exec = "squirreldisk"; + icon = "squirrel-disk"; + desktopName = "SquirrelDisk"; + comment = meta.description; + }) + ]; + meta = with lib; { description = "Cross-platform disk usage analysis tool"; homepage = "https://www.squirreldisk.com/"; From da001b2ed64a4aef6d53c323a1da536fab854fe1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Mar 2024 01:47:53 +0100 Subject: [PATCH 261/444] fit-trackee: relax sqlalchemy constraint --- pkgs/servers/geospatial/fit-trackee/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/geospatial/fit-trackee/default.nix b/pkgs/servers/geospatial/fit-trackee/default.nix index 8c430acdf9d5..b2f784649599 100644 --- a/pkgs/servers/geospatial/fit-trackee/default.nix +++ b/pkgs/servers/geospatial/fit-trackee/default.nix @@ -36,9 +36,11 @@ python.pkgs.buildPythonApplication rec { }; postPatch = '' - substituteInPlace pyproject.toml --replace psycopg2-binary psycopg2 \ - --replace 'flask = "^3.0.2"' 'flask = "*"' \ - --replace 'pyopenssl = "^24.0.0"' 'pyopenssl = "*"' + substituteInPlace pyproject.toml \ + --replace-fail psycopg2-binary psycopg2 \ + --replace-fail 'flask = "^3.0.2"' 'flask = "*"' \ + --replace-fail 'pyopenssl = "^24.0.0"' 'pyopenssl = "*"' \ + --replace-fail 'sqlalchemy = "=1.4.51"' 'sqlalchemy = "*"' ''; nativeBuildInputs = [ From e188a6bc2a41dd30fbf83ee0cf18c373096c812e Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sat, 2 Mar 2024 22:06:16 -0600 Subject: [PATCH 262/444] k9s: 0.31.9 -> 0.32.2 --- pkgs/applications/networking/cluster/k9s/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 7b238fb8b1f1..c20dee0bac78 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.31.9"; + version = "0.32.2"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - hash = "sha256-yPSAHqnGdLW2a2TCR7HPl8e5WlG+ruHwITATtivtBnw="; + hash = "sha256-lqLXk98rH5ZBI54ovj7YlyPh88d9Z9/jPjwUixeNJQc="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule rec { proxyVendor = true; - vendorHash = "sha256-roHFUKH72BSzqZp2qh/Hw7rfTXj9yqpJyB2dozUz+Y8="; + vendorHash = "sha256-R/lQAjEfch3RtJNsny6ox0ZgUOFGZdoUEgmeIIM/pmQ="; # TODO investigate why some config tests are failing doCheck = !(stdenv.isDarwin && stdenv.isAarch64); From be2aa8babf336fe283d32a22fc0cb64dd82f1e8f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 6 Mar 2024 14:56:26 +1300 Subject: [PATCH 263/444] rPackages.asciicast: Use xz.dev, not lzma.dev `lzma` is an alias which isn't allowed to be used inside nixpkgs. See https://github.com/NixOS/nixpkgs/pull/291604#issuecomment-1979935173. --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 2259fb5b9b71..02ff603f0d25 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -517,7 +517,7 @@ let packagesWithBuildInputs = { # sort -t '=' -k 2 - asciicast = with pkgs; [ lzma.dev bzip2.dev zlib.dev icu.dev ]; + asciicast = with pkgs; [ xz.dev bzip2.dev zlib.dev icu.dev ]; svKomodo = [ pkgs.which ]; nat = [ pkgs.which ]; nat_templatebrains = [ pkgs.which ]; From eb5cecd5a648c830e74cdfb4457a4410255e57cb Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Tue, 5 Mar 2024 18:15:03 -0800 Subject: [PATCH 264/444] cargo-llvm-cov: 0.6.5 -> 0.6.6 --- pkgs/development/tools/rust/cargo-llvm-cov/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index d805a10212b0..34f524d5d102 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -26,7 +26,7 @@ let pname = "cargo-llvm-cov"; - version = "0.6.5"; + version = "0.6.6"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -37,7 +37,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-nx0OwijDVwDoOiA7bEqK2aVo89xxOD9EQcOn5gv65jk="; + sha256 = "sha256-kY0Nb7bwF3o6DKQemZSwoZ55vw57jFGftNTpyprFxM0="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-TYz6fAuWLUndmu6NuK4XcsUN4/IWwKZMV6aPsB70esM="; + sha256 = "sha256-lcB/GWEIg5Y+VUSWphNwzmTuFROfMaTm17HyokoKzrI="; leaveDotGit = true; }; @@ -64,7 +64,7 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoSha256 = "sha256-KygRkdYlgCgc0UX5wkCfZsaigllOVCW+h4ralv/18g8="; + cargoSha256 = "sha256-DjWKjq5Vf4wOu6sDPT2yrGB00g80Z59oEpIUvIObjsQ="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests From 4b2a7dc32b01697940efb39af5f9b4d558140f9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 5 Mar 2024 18:30:22 -0800 Subject: [PATCH 265/444] nodePackages.grammarly-languageserver: mark broken --- pkgs/development/node-packages/overrides.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix index 2e00bfeb5ed2..514f8803fb14 100644 --- a/pkgs/development/node-packages/overrides.nix +++ b/pkgs/development/node-packages/overrides.nix @@ -80,6 +80,14 @@ final: prev: { ''; }; + grammarly-languageserver = prev.grammarly-languageserver.override (old: { + meta = old.meta // { + # requires EOL Node.js 16 + # https://github.com/znck/grammarly/issues/334 + broken = true; + }; + }); + graphql-language-service-cli = prev.graphql-language-service-cli.override { nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ]; postInstall = '' From 8be882dddc80d27cb1ad01eb05bb3eb635165cfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 02:45:01 +0000 Subject: [PATCH 266/444] python312Packages.pydeps: 1.12.18 -> 1.12.19 --- pkgs/development/python-modules/pydeps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index 560a62348541..9da4ff12b771 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pydeps"; - version = "1.12.18"; + version = "1.12.19"; pyproject = true; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "thebjorn"; repo = "pydeps"; rev = "refs/tags/v${version}"; - hash = "sha256-89RrAf09n42mRiWOUdHFNP4JoCP9bXMofkISyVqd+4I="; + hash = "sha256-3z/7pkeP6R8GsWvSaCChcf0DZPrC3KdwLeGdNm4m6Jc="; }; nativeBuildInputs = [ From 344b030e8dd6c51a9f3f42616f0962b9aaab2099 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:01:01 +0000 Subject: [PATCH 267/444] 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 e99590088836afc534a53c689e9b3c2aeb2b1974 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Mar 2024 13:12:35 +0000 Subject: [PATCH 268/444] keycloak: 23.0.7 -> 24.0.0 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 96a8f4673e66..754d51bdef0f 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "23.0.7"; + version = "24.0.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-9Hx7pX4m60u1UZAqXiafqEPMTvDVNdGLZfsSCktF84Q="; + hash = "sha256-UCXSFhpLHDQfw/s0rCywzL1JTs7XOlt+JUKp4Y/IGoY="; }; nativeBuildInputs = [ makeWrapper jre ]; From 77366d1b0ad71b1682a9dba841c74e5d375f3b18 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 5 Mar 2024 22:08:29 -0500 Subject: [PATCH 269/444] keycloak: 24.0.0 -> 24.0.1 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 754d51bdef0f..c0c93f2cf736 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "24.0.0"; + version = "24.0.1"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-UCXSFhpLHDQfw/s0rCywzL1JTs7XOlt+JUKp4Y/IGoY="; + hash = "sha256-d7bITeukqoLwEPQrUn01arXf8j7L8gM47wzHMsBvz2M="; }; nativeBuildInputs = [ makeWrapper jre ]; From 809eb566f6dfbf17bb22d1a436b81352fce92315 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Mon, 4 Mar 2024 17:40:09 +0100 Subject: [PATCH 270/444] keycloak.plugins.keycloak-restrict-client-auth: 23.0.0 -> 24.0.0 Release: https://github.com/sventorben/keycloak-restrict-client-auth/releases/tag/v24.0.0 --- .../keycloak/keycloak-restrict-client-auth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix b/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix index bf5d38bca013..16d37617336c 100644 --- a/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix +++ b/pkgs/servers/keycloak/keycloak-restrict-client-auth/default.nix @@ -2,16 +2,16 @@ maven.buildMavenPackage rec { pname = "keycloak-restrict-client-auth"; - version = "23.0.0"; + version = "24.0.0"; src = fetchFromGitHub { owner = "sventorben"; repo = "keycloak-restrict-client-auth"; rev = "v${version}"; - hash = "sha256-JA3DvLdBKyn2VE1pYSCcRV9Cl7ZAWsRG5MAp548Rl+g="; + hash = "sha256-Pk0tj8cTHSBwVIzINE7GLA5b/eI97wuOTvO7UoXBStM="; }; - mvnHash = "sha256-W1YvX1P/mshGYoTUO5XMlOcpu2KiujwLludaC3miak4="; + mvnHash = "sha256-Pk2yYuBqGs4k1KwaU06RQe1LpohZu0VI1pHEUBU3EUE="; installPhase = '' runHook preInstall From aaa7f52644511f4e7f6f54cb312084fb74855195 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:12:07 +0000 Subject: [PATCH 271/444] goimapnotify: 2.3.11 -> 2.3.12 --- pkgs/tools/networking/goimapnotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/goimapnotify/default.nix b/pkgs/tools/networking/goimapnotify/default.nix index 34de361d46b8..fc339f219349 100644 --- a/pkgs/tools/networking/goimapnotify/default.nix +++ b/pkgs/tools/networking/goimapnotify/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goimapnotify"; - version = "2.3.11"; + version = "2.3.12"; src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; rev = version; - sha256 = "sha256-b3w+SqmxRY/24qgFUSM4RQswObAH5jy3yEfGXY298Ko="; + sha256 = "sha256-H1psA73ZBz4ZCFWGpiAXQ3bDLVH3jPnyOvPtUdsO6BA="; }; vendorHash = "sha256-DphGe9jbKo1aIfpF5kRYNSn/uIYHaRMrygda5t46svw="; From ac12e7ffbd785ee645b2be3ad933827cfab40307 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 5 Mar 2024 22:11:30 -0500 Subject: [PATCH 272/444] keycloak.plugins.keycloak-metrics-spi: 4.0.0 -> 5.0.0 Diff: https://github.com/aerogear/keycloak-metrics-spi/compare/refs/tags/4.0.0...5.0.0 --- pkgs/servers/keycloak/keycloak-metrics-spi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix index 4752e5fe08c9..3e2b6049b187 100644 --- a/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix +++ b/pkgs/servers/keycloak/keycloak-metrics-spi/default.nix @@ -2,16 +2,16 @@ maven.buildMavenPackage rec { pname = "keycloak-metrics-spi"; - version = "4.0.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "aerogear"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pacmx5w1VVWz3HmHO6sc2friNUpzo4zyJI1/TQgCXlc="; + hash = "sha256-iagXbsKsU4vNP9eg05bwXEo67iij3N2FF0BW50MjRGE="; }; - mvnHash = "sha256-RjERY434UL9z/gNZFV+wMTITCmTPGanwu61L8sEGaKY="; + mvnHash = "sha256-+ySBrQ9yQ5ZxuVUh/mnHNEmugru3n8x5VR/RYEDCLAo="; installPhase = '' runHook preInstall From fd9df9ff881edc33220bc67220357b52ec7754e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:13:57 +0000 Subject: [PATCH 273/444] 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 bce279a0b8743eaac302e37fe206d741dbf9591d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:14:05 +0000 Subject: [PATCH 274/444] mlkit: 4.7.8 -> 4.7.9 --- pkgs/development/compilers/mlkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix index 082b768a2b00..e5cd4992d6c6 100644 --- a/pkgs/development/compilers/mlkit/default.nix +++ b/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.7.8"; + version = "4.7.9"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-IAlcf4McvWoCflrH6d6PQP1aosHq2QNKBwde7i38Mc4="; + sha256 = "sha256-Q5HKNilXhoOaCMY05A09VzK4CpLPte78bivs1c78euM="; }; nativeBuildInputs = [ autoreconfHook mlton ]; From 22ca26e22c1c9fcb5449ba902207ffa6a82aaa23 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 5 Mar 2024 22:17:51 -0500 Subject: [PATCH 275/444] keycloak.plugins.keycloak-discord: 0.3.1 -> 0.5.0, set sourceProvenance --- pkgs/servers/keycloak/keycloak-discord/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/keycloak/keycloak-discord/default.nix b/pkgs/servers/keycloak/keycloak-discord/default.nix index 0605145ff96f..9f00a292aad4 100644 --- a/pkgs/servers/keycloak/keycloak-discord/default.nix +++ b/pkgs/servers/keycloak/keycloak-discord/default.nix @@ -5,19 +5,20 @@ stdenv.mkDerivation rec { pname = "keycloak-discord"; - version = "0.3.1"; + version = "0.5.0"; src = fetchurl { - url = "https://github.com/wadahiro/keycloak-discord/releases/download/v${version}/keycloak-discord-ear-${version}.ear"; - sha256 = "0fswhbnxc80dpfqf5y6j29dxk3vcnm4kki6qdk22qliasvpw5n9c"; + url = "https://github.com/wadahiro/keycloak-discord/releases/download/v${version}/keycloak-discord-${version}.jar"; + hash = "sha256-radvUu2a6t0lbo5f/ADqy7+I/ONXB7/8pk2d1BtYzQA="; }; dontUnpack = true; dontBuild = true; installPhase = '' - mkdir -p "$out" - install "$src" "$out/${pname}-ear-${version}.ear" + runHook preInstall + install -Dm444 "$src" "$out/keycloak-discord-$version.jar" + runHook postInstall ''; meta = with lib; { @@ -25,5 +26,6 @@ stdenv.mkDerivation rec { description = "Keycloak Social Login extension for Discord"; license = licenses.asl20; maintainers = with maintainers; [ mkg20001 ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; } From 6f27c3cd1ef270f074ddab48fda66a883de8676a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:21:26 +0000 Subject: [PATCH 276/444] 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 5310bb7e498451f1e7e1a2f2024187d54332ac65 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:28:57 +0000 Subject: [PATCH 277/444] granted: 0.20.7 -> 0.21.0 --- pkgs/tools/admin/granted/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index 79fc6358ed29..57eaec1acf38 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "granted"; - version = "0.20.7"; + version = "0.21.0"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AGpR587vz1t5z/J09n4/XvFPgbwb66wRTfSVOTCWeSU="; + sha256 = "sha256-hNbn1bBC9dNiThwi1+Mh45s/9DAwoI8XC4ZjB6Ls8sw="; }; - vendorHash = "sha256-yw/hl82RQPjZB0SsVr4OPDUsFH2TY6i4RpVE7wd4fwk="; + vendorHash = "sha256-I4sds5r61oGop+EtOpDgTYwLbSVBBSBmNbRU56sCYjo="; nativeBuildInputs = [ makeWrapper ]; From 680f48eaefc7abb97f0db948650f7480300de1fe Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 5 Mar 2024 22:37:07 -0500 Subject: [PATCH 278/444] uhk-agent: 4.0.1 -> 4.0.2 Diff: https://github.com/UltimateHackingKeyboard/agent/compare/v4.0.1...v4.0.2 --- pkgs/os-specific/linux/uhk-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix index 093b92276f87..0d6b3ccd515c 100644 --- a/pkgs/os-specific/linux/uhk-agent/default.nix +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -12,12 +12,12 @@ let pname = "uhk-agent"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; name = "${pname}-${version}.AppImage"; - sha256 = "sha256-4N+BjllIMK/dUHL7yEeigOVIO2JyJdqZWGYOoZBMoGg="; + sha256 = "sha256-yx5hOmb1la+vNh8x0PM3edcMn4ojdwzNmGBUg/BH7wE="; }; appimageContents = appimageTools.extract { From f226fb4d801f4973eeef9720cbc83097e1078a86 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 5 Mar 2024 22:39:44 -0500 Subject: [PATCH 279/444] matrix-synapse-unwrapped: 1.101.0 -> 1.102.0 Diff: https://github.com/element-hq/synapse/compare/v1.101.0...v1.102.0 Changelog: https://github.com/element-hq/synapse/releases/tag/v1.102.0 --- pkgs/servers/matrix-synapse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 1cced1717ac9..2370dbc94349 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -17,20 +17,20 @@ let in python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.101.0"; + version = "1.102.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-yhOdIyKp+JM0qUl4dD1aMeYHNhE71DUDxrfCyRDP1VI="; + hash = "sha256-RJsuvNqqUiiVw6uKkG81rqo1ZoszUHK4UIJh8MReFqo="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-mWvcRNvCYf6WCKU/5LGJipOI032QFG90XpHTxFGs6TU="; + hash = "sha256-PoPJnSZ9QpcpVbqDMlqwgAqu0K8oornpihErLHXb6Gc="; }; postPatch = '' From 7dab93e7477ffed5cf18f59b28934a5a34436682 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:41:24 +0000 Subject: [PATCH 280/444] 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 281/444] 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 582be95706fbfdffa2582ffeb44197476085e74d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:41:34 +0000 Subject: [PATCH 282/444] buildkit: 0.12.5 -> 0.13.0 --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 19f418b543a1..6dd7d9a3746d 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.12.5"; + version = "0.13.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-LESaOrUxV/BHGW9JSZfTXpbedp1aegPFWu9/tRx2ArM="; + hash = "sha256-A6BncEyuAWyDlBK9ZuBoDl8gbQo0NAaVWXvy2mZs0GA="; }; vendorHash = null; From d04d07dbc61653a1c44d0618cad5204e74d131f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:45:40 +0000 Subject: [PATCH 283/444] python312Packages.pyvlx: 0.2.22 -> 0.2.23 --- pkgs/development/python-modules/pyvlx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvlx/default.nix b/pkgs/development/python-modules/pyvlx/default.nix index 59fb541503e0..263971e93321 100644 --- a/pkgs/development/python-modules/pyvlx/default.nix +++ b/pkgs/development/python-modules/pyvlx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyvlx"; - version = "0.2.22"; + version = "0.2.23"; pyproject = true; disabled = pythonOlder "3.10"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Julius2342"; repo = "pyvlx"; rev = "refs/tags/${version}"; - hash = "sha256-Ne/mEgvD2ANb5ER0y3eSW4TsPmrqDX1Pvki+0cb+t7w="; + hash = "sha256-J+oJQHsULrJQNdZqYsl2hufNubMwV1KtG10jZH0jbU4="; }; nativeBuildInputs = [ From 39392b18f07c8f6cd6faacfd3c0fbb23f4416f48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:55:13 +0000 Subject: [PATCH 284/444] 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 3f942966678af6bbdf82aab27c577b23fbba7e93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:55:21 +0000 Subject: [PATCH 285/444] spire: 1.9.0 -> 1.9.1 --- pkgs/tools/security/spire/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/spire/default.nix b/pkgs/tools/security/spire/default.nix index cade2f1299b5..19e2704516da 100644 --- a/pkgs/tools/security/spire/default.nix +++ b/pkgs/tools/security/spire/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "spire"; - version = "1.9.0"; + version = "1.9.1"; outputs = [ "out" "agent" "server" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "spiffe"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0gV4s5MsA5+QhDpceRH20/KjPJi5YF4HsN3HF1u7vBo="; + sha256 = "sha256-+IIT2y4TJDhxxEFiaefgiHVSzO4sVQ3oPO1aMEoBQTU="; }; vendorHash = "sha256-X8/R2u7mAJuwfltIZV5NrgbzR0U6Ty092Wlbs3u9oIw="; From 76618777b6dc0342e68b3a1772daa48973a0b6b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:55:22 +0000 Subject: [PATCH 286/444] python312Packages.xknx: 2.12.1 -> 2.12.2 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 237c7827f1e2..498be7f69303 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "2.12.1"; + version = "2.12.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = "xknx"; rev = "refs/tags/${version}"; - hash = "sha256-O8xhih/EVULTq4jdmxInzXRO4m6PJA9pyzsHjR+58dQ="; + hash = "sha256-gajxXIR3lmHsW7258v4z20RilzGfm5KGVrXZwRm74Mk="; }; nativeBuildInputs = [ From 23cb9921f2c991bae6e7ae144d039b7702f69333 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 03:56:59 +0000 Subject: [PATCH 287/444] python312Packages.pyngrok: 7.1.3 -> 7.1.4 --- pkgs/development/python-modules/pyngrok/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix index 8d668d8249e0..0ed02cd477ba 100644 --- a/pkgs/development/python-modules/pyngrok/default.nix +++ b/pkgs/development/python-modules/pyngrok/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyngrok"; - version = "7.1.3"; + version = "7.1.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-BnK1ynVbxFFwocxXc6QiYJkBIgEvc1RGpfwUhqe+Gec="; + hash = "sha256-MlTT2a4VvazWP+EPLb1W3KZIf284OM4mI6LA8ToBtVY="; }; nativeBuildInputs = [ From a4c635744215f5818341865b53c58557ef2f6a58 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 04:24:50 +0000 Subject: [PATCH 288/444] popeye: 0.20.4 -> 0.20.5 --- pkgs/applications/networking/cluster/popeye/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix index 95a437704120..7cb97701f8d8 100644 --- a/pkgs/applications/networking/cluster/popeye/default.nix +++ b/pkgs/applications/networking/cluster/popeye/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "popeye"; - version = "0.20.4"; + version = "0.20.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "derailed"; repo = "popeye"; - sha256 = "sha256-rUG2tZokWXWVvGiyDAxVYfVwSDInaLptBCBuawtP1bc="; + sha256 = "sha256-e3ANhF2g1YpCipnHej2ZegoAq20MOyTIjxgNMs3qGbk="; }; ldflags = [ @@ -17,7 +17,7 @@ buildGoModule rec { "-X github.com/derailed/popeye/cmd.commit=${version}" ]; - vendorHash = "sha256-ThldEPzAwMfNnhUEgHL5/asc+SETKxTrPIJt307tqsg="; + vendorHash = "sha256-lRm3cS+VYP9vptr6ixmkni7DpNnexrhyccKDV7TWKg0="; nativeBuildInputs = [ installShellFiles ]; From e61171ae4d880b9b30280d38f341059aed7b693b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 04:42:03 +0000 Subject: [PATCH 289/444] ollama: 0.1.27 -> 0.1.28 --- pkgs/tools/misc/ollama/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ollama/default.nix b/pkgs/tools/misc/ollama/default.nix index 7a0fea0c116b..36546b5869a6 100644 --- a/pkgs/tools/misc/ollama/default.nix +++ b/pkgs/tools/misc/ollama/default.nix @@ -24,12 +24,12 @@ let pname = "ollama"; - version = "0.1.27"; + version = "0.1.28"; src = fetchFromGitHub { owner = "jmorganca"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-+ayby+yVknFHLTyLjMAPMnOTMSzTKqzi9caN/TppcEg="; + hash = "sha256-8f7veZitorNiqGBPJuf/Y36TcFK8Q75Vw4w6CeTk8qs="; fetchSubmodules = true; }; @@ -98,7 +98,7 @@ goBuild ((lib.optionalAttrs enableRocm { CUDAToolkit_ROOT = cudaToolkit; }) // { inherit pname version src; - vendorHash = "sha256-zTrBighPBqZ9hhkEV3UawJZUYyPRay7+P6wkhDtpY7M="; + vendorHash = "sha256-DPIhDqE/yXpSQqrx07osMBMafK61yU2dl4cZhxSTvm8="; nativeBuildInputs = [ cmake From 6a8d88500c053e0e9fc40f341cbf10eefa7347d8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 04:49:27 +0000 Subject: [PATCH 290/444] 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 291/444] 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 8890024497754ed5fef8d0af6382c1828c6248f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Wed, 6 Mar 2024 06:04:27 +0100 Subject: [PATCH 292/444] eza: 0.18.5 -> 0.18.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- pkgs/by-name/ez/eza/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 5ac21168eb1f..5e0423a4ac9b 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -17,16 +17,16 @@ rustPlatform.buildRustPackage rec { pname = "eza"; - version = "0.18.5"; + version = "0.18.6"; src = fetchFromGitHub { owner = "eza-community"; repo = "eza"; rev = "v${version}"; - hash = "sha256-L0FF9pN4WGCFpg2MPAvrKC/DwyWK6BWGxwYEpQBl9Rw="; + hash = "sha256-xdMoOGOHbGNRouVbJewQ1bWJbd7nusq3H7mXDC4AIXU="; }; - cargoHash = "sha256-bZ2NzFpB9vpT0mB2LsETdmtzYAwNrpzBRoqmm4+13+0="; + cargoHash = "sha256-IM1dxTaFa5kq94pn6QQrUGg6fZWhBZsf4ZND42BPVag="; nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ]; buildInputs = [ zlib ] From 8ca587c437949f417082d6c0d6e9f54fd1a64a65 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 6 Mar 2024 13:16:56 +1000 Subject: [PATCH 293/444] dotnetCorePackages.dotnet_8.sdk: remove `updateScript` to fix eval --- pkgs/development/compilers/dotnet/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index 3eef77ff7144..c7a8e048121e 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -36,7 +36,7 @@ in { ''; passthru = { - inherit (vmr) icu targetRid updateScript; + inherit (vmr) icu targetRid; }; meta = vmr.meta // { From e2aa01df6d506fc95e09570e1da090b57d41d57e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 05:32:02 +0000 Subject: [PATCH 294/444] python311Packages.boto3-stubs: 1.34.55 -> 1.34.56 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index bdc53581027f..31fb366e508b 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.55"; + version = "1.34.56"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-y7rhuBG5fk4fHQDrojf/mHZ45lJQIia4fmJ295Y5NbQ="; + hash = "sha256-Yn+OymnYMlge4WdtOd8JmiouOobWs+vSHIHF8R7Wpvo="; }; nativeBuildInputs = [ From 69df07cab9632de4cc0769bd9b766b8a953870c3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 06:20:10 +0000 Subject: [PATCH 295/444] python311Packages.httpx-socks: 0.9.0 -> 0.9.1 --- pkgs/development/python-modules/httpx-socks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httpx-socks/default.nix b/pkgs/development/python-modules/httpx-socks/default.nix index a2fac2691b9d..65dedd26c02f 100644 --- a/pkgs/development/python-modules/httpx-socks/default.nix +++ b/pkgs/development/python-modules/httpx-socks/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "httpx-socks"; - version = "0.9.0"; + version = "0.9.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "romis2012"; repo = "httpx-socks"; rev = "refs/tags/v${version}"; - hash = "sha256-x+4J+uxICYdjpwr/chHIr/BeFGITCR8F9W1kqAliv38="; + hash = "sha256-9v5DfxEtM7jq+b8wR0M1klTSnSdFjQ4aDl8ZSZWxbFA="; }; nativeBuildInputs = [ From 0e0fbc99050a4fd4d3e320351b1dd4c77dabaab0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 06:39:28 +0000 Subject: [PATCH 296/444] libretro.mgba: unstable-2023-05-28 -> unstable-2024-02-28 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..02221578b6c3 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -518,10 +518,10 @@ "src": { "owner": "libretro", "repo": "mgba", - "rev": "314bf7b676f5b820f396209eb0c7d6fbe8103486", - "hash": "sha256-Rk+glDgSa1J1IIe5NrJElX9zr59+LQynfDXuHWyZcEM=" + "rev": "b2564482c86378581a7a43ef4e254b2a75167bc7", + "hash": "sha256-9qHk4V7wb9YISpZ2xO2NWCGCFMRWpE8lAKTzIldsC9M=" }, - "version": "unstable-2023-05-28" + "version": "unstable-2024-02-28" }, "mrboom": { "fetcher": "fetchFromGitHub", From 565b23a0cbb77478a14f80181a09456a01086b78 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 06:39:44 +0000 Subject: [PATCH 297/444] libretro.play: unstable-2024-02-23 -> unstable-2024-03-05 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..cb3a7cd34636 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -651,11 +651,11 @@ "src": { "owner": "jpd002", "repo": "Play-", - "rev": "a9a404632d3c6457e103314edb5f0985729ed0f1", - "hash": "sha256-PpRQXSK3TujmNL3Tmfva2oV6mWANGqz81ffiC99vuzQ=", + "rev": "79cb8379b0ac86d26bacf85f34b5d199b232f6fa", + "hash": "sha256-lXSbFsbZh01FxzN1f0pBSFXrJe1RimlmmmTB9GitQzo=", "fetchSubmodules": true }, - "version": "unstable-2024-02-23" + "version": "unstable-2024-03-05" }, "ppsspp": { "fetcher": "fetchFromGitHub", From e619085f91702add77bcfe2984d2d487ec350ae0 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 6 Mar 2024 09:47:17 +0300 Subject: [PATCH 298/444] maintainers/scripts/kde/generate-sources: sort keys for consistency --- maintainers/scripts/kde/generate-sources.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index e9f8c41ef4d7..380213ee6907 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -101,7 +101,7 @@ def main(set: str, version: str, nixpkgs: pathlib.Path): set_dir.mkdir(parents=True, exist_ok=True) with (set_dir / "default.nix").open("w") as fd: - fd.write(ROOT_TEMPLATE.render(packages=results.keys()) + "\n") + fd.write(ROOT_TEMPLATE.render(packages=sorted(results.keys())) + "\n") sources_dir = generated_dir / "sources" sources_dir.mkdir(parents=True, exist_ok=True) From 242a616c1ed8b21290775bc2478f3f4601ad6053 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 6 Mar 2024 09:47:35 +0300 Subject: [PATCH 299/444] pkgs/kde/plasma: 6.0.0 -> 6.0.1 --- pkgs/kde/generated/sources/plasma.json | 386 ++++++++++++------------- pkgs/kde/plasma/default.nix | 4 +- 2 files changed, 195 insertions(+), 195 deletions(-) diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 605ff3d9fb96..6897ae10ea10 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,317 +1,317 @@ { "bluedevil": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/bluedevil-6.0.0.tar.xz", - "hash": "sha256-gxRzBpx78HGHryrLsQHTpsdHVVh+SQFCCY1aoFTuYmU=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/bluedevil-6.0.1.tar.xz", + "hash": "sha256-7bpz4yNYWvTgzHhtCAZXclkRP9fLH6sPYsvHOL1/53k=" }, "breeze": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/breeze-6.0.0.tar.xz", - "hash": "sha256-vHKhaxFre+q/G06aRRAZ+QSOe+awWsc6RifyWywgWeo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-6.0.1.tar.xz", + "hash": "sha256-IASCzv0Gbg1I4WqnOAqcsA5jSyujSDTNxzVPNjtgVE0=" }, "breeze-grub": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/breeze-grub-6.0.0.tar.xz", - "hash": "sha256-bsSL/16nneLcQgdr5ROGb9zV10K0ZytpDK8u3OXLcNY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-grub-6.0.1.tar.xz", + "hash": "sha256-iI1vzXZ+j97dqgq/Uze81TSpeu+RqKXkf6oZcmdNguM=" }, "breeze-gtk": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/breeze-gtk-6.0.0.tar.xz", - "hash": "sha256-zsTK8cIpvDDKAMZgXbTbmKllAhZ/NKm3fKArJrSZqzY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-gtk-6.0.1.tar.xz", + "hash": "sha256-MmInFnKHzR4PHzIfm7UFQsQAa/x53lehSNSaHL8gYqU=" }, "breeze-plymouth": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/breeze-plymouth-6.0.0.tar.xz", - "hash": "sha256-J3eGWAwBDAmqGS+I0JZFmvYKKv/yWpDo/TldOlInpkw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-plymouth-6.0.1.tar.xz", + "hash": "sha256-TlPrMhAYMWCf8dGyzxP1PjS8JMQHb1ec0JysuXtx8ZM=" }, "discover": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/discover-6.0.0.tar.xz", - "hash": "sha256-e6gl/kd5pJX/7UaStQ5xFw4gIz25kB7L4VKO3Dqz37A=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/discover-6.0.1.tar.xz", + "hash": "sha256-fVGh2NErdS2rcyHMKC/mT8L2H5OAfDUzi1BEp4ahoZo=" }, "drkonqi": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/drkonqi-6.0.0.tar.xz", - "hash": "sha256-oI1SR63vWJ5K+8ow3xSPjxgjfFDWThOkzphb93h9MQY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/drkonqi-6.0.1.tar.xz", + "hash": "sha256-X2YFQ8MKee/7SJANHrrZ+eViBRTaq96b2rwrXwGyAm0=" }, "flatpak-kcm": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/flatpak-kcm-6.0.0.tar.xz", - "hash": "sha256-3u5cNcxTHAkuSJjmvJUInDOzJ5z1mPk0RjY8bYD7cSE=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/flatpak-kcm-6.0.1.tar.xz", + "hash": "sha256-sHI/1B0LYRm1cplSH0iy1jXeIsZ3mfK/UDxbfD+N5YM=" }, "kactivitymanagerd": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kactivitymanagerd-6.0.0.tar.xz", - "hash": "sha256-khCzkcMpAY5FrGXG46d/ZFMvPgF2xYm812RgwgMBAvw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kactivitymanagerd-6.0.1.tar.xz", + "hash": "sha256-L5LCvqE8fGn2gjfoyHBvfNnP70CdWex8HcSd+JRvsrc=" }, "kde-cli-tools": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kde-cli-tools-6.0.0.tar.xz", - "hash": "sha256-Q3DJO7XCBe8yv0i8APJj6qOQt/G0bfh1pC/L/79Ch0E=" - }, - "kdecoration": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kdecoration-6.0.0.tar.xz", - "hash": "sha256-NjpdI9kJUqXi4yvH+/Qf9Nu7fM/xOL7xnUiz2tEfFVE=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kde-cli-tools-6.0.1.tar.xz", + "hash": "sha256-RuDbooTXS1BpScAw4/gX8RwpJiwRbT6aKp5l855DzRU=" }, "kde-gtk-config": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kde-gtk-config-6.0.0.tar.xz", - "hash": "sha256-YAcf/LVCeBilDKqVsickidoQgFwyuXXTggJsB4+NhFM=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kde-gtk-config-6.0.1.tar.xz", + "hash": "sha256-u1Df3OqfIavqqAs91SiZMhrRi2bjNRYfZrRHKWCJflU=" + }, + "kdecoration": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kdecoration-6.0.1.tar.xz", + "hash": "sha256-gSDaTJyMrv6nYKj5egjz7P//uK8ncqtE34EJ9hn/NZY=" }, "kdeplasma-addons": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kdeplasma-addons-6.0.0.tar.xz", - "hash": "sha256-vQ1ZBmRGTIhv4URHvjjBYakntw+2yc4opwkPkJAmDPc=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kdeplasma-addons-6.0.1.tar.xz", + "hash": "sha256-ZFjmBdJY4LKkLWAUwzaALBDfGvP+FPNND9v56THNK28=" }, "kgamma": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kgamma-6.0.0.tar.xz", - "hash": "sha256-lwTTLITibYwzAX8LDFYrdBu7ZpW4n6OIKfyEN1pQVmU=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kgamma-6.0.1.tar.xz", + "hash": "sha256-+2CVNijflwfXuoMVXVgo1fRNCT7YQZdMeO6adOzjyRI=" }, "kglobalacceld": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kglobalacceld-6.0.0.tar.xz", - "hash": "sha256-qn6zTz36/cL0dbsg7WqFY6Lp+/sGRwiQ4SfckFT5Rao=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kglobalacceld-6.0.1.tar.xz", + "hash": "sha256-tA1DMo0CPXqxsmWj6FUNv+8rjQ0dsq2oWBEdzzwZTqc=" }, "kinfocenter": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kinfocenter-6.0.0.tar.xz", - "hash": "sha256-byma0LoUOGQSDazzZUSGOkkGg1pZFcHLiRcGzzmjfnk=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kinfocenter-6.0.1.tar.xz", + "hash": "sha256-FP7LO/ME5sI3eJ2WL+o/vHJWsEAwde2b9K661Y+IluA=" }, "kmenuedit": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kmenuedit-6.0.0.tar.xz", - "hash": "sha256-+moJ6P7DQ2gNWNR9rt8NWCZ/i5kPEuLFCqcrq8ljrF8=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kmenuedit-6.0.1.tar.xz", + "hash": "sha256-9wZA2Q88JbE5NFM5UDwAGax0Oy8ldd+d+Ywn0URcdiQ=" }, "kpipewire": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kpipewire-6.0.0.tar.xz", - "hash": "sha256-3Vhe5N47W83BDzb+XfkZZkR8pxZXDWtOoVFg2x8dc7w=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kpipewire-6.0.1.tar.xz", + "hash": "sha256-CfahfSldlHT0ecVrzYuL5pCl1RCHAdDcICJ+84Udvjk=" }, "kscreen": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kscreen-6.0.0.tar.xz", - "hash": "sha256-+XwEV2MLzg2Q/bwPbEXx4rIaYBRL0YLYtB9Yk5v9c0Y=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kscreen-6.0.1.tar.xz", + "hash": "sha256-WHLCDvu4mvi59SZWsFyYaE4PrOWAAdOw7g2nslgi9ho=" }, "kscreenlocker": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kscreenlocker-6.0.0.tar.xz", - "hash": "sha256-JQL6qFyHRgpLXqu5J2nTPBls0zc7PzpSHtOW5QTSKrY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kscreenlocker-6.0.1.tar.xz", + "hash": "sha256-Kd74dcQG41cCjekXiFh/3mtTrL0Q1LgXd1S+z12VYCg=" }, "ksshaskpass": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/ksshaskpass-6.0.0.tar.xz", - "hash": "sha256-tdkYWBTLYsZMVfTA67KQ0jn3Pqr3IVjEWOVkM4xV7cY=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/ksshaskpass-6.0.1.tar.xz", + "hash": "sha256-0kRZcKvMZXYVKLfTp7KAJAb6ykTYkowpUOR7dXMDIUY=" }, "ksystemstats": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/ksystemstats-6.0.0.tar.xz", - "hash": "sha256-qFAYXmObZ4kt6lGy/7cadJj9BJ/8KNFz5u58atPzzro=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/ksystemstats-6.0.1.tar.xz", + "hash": "sha256-Bxr+Zkw47Gq3spK5DmtVzC0r6yC+P4qlOxMWgok6XEk=" }, "kwallet-pam": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwallet-pam-6.0.0.tar.xz", - "hash": "sha256-GTqIHaQf8VG84ejt86CUqzUbUi/ZDjenNX0aGV7wBno=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwallet-pam-6.0.1.tar.xz", + "hash": "sha256-Gti7wB7F0cIUQSK9PYKyJn2nfQdq47+ku/HEGi1wulA=" }, "kwayland": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwayland-6.0.0.tar.xz", - "hash": "sha256-ADEglGgZZqTPaSKIOYBHokE28bzhMjBzBNDf+hz57Xk=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwayland-6.0.1.tar.xz", + "hash": "sha256-0rTZqzHiVNZ1ek7GqxzngNvGwA1Mj2pdoHz5GB6MhZU=" }, "kwayland-integration": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwayland-integration-6.0.0.tar.xz", - "hash": "sha256-BOLLxF6jxLbxiroWYQ/Sx/ogsmPKYGKQsbJ1RmUBAek=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwayland-integration-6.0.1.tar.xz", + "hash": "sha256-G4S88fPSm7FKvEVUR4r9srx8x5UboSwtPIgCM4uzLHM=" }, "kwin": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwin-6.0.0.tar.xz", - "hash": "sha256-sZR8K0TeYZCQhGLIHorIn/nHMmqHZB/rZebM2FJipNs=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwin-6.0.1.tar.xz", + "hash": "sha256-bmGFfFAwt7OVPMDaXulKJDdVmZpM4AegAxH5HbiXXwQ=" }, "kwrited": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/kwrited-6.0.0.tar.xz", - "hash": "sha256-9kHAA98JHE83lsTG8xUdVieoo4UxAITi5/T8rPT3SmI=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/kwrited-6.0.1.tar.xz", + "hash": "sha256-YGx8Iojk9T9YmUPQhhjuFcOulE+HCDwJM7u+LeAhdBI=" }, "layer-shell-qt": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/layer-shell-qt-6.0.0.tar.xz", - "hash": "sha256-FaV6gtnMsNUgtVihc/Mxs5d1yADAsoSB2oCBFeHSirQ=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/layer-shell-qt-6.0.1.tar.xz", + "hash": "sha256-PbMq6DC2f1Wl3ikrdXkRJKft0DOYm36T5L2RPFj9l58=" }, "libkscreen": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/libkscreen-6.0.0.tar.xz", - "hash": "sha256-xCpykMiZ/IuIeJCnsD79cgtHbXrG/JHGTm8D2t/wm0Q=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/libkscreen-6.0.1.tar.xz", + "hash": "sha256-8D3Px59OGyDSvT0WluRiKpW8TTtjYHgP3wxAj/o2KJs=" }, "libksysguard": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/libksysguard-6.0.0.tar.xz", - "hash": "sha256-a3LM++1p8nvOwNhkFO14CHAQmAHMIMUFkBZXyFw2RN0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/libksysguard-6.0.1.tar.xz", + "hash": "sha256-kPDmZzBbmqucMqToAQyqzGqfsfyBpzuB0uu7SEXrLwM=" }, "libplasma": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/libplasma-6.0.0.tar.xz", - "hash": "sha256-sdj0cBoAndGHl8v2jwa9xFo+haJDsEGQiQtLQEQJJ9I=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/libplasma-6.0.1.tar.xz", + "hash": "sha256-df7WkHW/Eazi++KfHRUnDIc3+6qReJBQSe/YAt52tHQ=" }, "milou": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/milou-6.0.0.tar.xz", - "hash": "sha256-yOqST3w5FeHeqlIgugByOFJrPfkCmzrJjsoVjlVSs0o=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/milou-6.0.1.tar.xz", + "hash": "sha256-wC6xYOq3nUvsGvh3RDptPGVfS5UsUXHhmHAT2s1L5hA=" }, "ocean-sound-theme": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/ocean-sound-theme-6.0.0.tar.xz", - "hash": "sha256-IqDtyoacebSb5aJVtsPfsNJYTJ72jbt5BhOKfJb2efo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/ocean-sound-theme-6.0.1.tar.xz", + "hash": "sha256-YoctZEvuhcjofoyUcER3ttxIdyU8bqLfwGWeodN6sp0=" }, "oxygen": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/oxygen-6.0.0.tar.xz", - "hash": "sha256-+5NjfGeceeuPdkPn1IQiVfN/kluWW84v1Vf4Ct/6weg=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/oxygen-6.0.1.tar.xz", + "hash": "sha256-Tdkt0bgp7pwlSRunoigb2cTsmV1ujdBM+ZDr+4lJ91Q=" }, "oxygen-sounds": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/oxygen-sounds-6.0.0.tar.xz", - "hash": "sha256-dWWuHsxtOVvK9DaH7/lPVu2opCidDG/19KV1E5HG5Y8=" - }, - "plasma5support": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma5support-6.0.0.tar.xz", - "hash": "sha256-qhMUh/8sdciSzoxSgTtuH+LWpJ9S7QjzhwDiLA6Z6+0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/oxygen-sounds-6.0.1.tar.xz", + "hash": "sha256-bMbU68dKW17oLbEg9tdX28F/m3CRJ5hACiATMjGbeo8=" }, "plasma-activities": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-activities-6.0.0.tar.xz", - "hash": "sha256-8L0Hu82QIscuVkBGBGAps59x0cxbRnufUJFIEwQ7J5U=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-activities-6.0.1.tar.xz", + "hash": "sha256-L9fe7g6q78KXoC5o4Ra09tqUdbtvJvc9fO0bWSK/TYY=" }, "plasma-activities-stats": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-activities-stats-6.0.0.tar.xz", - "hash": "sha256-Xmqw/l88XbDeLr5q3NecJhcLkq3cBWzzXwSE+0UAfS4=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-activities-stats-6.0.1.tar.xz", + "hash": "sha256-d5/1WkSbl0UpWn3L/5oiq7TU8PdKgHIZZ09iT3tVpuo=" }, "plasma-browser-integration": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-browser-integration-6.0.0.tar.xz", - "hash": "sha256-IdX3JyJKnhxUhqc0UELbQoLqpC4JpoUvt3tbATX09kE=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-browser-integration-6.0.1.tar.xz", + "hash": "sha256-QpBJgaCwFxKG71tTAJHrXzZgBfEfzLlslcr2GQXYFjU=" }, "plasma-desktop": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-desktop-6.0.0.tar.xz", - "hash": "sha256-kkzgTbLIjPeuGiPxmzjrRSl3CHtuk37QVozlOXvMkn0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-desktop-6.0.1.tar.xz", + "hash": "sha256-l9dA6OO1/5IXO5qQhlZ9/0D/dwyjTQzs/rNdZQgIovE=" }, "plasma-disks": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-disks-6.0.0.tar.xz", - "hash": "sha256-uC/+Mn227ddGxCL3HgBxUjcT3m2bL0b7DhLQMAKHTyo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-disks-6.0.1.tar.xz", + "hash": "sha256-eC8HigBYUBU7uH3zZjRI/Uqpz/TMfMve+kClFq1+p/4=" }, "plasma-firewall": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-firewall-6.0.0.tar.xz", - "hash": "sha256-MrC04kHmfXqrKt5eo0VnDwlFhQ4iDWWro8blX2AYV5Y=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-firewall-6.0.1.tar.xz", + "hash": "sha256-K+GFZDSTYBGZiCUf4VLAdiBLR0LsDSFv5RtRjopzaec=" }, "plasma-integration": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-integration-6.0.0.tar.xz", - "hash": "sha256-Ez/2bspjY7eYtRUuluNwQAIT5aK8KL1jPYtpFAawLEE=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-integration-6.0.1.tar.xz", + "hash": "sha256-FtEj3D9ZxJIlG44vupScddO/D2fzzs+WxRvkjcQUQp8=" }, "plasma-mobile": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-mobile-6.0.0.tar.xz", - "hash": "sha256-128H4RR/0utqMuNdfLTIR5XtoysWHLCmCgRnah6ab/M=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-mobile-6.0.1.tar.xz", + "hash": "sha256-snOILhyWtKu57n9BInxHokC6v+9FkJ8N13ysBa02QAg=" }, "plasma-nano": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-nano-6.0.0.tar.xz", - "hash": "sha256-mfxE3tTdO0TEX4k+2SIaphJt3p1Paty3JwTAOpMgfCc=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-nano-6.0.1.tar.xz", + "hash": "sha256-IEHQFekEQButOtNaSjEC2kaGau6PycwMk9o3246plHQ=" }, "plasma-nm": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-nm-6.0.0.tar.xz", - "hash": "sha256-Us+Wc4zur85l8YOjRXMlrrWx8YpDNs7t5aImVW5unrQ=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-nm-6.0.1.tar.xz", + "hash": "sha256-cKIB7prSAiQrAP9QYZZkrFIFlE+J3yrDpyqfTOV4kyo=" }, "plasma-pa": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-pa-6.0.0.tar.xz", - "hash": "sha256-tJq7K7dEAbIs2uHZkhAddktIOhjGAIfCAvbmlRRdAiw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-pa-6.0.1.tar.xz", + "hash": "sha256-Jyjs2fHFEG/ovAfwsDvaMWA2rcXQOjrAAVEfdUPDN8c=" }, "plasma-sdk": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-sdk-6.0.0.tar.xz", - "hash": "sha256-jLLeV6og30Qzp9lRMGpjfMKErOuuKzTPpxxQ7j7eKqo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-sdk-6.0.1.tar.xz", + "hash": "sha256-cuDXrIGZJI96emqO3nvc1geZDVhnqZmOHmrxT9cjKLc=" }, "plasma-systemmonitor": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-systemmonitor-6.0.0.tar.xz", - "hash": "sha256-WJ/QTx/g2Wv6KXpP4D7rAVx7X4OZMlvyMyd9/nnmb5k=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-systemmonitor-6.0.1.tar.xz", + "hash": "sha256-L4l5l4s0jWtxrAePmJ3SH/TptrDSW15Zo3G+UA/JnVE=" }, "plasma-thunderbolt": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-thunderbolt-6.0.0.tar.xz", - "hash": "sha256-BHjvWduv56m0l00o8Ukcud37OZ+DHW3BulqwN1zoqJ8=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-thunderbolt-6.0.1.tar.xz", + "hash": "sha256-mzw6wQ94iaZr+rv2KCPsld/a2f9GZSltDCB9S9KIkr0=" }, "plasma-vault": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-vault-6.0.0.tar.xz", - "hash": "sha256-ZB3XHds51dFb6E1LDCTVoODEG0zityVzj6cuWcRS7ak=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-vault-6.0.1.tar.xz", + "hash": "sha256-rWYoml4dP23zwX2xah+IwVi0z3h2VnJuiVhI0L5u0AU=" }, "plasma-welcome": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-welcome-6.0.0.tar.xz", - "hash": "sha256-xihVGMLHIQfGgnqdcZj5Oh8wrsb5mZPCoxHjE3/T5mw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-welcome-6.0.1.tar.xz", + "hash": "sha256-+Lrjd8pQpMvsSpYwXy4rjowzNZ9ZamSFEQirCVC280E=" }, "plasma-workspace": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-workspace-6.0.0.tar.xz", - "hash": "sha256-R92HtMDgnBvLNBYreq4+WjuaSquhuf7Q9NaBuz+f67o=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-workspace-6.0.1.tar.xz", + "hash": "sha256-1MNcsWi5kEh7OfG36xlGkJxedPAgDQ3i0xdlnBbxWgw=" }, "plasma-workspace-wallpapers": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plasma-workspace-wallpapers-6.0.0.tar.xz", - "hash": "sha256-Tde+PXqq8Bt8mmKGX/BITnSvEbJGhcVCMaMV90r2uB0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma-workspace-wallpapers-6.0.1.tar.xz", + "hash": "sha256-MWMiru1TqQSs+mk3gT320hZEmM2dTC8th7YQu1vPgs4=" + }, + "plasma5support": { + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plasma5support-6.0.1.tar.xz", + "hash": "sha256-CyW9EyMGCEy1wNrgfFwP+noy2eserMDTS1bnhHEe0zU=" }, "plymouth-kcm": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/plymouth-kcm-6.0.0.tar.xz", - "hash": "sha256-D79i6jP593fdbe4JPQlALUtNmF2Ghuc1S7xDavqJLeM=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/plymouth-kcm-6.0.1.tar.xz", + "hash": "sha256-RQtov7L/0cuFzQLE1kEgg3iHB4SBGn+POngU1mM1Ink=" }, "polkit-kde-agent-1": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/polkit-kde-agent-1-6.0.0.tar.xz", - "hash": "sha256-LM/EGoPP74ybMxH+H5OrUtBi9jsPblpjsIJA7RFTqk4=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/polkit-kde-agent-1-6.0.1.tar.xz", + "hash": "sha256-YpgXxuVqVkfDr5fW3JYOd0RGAzK9PeavgJCV6LUy2T0=" }, "powerdevil": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/powerdevil-6.0.0.tar.xz", - "hash": "sha256-EmNCdg4bjKS5j6hXmryqQVuFnX1tGAKzagJWSGcssFA=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/powerdevil-6.0.1.tar.xz", + "hash": "sha256-CsSPI+gmRDhDQPBjkDeoQkFpqOGjS0nz9tJQUzJC0K8=" }, "print-manager": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/print-manager-6.0.0.tar.xz", - "hash": "sha256-vZBXi5HmyQoTxa/PlLwW1XvHo7feiURb+gFfDE54FP0=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/print-manager-6.0.1.tar.xz", + "hash": "sha256-qMam4P00JMAi1yEUEKP3dMNT+G7ny08Yrb06pnEhl0o=" }, "qqc2-breeze-style": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/qqc2-breeze-style-6.0.0.tar.xz", - "hash": "sha256-pDDhl8ITxJif4Q/CSeTwrkYu4dP11vvJWPQus4sEySc=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/qqc2-breeze-style-6.0.1.tar.xz", + "hash": "sha256-d4hSRmOyOT2I8DeYeKu9HlLAUg6zyofZVHh3aiUCkLQ=" }, "sddm-kcm": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/sddm-kcm-6.0.0.tar.xz", - "hash": "sha256-iBIFJOqFFY5nhPNSP7cGQ8KmXBn+cu4NXwQAc6wih48=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/sddm-kcm-6.0.1.tar.xz", + "hash": "sha256-f8538z7WWFkQNx2YP+LiCxB/7KvIZS+K+wjZrhk+4c8=" }, "systemsettings": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/systemsettings-6.0.0.tar.xz", - "hash": "sha256-Vh+QE7oHBxwK3Xd4WOyF1AqN3fzIOhD18Ess4QFmZrw=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/systemsettings-6.0.1.tar.xz", + "hash": "sha256-HGShWBnCxoPGaXJfEa6Fos3ElOR5lvalbLLYExiQTZU=" }, "wacomtablet": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/wacomtablet-6.0.0.tar.xz", - "hash": "sha256-1/MYJz6HWKOiJAFuEJMIc/uO1wnZzWrMJm1lp47k0Ww=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/wacomtablet-6.0.1.tar.xz", + "hash": "sha256-m4LCsY3YClBN6OAM1qT5ypB2vZj6b6EReCIj3pRdzj4=" }, "xdg-desktop-portal-kde": { - "version": "6.0.0", - "url": "mirror://kde/stable/plasma/6.0.0/xdg-desktop-portal-kde-6.0.0.tar.xz", - "hash": "sha256-xW7ePlFI33RoOWGLdLCuOPsPtrEM0Eo1xxvJL41X3Wo=" + "version": "6.0.1", + "url": "mirror://kde/stable/plasma/6.0.1/xdg-desktop-portal-kde-6.0.1.tar.xz", + "hash": "sha256-2koLhkyhdujOGfbhXSfI+RkyOlGgck7II3gXnDFY2Zk=" } } \ No newline at end of file diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix index b50dc05b2fa4..a29c1fc36d2e 100644 --- a/pkgs/kde/plasma/default.nix +++ b/pkgs/kde/plasma/default.nix @@ -9,8 +9,8 @@ flatpak-kcm = callPackage ./flatpak-kcm {}; kactivitymanagerd = callPackage ./kactivitymanagerd {}; kde-cli-tools = callPackage ./kde-cli-tools {}; - kdecoration = callPackage ./kdecoration {}; kde-gtk-config = callPackage ./kde-gtk-config {}; + kdecoration = callPackage ./kdecoration {}; kdeplasma-addons = callPackage ./kdeplasma-addons {}; kgamma = callPackage ./kgamma {}; kglobalacceld = callPackage ./kglobalacceld {}; @@ -34,7 +34,6 @@ ocean-sound-theme = callPackage ./ocean-sound-theme {}; oxygen = callPackage ./oxygen {}; oxygen-sounds = callPackage ./oxygen-sounds {}; - plasma5support = callPackage ./plasma5support {}; plasma-activities = callPackage ./plasma-activities {}; plasma-activities-stats = callPackage ./plasma-activities-stats {}; plasma-browser-integration = callPackage ./plasma-browser-integration {}; @@ -53,6 +52,7 @@ plasma-welcome = callPackage ./plasma-welcome {}; plasma-workspace = callPackage ./plasma-workspace {}; plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers {}; + plasma5support = callPackage ./plasma5support {}; plymouth-kcm = callPackage ./plymouth-kcm {}; polkit-kde-agent-1 = callPackage ./polkit-kde-agent-1 {}; powerdevil = callPackage ./powerdevil {}; From 89ab2b075f12f31ec4c59ff9961f82d887c14998 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 06:59:19 +0000 Subject: [PATCH 300/444] libretro.beetle-psx-hw: unstable-2024-02-27 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..210973643c8f 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "4a006dca366af88d491e232892fe93aabe094b14", - "hash": "sha256-tdD2Ilkzph425RC4pVcS7kpvIxA+DF/rWYM9BhcWGyY=" + "rev": "680bbf0e2a4f9bc2b534d213416456baa9c95212", + "hash": "sha256-QmiCokeMtQC2+cwWFovve2+c3pahD+IdOFBRAXEPV0k=" }, - "version": "unstable-2024-02-27" + "version": "unstable-2024-03-01" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", From 9fbb05a8f4d281e6ee1f303ce1449f85b40b44d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:00:56 +0000 Subject: [PATCH 301/444] libretro.stella: unstable-2024-02-02 -> unstable-2024-03-03 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..f75395a73a08 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -793,10 +793,10 @@ "src": { "owner": "stella-emu", "repo": "stella", - "rev": "4557099e5d7a0c0b02424ea85d2a4b093911e048", - "hash": "sha256-wyJExpIIScgLTALgvqW5f/QgIsMC19JU8Meh3mV4d2c=" + "rev": "a311e1d714db3837ae4c05e2fab0abcf092a2e54", + "hash": "sha256-QJirSJleSPezNoyH2DKkaoNmGY3r/5J64IHBp+MeFvI=" }, - "version": "unstable-2024-02-02" + "version": "unstable-2024-03-03" }, "stella2014": { "fetcher": "fetchFromGitHub", From 07c8e94832d99a93adc21fd516af372cf4f05b45 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:02:07 +0000 Subject: [PATCH 302/444] tippecanoe: 2.47.0 -> 2.49.0 --- pkgs/by-name/ti/tippecanoe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ti/tippecanoe/package.nix b/pkgs/by-name/ti/tippecanoe/package.nix index 80fb8c195cff..056391f5119e 100644 --- a/pkgs/by-name/ti/tippecanoe/package.nix +++ b/pkgs/by-name/ti/tippecanoe/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "tippecanoe"; - version = "2.47.0"; + version = "2.49.0"; src = fetchFromGitHub { owner = "felt"; repo = "tippecanoe"; rev = finalAttrs.version; - hash = "sha256-tkecrbrkwYJU0eZMzU+7rJGAn+S/vnh/rw5co0x1m5M="; + hash = "sha256-Wu6TSld/mxCb4CFXf2oIZpDvX/j3Ujm7Vli4kp04u7c="; }; buildInputs = [ sqlite zlib ]; From 7abcb46186e17c4d166db475769174857b86384e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:02:08 +0000 Subject: [PATCH 303/444] libretro.beetle-pce-fast: unstable-2024-02-23 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..1e21314f2235 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -65,10 +65,10 @@ "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "ad9ad7e7e3b89d322e9f9492f5b04738641ffbe8", - "hash": "sha256-UUej94plV/UDsvfh7CPjP6zv99zNw4JT+ZDOl0AKzmc=" + "rev": "28180934e9d7f1a6ec655adde0b81f0b167732ad", + "hash": "sha256-Kt1Bh32zoJynbqp/0ARngPTYHlvp6k/Ya09l8/736gk=" }, - "version": "unstable-2024-02-23" + "version": "unstable-2024-03-01" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", From 2c86192f73d1fb5f00de61b3a62b3bed93c99e5f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:02:25 +0000 Subject: [PATCH 304/444] libretro.beetle-pce: unstable-2024-02-09 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..233110dc8ff5 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -55,10 +55,10 @@ "src": { "owner": "libretro", "repo": "beetle-pce-libretro", - "rev": "753f067738e55a6325d3ca5206151a9acd9127f0", - "hash": "sha256-OWvoIi0DS3YhxK1S6PAbCNZwKKXti6brZlWVCJELfKY=" + "rev": "95b5ea18a694f5a05b1c0cda20928c825d981238", + "hash": "sha256-4Y2dyELUGWycCQ1UA0Ov6Ijh1t+KgSL1AtDefbRmjbA=" }, - "version": "unstable-2024-02-09" + "version": "unstable-2024-03-01" }, "beetle-pce-fast": { "fetcher": "fetchFromGitHub", From 4e825dc6c48fdd0654f40fabf2485e55e86cc4c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:12:41 +0000 Subject: [PATCH 305/444] libretro.beetle-supergrafx: unstable-2024-02-09 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..ff375b66128d 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -115,10 +115,10 @@ "src": { "owner": "libretro", "repo": "beetle-supergrafx-libretro", - "rev": "32070ffd0082fd5127519bb6e92a2daecc359408", - "hash": "sha256-ZBZtDMP2inarEuLE76Zw1/qZ2YfyTJy+2eN10hhpn64=" + "rev": "29ff9e00a85db3d462cca42543a84597c421c99c", + "hash": "sha256-UZt1yFcwgdY/TbDs+GQ73Nu5KRA1R8gdKs73IQC1mCg=" }, - "version": "unstable-2024-02-09" + "version": "unstable-2024-03-01" }, "beetle-vb": { "fetcher": "fetchFromGitHub", From fc54a57acc2d86beb91472d0dd7426b14d2419f2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:13:03 +0000 Subject: [PATCH 306/444] vale: 3.2.1 -> 3.2.2 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 5f302cafd4db..e3d2896078ca 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "3.2.1"; + version = "3.2.2"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - hash = "sha256-e3cxUO05OU1RYINX24E8XXkxPADWpaIYTUgbcQIys7w="; + hash = "sha256-CLbzrJJVgFxJKuTtXQKGZ6q228Sm7s+Is11TE8mAmD8="; }; vendorHash = "sha256-KxIQZViUYT4cgRlOuKBwen6pqQjGiAofkeBztmjnKdQ="; From a9382f213b0b38e53a1c8f8f3f44f45cd1c4dc91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:18:35 +0000 Subject: [PATCH 307/444] libretro.ppsspp: unstable-2024-02-27 -> unstable-2024-02-28 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..c77dd95e666d 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -662,11 +662,11 @@ "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "bc18fb145bda05735b92dde1869426c3380d35e5", - "hash": "sha256-sofvjkrKDTCHyYWIqlaAR6kN3JdBOjh67pNCvw5IXi8=", + "rev": "0159102a191d43de7ae51775a79846efa2635988", + "hash": "sha256-b7QOOpeoVJUComVOlMtZK8B5w5vkE6rxJVEHecJE19k=", "fetchSubmodules": true }, - "version": "unstable-2024-02-27" + "version": "unstable-2024-02-28" }, "prboom": { "fetcher": "fetchFromGitHub", From 5557dc174393908019c09e0585abbdf4fa1f14f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:19:11 +0000 Subject: [PATCH 308/444] libretro.mame2003-plus: unstable-2024-02-26 -> unstable-2024-03-02 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..3efd19a47661 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -438,10 +438,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "d3bc97daafcd0ff8498c4e1acd8996accb668ad3", - "hash": "sha256-Ua/uP9vXKiij+VyEOf7lAD352LGpoqH3nuHAjDTaYus=" + "rev": "a7cb863de48247c771a0fcc71d519131eae4e9c6", + "hash": "sha256-Y/Zyfck5tJ6oVsL/WjNXJZdPE5THeyBD5tNzJQaLSn8=" }, - "version": "unstable-2024-02-26" + "version": "unstable-2024-03-02" }, "mame2010": { "fetcher": "fetchFromGitHub", From 9018456959fa4ad3172fabd185eb8502c7a33c27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:29:07 +0000 Subject: [PATCH 309/444] libretro.fbneo: unstable-2024-02-22 -> unstable-2024-03-03 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..34003e82b5ea 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -287,10 +287,10 @@ "src": { "owner": "libretro", "repo": "fbneo", - "rev": "226123d45854f23a93f5030471bf82d068f018ad", - "hash": "sha256-GTkUgLhnP2KFR6Lo354577qYS5CXjGZ7k7PZ9sTE0Cg=" + "rev": "a9c41d1e1132b1a7aad48c0f8e94fcf9c7ba0f9f", + "hash": "sha256-H4pJruHqJ4p3tBykm015U+wApHrAeVaZO9nLJ9Rc0NQ=" }, - "version": "unstable-2024-02-22" + "version": "unstable-2024-03-03" }, "fceumm": { "fetcher": "fetchFromGitHub", From c4c30b47c7caba77e46c5e58a4c933cafa868a1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:33:00 +0000 Subject: [PATCH 310/444] cargo-deny: 0.14.14 -> 0.14.15 --- pkgs/development/tools/rust/cargo-deny/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 6597bddb5f98..c3bc211a9c0e 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.14.14"; + version = "0.14.15"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; rev = version; - hash = "sha256-PCToLbMDElS+YfDmHUGq3hXNA0l02dL2+4dePCHvJ8g="; + hash = "sha256-soDLgxEbeNk8mQHwUzBZK5QqTURzXQKZb2LtJA6fnhc="; }; - cargoHash = "sha256-XKnuhNNTtdawFXjKn1oNLMRP4IPLaUGWyDOEwiPchhc="; + cargoHash = "sha256-XblrLV3AMmFFXOr3K/Sq4Vb6MknI7H92H/bDvUEUOko="; nativeBuildInputs = [ pkg-config From 855d9f6b937367cd32cde47a341768d7a812d312 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:42:32 +0000 Subject: [PATCH 311/444] files-cli: 2.12.39 -> 2.12.40 --- pkgs/by-name/fi/files-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 0fad52348253..67919148083f 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.12.39"; + version = "2.12.40"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-E2vxgDdTXIuge160mpu7w/cs2M3fRYlUyvNtPq3AncA="; + hash = "sha256-dtHmBpszacoKHOg5PXrIQ2oPPCk1zzhvxAWULzxm3C4="; }; - vendorHash = "sha256-EUPaPihTDHRh0Y4HEPhpgl1Qa3rfhOdJHO/uRD8KzT4="; + vendorHash = "sha256-yaDc2o0vzgb0KDn3dGiXxPjEXyPNcCCQ+bEu/X1Cs3Q="; ldflags = [ "-s" From 35f59cc7a5022d33fc23e14ca29ae9684db8ee3e Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 6 Mar 2024 10:43:17 +0300 Subject: [PATCH 312/444] kde/plasma: apply hacks to fix build --- pkgs/kde/plasma/breeze-gtk/default.nix | 5 +++++ pkgs/kde/plasma/breeze-plymouth/default.nix | 3 +++ pkgs/kde/plasma/kpipewire/default.nix | 9 +++++++++ 3 files changed, 17 insertions(+) diff --git a/pkgs/kde/plasma/breeze-gtk/default.nix b/pkgs/kde/plasma/breeze-gtk/default.nix index fc0bc4759d48..621ae4f88aae 100644 --- a/pkgs/kde/plasma/breeze-gtk/default.nix +++ b/pkgs/kde/plasma/breeze-gtk/default.nix @@ -10,5 +10,10 @@ mkKdeDerivation { # FIXME(later): upstream patches = [./0001-fix-add-executable-bit.patch]; + # FIXME: hack to fix build, remove for 6.0.2 + postPatch = '' + substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0" + ''; + extraNativeBuildInputs = [sass python3 python3Packages.pycairo]; } diff --git a/pkgs/kde/plasma/breeze-plymouth/default.nix b/pkgs/kde/plasma/breeze-plymouth/default.nix index 7551eca94e3a..b69ff3601a56 100644 --- a/pkgs/kde/plasma/breeze-plymouth/default.nix +++ b/pkgs/kde/plasma/breeze-plymouth/default.nix @@ -41,6 +41,9 @@ in postPatch = '' substituteInPlace cmake/FindPlymouth.cmake --subst-var out + + # FIXME: hack to fix build, remove for 6.0.2 + substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0" '' + lib.optionalString (logoFile != null) '' cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png diff --git a/pkgs/kde/plasma/kpipewire/default.nix b/pkgs/kde/plasma/kpipewire/default.nix index c79bfc792d51..18e595f39e16 100644 --- a/pkgs/kde/plasma/kpipewire/default.nix +++ b/pkgs/kde/plasma/kpipewire/default.nix @@ -1,5 +1,6 @@ { mkKdeDerivation, + fetchpatch, qtquick3d, pkg-config, pipewire, @@ -10,6 +11,14 @@ mkKdeDerivation { pname = "kpipewire"; + # FIXME: backport to fix build, remove for 6.0.2 + patches = [ + (fetchpatch { + url = "https://invent.kde.org/plasma/kpipewire/-/commit/df052bfa3c66d24109f40f18266ee057d1838b9b.patch"; + hash = "sha256-69ftUUz5cvG/CmCw3hHFeU8XKhZPJjnx1raJCCay38g="; + }) + ]; + extraNativeBuildInputs = [pkg-config]; extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva]; } From fb45e89a6e1bb28f0567579e5c5ae493942c917c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 6 Mar 2024 08:52:32 +0100 Subject: [PATCH 313/444] knot-dns: 3.3.4 -> 3.3.5 https://gitlab.nic.cz/knot/knot-dns/-/releases/v3.3.5 --- pkgs/servers/dns/knot-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 9e73c026b3f1..d939f4e375ed 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "knot-dns"; - version = "3.3.4"; + version = "3.3.5"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "2a771b43ce96b6b48d53b29f2086528732e6ac067bc71a3be934f859d1302fc0"; + sha256 = "0e0bf04319581280660e8e62ab04be64a7d632331e40fc9c87e76861305db3ad"; }; outputs = [ "bin" "out" "dev" ]; From 02e590bab824bf22aed35fb0a0ee89c7a16c5272 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 08:53:35 +0100 Subject: [PATCH 314/444] past-time: 0.2.1 -> 0.3.0 Diff: https://github.com/fabaff/past-time/compare/refs/tags/0.2.1...0.3.0 Changelog: https://github.com/fabaff/past-time/releases/tag/0.3.0 --- pkgs/tools/misc/past-time/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/past-time/default.nix b/pkgs/tools/misc/past-time/default.nix index cb36808ea366..4bb24ed22162 100644 --- a/pkgs/tools/misc/past-time/default.nix +++ b/pkgs/tools/misc/past-time/default.nix @@ -5,16 +5,20 @@ python3.pkgs.buildPythonApplication rec { pname = "past-time"; - version = "0.2.1"; - format = "setuptools"; + version = "0.3.0"; + pyproject = true; src = fetchFromGitHub { owner = "fabaff"; - repo = pname; + repo = "past-time"; rev = "refs/tags/${version}"; - hash = "sha256-9LmFOWNUkvKfWHLo4HB1W1UBQL90Gp9UJJ3VDIYBDHo="; + hash = "sha256-3tSEbqGwFw16JcaEERhs6I+BsfxjE1hQWpOT1C+fQDk="; }; + nativeBuildInputs = with python3.pkgs; [ + poetry-core + ]; + propagatedBuildInputs = with python3.pkgs; [ click tqdm From b9d157857d994cf2f9a7880d47f7d226c4184cfd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 07:55:20 +0000 Subject: [PATCH 315/444] libretro.beetle-psx: unstable-2024-02-27 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..210973643c8f 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "4a006dca366af88d491e232892fe93aabe094b14", - "hash": "sha256-tdD2Ilkzph425RC4pVcS7kpvIxA+DF/rWYM9BhcWGyY=" + "rev": "680bbf0e2a4f9bc2b534d213416456baa9c95212", + "hash": "sha256-QmiCokeMtQC2+cwWFovve2+c3pahD+IdOFBRAXEPV0k=" }, - "version": "unstable-2024-02-27" + "version": "unstable-2024-03-01" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", From fcd9227ff819f33cb426a8247eed22dd23a422c7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 6 Mar 2024 08:58:51 +0100 Subject: [PATCH 316/444] past-time: 0.3.0 -> 0.3.1 Diff: https://github.com/fabaff/past-time/compare/refs/tags/0.3.0...0.3.1 Changelog: https://github.com/fabaff/past-time/releases/tag/0.3.1 --- pkgs/tools/misc/past-time/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/past-time/default.nix b/pkgs/tools/misc/past-time/default.nix index 4bb24ed22162..4bdcff8c1935 100644 --- a/pkgs/tools/misc/past-time/default.nix +++ b/pkgs/tools/misc/past-time/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "past-time"; - version = "0.3.0"; + version = "0.3.1"; pyproject = true; src = fetchFromGitHub { owner = "fabaff"; repo = "past-time"; rev = "refs/tags/${version}"; - hash = "sha256-3tSEbqGwFw16JcaEERhs6I+BsfxjE1hQWpOT1C+fQDk="; + hash = "sha256-NSuU33vuHbgJ+cG0FrGYLizIrG7jSz+veptt3D4UegY="; }; nativeBuildInputs = with python3.pkgs; [ From baec779d4919182e2a9aa854949efdfab0141532 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 08:03:22 +0000 Subject: [PATCH 317/444] libretro.bsnes: unstable-2024-02-09 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..28bc185b3e4c 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -165,10 +165,10 @@ "src": { "owner": "libretro", "repo": "bsnes-libretro", - "rev": "d230353616ab4c7dc01a2f2a63865011bd5c7ffd", - "hash": "sha256-TiOdptWOb13UQ8jKDbIlZQQ3mY3h/lPHr/GskPVAkwA=" + "rev": "9e9b928e0153f663cf4802f266315ab092067b7e", + "hash": "sha256-Fn1bz3TC+8CEmGDNcll0yfzBpDPvfS1vknf49ogNCIQ=" }, - "version": "unstable-2024-02-09" + "version": "unstable-2024-03-01" }, "bsnes-hd": { "fetcher": "fetchFromGitHub", From 84003e9ec805c3f6578456d3b8f550a5525347b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 08:04:48 +0000 Subject: [PATCH 318/444] libretro.flycast: unstable-2024-02-23 -> unstable-2024-03-04 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..54cec76a8ff0 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -307,11 +307,11 @@ "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "bc51aefa9c52981621abf1d3545bff7befa4d01b", - "hash": "sha256-NSCJxex5Rl7sWe2DkJ2aIyPzfdTcwSRb2iI3xpvYiow=", + "rev": "391da7023f63c2afd32af72ac9f2cfb02bbc7eb6", + "hash": "sha256-fcNpFl6VwaoL2mWZOgyVoJWX9CV2KbWctukdxxo797I=", "fetchSubmodules": true }, - "version": "unstable-2024-02-23" + "version": "unstable-2024-03-04" }, "fmsx": { "fetcher": "fetchFromGitHub", From 6e957fb53040cbb2768736f8894bc4ac62b5aee2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 08:04:52 +0000 Subject: [PATCH 319/444] libretro.mame: unstable-2024-02-13 -> unstable-2024-02-29 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..2c1e5252adc4 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -408,10 +408,10 @@ "src": { "owner": "libretro", "repo": "mame", - "rev": "8ebaec4073703f5050dac3f6c8da408943e15938", - "hash": "sha256-CFCem9MiaHW2flEZyJkcC9JEGzx7Ox/uqrTY3jue+Pk=" + "rev": "6d6d21fd9e41dab2b0e0ca0587baf3fcad18fd67", + "hash": "sha256-8pPDIxnEeeTQl160E+sg/wmchOR53pQmbhvEAXRFif0=" }, - "version": "unstable-2024-02-13" + "version": "unstable-2024-02-29" }, "mame2000": { "fetcher": "fetchFromGitHub", From 03887526902a028065a64178732fc2f20770f1b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 08:08:05 +0000 Subject: [PATCH 320/444] libretro.fceumm: unstable-2024-02-27 -> unstable-2024-03-02 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..530c429645fe 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -297,10 +297,10 @@ "src": { "owner": "libretro", "repo": "libretro-fceumm", - "rev": "1deea6c93cdcf5158b032683f426a06dd1bfa8d5", - "hash": "sha256-e0AxHw9sRufk5cc6q66/cmdkD+FbVRY+OUkRjZA8j1U=" + "rev": "40969671ce9e4b1a49165d836476cd71bb960131", + "hash": "sha256-wdAigh3qUzB3wmh6q/dwCHHhuyqyAmqV+NSvrzjODVM=" }, - "version": "unstable-2024-02-27" + "version": "unstable-2024-03-02" }, "flycast": { "fetcher": "fetchFromGitHub", From dd99987e7779e1381fb7c10e3c83d329c5ff854d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 08:12:40 +0000 Subject: [PATCH 321/444] libretro.genesis-plus-gx: unstable-2024-02-23 -> unstable-2024-03-02 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..7cf684251d91 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -358,10 +358,10 @@ "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "b38cdca9036332c1b7b05817432d1fd42d59527b", - "hash": "sha256-5yr64Jy8WxamMknIG9nhIV4BLTZg8k7Q8Lnw8sfmWhk=" + "rev": "d434ad9ee418247490a8560b52e0651d25304f35", + "hash": "sha256-v6IYku+9hLlGD0sgkzoatdD7Glp/3pgwBE2K4hdsFec=" }, - "version": "unstable-2024-02-23" + "version": "unstable-2024-03-02" }, "gpsp": { "fetcher": "fetchFromGitHub", From ac07d446782cdf4ac55ebaa2ced990367e28fd94 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 08:16:40 +0000 Subject: [PATCH 322/444] libretro.gambatte: unstable-2024-02-23 -> unstable-2024-03-01 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index cc7a717f1477..d3656d6ef85d 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -348,10 +348,10 @@ "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "4041d5a6c474d2d01b4cb1e81324b06b51d0147b", - "hash": "sha256-TmPOka3oz5xIFDEsmDbvXXmLmP15FtQdoUZ+FErbqrI=" + "rev": "9806d3f12bc3a831fad3f71c6fbad6f93d83581c", + "hash": "sha256-EdqS410TZyRqE/nd/oLJt7dauN0DCtNnhB6k6CPd/tc=" }, - "version": "unstable-2024-02-23" + "version": "unstable-2024-03-01" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", From e68ed07011d57116bc9d2a7523bafc24e817643e Mon Sep 17 00:00:00 2001 From: jmarmstrong1207 Date: Wed, 6 Mar 2024 00:26:24 -0800 Subject: [PATCH 323/444] dk: Fix hash --- pkgs/applications/window-managers/dk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/dk/default.nix b/pkgs/applications/window-managers/dk/default.nix index 52084836890e..09cddc31a748 100644 --- a/pkgs/applications/window-managers/dk/default.nix +++ b/pkgs/applications/window-managers/dk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "natemaia"; repo = "dk"; rev = "v${finalAttrs.version}"; - hash = "sha256-AzvpvcH0S8WJNzYXMwvF6CIRDXnh/c6B8g2iWDQI6Qw="; + hash = "sha256-wuEsfzy4L40tL/Lb5R1jMFa8UAvAqkI3iEd//D7lxGY="; }; buildInputs = [ From 2390f97b935b12db6a0fbecf71473a9befd5ac5b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 08:48:25 +0000 Subject: [PATCH 324/444] python311Packages.aiohomekit: 3.1.4 -> 3.1.5 --- pkgs/development/python-modules/aiohomekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 8ea84581873a..2e6a1957779e 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "3.1.4"; + version = "3.1.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = "aiohomekit"; rev = "refs/tags/${version}"; - hash = "sha256-hZhbmEEqmhvoxGD4hvy4SDQWG5Xk1cmzFDSNa742iMs="; + hash = "sha256-F3PhZsuIgT3x1Y3/kx9juPwN2WKxvdbahrRm+r6ZPps="; }; nativeBuildInputs = [ From 73c0b48dd69255193aa07abd5670e39396bfaa3e Mon Sep 17 00:00:00 2001 From: Valentin Gagarin Date: Wed, 6 Mar 2024 10:21:23 +0100 Subject: [PATCH 325/444] doc: add details on `mapAttrsRecursive[Cond]` (#293509) * doc: add details on `mapAttrsRecursive[Cond]` from first reading it wasn't clear that `f` also takes the current attribute path. also the value f receives is tricky due to how the condition is evaluated. Co-authored-by: Daniel Sidhion --- lib/attrsets.nix | 77 +++++++++++++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 31 deletions(-) diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 4f7d795c397f..ebac469fcd4f 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -680,52 +680,67 @@ rec { attrsToList = mapAttrsToList nameValuePair; - /* Like `mapAttrs`, except that it recursively applies itself to - the *leaf* attributes of a potentially-nested attribute set: - the second argument of the function will never be an attrset. - Also, the first argument of the argument function is a *list* - of the attribute names that form the path to the leaf attribute. + /** + Like `mapAttrs`, except that it recursively applies itself to the *leaf* attributes of a potentially-nested attribute set: + the second argument of the function will never be an attrset. + Also, the first argument of the mapping function is a *list* of the attribute names that form the path to the leaf attribute. - For a function that gives you control over what counts as a leaf, - see `mapAttrsRecursiveCond`. + For a function that gives you control over what counts as a leaf, see `mapAttrsRecursiveCond`. - Example: - mapAttrsRecursive (path: value: concatStringsSep "-" (path ++ [value])) - { n = { a = "A"; m = { b = "B"; c = "C"; }; }; d = "D"; } - => { n = { a = "n-a-A"; m = { b = "n-m-b-B"; c = "n-m-c-C"; }; }; d = "d-D"; } + :::{#map-attrs-recursive-example .example} + # Map over leaf attributes - Type: - mapAttrsRecursive :: ([String] -> a -> b) -> AttrSet -> AttrSet + ```nix + mapAttrsRecursive (path: value: concatStringsSep "-" (path ++ [value])) + { n = { a = "A"; m = { b = "B"; c = "C"; }; }; d = "D"; } + ``` + evaluates to + ```nix + { n = { a = "n-a-A"; m = { b = "n-m-b-B"; c = "n-m-c-C"; }; }; d = "d-D"; } + ``` + ::: + + # Type + ``` + mapAttrsRecursive :: ([String] -> a -> b) -> AttrSet -> AttrSet + ``` */ mapAttrsRecursive = - # A function, given a list of attribute names and a value, returns a new value. + # A function that, given an attribute path as a list of strings and the corresponding attribute value, returns a new value. f: - # Set to recursively map over. + # Attribute set to recursively map over. set: mapAttrsRecursiveCond (as: true) f set; - /* Like `mapAttrsRecursive`, but it takes an additional predicate - function that tells it whether to recurse into an attribute - set. If it returns false, `mapAttrsRecursiveCond` does not - recurse, but does apply the map function. If it returns true, it - does recurse, and does not apply the map function. + /** + Like `mapAttrsRecursive`, but it takes an additional predicate that tells it whether to recurse into an attribute set. + If the predicate returns false, `mapAttrsRecursiveCond` does not recurse, but instead applies the mapping function. + If the predicate returns true, it does recurse, and does not apply the mapping function. - Example: - # To prevent recursing into derivations (which are attribute - # sets with the attribute "type" equal to "derivation"): - mapAttrsRecursiveCond - (as: !(as ? "type" && as.type == "derivation")) - (x: ... do something ...) - attrs + :::{#map-attrs-recursive-cond-example .example} + # Map over an leaf attributes defined by a condition - Type: - mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([String] -> a -> b) -> AttrSet -> AttrSet + Map derivations to their `name` attribute. + Derivatons are identified as attribute sets that contain `{ type = "derivation"; }`. + ```nix + mapAttrsRecursiveCond + (as: !(as ? "type" && as.type == "derivation")) + (x: x.name) + attrs + ``` + ::: + + # Type + ``` + mapAttrsRecursiveCond :: (AttrSet -> Bool) -> ([String] -> a -> b) -> AttrSet -> AttrSet + ``` */ mapAttrsRecursiveCond = - # A function, given the attribute set the recursion is currently at, determine if to recurse deeper into that attribute set. + # A function that, given the attribute set the recursion is currently at, determines if to recurse deeper into that attribute set. cond: - # A function, given a list of attribute names and a value, returns a new value. + # A function that, given an attribute path as a list of strings and the corresponding attribute value, returns a new value. + # The attribute value is either an attribute set for which `cond` returns false, or something other than an attribute set. f: # Attribute set to recursively map over. set: From 3d726897d2c44dbf58e86e0e9c6b76bc68b0bfc3 Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Wed, 6 Mar 2024 10:31:03 +0100 Subject: [PATCH 326/444] opensc: 0.24.0 -> 0.25.0 --- pkgs/tools/security/opensc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 856921edbf18..6edc9a7da55c 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "opensc"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "OpenSC"; repo = "OpenSC"; rev = version; - sha256 = "sha256-1mm0b4AAtX0AgjShpU1FR6e7pUkea5TOJdIGkNQgjuE="; + sha256 = "sha256-pNorJiZzLGpxtlkog2d3E9xePMy9ASoHeWduqVZiBiA="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 92cb8dd5c72e5b6f1cc3c536b85f65b0c80b4537 Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 5 Mar 2024 22:57:28 +0100 Subject: [PATCH 327/444] 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 9e811a255eb34a240236399eeb3aef8efe31ecbd Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Wed, 6 Mar 2024 09:49:13 +0000 Subject: [PATCH 328/444] multipass: revert change from OVMF.fd -> OVMF.firmware --- pkgs/tools/virtualization/multipass/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/multipass/default.nix b/pkgs/tools/virtualization/multipass/default.nix index c746639e98ee..e7875f00bb6a 100644 --- a/pkgs/tools/virtualization/multipass/default.nix +++ b/pkgs/tools/virtualization/multipass/default.nix @@ -70,8 +70,8 @@ stdenv.mkDerivation # Patch the patch of the OVMF binaries to use paths from the nix store. substituteInPlace ./src/platform/backends/qemu/linux/qemu_platform_detail_linux.cpp \ - --replace "OVMF.fd" "${OVMF.firmware}" \ - --replace "QEMU_EFI.fd" "${OVMF.firmware}" + --replace "OVMF.fd" "${OVMF.fd}/FV/OVMF.fd" \ + --replace "QEMU_EFI.fd" "${OVMF.fd}/FV/QEMU_EFI.fd" # Copy the grpc submodule we fetched into the source code. cp -r --no-preserve=mode ${grpc_src} 3rd-party/grpc @@ -122,6 +122,7 @@ stdenv.mkDerivation dnsmasq iproute2 iptables + OVMF.fd qemu qemu-utils xterm From 5dad48cc0ca2ab3dbc87452f121cf81a8f378243 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 09:52:59 +0000 Subject: [PATCH 329/444] python311Packages.pipdeptree: 2.16.0 -> 2.16.1 --- pkgs/development/python-modules/pipdeptree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipdeptree/default.nix b/pkgs/development/python-modules/pipdeptree/default.nix index dcedfb646111..3537c151e6f4 100644 --- a/pkgs/development/python-modules/pipdeptree/default.nix +++ b/pkgs/development/python-modules/pipdeptree/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pipdeptree"; - version = "2.16.0"; + version = "2.16.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "tox-dev"; repo = "pipdeptree"; rev = "refs/tags/${version}"; - hash = "sha256-KxjsT8hf+IbQVL+mzjrOkGCEJ0m5IqxdnDVWzbQbAhU="; + hash = "sha256-aOAFM8b0kOZT5/afZigZjJDvS2CyqghY6GATzeyySB4="; }; nativeBuildInputs = [ From 516bd5c9279f4be737567348eb5486f577656ea9 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 6 Mar 2024 13:03:10 +0300 Subject: [PATCH 330/444] Revert "kde/plasma: apply hacks to fix build" This reverts commit 35f59cc7a5022d33fc23e14ca29ae9684db8ee3e. --- pkgs/kde/plasma/breeze-gtk/default.nix | 5 ----- pkgs/kde/plasma/breeze-plymouth/default.nix | 3 --- pkgs/kde/plasma/kpipewire/default.nix | 9 --------- 3 files changed, 17 deletions(-) diff --git a/pkgs/kde/plasma/breeze-gtk/default.nix b/pkgs/kde/plasma/breeze-gtk/default.nix index 621ae4f88aae..fc0bc4759d48 100644 --- a/pkgs/kde/plasma/breeze-gtk/default.nix +++ b/pkgs/kde/plasma/breeze-gtk/default.nix @@ -10,10 +10,5 @@ mkKdeDerivation { # FIXME(later): upstream patches = [./0001-fix-add-executable-bit.patch]; - # FIXME: hack to fix build, remove for 6.0.2 - postPatch = '' - substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0" - ''; - extraNativeBuildInputs = [sass python3 python3Packages.pycairo]; } diff --git a/pkgs/kde/plasma/breeze-plymouth/default.nix b/pkgs/kde/plasma/breeze-plymouth/default.nix index b69ff3601a56..7551eca94e3a 100644 --- a/pkgs/kde/plasma/breeze-plymouth/default.nix +++ b/pkgs/kde/plasma/breeze-plymouth/default.nix @@ -41,9 +41,6 @@ in postPatch = '' substituteInPlace cmake/FindPlymouth.cmake --subst-var out - - # FIXME: hack to fix build, remove for 6.0.2 - substituteInPlace CMakeLists.txt --replace-fail "ECM 6.0.1" "ECM 6.0.0" '' + lib.optionalString (logoFile != null) '' cp ${logoFile} breeze/images/${resolvedLogoName}.logo.png diff --git a/pkgs/kde/plasma/kpipewire/default.nix b/pkgs/kde/plasma/kpipewire/default.nix index 18e595f39e16..c79bfc792d51 100644 --- a/pkgs/kde/plasma/kpipewire/default.nix +++ b/pkgs/kde/plasma/kpipewire/default.nix @@ -1,6 +1,5 @@ { mkKdeDerivation, - fetchpatch, qtquick3d, pkg-config, pipewire, @@ -11,14 +10,6 @@ mkKdeDerivation { pname = "kpipewire"; - # FIXME: backport to fix build, remove for 6.0.2 - patches = [ - (fetchpatch { - url = "https://invent.kde.org/plasma/kpipewire/-/commit/df052bfa3c66d24109f40f18266ee057d1838b9b.patch"; - hash = "sha256-69ftUUz5cvG/CmCw3hHFeU8XKhZPJjnx1raJCCay38g="; - }) - ]; - extraNativeBuildInputs = [pkg-config]; extraBuildInputs = [qtquick3d pipewire ffmpeg mesa libva]; } From ca00eb4c4bfe8468219d2b1c78b7a05bab114581 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 6 Mar 2024 13:03:12 +0300 Subject: [PATCH 331/444] kde/plasma: 6.0.1 -> 6.0.1.1 (where needed) --- pkgs/kde/generated/sources/plasma.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 6897ae10ea10..18854156c38b 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -15,14 +15,14 @@ "hash": "sha256-iI1vzXZ+j97dqgq/Uze81TSpeu+RqKXkf6oZcmdNguM=" }, "breeze-gtk": { - "version": "6.0.1", - "url": "mirror://kde/stable/plasma/6.0.1/breeze-gtk-6.0.1.tar.xz", - "hash": "sha256-MmInFnKHzR4PHzIfm7UFQsQAa/x53lehSNSaHL8gYqU=" + "version": "6.0.1.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-gtk-6.0.1.1.tar.xz", + "hash": "sha256-I8qWYBzJv/AENPf7/jkB+8uSNi0XUaMcCFIPtMESRhA=" }, "breeze-plymouth": { - "version": "6.0.1", - "url": "mirror://kde/stable/plasma/6.0.1/breeze-plymouth-6.0.1.tar.xz", - "hash": "sha256-TlPrMhAYMWCf8dGyzxP1PjS8JMQHb1ec0JysuXtx8ZM=" + "version": "6.0.1.1", + "url": "mirror://kde/stable/plasma/6.0.1/breeze-plymouth-6.0.1.1.tar.xz", + "hash": "sha256-Xk/enHtV4kwK4inPSrct34g1nvewvSrnFbuH4eDx94I=" }, "discover": { "version": "6.0.1", @@ -85,9 +85,9 @@ "hash": "sha256-9wZA2Q88JbE5NFM5UDwAGax0Oy8ldd+d+Ywn0URcdiQ=" }, "kpipewire": { - "version": "6.0.1", - "url": "mirror://kde/stable/plasma/6.0.1/kpipewire-6.0.1.tar.xz", - "hash": "sha256-CfahfSldlHT0ecVrzYuL5pCl1RCHAdDcICJ+84Udvjk=" + "version": "6.0.1.1", + "url": "mirror://kde/stable/plasma/6.0.1/kpipewire-6.0.1.1.tar.xz", + "hash": "sha256-GQLzlJBS/xq12nnGMJWG8+EaKcfASgRPc7P2rJglHEo=" }, "kscreen": { "version": "6.0.1", From e494174e18345323c47227b0d457360a5df8e855 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 4 Mar 2024 22:19:12 +0800 Subject: [PATCH 332/444] ags: init at 1.8.0 --- pkgs/by-name/ag/ags/package.nix | 74 +++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 pkgs/by-name/ag/ags/package.nix diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix new file mode 100644 index 000000000000..0076e5b0ba29 --- /dev/null +++ b/pkgs/by-name/ag/ags/package.nix @@ -0,0 +1,74 @@ +{ lib +, buildNpmPackage +, fetchFromGitHub +, meson +, ninja +, pkg-config +, gobject-introspection +, gjs +, glib-networking +, gnome +, gtk-layer-shell +, libpulseaudio +, libsoup_3 +, networkmanager +, upower +, typescript +, wrapGAppsHook +, linux-pam +}: + +buildNpmPackage rec { + pname = "ags"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "Aylur"; + repo = "ags"; + rev = "v${version}"; + hash = "sha256-+0us1/lawDXp6RXn4ev95a99VgpsVPi2A4jwNS2O1Uo="; + fetchSubmodules = true; + }; + + npmDepsHash = "sha256-ucWdADdMqAdLXQYKGOXHNRNM9bhjKX4vkMcQ8q/GZ20="; + + mesonFlags = [ + (lib.mesonBool "build_types" true) + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + gjs + gobject-introspection + typescript + wrapGAppsHook + ]; + + # Most of the build inputs here are basically needed for their typelibs. + buildInputs = [ + gjs + glib-networking + gnome.gnome-bluetooth + gtk-layer-shell + libpulseaudio + libsoup_3 + linux-pam + networkmanager + upower + ]; + + postPatch = '' + chmod u+x ./post_install.sh && patchShebangs ./post_install.sh + ''; + + meta = with lib; { + homepage = "https://github.com/Aylur/ags"; + description = "A EWW-inspired widget system as a GJS library"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ foo-dogsquared ]; + mainProgram = "ags"; + platforms = platforms.linux; + }; +} From fd7a9b6bd34895b3d3b436fee8b7e21755eb7202 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 10:43:39 +0000 Subject: [PATCH 333/444] python311Packages.google-cloud-shell: 1.9.2 -> 1.9.3 --- .../development/python-modules/google-cloud-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix index 09fa7ceb2c28..e2dd38444b56 100644 --- a/pkgs/development/python-modules/google-cloud-shell/default.nix +++ b/pkgs/development/python-modules/google-cloud-shell/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-shell"; - version = "1.9.2"; + version = "1.9.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JLQea7+qWjomlQ1cbYJMou7u1eGwHNKgzqiUIUT0otY="; + hash = "sha256-33TZcRsOWP8PBAXFHy9DQn20bVECwD2wv7hcaYl0E8Y="; }; nativeBuildInputs = [ From 22d4597b331854da82ca9bd4f7f53bb39a5f3cc3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 10:43:56 +0000 Subject: [PATCH 334/444] python311Packages.google-cloud-workstations: 0.5.5 -> 0.5.6 --- .../python-modules/google-cloud-workstations/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix index 02d92c08e638..1341eae06f2a 100644 --- a/pkgs/development/python-modules/google-cloud-workstations/default.nix +++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-workstations"; - version = "0.5.5"; + version = "0.5.6"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-N6A+dpgQpVhCTor4FbjPAafyDsgB8pRrJcVGABpJCuE="; + hash = "sha256-K6Qq243bX3waymyGcirLAANqmP0UAUgFS3kidwCFYBE="; }; nativeBuildInputs = [ From 4fc217de2f91556e50b22d0e1c9cde260dce6a2e Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Mar 2024 11:49:14 +0100 Subject: [PATCH 335/444] python311Packages.libknot: 3.3.4 -> 3.3.5 --- pkgs/development/python-modules/libknot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix index f79e4d638eba..96f900f2dd35 100644 --- a/pkgs/development/python-modules/libknot/default.nix +++ b/pkgs/development/python-modules/libknot/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "libknot"; - version = "3.3.4"; + version = "3.3.5"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-KRxc34lqOGuYJM2mUsYrjfiVCQNBxcQyO30wPLf17+Q="; + hash = "sha256-nEeDawZ/kChHQA3qoEKy+R+Uy7ogNL3ows3Yzs5OhpY="; }; postPatch = '' From 9e92cf2a5925e8632e02da3f9dac7baef97ebe85 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 10:51:13 +0000 Subject: [PATCH 336/444] python311Packages.google-cloud-workflows: 1.14.2 -> 1.14.3 --- .../python-modules/google-cloud-workflows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix index cf8c0bb3886f..bc54419923f3 100644 --- a/pkgs/development/python-modules/google-cloud-workflows/default.nix +++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-workflows"; - version = "1.14.2"; + version = "1.14.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-L1gL3r+HzywvsbfWk28Rthwm8lqz0S9ekTcWUh8FcLM="; + hash = "sha256-IUC5f3gDe5Z9QYVXaIZ3L+F7530q6ZltIHozTtWnf/4="; }; nativeBuildInputs = [ From 97260360cba723444b355f703bc9adba93725774 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 10:54:17 +0000 Subject: [PATCH 337/444] python311Packages.google-cloud-netapp: 0.3.6 -> 0.3.7 --- .../python-modules/google-cloud-netapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-netapp/default.nix b/pkgs/development/python-modules/google-cloud-netapp/default.nix index d411b64baa11..2730c971cc47 100644 --- a/pkgs/development/python-modules/google-cloud-netapp/default.nix +++ b/pkgs/development/python-modules/google-cloud-netapp/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-netapp"; - version = "0.3.6"; + version = "0.3.7"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-rWsR95I4lXf/xEJ/0HLhTR6V8g46NzmU/PmkAi797rM="; + hash = "sha256-g+tH/u2lEbQDdMPo/4+kl03+d9mrLzR2Eo/H8e8Niic="; }; nativeBuildInputs = [ From 34d1238e34650f1db15b64a55e50a3cd1020e1d5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 6 Mar 2024 11:57:52 +0100 Subject: [PATCH 338/444] prometheus-knot-exporter: 3.3.4 -> 3.3.5 --- pkgs/servers/monitoring/prometheus/knot-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix index d51d9bd3f79c..f15dc626e59f 100644 --- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -6,13 +6,13 @@ python3.pkgs.buildPythonApplication rec { pname = "knot-exporter"; - version = "3.3.4"; + version = "3.3.5"; pyproject = true; src = fetchPypi { pname = "knot_exporter"; inherit version; - hash = "sha256-jZNNJiJxq3pNSZFwu2UEHhrA0odIDY0UO+d4PJII1ZI="; + hash = "sha256-7r4zXqomiszDrplMedEyw2ZQ2NwDTf54EOwnsLc5RJ0="; }; nativeBuildInputs = [ From a041855b35737c4397ca69af2b00789da6cb5719 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 10:58:20 +0000 Subject: [PATCH 339/444] python311Packages.google-cloud-webrisk: 1.14.2 -> 1.14.3 --- .../python-modules/google-cloud-webrisk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix index 02d9baddd699..8457ab9180d0 100644 --- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix +++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-webrisk"; - version = "1.14.2"; + version = "1.14.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5bRZRPVN6PtAI3yX5ogtxkDeHmz8mSE8ofz8k+VRLkY="; + hash = "sha256-VrfIVy3qGEMfFUiJ27zZPjBaWIPZX/qraga/+FfJol4="; }; nativeBuildInputs = [ From 4b437e03bb780b0d309b6933760a9eb7a628f0a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 10:59:38 +0000 Subject: [PATCH 340/444] python311Packages.google-cloud-vpc-access: 1.10.2 -> 1.10.3 --- .../python-modules/google-cloud-vpc-access/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix index dd4ee94f8dff..0c6bbf6ace67 100644 --- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix +++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-vpc-access"; - version = "1.10.2"; + version = "1.10.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-KFOyq/vpfNWaFpKJ0AAupVn3XiTP3V95x/5M6LkJtAQ="; + hash = "sha256-mkDYB4HFJEu1ZRKo58s5a9lZjQ0pUs6nOBMnm27ajeM="; }; nativeBuildInputs = [ From a2ce8e0d8acdeace3f9f9a7254dcea9730cb330b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 11:18:26 +0000 Subject: [PATCH 341/444] rar: 6.24 -> 7.00 --- pkgs/tools/archivers/rar/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/archivers/rar/default.nix b/pkgs/tools/archivers/rar/default.nix index 168316813f76..3799afd736ef 100644 --- a/pkgs/tools/archivers/rar/default.nix +++ b/pkgs/tools/archivers/rar/default.nix @@ -6,25 +6,25 @@ }: let - version = "6.24"; + version = "7.00"; downloadVersion = lib.replaceStrings [ "." ] [ "" ] version; # Use `./update.sh` to generate the entries below srcs = { i686-linux = { url = "https://www.rarlab.com/rar/rarlinux-x32-${downloadVersion}.tar.gz"; - hash = "sha256-aacgJH0iJLRNEaZuVyzl/FxZgSnW3dIZFUfaqt0l88M="; + hash = "sha256-5y2BaclEKLUpZayqzilaLPcYi0dZkKpn99n5E+Z5lOo="; }; x86_64-linux = { url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz"; - hash = "sha256-iOIqjoQSXJR2N7vyjHRuM4oKYyedgPn51zc2A4ddses="; + hash = "sha256-Hbv68alpeCbuHFLP36EGZ/9nE1ANlpJjg6h3Gz7u4iI="; }; aarch64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz"; - hash = "sha256-2r4zWDT7Xw/CNvA7oNEsGfrXJDzFa5gNthIB/5TYR5U="; + hash = "sha256-icfpbU/UkysY4Z2wHDMWy1FnuqYkDJeDkF8yUrZuMUM="; }; x86_64-darwin = { url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz"; - hash = "sha256-4vENPNfMpQstsm9+8+glHPK9fAlDmnHWbCHW+HUwSX4="; + hash = "sha256-/ImdlFyCCKU1/1XluAxCz11lge7+EoIE1zjBL9c2IQc="; }; }; manSrc = fetchurl { From 32b5cf1e77dc1955c2489bd030f7c285690fd26b Mon Sep 17 00:00:00 2001 From: GGG KILLER Date: Wed, 6 Mar 2024 08:30:08 -0300 Subject: [PATCH 342/444] maintainers: add GGG --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 114f836bc9bf..5a9b5f8070b5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7042,6 +7042,12 @@ githubId = 37602871; name = "Galois"; }; + ggg = { + email = "gggkiller2@gmail.com"; + github = "GGG-KILLER"; + githubId = 5892127; + name = "GGG"; + }; ggpeti = { email = "ggpeti@gmail.com"; matrix = "@ggpeti:ggpeti.com"; From 3904a6e6f739e52ab516651e8060c2e611dde4cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 11:30:49 +0000 Subject: [PATCH 343/444] 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 b86245bb1cb1eb0d2f6c247253b57b15d9d70a92 Mon Sep 17 00:00:00 2001 From: GGG KILLER Date: Wed, 6 Mar 2024 08:31:02 -0300 Subject: [PATCH 344/444] maintainers: add GGG to dotnet team --- maintainers/team-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index e359fdc63dec..b60063417d8e 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -188,6 +188,7 @@ with lib.maintainers; { ivar mdarocha corngood + ggg raphaelr jamiemagee anpin From 55f0519012ce1f5db872dc3151aaab3f8b8bba67 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 13 Feb 2024 11:47:53 +0100 Subject: [PATCH 345/444] rl_json: 0.14 -> 0.15.1 Diff: https://github.com/RubyLane/rl_json/compare/0.14...0.15.1 --- pkgs/by-name/rl/rl_json/package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/rl/rl_json/package.nix b/pkgs/by-name/rl/rl_json/package.nix index 3a19df59d93a..4feaae71c6b5 100644 --- a/pkgs/by-name/rl/rl_json/package.nix +++ b/pkgs/by-name/rl/rl_json/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rl_json"; - version = "0.14"; + version = "0.15.1"; src = fetchFromGitHub { owner = "RubyLane"; repo = "rl_json"; rev = version; - hash = "sha256-7xjZQ8F8czrkr7p2Xg1xAZRCsDpiWXHXVxPhG0f9PNg="; + hash = "sha256-FkOsdOHPE75bSkKw3cdaech6jAv0f/RJ9tgRVzPSAdA="; fetchSubmodules = true; }; @@ -40,5 +40,7 @@ stdenv.mkDerivation rec { ''; maintainers = with lib.maintainers; [ fgaz ]; platforms = lib.platforms.all; + # From version 0.15.1: 'endian.h' file not found + broken = stdenv.isDarwin; }; } From 42934bf64fbb887a7bdcef5b0fe810ab18d1b018 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Tue, 13 Feb 2024 11:53:23 +0100 Subject: [PATCH 346/444] rl_json: set platforms to tcl platforms --- pkgs/by-name/rl/rl_json/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/rl/rl_json/package.nix b/pkgs/by-name/rl/rl_json/package.nix index 4feaae71c6b5..0484635d8f3a 100644 --- a/pkgs/by-name/rl/rl_json/package.nix +++ b/pkgs/by-name/rl/rl_json/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { values, and comparable in speed. ''; maintainers = with lib.maintainers; [ fgaz ]; - platforms = lib.platforms.all; + platforms = tcl.meta.platforms; # From version 0.15.1: 'endian.h' file not found broken = stdenv.isDarwin; }; From 45dd476c54d95a26b1c8e8751171f35fc54c3752 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 17 Feb 2024 10:18:42 +0100 Subject: [PATCH 347/444] rl_json: use finalAttrs --- pkgs/by-name/rl/rl_json/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/rl/rl_json/package.nix b/pkgs/by-name/rl/rl_json/package.nix index 0484635d8f3a..81076dd07677 100644 --- a/pkgs/by-name/rl/rl_json/package.nix +++ b/pkgs/by-name/rl/rl_json/package.nix @@ -5,14 +5,14 @@ , tcl }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "rl_json"; version = "0.15.1"; src = fetchFromGitHub { owner = "RubyLane"; repo = "rl_json"; - rev = version; + rev = finalAttrs.version; hash = "sha256-FkOsdOHPE75bSkKw3cdaech6jAv0f/RJ9tgRVzPSAdA="; fetchSubmodules = true; }; @@ -43,4 +43,4 @@ stdenv.mkDerivation rec { # From version 0.15.1: 'endian.h' file not found broken = stdenv.isDarwin; }; -} +}) From 84638cd317e8ec921cbc048f94eee3805613b272 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Wed, 6 Mar 2024 18:41:56 +0800 Subject: [PATCH 348/444] sbclPackages.nyxt-gtk: 3.11.3 -> 3.11.4 --- pkgs/development/lisp-modules/packages.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lisp-modules/packages.nix b/pkgs/development/lisp-modules/packages.nix index 10284b70205b..2b26ba64c15b 100644 --- a/pkgs/development/lisp-modules/packages.nix +++ b/pkgs/development/lisp-modules/packages.nix @@ -362,7 +362,7 @@ let nyxt-gtk = build-asdf-system { pname = "nyxt"; - version = "3.11.3"; + version = "3.11.4"; lispLibs = (with super; [ alexandria @@ -456,12 +456,14 @@ let nclasses nfiles cl-containers + # remove this override after quicklisp one is updated. + # Because of building failure with new sbcl, the slime version is different from the nyxt pinned one (swank.overrideAttrs (final: prev: { src = pkgs.fetchFromGitHub { owner = "slime"; repo = "slime"; - rev = "735258a26bb97e85d25f39e4bef83c1f80c12f5d"; - hash = "sha256-vMMer6qLJDKTwNE3unsOQezujISqFtn2AYl8cxsJvrc="; + rev = "v2.29.1"; + hash = "sha256-5hNB5XxbTER4HX3dn4umUGnw6UeiTQkczmggFz4uWoE="; }; systems = [ "swank" "swank/exts" ]; })) @@ -470,8 +472,8 @@ let src = pkgs.fetchFromGitHub { owner = "atlas-engineer"; repo = "nyxt"; - rev = "3.11.3"; - hash = "sha256-KkVn2sTvEYD9OYPezlckMdhMvQ2LKETwmsn+P1Ti424="; + rev = "3.11.4"; + hash = "sha256-5LhpcuQTioOXZtzwN9B1vWo/xsYXxn9fSKRCdhSPM7A="; }; nativeBuildInputs = [ pkgs.makeWrapper ]; From 368a2040a680a4bdd73cf9400679fc4d3f8d3433 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 11:59:05 +0000 Subject: [PATCH 349/444] brook: 20240214 -> 20240404 --- pkgs/tools/networking/brook/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/brook/default.nix b/pkgs/tools/networking/brook/default.nix index 432b49523e18..77a70381b1d9 100644 --- a/pkgs/tools/networking/brook/default.nix +++ b/pkgs/tools/networking/brook/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "brook"; - version = "20240214"; + version = "20240404"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5+AqlmDa11PrB24XkelOFHK4sBi4j78WMLQrzDuP1/M="; + sha256 = "sha256-QqA0LnbC72bnAQ25AehTnoXgdqQPc8wztHcFd4Q19ko="; }; - vendorHash = "sha256-cTw9k4AqS4NOJ0vX0InR0xxOfCXIgA3FxgL6oXryOnA="; + vendorHash = "sha256-1aaOPeKHPrZO6WK08EhX4+dME0A33raQnbZi/aNFpIw="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; From d7656b615eb621267873782b3b5edd8543786acd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 11:59:28 +0000 Subject: [PATCH 350/444] dapr-cli: 1.12.0 -> 1.13.0 --- pkgs/development/tools/dapr/cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index e1290fd90757..c1d06b45982d 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dapr-cli"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "dapr"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-G2n6VGP3ncuZ9siXojr4gx0VacIkKSt4OSQo3ZOecr0="; + sha256 = "sha256-nR9+6glX0oUJZq32XxyV4aVjfjVlNycZvMNaVHy+Q1s="; }; - vendorHash = "sha256-/sdW1cDFpOMkXN4RXJQB1PpDbyNmTEOo9OrK5A7cRGQ="; + vendorHash = "sha256-iqoxlqSdHDfLlb1bcHLPAO2/wiwRpqFBIuoVi7lecKs="; proxyVendor = true; From 2c35a5e633f6d82305968990709200f42894ae03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 12:01:17 +0000 Subject: [PATCH 351/444] aliyun-cli: 3.0.198 -> 3.0.199 --- pkgs/tools/admin/aliyun-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix index e45faef00cbe..6e3b205224fd 100644 --- a/pkgs/tools/admin/aliyun-cli/default.nix +++ b/pkgs/tools/admin/aliyun-cli/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "aliyun-cli"; - version = "3.0.198"; + version = "3.0.199"; src = fetchFromGitHub { rev = "v${version}"; owner = "aliyun"; repo = pname; fetchSubmodules = true; - sha256 = "sha256-kIFB1wFVZTFr4tqSiBvgwqGLVq2UmG58vAqhug8giE0="; + sha256 = "sha256-fHp+sLbCsfFGK6FmhiNp7Z2y2k2baP/s4na3zsBOccU="; }; - vendorHash = "sha256-NoismcBQtVv7QOIGOqRsmau9zY+MkCAl46ll2y0hbW4="; + vendorHash = "sha256-cCjLnJxO6e03vlWIa8OF9wSce4aVNr6ak4mY5rN7TVw="; subPackages = [ "main" ]; From 3a5eca741ac5ecabeaf1486ad975568c56eac211 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 2 Mar 2024 10:01:02 +0200 Subject: [PATCH 352/444] trilium-{desktop,server}: 0.62.5 -> 0.63.3 Co-Authored-By: FliegendeWurst <2012gdwu+github@posteo.de> --- .../0001-Use-console-logger-instead-of-rolling-files.patch | 4 ++-- pkgs/applications/office/trilium/desktop.nix | 6 +++--- pkgs/applications/office/trilium/server.nix | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch index 7acf353bea1b..68f203b464b2 100644 --- a/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch +++ b/pkgs/applications/office/trilium/0001-Use-console-logger-instead-of-rolling-files.patch @@ -6,8 +6,8 @@ index a141eae14..094b9381b 100644 "use strict"; -const fs = require('fs'); --const dataDir = require('./data_dir'); - const cls = require('./cls'); +-const dataDir = require('./data_dir.js'); + const cls = require('./cls.js'); -if (!fs.existsSync(dataDir.LOG_DIR)) { - fs.mkdirSync(dataDir.LOG_DIR, 0o700); diff --git a/pkgs/applications/office/trilium/desktop.nix b/pkgs/applications/office/trilium/desktop.nix index 32c7c2a7024c..a99fb6070c5e 100644 --- a/pkgs/applications/office/trilium/desktop.nix +++ b/pkgs/applications/office/trilium/desktop.nix @@ -7,13 +7,13 @@ let pname = "trilium-desktop"; - version = "0.62.5"; + version = "0.63.3"; linuxSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - linuxSource.sha256 = "1f2f8nvj1gx9i797mck5aazgz821sjcs06538py9za4m532i66pj"; + linuxSource.sha256 = "1dcq7s4lcp9bc0p4ylzxyfc020xvj7scrlsddzwcnp8mqz5ckik9"; darwinSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-mac-x64-${version}.zip"; - darwinSource.sha256 = "19zny4akf3hxqjqayiz4s47vdblbrn4kgwg3nykljv4lpqnqkyn3"; + darwinSource.sha256 = "0m9m68f9jg10nfn719q6wahwvi13lpc2hmandw7ddxfslylwq29s"; meta = metaCommon // { mainProgram = "trilium"; diff --git a/pkgs/applications/office/trilium/server.nix b/pkgs/applications/office/trilium/server.nix index 4beaba6688c9..8416a6f30bac 100644 --- a/pkgs/applications/office/trilium/server.nix +++ b/pkgs/applications/office/trilium/server.nix @@ -3,8 +3,8 @@ let serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "1s0pfb3virhxsh5kkgq4yfhdnv1lq2z0zdcikilnayzp0lpjskhb"; - version = "0.62.5"; + serverSource.sha256 = "1pnxss85lz313r5l1qpgm9msyfr87h54nbfc7d89dbj0wgsjwk0n"; + version = "0.63.3"; in stdenv.mkDerivation { pname = "trilium-server"; inherit version; From efe65b3e5b828e6b91ebfd043979adf5b978156a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 12:14:31 +0000 Subject: [PATCH 353/444] flow: 0.229.2 -> 0.230.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 2585cfa3926a..dc7edb5c79bd 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.229.2"; + version = "0.230.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - hash = "sha256-PoEtXk8EqlFgy33akd6na50P/tT6uWtEq+kfbayDo5s="; + hash = "sha256-8sfyjUlyJ9A96xD7n6BeJxDNhT7FMq/7HlVC373uLM8="; }; postPatch = '' From 749d82d15aed1eaf01ee799e90d59d9eab4616f9 Mon Sep 17 00:00:00 2001 From: Lin Xianyi Date: Wed, 6 Mar 2024 14:37:52 +0800 Subject: [PATCH 354/444] tenki: init at 1.4.0 --- pkgs/by-name/te/tenki/package.nix | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 pkgs/by-name/te/tenki/package.nix diff --git a/pkgs/by-name/te/tenki/package.nix b/pkgs/by-name/te/tenki/package.nix new file mode 100644 index 000000000000..e00d27eca21c --- /dev/null +++ b/pkgs/by-name/te/tenki/package.nix @@ -0,0 +1,25 @@ +{ lib +, fetchFromGitHub +, rustPlatform +}: +rustPlatform.buildRustPackage rec { + pname = "tenki"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "ckaznable"; + repo = "tenki"; + rev = "v${version}"; + hash = "sha256-64yNMO+Tm8APF2NnygQuub4z7kCxxf+T1urgA4Qs104="; + }; + + cargoHash = "sha256-R6Bfk3kW8721Q++dSY4u7AbUukBT0PODfFXsXuugWdk="; + + meta = with lib; { + description = "tty-clock with weather effect"; + homepage = "https://github.com/ckaznable/tenki"; + license = licenses.mit; + maintainers = with maintainers; [ iynaix ]; + mainProgram = "tenki"; + }; +} From 1cf069cbee8bb408ae1615b0fd8a1148f55cb903 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 12:25:35 +0000 Subject: [PATCH 355/444] fishPlugins.forgit: 24.03.0 -> 24.03.1 --- pkgs/shells/fish/plugins/forgit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index d0792d084ea8..e5e226665989 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "forgit"; - version = "24.03.0"; + version = "24.03.1"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-E8zL5HPUHhb3V03yTIF6IQ83bmqrrRt0KHxYbmtzCQ4="; + hash = "sha256-DIaoD6o+oY+/FnwQadQh0XqMVP4xbE8gAPtWrvwsG+c="; }; postInstall = '' From 60b457f504921a7f6516e1b08262f7cd6d28df53 Mon Sep 17 00:00:00 2001 From: James Armstrong <32995055+jmarmstrong1207@users.noreply.github.com> Date: Wed, 6 Mar 2024 04:26:01 -0800 Subject: [PATCH 356/444] planify: 4.4 -> 4.5.2 https://github.com/alainm23/planify/compare/4.4...4.5.2 --- pkgs/applications/office/planify/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index 9c8aad5e9cae..c4a1ab0887d1 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -12,11 +12,13 @@ , glib-networking , gtk4 , gtksourceview5 +, gxml , json-glib , libadwaita , libgee , libical , libportal-gtk4 +, libsecret , libsoup_3 , pantheon , sqlite @@ -25,13 +27,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.4"; + version = "4.5.2"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-HX6ZMx2NUAQxEGLIk/wgUlQX0BFtee3+t/JdlMTIYBw="; + hash = "sha256-huHNcAIwTvKssPQmOGCc6UzPxCh7JP1gM6BGbD0QM/w="; }; nativeBuildInputs = [ @@ -49,11 +51,13 @@ stdenv.mkDerivation rec { glib-networking gtk4 gtksourceview5 + gxml json-glib libadwaita libgee libical libportal-gtk4 + libsecret libsoup_3 pantheon.granite7 sqlite From 8d3af975171d4c19136dfff0f6d19b0e5fbad61e Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Wed, 6 Mar 2024 13:29:28 +0100 Subject: [PATCH 357/444] gpt4all: 2.7.1 -> 2.7.2 --- pkgs/by-name/gp/gpt4all/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index e6119fc9212e..452295b7c361 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpt4all"; - version = "2.7.1"; + version = "2.7.2"; src = fetchFromGitHub { fetchSubmodules = true; - hash = "sha256-PXOnhSU8YaV0fcLAptSVjsUP2Za23GFUxyOkL0T6z0o="; + hash = "sha256-casGjHiVZXec+9HGIH5fcpfWgLfsGCM5pEBINXJgMY8="; owner = "nomic-ai"; repo = "gpt4all"; rev = "v${finalAttrs.version}"; From 86b816fed3eee64825f19bfed823c838e60277e7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 12:31:26 +0000 Subject: [PATCH 358/444] go-protobuf: 1.5.3 -> 1.5.4 --- pkgs/development/tools/go-protobuf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/go-protobuf/default.nix b/pkgs/development/tools/go-protobuf/default.nix index 0f2e302aad05..aa8c8df12e86 100644 --- a/pkgs/development/tools/go-protobuf/default.nix +++ b/pkgs/development/tools/go-protobuf/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-protobuf"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "golang"; repo = "protobuf"; rev = "v${version}"; - sha256 = "sha256-cRB4oicBfYvhqtzafWWmf82AuvSnB0NhHwpp0pjgwQ0="; + sha256 = "sha256-AfyZ6xlqmrsVqtoKV1XMEo/Vba9Kpu1EgwfF6pPSZ64="; }; - vendorHash = "sha256-CcJjFMslSUiZMM0LLMM3BR53YMxyWk8m7hxjMI9tduE="; + vendorHash = "sha256-jGAWUgW0DA7EwmlzVxnBmtbf2dp+P4Qwcb8mTAEhUi4="; meta = with lib; { homepage = "https://github.com/golang/protobuf"; From d67739e24d8eb8955930b29de24a0dd23419c363 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 12:32:29 +0000 Subject: [PATCH 359/444] grex: 1.4.4 -> 1.4.5 --- pkgs/tools/misc/grex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grex/default.nix b/pkgs/tools/misc/grex/default.nix index 2a6ca6031e3b..d68deba131ff 100644 --- a/pkgs/tools/misc/grex/default.nix +++ b/pkgs/tools/misc/grex/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "grex"; - version = "1.4.4"; + version = "1.4.5"; src = fetchFromGitHub { owner = "pemistahl"; repo = "grex"; rev = "v${version}"; - hash = "sha256-ef1eUxeCznIgXLoywwJmnLkTGdW1AmGwCin9DLU9kAs="; + hash = "sha256-Ut2H2H66XN1+wHpYivnuhil21lbd7bwIcIcMyIimdis="; }; - cargoHash = "sha256-XLH+fS3fwRcWmVOzTjUacV010N37Oofs9Tbixdka1qY="; + cargoHash = "sha256-ZRE1vKgi0/UtSe2bdN0BLdtDfAauTfwcqOcl3y63fAA="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From aa38e829d6dbaaa2512823f870aa428088f6b7f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 12:33:07 +0000 Subject: [PATCH 360/444] gqlgenc: 0.19.2 -> 0.19.3 --- pkgs/development/tools/gqlgenc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix index 83c80cf82634..252713e6848e 100644 --- a/pkgs/development/tools/gqlgenc/default.nix +++ b/pkgs/development/tools/gqlgenc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gqlgenc"; - version = "0.19.2"; + version = "0.19.3"; src = fetchFromGitHub { owner = "yamashou"; repo = "gqlgenc"; rev = "v${version}"; - sha256 = "sha256-rK/wpdZkmsyv6FTkN7ILM8r10lNaXwjHT17ptn3N0LE="; + sha256 = "sha256-deaJFw1w5TiJIdbTlgEBhpAyDbkjUzqT3vVl+xDUXm4="; }; excludedPackages = [ "example" ]; From 3a1c091117e6770ac4f7e9ba2edb7dedf1db0373 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 12:43:47 +0000 Subject: [PATCH 361/444] 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 fca1821a78576e8743518dde71bdc5356b3cfbfb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 12:46:08 +0000 Subject: [PATCH 362/444] mackerel-agent: 0.78.3 -> 0.79.0 --- pkgs/servers/monitoring/mackerel-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/mackerel-agent/default.nix b/pkgs/servers/monitoring/mackerel-agent/default.nix index 8d65f992432f..b99309fb05e5 100644 --- a/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "mackerel-agent"; - version = "0.78.3"; + version = "0.79.0"; src = fetchFromGitHub { owner = "mackerelio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-9PahaZlHtD4p3C8CvXF2ceNuSOqyApJaZWhFNffNlVA="; + sha256 = "sha256-UKSrNUKS7VYK/hcKdNetaq6HNPqZyK7VtlJZjoyxU6o="; }; nativeBuildInputs = [ makeWrapper ]; nativeCheckInputs = lib.optionals (!stdenv.isDarwin) [ nettools ]; buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ]; - vendorHash = "sha256-lcK1rofTKPpEu/tK8XpS9EhOA30R/8J3o57YlU1/+0k="; + vendorHash = "sha256-AnkjmgcFSI8RadfTdtCk+NCiAw+NecfaU/vc7WOgbuk="; subPackages = [ "." ]; From ee6922fc7dd9523fa98a53e87169d318c1120149 Mon Sep 17 00:00:00 2001 From: Haseeb Majid Date: Sun, 25 Feb 2024 09:59:15 +0000 Subject: [PATCH 363/444] vimPlugins.windows-nvim: update overrides --- pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index ab4d9a594867..f278070e4550 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1782,6 +1782,10 @@ dependencies = with self; [ vimwiki fzf-vim ]; }; + windows-nvim = super.windows-nvim.overrideAttrs { + dependencies = with self; [ luaPackages.middleclass animation-nvim ]; + }; + wtf-nvim = super.wtf-nvim.overrideAttrs { dependencies = with self; [ nui-nvim ]; }; From 6acfd2fb33468986f2fd8e369b824bbfde5553b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 13:00:57 +0000 Subject: [PATCH 364/444] 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 138daca430ba32025559d22ca7c82c1db8782dc0 Mon Sep 17 00:00:00 2001 From: Shogo Takata Date: Wed, 6 Mar 2024 18:43:06 +0900 Subject: [PATCH 365/444] gitlab-ci-local: init at 4.46.1 --- pkgs/by-name/gi/gitlab-ci-local/package.nix | 40 +++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/gi/gitlab-ci-local/package.nix diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix new file mode 100644 index 000000000000..fdb21f92fac7 --- /dev/null +++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix @@ -0,0 +1,40 @@ +{ buildNpmPackage +, fetchFromGitHub +, lib +, nix-update-script +}: + +buildNpmPackage rec { + pname = "gitlab-ci-local"; + version = "4.46.1"; + + src = fetchFromGitHub { + owner = "firecow"; + repo = "gitlab-ci-local"; + rev = version; + hash = "sha256-0NUmsbuzs004w9ETj4e4nO+sDvYHQh9SwJoRc3+r+j8="; + }; + + npmDepsHash = "sha256-zCBNUKmLluVCDoPHuKy9KMKCGL8FqopFhKq7QCAUe4U="; + + postPatch = '' + # remove cleanup which runs git commands + substituteInPlace package.json \ + --replace-fail "npm run cleanup" "true" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = with lib;{ + description = "Run gitlab pipelines locally as shell executor or docker executor"; + longDescription = '' + Tired of pushing to test your .gitlab-ci.yml? + Run gitlab pipelines locally as shell executor or docker executor. + Get rid of all those dev specific shell scripts and make files. + ''; + homepage = "https://github.com/firecow/gitlab-ci-local"; + license = licenses.mit; + maintainers = with maintainers; [ pineapplehunter ]; + platforms = platforms.all; + }; +} 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 366/444] 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 367/444] 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 368/444] 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 825ff0dcd3d45465380e966088d419d04dd4c2e0 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 6 Mar 2024 13:45:27 +0000 Subject: [PATCH 369/444] syncthingtray.src: use hash instead of sha256 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Robert Schütz --- pkgs/applications/misc/syncthingtray/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index c51f4aa861d5..e98e3bdbfa6f 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Martchus"; repo = "syncthingtray"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-O8FLjse2gY8KNWGXpUeZ83cNk0ZuRAZJJ3Am33/ABVw="; + hash = "sha256-O8FLjse2gY8KNWGXpUeZ83cNk0ZuRAZJJ3Am33/ABVw="; }; buildInputs = [ From 5e9eeb3381dc44e491dc2a7e544cc86fc6a5f415 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 13:56:53 +0000 Subject: [PATCH 370/444] python312Packages.pytedee-async: 0.2.14 -> 0.2.15 --- pkgs/development/python-modules/pytedee-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytedee-async/default.nix b/pkgs/development/python-modules/pytedee-async/default.nix index e42af981cf33..a89b4fd03e8c 100644 --- a/pkgs/development/python-modules/pytedee-async/default.nix +++ b/pkgs/development/python-modules/pytedee-async/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pytedee-async"; - version = "0.2.14"; + version = "0.2.15"; pyproject = true; disabled = pythonOlder "3.9"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pytedee_async"; rev = "refs/tags/v${version}"; - hash = "sha256-BtBHiDOYe8BkrqJEGG4eGKFMnCspCQK4fvcj2vvGmFM="; + hash = "sha256-in5umB3ewrx5de1OaWI1XpDaNgy2ZtLYr4lCswhcayg="; }; nativeBuildInputs = [ From a110dbd8896eb89e82d10a88a8eb689f9ac6ccbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 13:58:59 +0000 Subject: [PATCH 371/444] 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 13367c80a83724a7563f869347aa4a9cbdcc4310 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 13:59:59 +0000 Subject: [PATCH 372/444] python312Packages.resend: 0.7.2 -> 0.8.0 --- pkgs/development/python-modules/resend/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix index 0fc371a76d2d..5ce129dd6716 100644 --- a/pkgs/development/python-modules/resend/default.nix +++ b/pkgs/development/python-modules/resend/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "resend"; - version = "0.7.2"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "resend"; repo = "resend-python"; rev = "refs/tags/v${version}"; - hash = "sha256-3wX2xNz/6Erv97TlQCuF0Sha0fbJJX1LK9dx8xYG4M0="; + hash = "sha256-6cQtI3it2AS8UdT83fp3y3IcbjSyPmBlQuymN74fBNo="; }; 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 373/444] 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 374/444] 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 f93dfa6038ff90ca50ba91e81a382a9816ef9cde Mon Sep 17 00:00:00 2001 From: SamueleFacenda Date: Tue, 5 Sep 2023 10:19:24 +0200 Subject: [PATCH 375/444] maintainers: add samuelefacenda Signed-off-by: SamueleFacenda --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5a9b5f8070b5..b9bb9723c80a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17058,6 +17058,15 @@ githubId = 132835; name = "Samuel Dionne-Riel"; }; + samuelefacenda = { + name = "Samuele Facenda"; + email = "samuele.facenda@gmail.com"; + github = "SamueleFacenda"; + githubId = 92163673; + keys = [{ + fingerprint = "3BA5 A3DB 3239 E2AC 1F3B 68A0 0DB8 3F58 B259 6271"; + }]; + }; samuel-martineau = { name = "Samuel Martineau"; email = "samuel@smartineau.me"; From 29d830243aeeded398237f0743f4d7265967df3c Mon Sep 17 00:00:00 2001 From: SamueleFacenda Date: Tue, 5 Sep 2023 10:06:41 +0200 Subject: [PATCH 376/444] xdg-desktop-portal-shana: init at 0.3.9 Signed-off-by: SamueleFacenda --- .../xd/xdg-desktop-portal-shana/package.nix | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix diff --git a/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix new file mode 100644 index 000000000000..b5e7aa0c3c01 --- /dev/null +++ b/pkgs/by-name/xd/xdg-desktop-portal-shana/package.nix @@ -0,0 +1,44 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, meson +, ninja +, xdg-desktop-portal +}: + +rustPlatform.buildRustPackage rec { + pname = "xdg-desktop-portal-shana"; + version = "0.3.9"; + + src = fetchFromGitHub { + owner = "Decodetalkers"; + repo = "xdg-desktop-portal-shana"; + rev = "v${version}"; + sha256 = "cgiWlZbM0C47CisR/KlSV0xqfeKgM41QaQihjqSy9CU="; + }; + + nativeBuildInputs = [ + meson + ninja + ]; + + buildInputs = [ + xdg-desktop-portal + ]; + + # Needed for letting meson run. rustPackage will overwrite it otherwise. + configurePhase = ""; + + mesonBuildType = "release"; + + cargoHash = "sha256-uDM4a7AB0753c/H1nfic/LjWrLmjEvi/p2S/tLIDXaQ="; + + meta = with lib; { + description = "A filechooser portal backend for any desktop environment"; + homepage = "https://github.com/Decodetalkers/xdg-desktop-portal-shana"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.samuelefacenda ]; + }; + +} From 478cff8d326d7848fb9a8a1d242db7fe18688a61 Mon Sep 17 00:00:00 2001 From: Coutinho de Souza Date: Wed, 6 Mar 2024 11:10:27 -0300 Subject: [PATCH 377/444] 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 6081ff43ee848ca080ca391e3cba87bdb493eeed Mon Sep 17 00:00:00 2001 From: iosmanthus Date: Wed, 6 Mar 2024 23:03:16 +0800 Subject: [PATCH 378/444] vscode: Fix url handler MimeType for vscode-insiders According to upstream RPMs, while using vscode-insiders, the URL handler MimeType should be `x-scheme-handler/vscode-insiders` instead of `x-scheme-handler/vscode`. See pull request 293460 and pull request 288425. --- pkgs/applications/editors/vscode/generic.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 5000393913c1..b7fe7d2712a6 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -150,7 +150,7 @@ in icon = "vs${executableName}"; startupNotify = true; categories = [ "Utility" "TextEditor" "Development" "IDE" ]; - mimeTypes = [ "x-scheme-handler/vscode" ]; + mimeTypes = [ "x-scheme-handler/vs${executableName}" ]; keywords = [ "vscode" ]; noDisplay = true; }; From 9bb1834bfa62466ab67179ceeb2c45cd08ed2934 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 15:23:48 +0000 Subject: [PATCH 379/444] 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 380/444] 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 381/444] 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 362ea44d932f7d26893545834787d9ff65fc973c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 15:39:34 +0000 Subject: [PATCH 382/444] remind: 04.03.01 -> 04.03.02 --- pkgs/tools/misc/remind/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index f003b36ea755..b9becd60ab08 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -15,11 +15,11 @@ let in tcl.mkTclDerivation rec { pname = "remind"; - version = "04.03.01"; + version = "04.03.02"; src = fetchurl { url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz"; - sha256 = "sha256-thmjcNWa1t4sHQTUu6NotbThTJ6scqrd/UWBqELe1NM="; + sha256 = "sha256-tL5Ntb/RIoT9mKcdU1ndBo/pGwhtIsRnTV0lL6Sg1Vw="; }; propagatedBuildInputs = tclLibraries; From e2be8075739fff6df297fb3d14ec40553147a9fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 15:42:31 +0000 Subject: [PATCH 383/444] 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 384/444] 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 385/444] 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 386/444] 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 387/444] 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 388/444] 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 389/444] 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 390/444] 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 391/444] 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 392/444] 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 393/444] 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 7a5803847756caca4208168e0434085cc7262ffe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 6 Mar 2024 12:25:34 +0100 Subject: [PATCH 394/444] disko: 1.3.0 -> 1.4.0 --- pkgs/by-name/di/disko/package.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/di/disko/package.nix b/pkgs/by-name/di/disko/package.nix index 0ac7101283eb..8dd1b1313f9a 100644 --- a/pkgs/by-name/di/disko/package.nix +++ b/pkgs/by-name/di/disko/package.nix @@ -4,29 +4,38 @@ , fetchFromGitHub , bash , nix +, coreutils }: stdenvNoCC.mkDerivation (finalAttrs: { name = "disko"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "disko"; rev = "v${finalAttrs.version}"; - hash = "sha256-wOIJwAsnZhM0NlFRwYJRgO4Lldh8j9viyzwQXtrbNtM="; + hash = "sha256-71S/64RbyADT6FUVJq4WLiNbmcxFvgMsSihf/C2Hgno="; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ bash ]; installPhase = '' + runHook preInstall mkdir -p $out/bin $out/share/disko - cp -r cli.nix default.nix disk-deactivate lib $out/share/disko - sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" disko > $out/bin/disko - chmod 755 $out/bin/disko - wrapProgram $out/bin/disko --prefix PATH : ${lib.makeBinPath [ nix ]} + cp -r install-cli.nix cli.nix default.nix disk-deactivate lib $out/share/disko + + for i in disko disko-install; do + sed -e "s|libexec_dir=\".*\"|libexec_dir=\"$out/share/disko\"|" "$i" > "$out/bin/$i" + chmod 755 "$out/bin/$i" + wrapProgram "$out/bin/$i" --prefix PATH : ${lib.makeBinPath [ nix coreutils ]} + done + runHook postInstall ''; doInstallCheck = true; installCheckPhase = '' + runHook preInstallCheck $out/bin/disko --help + $out/bin/disko-install --help + runHook postInstallCheck ''; meta = { homepage = "https://github.com/nix-community/disko"; From 79a80302eaa8f30e47838b2174e8a48948e2df9b Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 6 Mar 2024 16:51:09 +0100 Subject: [PATCH 395/444] 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 13d355048b30ec0973a10d3009ba0a404f9f2d26 Mon Sep 17 00:00:00 2001 From: Dennis <52411861+DerDennisOP@users.noreply.github.com> Date: Wed, 6 Mar 2024 17:29:59 +0100 Subject: [PATCH 396/444] python3Packages.wikipedia2vec: init at 2.0.0 (#293119) --- .../python-modules/wikipedia2vec/default.nix | 65 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/development/python-modules/wikipedia2vec/default.nix diff --git a/pkgs/development/python-modules/wikipedia2vec/default.nix b/pkgs/development/python-modules/wikipedia2vec/default.nix new file mode 100644 index 000000000000..f28addf30f4f --- /dev/null +++ b/pkgs/development/python-modules/wikipedia2vec/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildPythonPackage +, click +, cython_3 +, fetchFromGitHub +, jieba +, joblib +, lmdb +, marisa-trie +, mwparserfromhell +, numpy +, pythonOlder +, scipy +, setuptools +, tqdm +}: + +buildPythonPackage rec { + pname = "wikipedia2vec"; + version = "2.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "wikipedia2vec"; + repo = "wikipedia2vec"; + rev = "refs/tags/v${version}"; + hash = "sha256-vrBLlNm0bVIStSBWDHRCtuRpazu8JMCtBl4qJPtHGvU="; + }; + + nativeBuildInputs = [ + cython_3 + setuptools + ]; + + propagatedBuildInputs = [ + click + cython_3 + jieba + joblib + lmdb + marisa-trie + mwparserfromhell + numpy + scipy + tqdm + ]; + + preBuild = '' + bash cythonize.sh + ''; + + pythonImportsCheck = [ + "wikipedia2vec" + ]; + + meta = with lib; { + description = "Tool for learning vector representations of words and entities from Wikipedia"; + homepage = "https://wikipedia2vec.github.io/wikipedia2vec/"; + changelog = "https://github.com/wikipedia2vec/wikipedia2vec/releases/tag/v${version}"; + license = licenses.asl20; + maintainers = with maintainers; [ derdennisop ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6309404f98cd..02906d76ef4c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16478,6 +16478,8 @@ self: super: with self; { wikipedia = callPackage ../development/python-modules/wikipedia { }; + wikipedia2vec = callPackage ../development/python-modules/wikipedia2vec { }; + wikipedia-api = callPackage ../development/python-modules/wikipedia-api { }; wikitextparser = callPackage ../development/python-modules/wikitextparser { }; From 224bfbe8943c26ccd2a54d7f036bd8fabdf58363 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Mar 2024 16:32:06 +0000 Subject: [PATCH 397/444] 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 398/444] 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 399/444] 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 400/444] 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 401/444] 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 402/444] 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 403/444] 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 404/444] 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 405/444] 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 406/444] 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 407/444] 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 408/444] 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 409/444] 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 410/444] 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 411/444] 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 412/444] 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 413/444] 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 414/444] 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 415/444] 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 416/444] 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 417/444] 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 418/444] 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 419/444] 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 420/444] 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 421/444] 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 422/444] 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 423/444] 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 424/444] 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 425/444] 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 426/444] 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 427/444] 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 428/444] 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 429/444] 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 430/444] 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 431/444] 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 432/444] 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 433/444] 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 434/444] 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 435/444] 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 436/444] 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 437/444] 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 438/444] 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 439/444] 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 440/444] 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 441/444] 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 442/444] 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 443/444] 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 = [ From b4210fae558ab876e98b9f255b93223cd6184c58 Mon Sep 17 00:00:00 2001 From: Vincenzo Mantova <1962985+xworld21@users.noreply.github.com> Date: Thu, 7 Mar 2024 00:05:02 +0000 Subject: [PATCH 444/444] texlive.withPackages: build all outputs (#289756) --- pkgs/tools/typesetting/tex/texlive/build-tex-env.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix index 9a721168591f..85be581a3066 100644 --- a/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix +++ b/pkgs/tools/typesetting/tex/texlive/build-tex-env.nix @@ -188,7 +188,6 @@ let passthru = lib.optionalAttrs (! __combine) (splitOutputs // { all = builtins.attrValues splitOutputs; - outputs = [ "out" ] ++ pkgList.nonEnvOutputs; }) // { # This is set primarily to help find-tarballs.nix to do its job requiredTeXPackages = builtins.filter lib.isDerivation (pkgList.bin ++ pkgList.nonbin @@ -440,14 +439,11 @@ let ; }).overrideAttrs (prev: { allowSubstitutes = true; } - # the outputsToInstall must be built by the main derivation for nix-profile-install to work // lib.optionalAttrs (! __combine) ({ - outputs = pkgList.outputsToInstall; + outputs = [ "out" ] ++ pkgList.nonEnvOutputs; meta = prev.meta // { inherit (pkgList) outputsToInstall; }; - } // (lib.mapAttrs' - (out: drv: { name = "otherOutput_" + out; value = drv; }) - (lib.getAttrs (builtins.tail pkgList.outputsToInstall) splitOutputs) - ) + } // builtins.listToAttrs + (map (out: { name = "otherOutput_" + out; value = splitOutputs.${out}; }) pkgList.nonEnvOutputs) ) ); in out)