From 535ceaaa0e7bce78a226f1cacf84b4b413391da1 Mon Sep 17 00:00:00 2001 From: Tom Fitzhenry Date: Sun, 19 May 2024 09:06:36 +1000 Subject: [PATCH 01/72] nixos/networkd: allow IPv6OnlyPreferredSec in networkd.conf https://www.freedesktop.org/software/systemd/man/latest/systemd.network.html#IPv6OnlyPreferredSec= https://datatracker.ietf.org/doc/html/rfc8925 --- nixos/modules/system/boot/networkd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 7f53efbf83f5..c2c7a1260b76 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -997,6 +997,7 @@ let "BootServerAddress" "BootServerName" "BootFilename" + "IPv6OnlyPreferredSec" ]) (assertInt "PoolOffset") (assertMinimum "PoolOffset" 0) From b3e2ac82e27e211533488e39de17890848dd5daf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 28 Jul 2024 01:17:20 +0000 Subject: [PATCH 02/72] sozu: 0.15.19 -> 1.0.4 --- pkgs/servers/sozu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index 53907baed59d..f0467f7f9c27 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sozu"; - version = "0.15.19"; + version = "1.0.4"; src = fetchFromGitHub { owner = "sozu-proxy"; repo = pname; rev = version; - hash = "sha256-9TSu27s/rnO48zEhBzaHaU3pHyIJ0LVZC8LBRhn0PNM="; + hash = "sha256-FiCKRYIbgxSXbnSv1nauCryUA2PB5uVUK1mhtxJECAA="; }; - cargoHash = "sha256-h9igqV9YqMqRhqwsKYIji8WAVmcPQfErcPPm0PcDwss="; + cargoHash = "sha256-iP5lElqfO4btllVAel5010bgSRQFO/pxyfrj4PFAnJc="; nativeBuildInputs = [ protobuf ]; From b79c216dcfce8b55fdf1b4cf5df7d5a12bb9d271 Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 1 Aug 2024 16:59:05 -0400 Subject: [PATCH 03/72] calamares: 3.3.3 -> 3.3.8 --- ...s-module-to-only-set-passwords-of-u.patch} | 23 ++++++++++- ...earch-run-current-system-sw-share-c.patch} | 19 ++++++++- ...n-modules-in-order-to-run-calamares.patch} | 29 ++++++++++---- ...-Adds-unfree-qml-to-packagechooserq.patch} | 17 +++++++- ...-module-to-add-some-NixOS-resources.patch} | 24 ++++++++--- ...ons-for-unsupported-partition-types.patch} | 18 +++++++-- ...he-kayboard-layout-on-GNOME-wayland.patch} | 13 +++++- ...cation-where-calamares-searches-for.patch} | 11 ++++- pkgs/tools/misc/calamares/default.nix | 40 ++++++++----------- 9 files changed, 145 insertions(+), 49 deletions(-) rename pkgs/tools/misc/calamares/{userjob.patch => 0001-Modifies-the-users-module-to-only-set-passwords-of-u.patch} (53%) rename pkgs/tools/misc/calamares/{nixos-extensions-paths.patch => 0002-Makes-calamares-search-run-current-system-sw-share-c.patch} (69%) rename pkgs/tools/misc/calamares/{nonroot.patch => 0003-Uses-pkexec-within-modules-in-order-to-run-calamares.patch} (81%) rename pkgs/tools/misc/calamares/{unfreeq.patch => 0004-Adds-unfree-qml-to-packagechooserq.patch} (85%) rename pkgs/tools/misc/calamares/{uimod.patch => 0005-Modifies-finished-module-to-add-some-NixOS-resources.patch} (86%) rename pkgs/tools/misc/calamares/{partitions.patch => 0006-Remove-options-for-unsupported-partition-types.patch} (74%) rename pkgs/tools/misc/calamares/{waylandkbd.patch => 0007-Fix-setting-the-kayboard-layout-on-GNOME-wayland.patch} (81%) rename pkgs/tools/misc/calamares/{supportedlocale.patch => 0008-Change-default-location-where-calamares-searches-for.patch} (63%) diff --git a/pkgs/tools/misc/calamares/userjob.patch b/pkgs/tools/misc/calamares/0001-Modifies-the-users-module-to-only-set-passwords-of-u.patch similarity index 53% rename from pkgs/tools/misc/calamares/userjob.patch rename to pkgs/tools/misc/calamares/0001-Modifies-the-users-module-to-only-set-passwords-of-u.patch index a0bfea9bb05a..a03aa4180e08 100644 --- a/pkgs/tools/misc/calamares/userjob.patch +++ b/pkgs/tools/misc/calamares/0001-Modifies-the-users-module-to-only-set-passwords-of-u.patch @@ -1,8 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Victor Fuentes +Date: Thu, 1 Aug 2024 15:53:16 -0400 +Subject: [PATCH] Modifies the users module to only set passwords of user and + root + +as the users will have already been created in the configuration.nix +file +--- + src/modules/users/Config.cpp | 15 --------------- + 1 file changed, 15 deletions(-) + diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp -index eedfd274d..0f3e78848 100644 +index cd56bc3e2..9b09b36cd 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp -@@ -972,26 +972,11 @@ Config::createJobs() const +@@ -1028,12 +1028,6 @@ Config::createJobs() const Calamares::Job* j; @@ -12,6 +24,13 @@ index eedfd274d..0f3e78848 100644 - jobs.append( Calamares::job_ptr( j ) ); - } - + if ( getActiveDirectoryUsed() ) + { + j = new ActiveDirectoryJob( m_activeDirectoryAdminUsername, +@@ -1043,20 +1037,11 @@ Config::createJobs() const + jobs.append( Calamares::job_ptr( j ) ); + } + - j = new SetupGroupsJob( this ); - jobs.append( Calamares::job_ptr( j ) ); - diff --git a/pkgs/tools/misc/calamares/nixos-extensions-paths.patch b/pkgs/tools/misc/calamares/0002-Makes-calamares-search-run-current-system-sw-share-c.patch similarity index 69% rename from pkgs/tools/misc/calamares/nixos-extensions-paths.patch rename to pkgs/tools/misc/calamares/0002-Makes-calamares-search-run-current-system-sw-share-c.patch index 292310e314f9..1d6d601e5c1d 100644 --- a/pkgs/tools/misc/calamares/nixos-extensions-paths.patch +++ b/pkgs/tools/misc/calamares/0002-Makes-calamares-search-run-current-system-sw-share-c.patch @@ -1,3 +1,18 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Victor Fuentes +Date: Thu, 1 Aug 2024 15:57:55 -0400 +Subject: [PATCH] Makes calamares search + /run/current-system/sw/share/calamares/ for extra configuration files as by + default it only searches /usr/share/calamares/ and + /nix/store/-calamares-/share/calamares/ but + calamares-nixos-extensions is not in either of these locations + +--- + src/calamares/main.cpp | 1 + + src/libcalamares/utils/Dirs.cpp | 8 ++++++++ + src/libcalamares/utils/Dirs.h | 3 +++ + 3 files changed, 12 insertions(+) + diff --git a/src/calamares/main.cpp b/src/calamares/main.cpp index e0491e5f9..faf272016 100644 --- a/src/calamares/main.cpp @@ -11,7 +26,7 @@ index e0491e5f9..faf272016 100644 if ( !is_debug ) { diff --git a/src/libcalamares/utils/Dirs.cpp b/src/libcalamares/utils/Dirs.cpp -index c42768a08..bac98645a 100644 +index c42768a08..dfce7eb5d 100644 --- a/src/libcalamares/utils/Dirs.cpp +++ b/src/libcalamares/utils/Dirs.cpp @@ -114,6 +114,14 @@ setXdgDirs() @@ -23,7 +38,7 @@ index c42768a08..bac98645a 100644 +{ + s_extraConfigDirs << "/run/current-system/sw/share/calamares/"; + s_extraDataDirs << "/run/current-system/sw/share/calamares/"; -+ s_haveExtraDirs = !( s_extraConfigDirs.isEmpty() && s_extraDataDirs.isEmpty() ); ++ s_haveExtraDirs = !( s_extraConfigDirs.isEmpty() && s_extraDataDirs.isEmpty() ); +} + QStringList diff --git a/pkgs/tools/misc/calamares/nonroot.patch b/pkgs/tools/misc/calamares/0003-Uses-pkexec-within-modules-in-order-to-run-calamares.patch similarity index 81% rename from pkgs/tools/misc/calamares/nonroot.patch rename to pkgs/tools/misc/calamares/0003-Uses-pkexec-within-modules-in-order-to-run-calamares.patch index 24e47574142f..14b20d26780d 100644 --- a/pkgs/tools/misc/calamares/nonroot.patch +++ b/pkgs/tools/misc/calamares/0003-Uses-pkexec-within-modules-in-order-to-run-calamares.patch @@ -1,8 +1,22 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Victor Fuentes +Date: Thu, 1 Aug 2024 15:59:54 -0400 +Subject: [PATCH] Uses pkexec within modules in order to run calamares without + root permissions as a whole. + +Also fixes storage check in the welcome module +--- + src/libcalamares/utils/Runner.cpp | 8 +++--- + src/modules/mount/main.py | 8 +++--- + .../welcome/checker/GeneralRequirements.cpp | 27 ++++++++++++++++++- + .../welcome/checker/GeneralRequirements.h | 1 + + 4 files changed, 35 insertions(+), 9 deletions(-) + diff --git a/src/libcalamares/utils/Runner.cpp b/src/libcalamares/utils/Runner.cpp -index 632f32028..fe9052449 100644 +index f7872a7d0..a246ca110 100644 --- a/src/libcalamares/utils/Runner.cpp +++ b/src/libcalamares/utils/Runner.cpp -@@ -137,13 +137,13 @@ Calamares::Utils::Runner::run() +@@ -145,13 +145,13 @@ Calamares::Utils::Runner::run() } if ( m_location == RunLocation::RunInTarget ) { @@ -21,20 +35,19 @@ index 632f32028..fe9052449 100644 if ( m_output ) diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py -index 4202639f3..de2556b91 100644 +index 4a16f8872..6d32916a5 100644 --- a/src/modules/mount/main.py +++ b/src/modules/mount/main.py -@@ -235,7 +235,8 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun - +@@ -244,7 +244,7 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun # Ensure that the created directory has the correct SELinux context on # SELinux-enabled systems. + - os.makedirs(mount_point, exist_ok=True) + subprocess.check_call(["pkexec", "mkdir", "-p", mount_point]) -+ + try: subprocess.call(['chcon', '--reference=' + raw_mount_point, mount_point]) - except FileNotFoundError as e: -@@ -278,13 +279,13 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun +@@ -288,13 +288,13 @@ def mount_partition(root_mount_point, partition, partitions, mount_options, moun for s in btrfs_subvolumes: if not s["subvolume"]: continue diff --git a/pkgs/tools/misc/calamares/unfreeq.patch b/pkgs/tools/misc/calamares/0004-Adds-unfree-qml-to-packagechooserq.patch similarity index 85% rename from pkgs/tools/misc/calamares/unfreeq.patch rename to pkgs/tools/misc/calamares/0004-Adds-unfree-qml-to-packagechooserq.patch index a234113a726e..f625b0c8ca29 100644 --- a/pkgs/tools/misc/calamares/unfreeq.patch +++ b/pkgs/tools/misc/calamares/0004-Adds-unfree-qml-to-packagechooserq.patch @@ -1,3 +1,16 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Victor Fuentes +Date: Thu, 1 Aug 2024 16:00:43 -0400 +Subject: [PATCH] Adds unfree qml to packagechooserq + +--- + .../packagechooserq/packagechooserq.qrc | 1 + + .../packagechooserq@unfree.qml | 75 +++++++++++++++++++ + src/modules/packagechooserq/unfree.conf | 11 +++ + 3 files changed, 87 insertions(+) + create mode 100644 src/modules/packagechooserq/packagechooserq@unfree.qml + create mode 100644 src/modules/packagechooserq/unfree.conf + diff --git a/src/modules/packagechooserq/packagechooserq.qrc b/src/modules/packagechooserq/packagechooserq.qrc index 1b892dce1..ee80a934b 100644 --- a/src/modules/packagechooserq/packagechooserq.qrc @@ -11,7 +24,7 @@ index 1b892dce1..ee80a934b 100644 diff --git a/src/modules/packagechooserq/packagechooserq@unfree.qml b/src/modules/packagechooserq/packagechooserq@unfree.qml new file mode 100644 -index 000000000..cb87d864a +index 000000000..5e36d77d9 --- /dev/null +++ b/src/modules/packagechooserq/packagechooserq@unfree.qml @@ -0,0 +1,75 @@ @@ -32,7 +45,7 @@ index 000000000..cb87d864a +import QtQuick.Layouts 1.3 + +Item { -+ ++ + SystemPalette { + id: palette + colorGroup: SystemPalette.Active diff --git a/pkgs/tools/misc/calamares/uimod.patch b/pkgs/tools/misc/calamares/0005-Modifies-finished-module-to-add-some-NixOS-resources.patch similarity index 86% rename from pkgs/tools/misc/calamares/uimod.patch rename to pkgs/tools/misc/calamares/0005-Modifies-finished-module-to-add-some-NixOS-resources.patch index f45f68f9a5b3..7155f0b7870d 100644 --- a/pkgs/tools/misc/calamares/uimod.patch +++ b/pkgs/tools/misc/calamares/0005-Modifies-finished-module-to-add-some-NixOS-resources.patch @@ -1,12 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Victor Fuentes +Date: Thu, 1 Aug 2024 16:01:53 -0400 +Subject: [PATCH] Modifies finished module to add some NixOS resources. + +Modifies packagechooser module to change the UI. +--- + src/modules/finished/FinishedPage.cpp | 12 +++++--- + .../packagechooser/PackageChooserPage.cpp | 1 + + src/modules/packagechooser/page_package.ui | 28 +++++++++---------- + 3 files changed, 23 insertions(+), 18 deletions(-) + diff --git a/src/modules/finished/FinishedPage.cpp b/src/modules/finished/FinishedPage.cpp -index 23cb194c4..8714937f6 100644 +index 51be52678..307607232 100644 --- a/src/modules/finished/FinishedPage.cpp +++ b/src/modules/finished/FinishedPage.cpp -@@ -74,7 +74,10 @@ FinishedPage::retranslate() +@@ -74,8 +74,10 @@ FinishedPage::retranslate() { ui->mainText->setText( tr( "

All done.


" "%1 has been set up on your computer.
" -- "You may now start using your new system.", "@info" ) +- "You may now start using your new system.", +- "@info" ) + "You may now start using your new system.
" + "You can change every setting later except the bootloader.
" + "Check the manual for instructions on how to install software, upgrade the system or enable services.
" @@ -14,11 +27,12 @@ index 23cb194c4..8714937f6 100644 .arg( branding->versionedName() ) ); ui->restartCheckBox->setToolTip( tr( "" "

When this box is checked, your system will " -@@ -87,7 +90,10 @@ FinishedPage::retranslate() +@@ -89,8 +91,10 @@ FinishedPage::retranslate() ui->mainText->setText( tr( "

All done.


" "%1 has been installed on your computer.
" "You may now restart into your new system, or continue " -- "using the %2 Live environment.", "@info" ) +- "using the %2 Live environment.", +- "@info" ) + "using the %2 Live environment.
" + "You can change every setting later except the bootloader.
" + "Check the manual for instructions on how to install software, upgrade the system or enable services.
" diff --git a/pkgs/tools/misc/calamares/partitions.patch b/pkgs/tools/misc/calamares/0006-Remove-options-for-unsupported-partition-types.patch similarity index 74% rename from pkgs/tools/misc/calamares/partitions.patch rename to pkgs/tools/misc/calamares/0006-Remove-options-for-unsupported-partition-types.patch index ae3c7961ae64..3f378498d762 100644 --- a/pkgs/tools/misc/calamares/partitions.patch +++ b/pkgs/tools/misc/calamares/0006-Remove-options-for-unsupported-partition-types.patch @@ -1,8 +1,18 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Victor Fuentes +Date: Thu, 1 Aug 2024 16:02:40 -0400 +Subject: [PATCH] Remove options for unsupported partition types + +--- + src/modules/partition/gui/CreatePartitionDialog.cpp | 3 ++- + src/modules/partition/gui/EditExistingPartitionDialog.cpp | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + diff --git a/src/modules/partition/gui/CreatePartitionDialog.cpp b/src/modules/partition/gui/CreatePartitionDialog.cpp -index c5b17c69e..353b6f964 100644 +index d18676138..60bb8fdaf 100644 --- a/src/modules/partition/gui/CreatePartitionDialog.cpp +++ b/src/modules/partition/gui/CreatePartitionDialog.cpp -@@ -107,7 +107,8 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, +@@ -108,7 +108,8 @@ CreatePartitionDialog::CreatePartitionDialog( Device* device, { // We need to ensure zfs is added to the list if the zfs module is enabled if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) ) @@ -13,10 +23,10 @@ index c5b17c69e..353b6f964 100644 fsNames << userVisibleFS( fs ); // This is put into the combobox if ( fs->type() == defaultFSType ) diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp -index 0bc35cabe..3cf8a7fa2 100644 +index 7a3f4951a..4c3bfc4b0 100644 --- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp +++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp -@@ -95,7 +95,8 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, +@@ -113,7 +113,8 @@ EditExistingPartitionDialog::EditExistingPartitionDialog( Device* device, { // We need to ensure zfs is added to the list if the zfs module is enabled if ( ( fs->type() == FileSystem::Type::Zfs && Calamares::Settings::instance()->isModuleEnabled( "zfs" ) ) diff --git a/pkgs/tools/misc/calamares/waylandkbd.patch b/pkgs/tools/misc/calamares/0007-Fix-setting-the-kayboard-layout-on-GNOME-wayland.patch similarity index 81% rename from pkgs/tools/misc/calamares/waylandkbd.patch rename to pkgs/tools/misc/calamares/0007-Fix-setting-the-kayboard-layout-on-GNOME-wayland.patch index 4c282b04062f..53bf54599315 100644 --- a/pkgs/tools/misc/calamares/waylandkbd.patch +++ b/pkgs/tools/misc/calamares/0007-Fix-setting-the-kayboard-layout-on-GNOME-wayland.patch @@ -1,5 +1,16 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Victor Fuentes +Date: Thu, 1 Aug 2024 16:03:14 -0400 +Subject: [PATCH] Fix setting the kayboard layout on GNOME wayland. + +By default the module uses the setxkbmap, which will not change the +keyboard +--- + src/modules/keyboard/Config.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp -index d8b1e8e86..b2e1b7b5f 100644 +index ad6bee6f7..4d43abe53 100644 --- a/src/modules/keyboard/Config.cpp +++ b/src/modules/keyboard/Config.cpp @@ -307,7 +307,10 @@ Config::xkbApply() diff --git a/pkgs/tools/misc/calamares/supportedlocale.patch b/pkgs/tools/misc/calamares/0008-Change-default-location-where-calamares-searches-for.patch similarity index 63% rename from pkgs/tools/misc/calamares/supportedlocale.patch rename to pkgs/tools/misc/calamares/0008-Change-default-location-where-calamares-searches-for.patch index 859018d4947f..58b53758609f 100644 --- a/pkgs/tools/misc/calamares/supportedlocale.patch +++ b/pkgs/tools/misc/calamares/0008-Change-default-location-where-calamares-searches-for.patch @@ -1,5 +1,14 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Victor Fuentes +Date: Thu, 1 Aug 2024 16:03:53 -0400 +Subject: [PATCH] Change default location where calamares searches for locales + +--- + src/modules/locale/Config.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/src/modules/locale/Config.cpp b/src/modules/locale/Config.cpp -index 54ff5eb64..1a2b98c9c 100644 +index 8fa17a768..79b5419b6 100644 --- a/src/modules/locale/Config.cpp +++ b/src/modules/locale/Config.cpp @@ -48,7 +48,7 @@ loadLocales( const QString& localeGenPath ) diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix index 87f81724eaa5..c3627b66a99f 100644 --- a/pkgs/tools/misc/calamares/default.nix +++ b/pkgs/tools/misc/calamares/default.nix @@ -7,37 +7,29 @@ mkDerivation rec { pname = "calamares"; - version = "3.3.3"; + version = "3.3.8"; # release including submodule src = fetchurl { url = "https://github.com/calamares/calamares/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-XCp2Qc2y9eF2Z0BqfTtzUkf6860KzHl1lZE7kiHZbQM="; + sha256 = "sha256-CUNbBOflzuFhdyIwaNinQCw8a4EmrxP/Unr3d0LEM2M="; }; + # On major changes, or when otherwise required, you *must* : + # 1. reformat the patches, + # 2. `git am path/to/00*.patch` them into a calamares worktree, + # 3. rebase to the more recent calamares version, + # 4. and export the patches again via + # `git -c format.signoff=false format-patch v${version} --no-numbered --zero-commit --no-signature`. patches = lib.optionals nixos-extensions [ - # Modifies the users module to only set passwords of user and root - # as the users will have already been created in the configuration.nix file - ./userjob.patch - # Makes calamares search /run/current-system/sw/share/calamares/ for extra configuration files - # as by default it only searches /usr/share/calamares/ and /nix/store/-calamares-/share/calamares/ - # but calamares-nixos-extensions is not in either of these locations - ./nixos-extensions-paths.patch - # Uses pkexec within modules in order to run calamares without root permissions as a whole - # Also fixes storage check in the welcome module - ./nonroot.patch - # Adds unfree qml to packagechooserq - ./unfreeq.patch - # Modifies finished module to add some NixOS resources - # Modifies packagechooser module to change the UI - ./uimod.patch - # Remove options for unsupported partition types - ./partitions.patch - # Fix setting the kayboard layout on GNOME wayland - # By default the module uses the setxkbmap, which will not change the keyboard - ./waylandkbd.patch - # Change default location where calamares searches for locales - ./supportedlocale.patch + ./0001-Modifies-the-users-module-to-only-set-passwords-of-u.patch + ./0002-Makes-calamares-search-run-current-system-sw-share-c.patch + ./0003-Uses-pkexec-within-modules-in-order-to-run-calamares.patch + ./0004-Adds-unfree-qml-to-packagechooserq.patch + ./0005-Modifies-finished-module-to-add-some-NixOS-resources.patch + ./0006-Remove-options-for-unsupported-partition-types.patch + ./0007-Fix-setting-the-kayboard-layout-on-GNOME-wayland.patch + ./0008-Change-default-location-where-calamares-searches-for.patch ]; nativeBuildInputs = [ cmake extra-cmake-modules ]; From 3fe9664e2ab39752a300be06d2f283da7ab407d2 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 6 Aug 2024 21:43:48 +0200 Subject: [PATCH 04/72] rustup: convert to cargoHash This used to have git dependencies, but no longer does. Fixes: 26f5d6fbec4e ("rustup: 1.25.2 -> 1.26.0") --- pkgs/development/tools/rust/rustup/Cargo.lock | 2503 ----------------- .../development/tools/rust/rustup/default.nix | 4 +- 2 files changed, 1 insertion(+), 2506 deletions(-) delete mode 100644 pkgs/development/tools/rust/rustup/Cargo.lock diff --git a/pkgs/development/tools/rust/rustup/Cargo.lock b/pkgs/development/tools/rust/rustup/Cargo.lock deleted file mode 100644 index 1226dfb3bc18..000000000000 --- a/pkgs/development/tools/rust/rustup/Cargo.lock +++ /dev/null @@ -1,2503 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - -[[package]] -name = "aligned" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80a21b9440a626c7fc8573a9e3d3a06b75c7c97754c2949bc7857b90353ca655" -dependencies = [ - "as-slice", -] - -[[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 = "anyhow" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800" - -[[package]] -name = "as-slice" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "516b6b4f0e40d50dcda9365d53964ec74560ad4284da2e7fc97122cd83174516" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "async-compression" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" -dependencies = [ - "flate2", - "futures-core", - "memchr", - "pin-project-lite", - "tokio", -] - -[[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]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "base64" -version = "0.21.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "block-buffer" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bstr" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ffdb39cb703212f3c11973452c2861b972f757b021158f3516ba10f2fa8b2c1" -dependencies = [ - "memchr", - "once_cell", - "regex-automata", - "serde", -] - -[[package]] -name = "bumpalo" -version = "3.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "bytes" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" - -[[package]] -name = "cc" -version = "1.0.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" -dependencies = [ - "jobserver", -] - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[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.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" -dependencies = [ - "iana-time-zone", - "js-sys", - "num-integer", - "num-traits", - "time 0.1.45", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "clap" -version = "3.2.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" -dependencies = [ - "atty", - "bitflags", - "clap_lex", - "indexmap", - "strsim", - "termcolor", - "terminal_size", - "textwrap", -] - -[[package]] -name = "clap_complete" -version = "3.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f7a2e0a962c45ce25afce14220bc24f9dade0a1787f185cecf96bfba7847cd8" -dependencies = [ - "clap", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "codespan-reporting" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" -dependencies = [ - "termcolor", - "unicode-width", -] - -[[package]] -name = "concolor" -version = "0.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b3e3c41e9488eeda196b6806dbf487742107d61b2e16485bcca6c25ed5755b" -dependencies = [ - "bitflags", - "concolor-query", - "is-terminal", -] - -[[package]] -name = "concolor-query" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a90734b3d5dcf656e7624cca6bce9c3a90ee11f900e80141a7427ccfb3d317" - -[[package]] -name = "content_inspector" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7bda66e858c683005a53a9a60c69a4aca7eeaa45d124526e389f7aec8e62f38" -dependencies = [ - "memchr", -] - -[[package]] -name = "core-foundation" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" - -[[package]] -name = "cpufeatures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" -dependencies = [ - "libc", -] - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" -dependencies = [ - "autocfg", - "cfg-if 1.0.0", - "crossbeam-utils", - "memoffset", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" -dependencies = [ - "cfg-if 1.0.0", -] - -[[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 = "curl" -version = "0.4.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22" -dependencies = [ - "curl-sys", - "libc", - "openssl-probe", - "openssl-sys", - "schannel", - "socket2", - "winapi", -] - -[[package]] -name = "curl-sys" -version = "0.4.60+curl-7.88.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "717abe2cb465a5da6ce06617388a3980c9a2844196734bec8ccb8e575250f13f" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", - "winapi", -] - -[[package]] -name = "cvt" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34ac344c7efccb80cd25bc61b2170aec26f2f693fd40e765a539a1243db48c71" -dependencies = [ - "cfg-if 0.1.10", -] - -[[package]] -name = "cxx" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86d3488e7665a7a483b57e25bdd90d0aeb2bc7608c8d0346acf2ad3f1caf1d62" -dependencies = [ - "cc", - "cxxbridge-flags", - "cxxbridge-macro", - "link-cplusplus", -] - -[[package]] -name = "cxx-build" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48fcaf066a053a41a81dfb14d57d99738b767febb8b735c3016e469fac5da690" -dependencies = [ - "cc", - "codespan-reporting", - "once_cell", - "proc-macro2", - "quote", - "scratch", - "syn", -] - -[[package]] -name = "cxxbridge-flags" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2ef98b8b717a829ca5603af80e1f9e2e48013ab227b68ef37872ef84ee479bf" - -[[package]] -name = "cxxbridge-macro" -version = "1.0.91" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "086c685979a698443656e5cf7856c95c642295a38599f12fb1ff76fb28d19892" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "digest" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "download" -version = "1.26.0" -dependencies = [ - "anyhow", - "curl", - "env_proxy", - "hyper", - "lazy_static", - "reqwest", - "tempfile", - "thiserror", - "tokio", - "url", -] - -[[package]] -name = "dunce" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" - -[[package]] -name = "effective-limits" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37195f01a7464b2bc99ba33c5b2b61929bb294632bce96987f88e2ade8e29a07" -dependencies = [ - "cfg-if 0.1.10", - "libc", - "sys-info", - "thiserror", - "winapi", -] - -[[package]] -name = "either" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" - -[[package]] -name = "encoding_rs" -version = "0.8.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "enum-map" -version = "2.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50c25992259941eb7e57b936157961b217a4fc8597829ddef0596d6c3cd86e1a" -dependencies = [ - "enum-map-derive", -] - -[[package]] -name = "enum-map-derive" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a4da76b3b6116d758c7ba93f7ec6a35d2e2cf24feda76c6e38a375f4d5c59f2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "env_proxy" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a5019be18538406a43b5419a5501461f0c8b49ea7dfda0cfc32f4e51fc44be1" -dependencies = [ - "log", - "url", -] - -[[package]] -name = "errno" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" -dependencies = [ - "errno-dragonfly", - "libc", - "winapi", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - -[[package]] -name = "filetime" -version = "0.2.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3de6e8d11b22ff9edc6d916f890800597d60f8b2da1caf2955c274638d6412" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "windows-sys 0.45.0", -] - -[[package]] -name = "flate2" -version = "1.0.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" -dependencies = [ - "crc32fast", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fs_at" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3dfc546714a30e1e1f2eb5e1d233a6c1254c4a3d25ac35c09743e824a39d35e" -dependencies = [ - "aligned", - "cfg-if 1.0.0", - "cvt", - "libc", - "nix", - "smart-default", - "windows-sys 0.45.0", -] - -[[package]] -name = "futures-channel" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5317663a9089767a1ec00a487df42e0ca174b61b4483213ac24448e4664df5" -dependencies = [ - "futures-core", -] - -[[package]] -name = "futures-core" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec90ff4d0fe1f57d600049061dc6bb68ed03c7d2fbd697274c41805dcb3f8608" - -[[package]] -name = "futures-io" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfb8371b6fb2aeb2d280374607aeabfc99d95c72edfe51692e42d3d7f0d08531" - -[[package]] -name = "futures-sink" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f310820bb3e8cfd46c80db4d7fb8353e15dfff853a127158425f31e0be6c8364" - -[[package]] -name = "futures-task" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf79a1bf610b10f42aea489289c5a2c478a786509693b80cd39c44ccd936366" - -[[package]] -name = "futures-util" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c1d6de3acfef38d2be4b1f543f553131788603495be83da675e180c8d6b7bd1" -dependencies = [ - "futures-core", - "futures-io", - "futures-task", - "memchr", - "pin-project-lite", - "pin-utils", - "slab", -] - -[[package]] -name = "generic-array" -version = "0.14.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "getrandom" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.11.0+wasi-snapshot-preview1", -] - -[[package]] -name = "git-testament" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "986bf57c808270f3a0a0652c3bfce0f5d667aa5f5b465616dc697c7f390834b1" -dependencies = [ - "git-testament-derive", - "no-std-compat", -] - -[[package]] -name = "git-testament-derive" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a782db5866c7ab75f3552dda4cbf34e3e257cc64c963c6ed5af1e12818e8ae6" -dependencies = [ - "log", - "proc-macro2", - "quote", - "syn", - "time 0.3.20", -] - -[[package]] -name = "glob" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" - -[[package]] -name = "h2" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" -dependencies = [ - "bytes", - "fnv", - "futures-core", - "futures-sink", - "futures-util", - "http", - "indexmap", - "slab", - "tokio", - "tokio-util", - "tracing", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" - -[[package]] -name = "home" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "747309b4b440c06d57b0b25f2aee03ee9b5e5397d288c60e21fc709bb98a7408" -dependencies = [ - "winapi", -] - -[[package]] -name = "http" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "http-body" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" -dependencies = [ - "bytes", - "http", - "pin-project-lite", -] - -[[package]] -name = "httparse" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" - -[[package]] -name = "httpdate" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" - -[[package]] -name = "humantime" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" - -[[package]] -name = "humantime-serde" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c" -dependencies = [ - "humantime", - "serde", -] - -[[package]] -name = "hyper" -version = "0.14.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e011372fa0b68db8350aa7a248930ecc7839bf46d8485577d69f117a75f164c" -dependencies = [ - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", - "want", -] - -[[package]] -name = "hyper-rustls" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" -dependencies = [ - "http", - "hyper", - "rustls", - "tokio", - "tokio-rustls", -] - -[[package]] -name = "hyper-tls" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" -dependencies = [ - "bytes", - "hyper", - "native-tls", - "tokio", - "tokio-native-tls", -] - -[[package]] -name = "iana-time-zone" -version = "0.1.53" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "wasm-bindgen", - "winapi", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0703ae284fc167426161c2e3f1da3ea71d94b21bedbcc9494e92b28e334e3dca" -dependencies = [ - "cxx", - "cxx-build", -] - -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "io-lifetimes" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "ipnet" -version = "2.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" - -[[package]] -name = "is-terminal" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b6b32576413a8e69b90e952e4a026476040d81017b80445deda5f2d3921857" -dependencies = [ - "hermit-abi 0.3.1", - "io-lifetimes", - "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "itoa" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" - -[[package]] -name = "jobserver" -version = "0.1.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" -dependencies = [ - "libc", -] - -[[package]] -name = "js-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" -dependencies = [ - "wasm-bindgen", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.139" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" - -[[package]] -name = "libz-sys" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9702761c3935f8cc2f101793272e202c72b99da8f4224a19ddcf1279a6450bbf" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "link-cplusplus" -version = "1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" -dependencies = [ - "cc", -] - -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - -[[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "lzma-sys" -version = "0.1.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fda04ab3764e6cde78b9974eec4f779acaba7c4e84b36eca3cf77c581b85d27" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - -[[package]] -name = "memchr" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" - -[[package]] -name = "memoffset" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" -dependencies = [ - "autocfg", -] - -[[package]] -name = "mime" -version = "0.3.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" - -[[package]] -name = "miniz_oxide" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" -dependencies = [ - "adler", -] - -[[package]] -name = "mio" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.45.0", -] - -[[package]] -name = "native-tls" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" -dependencies = [ - "lazy_static", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "nix" -version = "0.26.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "libc", - "static_assertions", -] - -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - -[[package]] -name = "normalize-line-endings" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" - -[[package]] -name = "normpath" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "972dec05f98e7c787ede35d7a9ea4735eb7788c299287352757b3def6cc1f7b5" -dependencies = [ - "windows-sys 0.45.0", -] - -[[package]] -name = "num-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" -dependencies = [ - "hermit-abi 0.2.6", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.17.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" - -[[package]] -name = "opener" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005" -dependencies = [ - "bstr", - "winapi", -] - -[[package]] -name = "openssl" -version = "0.10.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1" -dependencies = [ - "bitflags", - "cfg-if 1.0.0", - "foreign-types", - "libc", - "once_cell", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-src" -version = "111.25.1+1.1.1t" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef9a9cc6ea7d9d5e7c4a913dc4b48d0e359eddf01af1dfec96ba7064b4aba10" -dependencies = [ - "cc", -] - -[[package]] -name = "openssl-sys" -version = "0.9.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23bbbf7854cd45b83958ebe919f0e8e516793727652e27fda10a8384cfc790b7" -dependencies = [ - "autocfg", - "cc", - "libc", - "openssl-src", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "os_pipe" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a53dbb20faf34b16087a931834cba2d7a73cc74af2b7ef345a4c8324e2409a12" -dependencies = [ - "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "os_str_bytes" -version = "6.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" - -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" - -[[package]] -name = "pin-project-lite" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" - -[[package]] -name = "pin-utils" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" - -[[package]] -name = "pkg-config" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" - -[[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.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "pulldown-cmark" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d9cc634bc78768157b5cbfe988ffcd1dcba95cd2b2f03a88316c08c6d00ed63" -dependencies = [ - "bitflags", - "memchr", - "unicase", -] - -[[package]] -name = "quote" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" -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 = "rayon" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356a0625f1954f730c0201cdab48611198dc6ce21f4acff55089b5a78e6e835b" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "redox_syscall" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" -dependencies = [ - "bitflags", -] - -[[package]] -name = "regex" -version = "1.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[package]] -name = "regex-syntax" -version = "0.6.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" - -[[package]] -name = "remove_dir_all" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7174320e07c29945955cedd70b865995b286847111c8308d349a1f3a9e3af555" -dependencies = [ - "aligned", - "cfg-if 1.0.0", - "cvt", - "fs_at", - "lazy_static", - "libc", - "normpath", - "rayon", - "windows-sys 0.45.0", -] - -[[package]] -name = "reqwest" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" -dependencies = [ - "async-compression", - "base64", - "bytes", - "encoding_rs", - "futures-core", - "futures-util", - "h2", - "http", - "http-body", - "hyper", - "hyper-rustls", - "hyper-tls", - "ipnet", - "js-sys", - "log", - "mime", - "native-tls", - "once_cell", - "percent-encoding", - "pin-project-lite", - "rustls", - "rustls-native-certs", - "rustls-pemfile", - "serde", - "serde_json", - "serde_urlencoded", - "tokio", - "tokio-native-tls", - "tokio-rustls", - "tokio-socks", - "tokio-util", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.10.1", -] - -[[package]] -name = "retry" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac95c60a949a63fd2822f4964939662d8f2c16c4fa0624fd954bc6e703b9a3f6" -dependencies = [ - "rand", -] - -[[package]] -name = "ring" -version = "0.16.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" -dependencies = [ - "cc", - "libc", - "once_cell", - "spin", - "untrusted", - "web-sys", - "winapi", -] - -[[package]] -name = "rs_tracing" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b121670da627e1c0110e7972c9db150dd7f8704dc073cce32c3db9cb7861e0" -dependencies = [ - "serde", - "serde_json", -] - -[[package]] -name = "rustix" -version = "0.36.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" -dependencies = [ - "bitflags", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys", - "windows-sys 0.45.0", -] - -[[package]] -name = "rustls" -version = "0.20.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" -dependencies = [ - "log", - "ring", - "sct", - "webpki", -] - -[[package]] -name = "rustls-native-certs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "schannel", - "security-framework", -] - -[[package]] -name = "rustls-pemfile" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" -dependencies = [ - "base64", -] - -[[package]] -name = "rustup" -version = "1.26.0" -dependencies = [ - "anyhow", - "cc", - "cfg-if 1.0.0", - "chrono", - "clap", - "clap_complete", - "download", - "effective-limits", - "enum-map", - "flate2", - "git-testament", - "home", - "lazy_static", - "libc", - "num_cpus", - "once_cell", - "opener", - "openssl", - "pulldown-cmark", - "rand", - "regex", - "remove_dir_all", - "retry", - "rs_tracing", - "same-file", - "scopeguard", - "semver", - "serde", - "sha2", - "sharded-slab", - "strsim", - "tar", - "tempfile", - "term", - "thiserror", - "threadpool", - "toml", - "trycmd", - "url", - "wait-timeout", - "walkdir", - "winapi", - "winreg 0.11.0", - "xz2", - "zstd", -] - -[[package]] -name = "ryu" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" -dependencies = [ - "windows-sys 0.42.0", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "scratch" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" - -[[package]] -name = "sct" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "security-framework" -version = "2.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a332be01508d814fed64bf28f798a146d73792121129962fdf335bb3c49a4254" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31c9bb296072e961fcbd8853511dd39c2d8be2deb1e17c6860b1d30732b323b4" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "1.0.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" - -[[package]] -name = "serde" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.152" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.93" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cad406b69c91885b5107daf2c29572f6c8cdb3c66826821e286c533490c0bc76" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "serde_spanned" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" -dependencies = [ - "serde", -] - -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" -dependencies = [ - "cfg-if 1.0.0", - "cpufeatures", - "digest", -] - -[[package]] -name = "sharded-slab" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" -dependencies = [ - "lazy_static", -] - -[[package]] -name = "shlex" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" - -[[package]] -name = "similar" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf" - -[[package]] -name = "slab" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" -dependencies = [ - "autocfg", -] - -[[package]] -name = "smart-default" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "snapbox" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4389a6395e9925166f19d67b64874e526ec28a4b8455f3321b686c912299c3ea" -dependencies = [ - "concolor", - "content_inspector", - "dunce", - "filetime", - "libc", - "normalize-line-endings", - "os_pipe", - "similar", - "snapbox-macros", - "tempfile", - "wait-timeout", - "walkdir", - "windows-sys 0.45.0", - "yansi", -] - -[[package]] -name = "snapbox-macros" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "485e65c1203eb37244465e857d15a26d3a85a5410648ccb53b18bd44cb3a7336" - -[[package]] -name = "socket2" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - -[[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.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[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 = "sys-info" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b3a0d0aba8bf96a0e1ddfdc352fc53b3df7f39318c71854910c3c4b024ae52c" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tar" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b55807c0344e1e6c04d7c965f5289c39a8d94ae23ed5c0b57aabac549f871c6" -dependencies = [ - "filetime", - "libc", - "xattr", -] - -[[package]] -name = "tempfile" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af18f7ae1acd354b992402e9ec5864359d693cd8a79dcbef59f76891701c1e95" -dependencies = [ - "cfg-if 1.0.0", - "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.42.0", -] - -[[package]] -name = "term" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6b677dd1e8214ea1ef4297f85dbcbed8e8cdddb561040cc998ca2551c37561" -dependencies = [ - "byteorder", - "winapi", -] - -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "terminal_size" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9afddd2cec1c0909f06b00ef33f94ab2cc0578c4a610aa208ddfec8aa2b43a" -dependencies = [ - "rustix", - "windows-sys 0.45.0", -] - -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" -dependencies = [ - "terminal_size", -] - -[[package]] -name = "thiserror" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "threadpool" -version = "1.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" -dependencies = [ - "num_cpus", -] - -[[package]] -name = "time" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -dependencies = [ - "itoa", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" - -[[package]] -name = "time-macros" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" -dependencies = [ - "time-core", -] - -[[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.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e00990ebabbe4c14c08aca901caed183ecd5c09562a12c824bb53d3c3fd3af" -dependencies = [ - "autocfg", - "bytes", - "libc", - "memchr", - "mio", - "num_cpus", - "pin-project-lite", - "socket2", - "windows-sys 0.42.0", -] - -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - -[[package]] -name = "tokio-rustls" -version = "0.23.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" -dependencies = [ - "rustls", - "tokio", - "webpki", -] - -[[package]] -name = "tokio-socks" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51165dfa029d2a65969413a6cc96f354b86b464498702f174a4efa13608fd8c0" -dependencies = [ - "either", - "futures-util", - "thiserror", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", - "tracing", -] - -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_datetime" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" -dependencies = [ - "serde", -] - -[[package]] -name = "toml_edit" -version = "0.19.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1eb0622d28f4b9c90adc4ea4b2b46b47663fde9ac5fafcb14a1369d5508825" -dependencies = [ - "indexmap", - "serde", - "serde_spanned", - "toml_datetime", - "winnow", -] - -[[package]] -name = "tower-service" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" - -[[package]] -name = "tracing" -version = "0.1.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" -dependencies = [ - "cfg-if 1.0.0", - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "trycmd" -version = "0.14.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2311fe1144338119b5b9b31499286c7f60eaf00ce0dcacf5a445a12eb47aed29" -dependencies = [ - "glob", - "humantime", - "humantime-serde", - "rayon", - "serde", - "shlex", - "snapbox", - "toml_edit", -] - -[[package]] -name = "typenum" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54675592c1dbefd78cbd98db9bacd89886e1ca50692a0692baefffdeb92dd58" - -[[package]] -name = "unicode-ident" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" - -[[package]] -name = "unicode-normalization" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - -[[package]] -name = "url" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wait-timeout" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6" -dependencies = [ - "libc", -] - -[[package]] -name = "walkdir" -version = "2.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" -dependencies = [ - "same-file", - "winapi", - "winapi-util", -] - -[[package]] -name = "want" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" -dependencies = [ - "log", - "try-lock", -] - -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - -[[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.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" -dependencies = [ - "cfg-if 1.0.0", - "wasm-bindgen-macro", -] - -[[package]] -name = "wasm-bindgen-backend" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" -dependencies = [ - "bumpalo", - "log", - "once_cell", - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" -dependencies = [ - "cfg-if 1.0.0", - "js-sys", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "wasm-bindgen-macro" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" -dependencies = [ - "quote", - "wasm-bindgen-macro-support", -] - -[[package]] -name = "wasm-bindgen-macro-support" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "wasm-bindgen-backend", - "wasm-bindgen-shared", -] - -[[package]] -name = "wasm-bindgen-shared" -version = "0.2.84" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" - -[[package]] -name = "web-sys" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "webpki" -version = "0.22.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" -dependencies = [ - "ring", - "untrusted", -] - -[[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-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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-sys" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" -dependencies = [ - "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-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets", -] - -[[package]] -name = "windows-targets" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" -dependencies = [ - "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_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" - -[[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_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" - -[[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_gnullvm" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" - -[[package]] -name = "winnow" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf09497b8f8b5ac5d3bb4d05c0a99be20f26fd3d5f2db7b0716e946d5103658" -dependencies = [ - "memchr", -] - -[[package]] -name = "winreg" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" -dependencies = [ - "winapi", -] - -[[package]] -name = "winreg" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" -dependencies = [ - "cfg-if 1.0.0", - "winapi", -] - -[[package]] -name = "xattr" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d1526bbe5aaeb5eb06885f4d987bcdfa5e23187055de9b83fe00156a821fabc" -dependencies = [ - "libc", -] - -[[package]] -name = "xz2" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388c44dc09d76f1536602ead6d325eb532f5c122f17782bd57fb47baeeb767e2" -dependencies = [ - "lzma-sys", -] - -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - -[[package]] -name = "zstd" -version = "0.12.3+zstd.1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "6.0.4+zstd.1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7afb4b54b8910cf5447638cb54bf4e8a65cbedd783af98b98c62ffe91f185543" -dependencies = [ - "libc", - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.7+zstd.1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94509c3ba2fe55294d752b79842c530ccfab760192521df74a081a78d2b3c7f5" -dependencies = [ - "cc", - "libc", - "pkg-config", -] diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 3f08882e1fbe..81ee5aed5af7 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -32,9 +32,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-rdhG9MdjWyvoaMGdjgFyCfQaoV48QtAZE7buA5TkDKg="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-CRqRSsDNWfVHOgmZGMOD7z44tzEEFqGxHo7z7IExVn8="; nativeBuildInputs = [ makeBinaryWrapper pkg-config ]; From 92ac5eebfb7ac4e2a43f9160ef86c6047821e3db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Wed, 7 Aug 2024 13:01:18 -0700 Subject: [PATCH 05/72] python312Packages.rapidfuzz: 3.9.5 -> 3.9.6 Diff: https://github.com/maxbachmann/RapidFuzz/compare/refs/tags/v3.9.5...v3.9.6 Changelog: https://github.com/maxbachmann/RapidFuzz/blob/refs/tags/v3.9.6/CHANGELOG.rst --- pkgs/development/python-modules/rapidfuzz/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index 4da9eb0bd17d..59c78777a6fe 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "3.9.5"; + version = "3.9.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,13 +28,13 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-uoiXUE36FjIzYrcoqVnHF5RpNeYm8Nkied9UzaEGeSY="; + hash = "sha256-vO63Zkc2ltgfpAq81qRP5MjQ08GTkJhnfqwLIxP5eEI="; }; postPatch = '' substituteInPlace pyproject.toml \ --replace-fail "scikit-build~=0.18.0" "scikit-build" \ - --replace-fail "Cython >=3.0.10, <3.1.0" "Cython" + --replace-fail "Cython >=3.0.11, <3.1.0" "Cython" ''; build-system = [ From d858bca61f9dd35dd2b4c7e0dd050f786b2173c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 8 Aug 2024 03:09:53 -0700 Subject: [PATCH 06/72] python312Packages.asyncinotify: 4.0.6 -> 4.0.9 Diff: https://github.com/absperf/asyncinotify/compare/refs/tags/v4.0.6...v4.0.9 --- pkgs/development/python-modules/asyncinotify/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index 27fb79e5b98b..c58cad40d482 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "asyncinotify"; - version = "4.0.6"; + version = "4.0.9"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,10 +18,10 @@ buildPythonPackage rec { owner = "absperf"; repo = "asyncinotify"; rev = "refs/tags/v${version}"; - hash = "sha256-RXx6i5dIB2oySVaLoHPRGD9VKgiO5OAXmrzVBq8Ad18="; + hash = "sha256-Pmv1BXmKUNjFE5h99GR0GmjYKYmTi8ECKAUCKwIAMzc="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; nativeCheckInputs = [ pytestCheckHook ]; From a1d58d54baa49216962af08f4522733a980c1c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 8 Aug 2024 03:13:56 -0700 Subject: [PATCH 07/72] python312Packages.asyncinotify: fix license --- pkgs/development/python-modules/asyncinotify/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index c58cad40d482..24837d824d6c 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { description = "Module for inotify"; homepage = "https://github.com/absperf/asyncinotify/"; changelog = "https://github.com/absperf/asyncinotify/releases/tag/v${version}"; - license = licenses.mit; + license = licenses.mpl20; maintainers = with maintainers; [ cynerd ]; }; } From f0c65051a7440c946d7458a595b2706df3189f04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Aug 2024 12:07:29 +0000 Subject: [PATCH 08/72] emacsPackages.ligo-mode: 1.7.1-unstable-2024-07-17 -> 1.7.0-unstable-2024-08-01 --- .../elisp-packages/manual-packages/ligo-mode/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix index 3be4a3b56b96..f04daf579d65 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix @@ -7,13 +7,13 @@ melpaBuild { pname = "ligo-mode"; - version = "1.7.1-unstable-2024-07-17"; + version = "1.7.0-unstable-2024-08-01"; src = fetchFromGitLab { owner = "ligolang"; repo = "ligo"; - rev = "09afc3ff3dd9c88b2dfbc563278a78a099b39902"; - hash = "sha256-AX0zZljZPrfBlpdgCNuiq0JaYpHcVBdHHZ9jM31LlQs="; + rev = "454e4a505212b8bd80ac3c75a1432320b9be2604"; + hash = "sha256-Z7bv+ulGwnczrSWWC1RIUzSI4wAF9AtObdi5bBfYsOs="; }; files = ''("tools/emacs/ligo-mode.el")''; From 54f84ea4cd4198b123a068a5aaefa9ce2aa60fdb Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Fri, 9 Aug 2024 17:26:16 -0400 Subject: [PATCH 09/72] hyprdim: 2.2.5 -> 2.2.6 Depends on Hyprland v0.42.0. --- pkgs/by-name/hy/hyprdim/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprdim/package.nix b/pkgs/by-name/hy/hyprdim/package.nix index 11afcf6daa3a..e0c0eb3f7e91 100644 --- a/pkgs/by-name/hy/hyprdim/package.nix +++ b/pkgs/by-name/hy/hyprdim/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprdim"; - version = "2.2.5"; + version = "2.2.6"; src = fetchFromGitHub { owner = "donovanglover"; repo = "hyprdim"; rev = version; - hash = "sha256-EWZnimLLV879FiZUax1YK5ML/Qz4qt29rJWn5uoKtqw="; + hash = "sha256-zE1GYgS3fFO6Zz1I5zr+ApEux9ndKOeegj2n/rF/4HY="; }; - cargoHash = "sha256-V4Z3PKavxfQm7zSoTyoWtxpc8yuuGPemO4OdadQEVdg="; + cargoHash = "sha256-WchQXRlU/fkjnCOeP9E5JXVdM8UZlG3ixfLGHvmezHg="; nativeBuildInputs = [ installShellFiles ]; From 447594c8a8d26ed432a721170becf391986da052 Mon Sep 17 00:00:00 2001 From: Donovan Glover Date: Fri, 9 Aug 2024 17:39:03 -0400 Subject: [PATCH 10/72] hyprnome: 0.3.0 -> 0.3.1 Depends on Hyprland v0.42.0. --- pkgs/by-name/hy/hyprnome/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/hy/hyprnome/package.nix b/pkgs/by-name/hy/hyprnome/package.nix index 387f1e72d2dc..875acfba2ed2 100644 --- a/pkgs/by-name/hy/hyprnome/package.nix +++ b/pkgs/by-name/hy/hyprnome/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "hyprnome"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "donovanglover"; repo = "hyprnome"; rev = version; - hash = "sha256-J/gaAwydSA9fi2qZYrWLpodTltL56yG4VQ2YlIPKJ/U="; + hash = "sha256-GZn7qS1J6QSanWdy17sMBbwJ77iMij2jKRgPdrjt6tM="; }; - cargoHash = "sha256-Fyst6rwpvVQoeWCOkJwpNuMcnp6Q+kAXtDg+fccTVNM="; + cargoHash = "sha256-oxIZTp5ZJRUjXLpMw2nOnPHYHhHN03HWFRhBZ82Ac10="; nativeBuildInputs = [ installShellFiles ]; From bd4bddc0d75efa5b9ad82e392fc0d66871679af8 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 6 Aug 2024 21:46:10 +0200 Subject: [PATCH 11/72] rustup: 1.26.0 -> 1.27.1 Required to build with Rust 1.80. Link: https://github.com/rust-lang/rust/issues/127343 --- pkgs/development/tools/rust/rustup/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/rustup/default.nix b/pkgs/development/tools/rust/rustup/default.nix index 81ee5aed5af7..b59d9d08ef23 100644 --- a/pkgs/development/tools/rust/rustup/default.nix +++ b/pkgs/development/tools/rust/rustup/default.nix @@ -23,16 +23,16 @@ in rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.26.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; rev = version; - sha256 = "sha256-rdhG9MdjWyvoaMGdjgFyCfQaoV48QtAZE7buA5TkDKg="; + sha256 = "sha256-BehkJTEIbZHaM+ABaWN/grl9pX75lPqyBj1q1Kt273M="; }; - cargoHash = "sha256-CRqRSsDNWfVHOgmZGMOD7z44tzEEFqGxHo7z7IExVn8="; + cargoHash = "sha256-iQoMPV97V9WJqT+qVtNpQtW5g+Jyl+U2uA+JEoRYTQA="; nativeBuildInputs = [ makeBinaryWrapper pkg-config ]; @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { buildFeatures = [ "no-self-update" ]; - checkFeatures = [ ]; + checkFeatures = [ "test" ]; patches = lib.optionals stdenv.isLinux [ (runCommand "0001-dynamically-patchelf-binaries.patch" @@ -60,7 +60,9 @@ rustPlatform.buildRustPackage rec { '') ]; - doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; + # Random tests fail nondeterministically on macOS. + # TODO: Investigate this. + doCheck = !stdenv.isDarwin; # skip failing tests checkFlags = [ From 8d9ed73e6568d3efd95bbf0ff93d9094f623ceac Mon Sep 17 00:00:00 2001 From: V Date: Tue, 9 Apr 2024 06:54:05 +0200 Subject: [PATCH 12/72] kakoune-lsp: 16.0.0 -> 17.0.1 --- .../ka/kakoune-lsp/Hardcode-perl.patch | 51 +++++++++++++++++++ .../ka/kakoune-lsp/Use-full-Perl-path.patch | 37 -------------- pkgs/by-name/ka/kakoune-lsp/package.nix | 33 ++++++------ 3 files changed, 69 insertions(+), 52 deletions(-) create mode 100644 pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch delete mode 100644 pkgs/by-name/ka/kakoune-lsp/Use-full-Perl-path.patch diff --git a/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch b/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch new file mode 100644 index 000000000000..747a9481025b --- /dev/null +++ b/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch @@ -0,0 +1,51 @@ +From 17cec4d94bc04bd02b91361ca72f561f1eebce60 Mon Sep 17 00:00:00 2001 +From: V +Date: Tue, 9 Apr 2024 06:15:00 +0200 +Subject: [PATCH] Hardcode perl + +--- + rc/lsp.kak | 13 ++----------- + 1 file changed, 2 insertions(+), 11 deletions(-) + +diff --git a/rc/lsp.kak b/rc/lsp.kak +index b173478..015c3ca 100644 +--- a/rc/lsp.kak ++++ b/rc/lsp.kak +@@ -280,12 +280,8 @@ define-command -hidden lsp-menu -params 1.. %{ + } + define-command -hidden lsp-menu-impl %{ + evaluate-commands %sh{ +- if ! command -v perl > /dev/null; then +- printf "fail %{'perl' must be installed to use the 'lsp-menu' command}" +- exit +- fi + echo >$kak_command_fifo "echo -to-file $kak_response_fifo -quoting kakoune -- %reg{a}" +- perl < $kak_response_fifo -we ' ++ @perl@ < $kak_response_fifo -we ' + use strict; + my $Q = "'\''"; + my @args = (); +@@ -2410,11 +2406,6 @@ define-command -hidden lsp-snippets-insert-completion -params 1 %{ evaluate-comm + }} + + define-command lsp-snippets-insert -hidden -params 1 %[ +- evaluate-commands %sh{ +- if ! command -v perl > /dev/null; then +- printf "fail %{'perl' must be installed to use the 'lsp-snippets-insert' command'}" +- fi +- } + evaluate-commands -draft -save-regs '^"' %[ + set-register '"' %arg{1} + execute-keys +@@ -2469,7 +2460,7 @@ define-command lsp-snippets-insert -hidden -params 1 %[ + define-command -hidden lsp-snippets-insert-perl-impl %[ + set-register x nop + evaluate-commands %sh[ # $kak_quoted_selections +- perl -e ' ++ @perl@ -e ' + use strict; + use warnings; + use Text::ParseWords(); +-- +2.44.0 + diff --git a/pkgs/by-name/ka/kakoune-lsp/Use-full-Perl-path.patch b/pkgs/by-name/ka/kakoune-lsp/Use-full-Perl-path.patch deleted file mode 100644 index 38f0d38cb215..000000000000 --- a/pkgs/by-name/ka/kakoune-lsp/Use-full-Perl-path.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b93660cfa8a80a5e5bf72e1f06fb7bf95272c7e4 Mon Sep 17 00:00:00 2001 -From: PoweredByPie -Date: Fri, 8 Dec 2023 04:39:01 -0800 -Subject: [PATCH] Use full Perl path - ---- - rc/lsp.kak | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/rc/lsp.kak b/rc/lsp.kak -index d695a2e..7c6a436 100644 ---- a/rc/lsp.kak -+++ b/rc/lsp.kak -@@ -2339,11 +2339,6 @@ define-command -hidden lsp-snippets-insert-completion -params 1 %{ evaluate-comm - }} - - define-command lsp-snippets-insert -hidden -params 1 %[ -- evaluate-commands %sh{ -- if ! command -v perl > /dev/null 2>&1; then -- printf "fail '''perl'' must be installed to use the ''snippets-insert'' command'" -- fi -- } - evaluate-commands -draft -save-regs '^"' %[ - set-register '"' %arg{1} - execute-keys -@@ -2397,7 +2392,7 @@ define-command lsp-snippets-insert -hidden -params 1 %[ - - define-command -hidden lsp-snippets-insert-perl-impl %[ - evaluate-commands %sh[ # $kak_quoted_selections -- perl -e ' -+ @perlPath@/bin/perl -e ' - use strict; - use warnings; - use Text::ParseWords(); --- -2.42.0 - diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index 8e8406587f1c..a13c2bf6bd73 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -1,34 +1,37 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, perl, CoreServices, Security, SystemConfiguration }: +{ lib +, rustPlatform +, fetchFromGitHub +, substituteAll, perl +, stdenv, CoreServices, Security, SystemConfiguration +}: rustPlatform.buildRustPackage rec { pname = "kakoune-lsp"; - version = "16.0.0"; + version = "17.0.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-d4Tc6iYp20uOKMd+T2LhWgXWZzvzq1E+VWqjhhiIiHE="; + sha256 = "sha256-uXKquAjfytUn/Q0kx+0BGRQTkVMQ9rMRnTCy622upag="; }; - cargoHash = "sha256-kV8d0PwIWS6gyfCtv70iv8MrL91ZOZbwYznhc3lUw0U="; - - buildInputs = [ perl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; - patches = [ - ./Use-full-Perl-path.patch + (substituteAll { + src = ./Hardcode-perl.patch; + perl = lib.getExe perl; + }) ]; - postPatch = '' - substituteInPlace rc/lsp.kak \ - --subst-var-by perlPath ${lib.getBin perl} - ''; + cargoHash = "sha256-XnhYODMzqInwbgM8wveY048sljZ8OKw4hLYJG5h8Twc="; - meta = with lib; { + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; + + meta = { description = "Kakoune Language Server Protocol Client"; homepage = "https://github.com/kakoune-lsp/kakoune-lsp"; - license = with licenses; [ unlicense /* or */ mit ]; - maintainers = with maintainers; [ philiptaron spacekookie poweredbypie ]; + license = with lib.licenses; [ unlicense /* or */ mit ]; + maintainers = with lib.maintainers; [ philiptaron spacekookie poweredbypie ]; mainProgram = "kak-lsp"; }; } From afff35d4250eac71e4f6133db194b6f179410ab2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 3 May 2024 10:11:00 +0200 Subject: [PATCH 13/72] python312Packages.betamax-matchers: refactor - enabel tests - disable on unsupported Python releases - add pythonImportsCheck - add changelog to meta --- .../betamax-matchers/default.nix | 30 ++++++++++++++----- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/betamax-matchers/default.nix b/pkgs/development/python-modules/betamax-matchers/default.nix index 210d463b2378..b1ac71b6cc21 100644 --- a/pkgs/development/python-modules/betamax-matchers/default.nix +++ b/pkgs/development/python-modules/betamax-matchers/default.nix @@ -1,29 +1,43 @@ { lib, - buildPythonPackage, - fetchPypi, betamax, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, requests-toolbelt, + setuptools, }: buildPythonPackage rec { pname = "betamax-matchers"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit pname version; - sha256 = "07qpwjyq2i2aqhz5iwghnj4pqr2ys5n45v1vmpcfx9r5mhwrsq43"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "betamaxpy"; + repo = "betamax_matchers"; + rev = "refs/tags/${version}"; + hash = "sha256-BV9DOfZLDAZIr2E75l988QxFWWvazBL9VttxGFIez1M="; }; - buildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ betamax requests-toolbelt ]; + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "betamax_matchers" ]; + meta = with lib; { + description = "A group of experimental matchers for Betamax"; homepage = "https://github.com/sigmavirus24/betamax_matchers"; - description = "Group of experimental matchers for Betamax"; + changelog = "https://github.com/betamaxpy/betamax_matchers/blob/${version}/HISTORY.rst"; license = licenses.asl20; maintainers = with maintainers; [ pSub ]; }; From eddf581cf0d2ab5579d132e1ee561954eb4aedf3 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Mon, 12 Aug 2024 01:52:16 +0800 Subject: [PATCH 14/72] emacsPackages.ligo-mode: add AndersonTorres as a maintainer --- .../emacs/elisp-packages/manual-packages/ligo-mode/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix index f04daf579d65..7b1a19fe3a3c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix @@ -24,6 +24,6 @@ melpaBuild { description = "Major mode for editing LIGO source code"; homepage = "https://gitlab.com/ligolang/ligo"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ AndersonTorres ]; }; } From 34be673a23be3020ebf7f517e8b61106cc429a2b Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 11 Aug 2024 20:48:17 +0200 Subject: [PATCH 15/72] linux_xanmod_latest: 6.10.3 -> 6.10.4 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 3283f44d0a64..743fa865a23e 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -12,8 +12,8 @@ let }; mainVariant = { - version = "6.10.3"; - hash = "sha256-Nwv7Ms8R6tTBK7oHeRf19S1OFCEJcf/fTXurHs+JI0Y="; + version = "6.10.4"; + hash = "sha256-8iK821QbJcgXEeCWh1g1DlJ3gOD5eDErw0O7O+cEGwQ="; variant = "main"; }; From 4f0e9ad466787230c1e1d018e851c4699ed63e43 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 11 Aug 2024 20:53:01 +0200 Subject: [PATCH 16/72] linux_xanmod: 6.6.44 -> 6.6.45 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 743fa865a23e..875a5e1f87b9 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,8 +6,8 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.6.44"; - hash = "sha256-kRMx0NVZNZ0xcEq+Bg9NkzHgRCnblbamxLKUbzfp6h0="; + version = "6.6.45"; + hash = "sha256-sYAa/uIi076XJMHOSjOSQO/rK/wUWIpAfWb/EYDXvD0="; variant = "lts"; }; From 4cb6719cfb8dce32010073c1c8b24450717720ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 11 Aug 2024 21:29:45 +0000 Subject: [PATCH 17/72] fluent-bit: 3.1.4 -> 3.1.5 --- pkgs/by-name/fl/fluent-bit/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index d640a7da023f..a557e872536f 100644 --- a/pkgs/by-name/fl/fluent-bit/package.nix +++ b/pkgs/by-name/fl/fluent-bit/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluent-bit"; - version = "3.1.4"; + version = "3.1.5"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${finalAttrs.version}"; - hash = "sha256-TXFVvnjEitEFwQAuqNCgV0xbABcDxGS9KfCUenKN448="; + hash = "sha256-3pHqKBRMxPdgicxRN0H2OT3qp8+p0tp4ej83OWEh5OQ="; }; # optional only to avoid linux rebuild From 0877a48aa62ff674df43ff67f4ce4c8601cd6b74 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 12 Aug 2024 11:20:30 +0900 Subject: [PATCH 18/72] python312Packages.pycrdt: add updateScript --- pkgs/development/python-modules/pycrdt/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 6ae1c9c5bd6c..070daf1fdad4 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -11,6 +11,7 @@ pytestCheckHook, trio, y-py, + nix-update-script, }: buildPythonPackage rec { @@ -49,6 +50,8 @@ buildPythonPackage rec { y-py ]; + passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; + meta = with lib; { description = "CRDTs based on Yrs"; homepage = "https://github.com/jupyter-server/pycrdt"; From 116fe572fa7f5499e465047403d893bd6ef7706a Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 12 Aug 2024 11:24:57 +0900 Subject: [PATCH 19/72] python312Packages.pycrdt: 0.9.6 -> 0.9.8 Changelog: https://github.com/jupyter-server/pycrdt/releases/tag/refs/tags/v0.9.8 --- .../python-modules/pycrdt/Cargo.lock | 29 ++++++++++++------- .../python-modules/pycrdt/default.nix | 4 +-- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock index 0da04d69be57..1b6ad5bb32ce 100644 --- a/pkgs/development/python-modules/pycrdt/Cargo.lock +++ b/pkgs/development/python-modules/pycrdt/Cargo.lock @@ -93,6 +93,12 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +[[package]] +name = "memchr" +version = "2.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" + [[package]] name = "memoffset" version = "0.9.1" @@ -125,7 +131,7 @@ dependencies = [ [[package]] name = "pycrdt" -version = "0.9.6" +version = "0.9.8" dependencies = [ "pyo3", "yrs", @@ -211,18 +217,18 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "5b3e4cd94123dd520a128bcd11e34d9e9e423e7e3e50425cb1b4b1e3549d0284" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.206" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "fabfb6138d2383ea8208cf98ccf69cdfb1aff4088460681d84189aa259762f97" dependencies = [ "proc-macro2", "quote", @@ -231,11 +237,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "66ad62847a56b3dba58cc891acd13884b9c61138d330c0d7b6181713d4fce38d" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -257,9 +264,9 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "syn" -version = "2.0.72" +version = "2.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "1fceb41e3d546d0bd83421d3409b1460cc7444cd389341a4c880fe7a042cb3d7" dependencies = [ "proc-macro2", "quote", @@ -268,9 +275,9 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.15" +version = "0.12.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2" +checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "thiserror" diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix index 070daf1fdad4..7cc073ff81a5 100644 --- a/pkgs/development/python-modules/pycrdt/default.nix +++ b/pkgs/development/python-modules/pycrdt/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pycrdt"; - version = "0.9.6"; + version = "0.9.8"; pyproject = true; src = fetchFromGitHub { owner = "jupyter-server"; repo = "pycrdt"; rev = "refs/tags/v${version}"; - hash = "sha256-1BGJ6I8ODLyEv566w+vQOsPEqN8nQlZHXTWv0tH0cR0="; + hash = "sha256-W93rLSDcCB9jrxC/Z88ToCkcfMGnCTGjBkVRNk3lLaI="; }; postPatch = '' From fccfcc8ac6ebf7f4180eaf688a8206a822f326e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 02:45:03 +0000 Subject: [PATCH 20/72] python312Packages.qtile-extras: 0.27.0.post1 -> 0.28.0 --- pkgs/development/python-modules/qtile-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix index 39da7959de59..e6f200b5e9c8 100644 --- a/pkgs/development/python-modules/qtile-extras/default.nix +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "qtile-extras"; - version = "0.27.0.post1"; + version = "0.28.0"; pyproject = true; src = fetchFromGitHub { owner = "elParaguayo"; repo = "qtile-extras"; rev = "refs/tags/v${version}"; - hash = "sha256-c5MCcpU6g95DMycSgOaUdpvPUtgVV/zUSdKVDbZWZGM="; + hash = "sha256-gQH9zWSPUH1eL6ZTD0gXVbZmOVG5hhhCakmWSHS2DBQ="; }; build-system = [ setuptools-scm ]; From 0bdc8e65a04b0570f256e8a549f79ce393719754 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 03:34:08 +0000 Subject: [PATCH 21/72] gnmic: 0.38.1 -> 0.38.2 --- pkgs/applications/networking/gnmic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gnmic/default.nix b/pkgs/applications/networking/gnmic/default.nix index e1b3c5fc46b0..dfa28d8417d0 100644 --- a/pkgs/applications/networking/gnmic/default.nix +++ b/pkgs/applications/networking/gnmic/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.38.1"; + version = "0.38.2"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-Js5l6bVZtnR6uOo2+3L2CAvFj/i0O2FFGEiGOkc2qDQ="; + hash = "sha256-TSRexhhYny1L7znhjqPLudIMUYhyMQUmLClyXzsZxcY="; }; - vendorHash = "sha256-4TTxhcP06YuhWWufVTAVK2wTf8mCc3WLAjzFe5wKChY="; + vendorHash = "sha256-pJz613QFdA+8HcV+U0aG+A+WDZtSZIgaLVqCnu4WQWo="; ldflags = [ "-s" "-w" From f9e28e44d9b6c38811729d8b0f568be8a5025df4 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 12 Aug 2024 11:22:50 +0900 Subject: [PATCH 22/72] python312Packages.ipyvuetify: 1.9.4 -> 1.10.0 --- .../python-modules/ipyvuetify/default.nix | 24 ++++--------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index 63e3d23c433a..85a1b016ac06 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -3,45 +3,31 @@ buildPythonPackage, fetchPypi, # Python Inputs - jupyter-packaging, - jupyterlab, setuptools, - wheel, ipyvue, }: buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.9.4"; + version = "1.10.0"; pyproject = true; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - hash = "sha256-wpwfN68wpj2+lLb4w0erAZYa7OrbVhNfGMv0635oiVs="; + hash = "sha256-h97mqq3zFu4n7Ymnmz08P14PLltjjaBoFzYEhTJUWsE="; }; # drop pynpm which tries to install node_modules postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "jupyter_packaging~=0.7.9" "jupyter_packaging" \ - --replace-fail "jupyterlab~=3.0" "jupyterlab" \ + --replace-fail '"jupyterlab~=4.0",' "" \ --replace-fail '"pynpm"' "" - - substituteInPlace setup.py \ - --replace-fail "from pynpm import NPMPackage" "" \ - --replace-fail "from generate_source import generate_source" "" \ - --replace-fail 'setup(cmdclass={"egg_info": js_prerelease(egg_info)})' 'setup()' ''; - nativeBuildInputs = [ - jupyter-packaging - jupyterlab - setuptools - wheel - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ ipyvue ]; + dependencies = [ ipyvue ]; doCheck = false; # no tests on PyPi/GitHub pythonImportsCheck = [ "ipyvuetify" ]; From f411398f9cffee61dbfb11e73f594a938e05528c Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 12 Aug 2024 11:35:33 +0900 Subject: [PATCH 23/72] python312Packages.jupyter-book: add teams.jupyter.members to maintainers jupyter-book became a jupyter subproject --- pkgs/development/python-modules/jupyter-book/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 727d5afa83cc..395afa5664cd 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -70,7 +70,7 @@ buildPythonPackage rec { homepage = "https://jupyterbook.org/"; changelog = "https://github.com/executablebooks/jupyter-book/blob/v${version}/CHANGELOG.md"; license = licenses.bsd3; - maintainers = [ ]; + maintainers = teams.jupyter.members; mainProgram = "jupyter-book"; }; } From 07252e21603f23fdc556cff35e753de7202366e2 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 12 Aug 2024 12:26:17 +0900 Subject: [PATCH 24/72] python312Packages.jupyter-book: refactor --- .../python-modules/jupyter-book/default.nix | 59 ++++++++++++++++--- 1 file changed, 51 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/jupyter-book/default.nix b/pkgs/development/python-modules/jupyter-book/default.nix index 395afa5664cd..47e36e157eb1 100644 --- a/pkgs/development/python-modules/jupyter-book/default.nix +++ b/pkgs/development/python-modules/jupyter-book/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, pythonOlder, flit-core, click, @@ -22,6 +22,12 @@ sphinx-togglebutton, sphinxcontrib-bibtex, sphinx-multitoc-numbering, + pytestCheckHook, + texsoup, + jupytext, + pytest-regressions, + pytest-xdist, + sphinx-inline-tabs, }: buildPythonPackage rec { @@ -31,15 +37,18 @@ buildPythonPackage rec { disabled = pythonOlder "3.9"; - src = fetchPypi { - inherit version; - pname = "jupyter_book"; - hash = "sha256-rRXuSanf7Hc6HTBJ2sOFY4KqL5txRKGAEUduZcEbX0Y="; + src = fetchFromGitHub { + owner = "jupyter-book"; + repo = "jupyter-book"; + rev = "refs/tags/v${version}"; + hash = "sha256-NlCMfkfvquonqf7FdaJ7AC9ebM7VSifn+zM7gWh32LQ="; }; - nativeBuildInputs = [ flit-core ]; + build-system = [ flit-core ]; - propagatedBuildInputs = [ + pythonRelaxDeps = [ "myst-parser" ]; + + dependencies = [ click jinja2 jsonschema @@ -65,10 +74,44 @@ buildPythonPackage rec { "jupyter_book.cli.main" ]; + nativeCheckInputs = [ + jupytext + pytest-regressions + pytest-xdist + pytestCheckHook + sphinx-inline-tabs + texsoup + ]; + + preCheck = '' + export HOME=$TMPDIR + ''; + + disabledTests = [ + # touch the network + "test_create_from_cookiecutter" + # flaky? + "test_execution_timeout" + # require texlive + "test_toc" + "test_toc_latex_parts" + "test_toc_latex_urllink" + # WARNING: Executing notebook failed: CellExecutionError [mystnb.exec] + "test_build_dirhtml_from_template" + "test_build_from_template" + "test_build_page" + "test_build_singlehtml_from_template" + ]; + + disabledTestPaths = [ + # require texlive + "tests/test_pdf.py" + ]; + meta = with lib; { description = "Build a book with Jupyter Notebooks and Sphinx"; homepage = "https://jupyterbook.org/"; - changelog = "https://github.com/executablebooks/jupyter-book/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/jupyter-book/jupyter-book/blob/${src.rev}/CHANGELOG.md"; license = licenses.bsd3; maintainers = teams.jupyter.members; mainProgram = "jupyter-book"; From 927ad17355c73691726515fcccf563a0925e654f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 04:01:43 +0000 Subject: [PATCH 25/72] planify: 4.10.5 -> 4.10.7 --- pkgs/applications/office/planify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index f9227354deea..65d251ef134d 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "planify"; - version = "4.10.5"; + version = "4.10.7"; src = fetchFromGitHub { owner = "alainm23"; repo = "planify"; rev = version; - hash = "sha256-tjU7/JZjJqH9H/EWMoAbRurJtIDv8BTT938EnJicTv4="; + hash = "sha256-jGfLbKDhiBpLkO5de5aLBwLw6xBZ+IIsYPDX4/XGPqE="; }; nativeBuildInputs = [ From f044d04013648d9c8aa6f74f82c9598794381f19 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 05:32:26 +0000 Subject: [PATCH 26/72] kube-router: 2.2.0 -> 2.2.1 --- pkgs/applications/networking/cluster/kube-router/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kube-router/default.nix b/pkgs/applications/networking/cluster/kube-router/default.nix index ad185bd853f5..b0219b25ca32 100644 --- a/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/pkgs/applications/networking/cluster/kube-router/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kube-router"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "cloudnativelabs"; repo = pname; rev = "v${version}"; - hash = "sha256-tEeqenOJVpwFGBS3iYlVdedNo02NV9/jtGsgrquV+0I="; + hash = "sha256-Pm/CrB/RxCvEhNdCyfI7kF62cxpx96Cj2zWmW0wl5wM="; }; vendorHash = "sha256-sIWRODIV3iJ5FdVjVwesqfbYivOlqZAvPSYa38vhCMA="; From e3b1b24e00f02238f108edc7362769f0553958d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 Aug 2024 08:34:56 +0200 Subject: [PATCH 27/72] python312Packages.tencentcloud-sdk-python: 3.0.1208 -> 3.0.1209 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1208...3.0.1209 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1209/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index ce6a6f9b3688..8e019554039f 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1208"; + version = "3.0.1209"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-AwkzoGJm+lI853Riq4VACU18nUn0jvUCFmMRJdFhcJM="; + hash = "sha256-SQcqLtdt74Onk3mBre9zaZmJhAOTrjZBhL3i1zr9R80="; }; build-system = [ setuptools ]; From 26c20d2fda6bcae4a34af234104670661e548e51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 06:41:39 +0000 Subject: [PATCH 28/72] trustymail: 0.8.3 -> 1.0.0 --- pkgs/tools/security/trustymail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/trustymail/default.nix b/pkgs/tools/security/trustymail/default.nix index 11133548bbd3..4df51400dd8b 100644 --- a/pkgs/tools/security/trustymail/default.nix +++ b/pkgs/tools/security/trustymail/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "trustymail"; - version = "0.8.3"; + version = "1.0.0"; format = "setuptools"; src = fetchFromGitHub { owner = "cisagov"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aFXz78Gviki0yIcnn2EgR3mHmt0wMoY5u6RoT6zQc1Y="; + hash = "sha256-Zkw+NfeVtIArrBxR1qR9bAQe5yd7mAtNiT0x5Mqr3Ic="; }; postPatch = '' From 9aa656a865f0b07dc46fdaf3e33c0918574edd2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 Aug 2024 09:05:40 +0200 Subject: [PATCH 29/72] python312Packages.asana: disable tests which require network access - add missing input --- pkgs/development/python-modules/asana/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 60aa3520e738..62ac3ad20610 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -1,14 +1,15 @@ { lib, buildPythonPackage, + certifi, fetchFromGitHub, + pytestCheckHook, + python-dateutil, + python-dotenv, pythonOlder, setuptools, - certifi, six, - python-dateutil, urllib3, - pytestCheckHook, }: buildPythonPackage rec { @@ -31,6 +32,7 @@ buildPythonPackage rec { certifi six python-dateutil + python-dotenv urllib3 ]; @@ -38,6 +40,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "asana" ]; + disabledTestPaths = [ + # Tests require network access + "build_tests/" + ]; + meta = with lib; { description = "Python client library for Asana"; homepage = "https://github.com/asana/python-asana"; From 7d04ba08ddeeff7c4d9e9abf5bf735d0e0c420db Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 Aug 2024 09:06:24 +0200 Subject: [PATCH 30/72] python312Packages.asana: 5.0.7 -> 5.0.8 Diff: https://github.com/asana/python-asana/compare/refs/tags/v5.0.7...v5.0.8 Changelog: https://github.com/Asana/python-asana/releases/tag/v5.0.8 --- pkgs/development/python-modules/asana/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asana/default.nix b/pkgs/development/python-modules/asana/default.nix index 62ac3ad20610..449d59ac86df 100644 --- a/pkgs/development/python-modules/asana/default.nix +++ b/pkgs/development/python-modules/asana/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "asana"; - version = "5.0.7"; + version = "5.0.8"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "asana"; repo = "python-asana"; rev = "refs/tags/v${version}"; - hash = "sha256-X6444LU2hcx4Er5N+WbSjgbe2tHjl1y1z5FqZGngiOw="; + hash = "sha256-JC7t8im5OlvQlln9mUJHWMRJ1cRyAwfbIVQ0U3Q1KsU="; }; build-system = [ setuptools ]; From cc72ed96512e979aae9f841502a512b8811f1438 Mon Sep 17 00:00:00 2001 From: Arseniy Zorin Date: Mon, 12 Aug 2024 11:17:49 +0300 Subject: [PATCH 31/72] pulumi-bin: 3.127.0 -> 3.128.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 290 +++++++++++++-------------- 1 file changed, 145 insertions(+), 145 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index f65dcc465fdb..e19e9651bb26 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,16 +1,16 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.127.0"; + version = "3.128.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.127.0-linux-x64.tar.gz"; - sha256 = "19ndjx7k7gqchqw6rh66c7jpxqxq49cx98r5kya0wgsdhm1ppnxi"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.128.0-linux-x64.tar.gz"; + sha256 = "15faqcd6r74a8lwmhrjvy1qnlkc288n8681dpavc2nl6abc46ayh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.20.0-linux-amd64.tar.gz"; - sha256 = "0ihn2rn05c1ajs3kh6sk62qsd19a932z27061kym4810fdw3vqai"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.21.0-linux-amd64.tar.gz"; + sha256 = "1r4pvgjdibnmklfya1jd96rnvfwi6n3fgcwxkhsjbkr38z65am2p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-linux-amd64.tar.gz"; @@ -21,20 +21,16 @@ sha256 = "0vcps3pzl8dfcrsk2vc3qgqzjxfb2waq90jld7ap6glc882sr19d"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.1-linux-amd64.tar.gz"; - sha256 = "0792bjc3csjfv55pg9b6imwrasxz40g928jbackrvdl1c2pawpkn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.5.1-linux-amd64.tar.gz"; + sha256 = "1xbfr2z610krkyxwlbm4y882nl3g65vdprp3pbmm2gyniqh2r9xr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-linux-amd64.tar.gz"; sha256 = "11kpczajnshx3ky6m8imsydxpw7a8k608bz3bhy9wd43x2gcg5qd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.46.0-linux-amd64.tar.gz"; - sha256 = "15fc8i0y0xhq85p6vf68df2kavdzph769lzjrrmrayvlclblaiz2"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-linux-amd64.tar.gz"; - sha256 = "0m652snqibs73bhb5rhi4f3a18jjs5s4mh8xj91w82ksljgs0ww3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.48.0-linux-amd64.tar.gz"; + sha256 = "1a1jv01ljz7zc54qqqyy8nb0qn5w4msvp6jr55wl5li39scvp4ck"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-amd64.tar.gz"; @@ -45,20 +41,24 @@ sha256 = "02v61pqpsxj652937rm7fwdr0612cq157g8wxkah27cxyyyf6qzq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.35.0-linux-amd64.tar.gz"; - sha256 = "11rjl9ddg495awnslnd0q7cfc6x31mwzvcjz56xllgkxxryn8c1n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.86.0-linux-amd64.tar.gz"; + sha256 = "0a0yl4w5x0d9lvaaqdasbm9sd6h8fr9k8qvnnjq3vbs5xpxf8qap"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.4-linux-amd64.tar.gz"; - sha256 = "0gb8yrsl7js41ffq993x5cibl3drgdjgaq3nl1xd72248b82pik4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.36.0-linux-amd64.tar.gz"; + sha256 = "0bcdsi66dwvcfa1wpwq9fzh1khizlkzn6wb8rj1i2fipj39gvs9w"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.0-linux-amd64.tar.gz"; + sha256 = "10nn27kvv9l32bgy9mrzvs5s5krq1kpaw702mmq5ngiznrkj4ss8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-linux-amd64.tar.gz"; sha256 = "00px345df0gnirscmj57pvsk9z412z4r5la4y71daf2f2acl73q3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.2-linux-amd64.tar.gz"; - sha256 = "1fsslwik687gqpcj3i5d1zv5jwcf2knkx2whn61bm0gir8wcl3iq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.0-linux-amd64.tar.gz"; + sha256 = "0v5cj9gf63s79crbzs0a32wr8w450z2pzlm3m4njgxnklw3l57r3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "03wx8b74nr93b5z7cm94n728ljzjggpxa0x6n1zn1zcdr6f495sk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.32.0-linux-amd64.tar.gz"; - sha256 = "1dmw1359wcaczc8iyk6ywjzk9yqrn1539br8js4mcvl6yhrp6a2a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.35.0-linux-amd64.tar.gz"; + sha256 = "12055sgxpa0a14rb2zx7b42f1f2h7ih07jilapbj69kypxfppwij"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-linux-amd64.tar.gz"; @@ -89,12 +89,12 @@ sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.19.2-linux-amd64.tar.gz"; - sha256 = "1j44m55x2yi31790vlc1vivxjbar921xnbx77c3n03s86mmlsyv8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-linux-amd64.tar.gz"; + sha256 = "0biyj03nhbmq0fnlkx3v4w43cwk095sa80di1mhbszgz13zj4409"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.15.0-linux-amd64.tar.gz"; - sha256 = "04bldr5h13gfpk19d4s74fvhskyzihi199af1rq0n7ks8mf43ig2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.16.0-linux-amd64.tar.gz"; + sha256 = "11y742hhna8izpcmra2j5jqhhnd3x7mb0l6n1lark8wazjqifqx9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-linux-amd64.tar.gz"; @@ -109,8 +109,8 @@ sha256 = "1vl57mjz23krcp7801q5v2vb64daxpyqpas57y8hxvi5np7qnpk4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.0-linux-amd64.tar.gz"; - sha256 = "1zh21cnnr3pfsraad0spv3nnds6pnad1xa3whms9qzdk62lrh0zh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.1-linux-amd64.tar.gz"; + sha256 = "1fqahbl0rh5794ck21jx4krn5ni5wkk958rf1darl2d7h9l4zr35"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-amd64.tar.gz"; @@ -121,28 +121,28 @@ sha256 = "0byfb2zjymwmgd52wfk1xhp1llw6b4hniwa4faf66fmpr2i157nd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.56.0-linux-amd64.tar.gz"; - sha256 = "0d05z7iym834vxlk7d1blxvjcbyqvi129pfbcl76qyf294sbgbsv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.1-linux-amd64.tar.gz"; + sha256 = "0cfmi8f8v31jbyz32mflb5lvr2hh550mrmavnk3lv631iy5pf1iw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.83.1-linux-amd64.tar.gz"; - sha256 = "16604jh4p4g7rirhcjcnrbyk1srmnzbbr93fc31hlv8hya348c5w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.86.0-linux-amd64.tar.gz"; + sha256 = "1qdsbgxkaci0m8k70zmjl997njp5pax4c1paa6lngdp4vbsdrq7m"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.1-linux-amd64.tar.gz"; - sha256 = "191nslfjl5l3lv50ficavhir4qpnr5dha1zvsg87ps76cp693jnh"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.2-linux-amd64.tar.gz"; + sha256 = "0h9hb51h5fjsnf3lcyik77sb1mw070h7p4drnm6f8rjkg5jy1q7i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.1-linux-amd64.tar.gz"; - sha256 = "1pi6mfd9309ly8d633cv3mc4mm1gmwg8hfamdyljkw4svagl9l67"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-linux-amd64.tar.gz"; + sha256 = "03y02rcy2xarvb4v33wxqf2qcy71amc9f6j6h406c8w8dnlaa9c3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-linux-amd64.tar.gz"; sha256 = "0rx05a9mdlv9yfsf6pi0ccdv7zfp7kgrj5zhfjagbk8x04cnygrz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.2.0-linux-amd64.tar.gz"; - sha256 = "02a0vbqwaq65yfmjqjrix0s4asnr3mrpn7rr97wmrc7nr47x3pcd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-linux-amd64.tar.gz"; + sha256 = "0dmx29ldms7mwhi4ka9qnz53qkis29diyz4g06hbnkc6j1bdc7jn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-linux-amd64.tar.gz"; @@ -163,12 +163,12 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.127.0-darwin-x64.tar.gz"; - sha256 = "0mvyjbvabgxqmv1bjfbiid31grzgcajflhqsmhi5nrdb72w0sq2d"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.128.0-darwin-x64.tar.gz"; + sha256 = "1py0f208laf82857pfl3ksqwszr12qyfdcc73z9b376wyp5pb86w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.20.0-darwin-amd64.tar.gz"; - sha256 = "148ksf36bfvl4xysw949yhixcc8q9lm945r03pb8rfrb04561fx2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.21.0-darwin-amd64.tar.gz"; + sha256 = "1r7rfkgp0jnvfcq02jimb3cm2bjw9amz48j0ngx9l29ljykf857a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-darwin-amd64.tar.gz"; @@ -179,20 +179,16 @@ sha256 = "01bbbwczlakxb08p35s74rd5yqnk8z7580k146ib0l9xgzf0a811"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.1-darwin-amd64.tar.gz"; - sha256 = "1b1fwvwxdiwk7cq4gf1ssjj294abx86j93q8rp1vqj1hfj75glyl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.5.1-darwin-amd64.tar.gz"; + sha256 = "1gi96ndl33b33hxpv67g53aiys8ry2mvk07xc0lb2ckmky5976s8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-darwin-amd64.tar.gz"; sha256 = "00p3b7m2rnp5w4nsh15w2s3hbhwv6wm2x30d8g939z07z6dxzq3s"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.46.0-darwin-amd64.tar.gz"; - sha256 = "0yqp5fajmlsxgsin6vrpikr49b5fxi1v6alw5ix2i04mv8fzs5i7"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-darwin-amd64.tar.gz"; - sha256 = "1lki7piyk3dffd1cd5zs37dck002ir9mbaysx4cn92w1bbjvn2c2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.48.0-darwin-amd64.tar.gz"; + sha256 = "0ilq9hsz503n2z8rkzqdqhpv6pi3jgz16kcz6jb7xn1kdxqia96l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-amd64.tar.gz"; @@ -203,20 +199,24 @@ sha256 = "1xranra0rkcnvahna4jrb091jy23sgk9ib92dbzl2gw26yj6x9gx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.35.0-darwin-amd64.tar.gz"; - sha256 = "14h8dr3xs17lqjr9vxa63m2pwiqc0hd227f1n6x4vchb726h7iam"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.86.0-darwin-amd64.tar.gz"; + sha256 = "0bpscwrm8jrhfcma1vy8pzbi2i5l69p40dx9va5lbrslxf73mf88"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.4-darwin-amd64.tar.gz"; - sha256 = "0q9ycpaavrnzl3dh1wa9pi4acpr52s2f3plf3x9yx3l3jdqs8m76"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.36.0-darwin-amd64.tar.gz"; + sha256 = "111dl2rpjf8zkb5910sz627cw4cqi4c77vbzjimmx837mjkpij69"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.0-darwin-amd64.tar.gz"; + sha256 = "0scdybl1mgdrqif6m5gkagh2jrlir2srjmbdgig2i3kqs7y5z2d0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-darwin-amd64.tar.gz"; sha256 = "0rvpv2igaq4xsw0z5fpd11zkkwxwbi3ymq08h2gvkv3zdb966bci"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.2-darwin-amd64.tar.gz"; - sha256 = "0lwwq0na0334ynddmpy1fy71js5f35i4ps3084z4cxzaz0amlnv1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.0-darwin-amd64.tar.gz"; + sha256 = "049l8287a9rmrr2ypywycnc36g8jhkx37swqkklw1qp1az4cl2k8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "1kcp2hryja7bn7n2115wqlc326hb5ln1bk8fzmhlbwaysamxspbj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.32.0-darwin-amd64.tar.gz"; - sha256 = "01yg9rpkgxhcs832f0hgjilyjp257mii1mk1ljjxdvxl9cr82d68"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.35.0-darwin-amd64.tar.gz"; + sha256 = "16mk8c9wpl32nb7wf4rj258hh2x6vm8wql0c6ha8w0al0va4bsmf"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-darwin-amd64.tar.gz"; @@ -247,12 +247,12 @@ sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.19.2-darwin-amd64.tar.gz"; - sha256 = "196acjy617p868arsnyr0an4m338b50in1axbwzlkf8rhhifzraq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-darwin-amd64.tar.gz"; + sha256 = "0pw9qawf3wrndzrz0i93al09rygr23b6gg53njq3az74gw4vjaw3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.15.0-darwin-amd64.tar.gz"; - sha256 = "0lnlahbrsccz6qhjrbrmgjh1dc2qvhr4rxhj0zbmvjmgch81cy1a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.16.0-darwin-amd64.tar.gz"; + sha256 = "0dfdc9y0rmn70fjgcnf4c8aqgvj6zai8anjjw5ifgchkp2hqi7s9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-darwin-amd64.tar.gz"; @@ -267,8 +267,8 @@ sha256 = "1a7gd4vbkvbmk2870xc2dgkq6dd4bvcmdcrkny51m2bcns94b2xl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.0-darwin-amd64.tar.gz"; - sha256 = "1y3z2jlw5x1zmfljf25dy8a48arkk030qjc9isxzal6ij8v4ylml"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.1-darwin-amd64.tar.gz"; + sha256 = "0xjfhrid7jhz6mkbvf4a8fpbhphxmjbj5xhrg7r7v266vgvjjw2y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-amd64.tar.gz"; @@ -279,28 +279,28 @@ sha256 = "0xfqi33x1crkvqdl3iqq1i7vky2s3v36fyb1adrn6067mbd7dgxj"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.56.0-darwin-amd64.tar.gz"; - sha256 = "0pr5s2iaxid9jn290798ssbrcn00gkx3r72f3dvimdb9njrvr2pi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.1-darwin-amd64.tar.gz"; + sha256 = "1vx0f9d222vvvflkza288327h5ksiff7sysnzpyaca1kf8v3qs7y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.83.1-darwin-amd64.tar.gz"; - sha256 = "0aj92m6f6aydfnj2616azkym9jk8ksai9598njg213dhmiiamyr5"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.86.0-darwin-amd64.tar.gz"; + sha256 = "1mwp3pfr8gjq6ff1q4dsfq58pcq2v6qnm5pc1fhp083cvsxvzxkz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.1-darwin-amd64.tar.gz"; - sha256 = "0mfg1c9dn948kkh3ylfm5njzri28hngv8fbszhx40x5qkyla6qkj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.2-darwin-amd64.tar.gz"; + sha256 = "0di85gf7rjg7z1rckqp6ff5jsrc1ng1sihwkpgiv2w9wxhxrh333"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.1-darwin-amd64.tar.gz"; - sha256 = "0021nwmzy3kf87da6r77di0gqpi6g9qby3r459d71631g19xi5hs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-darwin-amd64.tar.gz"; + sha256 = "0sr9a8zgfvhyr9993pmfddiw92c2m6v5wiafpd0p5hfzf99n5l8c"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-darwin-amd64.tar.gz"; sha256 = "0zqc8iwzgg5aw03sbgcmpi3s0dffya7c8qx2ncxjvq1hcdhzsyj7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.2.0-darwin-amd64.tar.gz"; - sha256 = "0lc7baayl1yq67mg9j0q0sgln915234f7rs22ncp9lk996xgwin8"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-darwin-amd64.tar.gz"; + sha256 = "00l1ybf0a2bjkvd10db9ilyxq0zpv55r3wdy7s9dklq2bagmqzjz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-darwin-amd64.tar.gz"; @@ -321,12 +321,12 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.127.0-linux-arm64.tar.gz"; - sha256 = "1w7k6g8rch463hmgh1qymblikk9j5pcgl0scl422ffd3clqrl8zm"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.128.0-linux-arm64.tar.gz"; + sha256 = "1wwq601y7dkaj2jfj3zxi9yp3m7pka6mad73jaqr2gbgnz8ks0w0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.20.0-linux-arm64.tar.gz"; - sha256 = "0rva2s47fgii2c3l52gmfnpf0fs8rw3w4prhz7afpv96s9m0qpjb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.21.0-linux-arm64.tar.gz"; + sha256 = "1nadxwfmn6622jy5hjwxmhczsj4js049nhh128xkc51a70f7iz5k"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-linux-arm64.tar.gz"; @@ -337,20 +337,16 @@ sha256 = "0cs456c4hlasjzd7whnna5adv0x9y4q8jqjmrkb3ijnlyi1l24pv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.1-linux-arm64.tar.gz"; - sha256 = "0jmvk7158384y512g9qycq7d9877rxzk1snwzbz0lfg4rqlw169p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.5.1-linux-arm64.tar.gz"; + sha256 = "05gafxa1xjqdd0d8ibr9ps1wrca91bvxbgidjrj83ilg6hflsr1j"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-linux-arm64.tar.gz"; sha256 = "0kabsgjxhg8dlj0qa33mfsm90vsd9lzizw1a5sfmf9py7flcvn0y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.46.0-linux-arm64.tar.gz"; - sha256 = "0aihaakzb4cbrdp6xdqxidh08n7zwqgg1ncb57j841gilzf7ya1m"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-linux-arm64.tar.gz"; - sha256 = "0y5avw0zf87sqsh50nb6dm45cpbf2glaxd9lwcnk3bkiwqlbxyis"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.48.0-linux-arm64.tar.gz"; + sha256 = "11w454ccy73pmn4jf8dgk7l1pa5m9in8dwshz9a58fvsq2rm9n1h"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-arm64.tar.gz"; @@ -361,20 +357,24 @@ sha256 = "03rvhz2zbjdldlp3c1335cbp2b8c3y3p88czwsfy6dsd9hry8fsa"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.35.0-linux-arm64.tar.gz"; - sha256 = "1kphr21na2rzspd4m2kh962mfbr6df23f0rfas3qdrd2nw7vh1rq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.86.0-linux-arm64.tar.gz"; + sha256 = "1lilc1y1ji91xqz1hvl6nc49apvbm1z7ibd3a701dgsnfc9hbafq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.4-linux-arm64.tar.gz"; - sha256 = "1zaxwkn4kg4nnns90dbx6dwdjw5mbbpm9h8wjcd41zhhbd4b3vld"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.36.0-linux-arm64.tar.gz"; + sha256 = "0m7xcblqcpaiiyv0izp5inczzyn07a7s77647fmskq3wax0fgady"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.0-linux-arm64.tar.gz"; + sha256 = "0z6c4c2g26hl999l7bpx0ma9ks8rlcin5n0jyr1sbl3myy3804hs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-linux-arm64.tar.gz"; sha256 = "1xfql6ggxd90vh4kb9c0iki1cs47j6v1qld9chcanm394kchavd5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.2-linux-arm64.tar.gz"; - sha256 = "10asvq6ds4y9sfxy2lh81ldzxdr347nwvhphjzs3sb2pxrx9dksz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.0-linux-arm64.tar.gz"; + sha256 = "10am0w1q60whmrzrm3hmyxgmg4i1b6m45syy3qhvr8xx0af3p9wi"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "1fr9hm4pkrhhgw6i9ay0mrnf17p5q8sj2bjf1v3lqgchfw8z6sga"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.32.0-linux-arm64.tar.gz"; - sha256 = "07qzrx6lnca2fpfk9ld6czaz2qyrzli2dzqa0hkf56mir49rjkj2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.35.0-linux-arm64.tar.gz"; + sha256 = "0w3sspn64q5h056d7ql12w4q6lnvpdfla2llac4bv7rx1sd3hh3v"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-linux-arm64.tar.gz"; @@ -405,12 +405,12 @@ sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.19.2-linux-arm64.tar.gz"; - sha256 = "1x4jxlhgfxr8fl4zfpz0d6c4pbawx7q6y6igzkk3jj2nwfnawmjl"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-linux-arm64.tar.gz"; + sha256 = "1m18aypypjsyr18igj2kmzh1dw86hxph32agk7k0zjfj921anqmx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.15.0-linux-arm64.tar.gz"; - sha256 = "00mla8clf53jwdivd0magmzc0psm6ac3xps7xbx979aqd7lgxzv6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.16.0-linux-arm64.tar.gz"; + sha256 = "1rf6l9wzynn25nds0m7wyzzdd34yg81vf79269j268wkpif7xpmg"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-linux-arm64.tar.gz"; @@ -425,8 +425,8 @@ sha256 = "0krvvhm842lkxa14xfpkk2b1namgxnk3y6n5lcvhsnswga10r2xq"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.0-linux-arm64.tar.gz"; - sha256 = "1mvx5hq5s4s6hvcjfk4ficdacz5ivrczr10d182n7hzai8nmq3c3"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.1-linux-arm64.tar.gz"; + sha256 = "0fwmrxrap9wrihy4d2a85avmgzfmn0xm49b30da2x8cibsdl4g0b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-linux-arm64.tar.gz"; @@ -437,28 +437,28 @@ sha256 = "064x91jvbqj142rkyphvwwds71i347nifv5akak35lf0ha4v57hw"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.56.0-linux-arm64.tar.gz"; - sha256 = "0g7hm3s6mm17y417il6pm78d6aq02bb13sq00cp4ard9sd3qvzwa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.1-linux-arm64.tar.gz"; + sha256 = "1k61nqg0cgy5bdj8fkzf17azx4wskalf6spmfs46swdbrgq5ra2l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.83.1-linux-arm64.tar.gz"; - sha256 = "0b79daawccp4s1nrv4x5blnl5d8gfyia1jmsm1v2xczwcrp8qjvc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.86.0-linux-arm64.tar.gz"; + sha256 = "0h6cyklya3dpfbkg6n4fm5cxmmdgy1fcq45jriwqyx9isy62wq9p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.1-linux-arm64.tar.gz"; - sha256 = "1rjjr3xxmms646navaiijcx70jv36mngxp9hkiab16avxs96vgd0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.2-linux-arm64.tar.gz"; + sha256 = "19mrlxyl63m9c7albhszd9ikklm29k8s465cp0bzkrwawy6nn3yy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.1-linux-arm64.tar.gz"; - sha256 = "0jxrhwv8ailnakxqa8lcbds02r5m33xvn4n1xrrsq2xj15vbyzlz"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-linux-arm64.tar.gz"; + sha256 = "08f5yqxf0vgidcmwrzq8scdbd2h4wdz226l87h8rxpzssj56lpls"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-linux-arm64.tar.gz"; sha256 = "1868473rk41dhl2gxabg6bin8m9c1lzs52wmcbpjrn91wb8pyz7v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.2.0-linux-arm64.tar.gz"; - sha256 = "0w9nqw99k0vril5rm2bsgny8vrmw84d8qlb2lvxp6qbn0hvaim6v"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-linux-arm64.tar.gz"; + sha256 = "16j5vimwjksnjwfmgf8nkmja5g8pqi9hsw0mr8xndl61hsrawirn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-linux-arm64.tar.gz"; @@ -479,12 +479,12 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.127.0-darwin-arm64.tar.gz"; - sha256 = "06sfzk8hm2lgfaj2k0br9w1z6yfa7pfxqvh4wp0c2gxq5vykjw2m"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.128.0-darwin-arm64.tar.gz"; + sha256 = "06kw0bh50q16bqdv16xrsl6iqa9nd3kc431n4k3j536m3f83v9ng"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.20.0-darwin-arm64.tar.gz"; - sha256 = "097wrym5h2x3bak28sflpslvfmzh2sw05hgaj3wslcmvvc0h1s5r"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.21.0-darwin-arm64.tar.gz"; + sha256 = "1yrccl7z5mbjnxxvvmcjsq4jwvm9ppch2wdybgrapkk7n1liwbd3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.3.0-darwin-arm64.tar.gz"; @@ -495,20 +495,16 @@ sha256 = "1gpaz8nrx85mrhp03nn3m44q7ksg4irszzj62yyhckdj1jpfkahz"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.2.1-darwin-arm64.tar.gz"; - sha256 = "17mh63n9w45y320fjcafvcdic52zfmnvkd2fq193ppfx930lz1zc"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.5.1-darwin-arm64.tar.gz"; + sha256 = "1wrd06bxwn2y7v9m608dvi53ynsg87c6kv9mv9gafbcxfkjgf8ga"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.5.0-darwin-arm64.tar.gz"; sha256 = "1mmrvn31njs2sr9h6cj7m1ph2gh465qqx0pigvbidjfhl9ag2hrx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.46.0-darwin-arm64.tar.gz"; - sha256 = "1rkavb9la0dmbd49hzwbg8sv5py1h3n88v4sf7y2fjb877xaq1ni"; - } - { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.85.0-darwin-arm64.tar.gz"; - sha256 = "0aml7p89i5dgynfxzzrp2p1acp9s222y6s65s6vxdy2llq8izccd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.48.0-darwin-arm64.tar.gz"; + sha256 = "08a5xsmq38dpy1hashzacwhchjj1mvj3ql0mbya5kz8s530iz24x"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-arm64.tar.gz"; @@ -519,20 +515,24 @@ sha256 = "04wibkfpq76qhyy8kf0y89qkssapwgmkv56bspdxpydlnnwvn714"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.35.0-darwin-arm64.tar.gz"; - sha256 = "10vr6vr9dna44g6qsrk5dkc7g03qq7v91x4js8hz20aql7qp68p7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.86.0-darwin-arm64.tar.gz"; + sha256 = "1idnrj0lyc3y466x6lz98h3v9sp4asn6cln390snywxwiam6dx9k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.4-darwin-arm64.tar.gz"; - sha256 = "1w04f1w8f1ir1jfbkn6rmrpjj49k6ddw2nfx2617q2icmvaj3q7p"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.36.0-darwin-arm64.tar.gz"; + sha256 = "12y6vyz8zfxhn71agzw90mhhn4czyh0xdljpxhsl6yzai3l176jb"; + } + { + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.12.0-darwin-arm64.tar.gz"; + sha256 = "1m8jjiq1yfiw06dgji3rw90rmzcwn2j2lrj17vilqxim708vg5fn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.31.0-darwin-arm64.tar.gz"; sha256 = "0x9fvwwx4hd7a3n0nmjnri2r5pdf72chkczdjx3n04rf7lrzbhz4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.2-darwin-arm64.tar.gz"; - sha256 = "0gi776zhi37nrj37aalz5qmkyf2wihgq4jhm7h6qr5vgr7chld34"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.0-darwin-arm64.tar.gz"; + sha256 = "1r9pnxwv0dp7ahw1gk7c89j9wqcfp0rpam3qwxq4x3xc5x1b8cg9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "0sd24dkf2bbz113vl59yc4ka5kxjdgsz0z6a84nnfa66llgr81b7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.32.0-darwin-arm64.tar.gz"; - sha256 = "0ivyd5rhsp6mad1z3zxs8y60lfdf7qvqggjlcckn0izhxw69kfzd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.35.0-darwin-arm64.tar.gz"; + sha256 = "1yc35zjzr9ry1jy9avb8d1sliq4iyy59v2jsx4bdixwk9ih3ddpm"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.3-darwin-arm64.tar.gz"; @@ -563,12 +563,12 @@ sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.19.2-darwin-arm64.tar.gz"; - sha256 = "0qpyl38na36gahddblqx602vnhnjcwqxdp2iy38k5d5mlqihg1zn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.20.0-darwin-arm64.tar.gz"; + sha256 = "19nr55glr64lvxf233c2z8j5g13b7r2zxqwsri9vgj3kg52rjsbi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.15.0-darwin-arm64.tar.gz"; - sha256 = "0qa07scjj7mjwqjmv260ansiy8qk3ch9bf50p33ig86599r4indp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.16.0-darwin-arm64.tar.gz"; + sha256 = "0rp7wqz1fydj53jcnsqw2pgs015hmp7am2mps6y03yrh8zy17rnb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.24.0-darwin-arm64.tar.gz"; @@ -583,8 +583,8 @@ sha256 = "0girslx186bif03hxkpsgs21g88sy2r1py05b2kqb67izcbh996v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.0-darwin-arm64.tar.gz"; - sha256 = "007v4jacfg1i0skarsab918i8qwipgvklrsa6fqv4gwqjcz6y2lr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v4.1.1-darwin-arm64.tar.gz"; + sha256 = "1whav393yg0w3vxnf835ryp3ah9aqya092w8kw18rgd7miqf6m5m"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v3.11.3-darwin-arm64.tar.gz"; @@ -595,28 +595,28 @@ sha256 = "15l2609g7z2xxsblakwq3d3lyg32swb4lmfsrn7m0cwa2a2s2v1x"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.56.0-darwin-arm64.tar.gz"; - sha256 = "0c4p9gv7a740432190mi6z1471irrfl51rmmbsrdf05dj7brn3zx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v0.57.1-darwin-arm64.tar.gz"; + sha256 = "0bfxi4c9bv3bwd0x9gv25pcspcvw8cqpgkfbrjnq49mcmys1wz24"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.83.1-darwin-arm64.tar.gz"; - sha256 = "08j3irvd034fkpaym6iv67a8ipys6py5hzj3sl6hj3i7894ddv9f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.86.0-darwin-arm64.tar.gz"; + sha256 = "1dfffxx0wrrhrh8h29ffcijp5v55i85x1608l3g12a4dac5p2r3k"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.1-darwin-arm64.tar.gz"; - sha256 = "1x9vc999rm8sb14294003ak64cim939k2p2lrng2yjib8h553w9y"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v0.23.2-darwin-arm64.tar.gz"; + sha256 = "1jrccj0fkzqb88spl2v97sc2d7nwmkbi0f093f999av504qg0gg4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.1-darwin-arm64.tar.gz"; - sha256 = "01imbxv3l7f0kybykkcdnbvhaypnqalm1n6gzkz6badhazgl9552"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-darwin-arm64.tar.gz"; + sha256 = "0d7jyzf66hxg13zkg9c4g63328vazlp9g7z9djqx44zmpxm6yh2b"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.4-darwin-arm64.tar.gz"; sha256 = "1az0h9xq7py2cn9qwnhndacla8bfayznv2zbghqqy5wnc3rwbdr7"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.2.0-darwin-arm64.tar.gz"; - sha256 = "0ssnhzgddg30rgyrqrcp0xmxmik16blk2a06mgcy0q5llara69f2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v6.3.0-darwin-arm64.tar.gz"; + sha256 = "15djjgjf117hswmg8pg53xp8ck8wp2lls6vnfj6ppdx5c6mpj0gh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.0-darwin-arm64.tar.gz"; From 84fc8e02b4caf7efd5d2752a5eb8b1426a8de919 Mon Sep 17 00:00:00 2001 From: natsukium Date: Mon, 12 Aug 2024 17:17:50 +0900 Subject: [PATCH 32/72] python312Packages.numpy-groupies: remove broken updateScript The python package has an updateScript by default, and in most simple cases, we don't need to add it. --- pkgs/development/python-modules/numpy-groupies/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/development/python-modules/numpy-groupies/default.nix b/pkgs/development/python-modules/numpy-groupies/default.nix index e09ce3abb7ba..73d56a69305b 100644 --- a/pkgs/development/python-modules/numpy-groupies/default.nix +++ b/pkgs/development/python-modules/numpy-groupies/default.nix @@ -8,7 +8,6 @@ numpy, numba, pandas, - gitUpdater, }: buildPythonPackage rec { @@ -38,8 +37,6 @@ buildPythonPackage rec { pythonImportsCheck = [ "numpy_groupies" ]; - passthru.updateScript = gitUpdater { tagPrefix = "v"; }; - meta = with lib; { homepage = "https://github.com/ml31415/numpy-groupies"; changelog = "https://github.com/ml31415/numpy-groupies/releases/tag/v${version}"; From d53414a54ecb4d271f4681a4c3fe49b031a64858 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 09:13:56 +0000 Subject: [PATCH 33/72] git-machete: 3.26.3 -> 3.27.0 --- pkgs/applications/version-management/git-machete/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-machete/default.nix b/pkgs/applications/version-management/git-machete/default.nix index 2eb80fa6b615..93607cdfd977 100644 --- a/pkgs/applications/version-management/git-machete/default.nix +++ b/pkgs/applications/version-management/git-machete/default.nix @@ -10,13 +10,13 @@ buildPythonApplication rec { pname = "git-machete"; - version = "3.26.3"; + version = "3.27.0"; src = fetchFromGitHub { owner = "virtuslab"; repo = pname; rev = "v${version}"; - hash = "sha256-UCaJiYLYeHI4R8IJfhgmT4Ji++CtQgvIJrKH1EXl83o="; + hash = "sha256-37SZhuMrGjRQOzjnAegL6babhcIjAwh9wtAb7RB09dM="; }; nativeBuildInputs = [ installShellFiles ]; From ba7332a9787a718cc4f1a4ef1fdd017e5ea68fd3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 09:37:10 +0000 Subject: [PATCH 34/72] minijinja: 2.1.1 -> 2.1.2 --- pkgs/by-name/mi/minijinja/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 9d5f9cab4704..635d593f2851 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "minijinja"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = version; - hash = "sha256-21PPIh4xu5EFXdtvmmvoSRPdYiSEwswkACNys32kjXY="; + hash = "sha256-BB8uM0yU8M5Crh5hLucJkhvjLC1Vlk5bGKmeO1rCy+Y="; }; - cargoHash = "sha256-lPHM/pEXt4VLTTRxVxQTt/IAKhOxmzYkq71x10LFZ0w="; + cargoHash = "sha256-bn7qJZE68UJPNaARQRXy6GPkplv0KAkKByy85ooi5kg="; # The tests relies on the presence of network connection doCheck = false; From 9115c6a588a588e7dbbb8bc381a0a5a1770fe897 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 10:16:02 +0000 Subject: [PATCH 35/72] ddns-updater: 2.7.0 -> 2.6.1 --- pkgs/by-name/dd/ddns-updater/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dd/ddns-updater/package.nix b/pkgs/by-name/dd/ddns-updater/package.nix index 8ceaeecd14de..5f78205cf534 100644 --- a/pkgs/by-name/dd/ddns-updater/package.nix +++ b/pkgs/by-name/dd/ddns-updater/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "ddns-updater"; - version = "2.7.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "qdm12"; repo = "ddns-updater"; rev = "v${version}"; - hash = "sha256-U8Vw7dsj/efqvpooT3QQjNp41AuGYJ/Gz/pA8Em3diE="; + hash = "sha256-wS2RP9UkKfYrE9HK1R1QfEkmseZC8vkjfcPeiCuw84M="; }; - vendorHash = "sha256-M9Al3zl2Ltv4yWdyRB3+9zpTr3foliu5WweImHltz3M="; + vendorHash = "sha256-Ibrv0m3Tz/5JbkHYmiJ9Ijo37fjHc7TP100K7ZTwO8I="; ldflags = [ "-s" From d1eeae336379e5154c8889c2d58dbaa71ef9bf20 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 10:16:33 +0000 Subject: [PATCH 36/72] sqldef: 0.17.16 -> 0.17.17 --- pkgs/development/tools/sqldef/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sqldef/default.nix b/pkgs/development/tools/sqldef/default.nix index 7384350b6af2..4c5c4e6c230b 100644 --- a/pkgs/development/tools/sqldef/default.nix +++ b/pkgs/development/tools/sqldef/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "sqldef"; - version = "0.17.16"; + version = "0.17.17"; src = fetchFromGitHub { owner = "k0kubun"; repo = "sqldef"; rev = "v${version}"; - hash = "sha256-LnkaHVkh/yoONtYEZ7z4QM6NRKuGjTUwT0GFy20neNQ="; + hash = "sha256-J3qFafiMVjnJUa9bsYOxBqe3Hrsc/XDUI4p/GGO9Kmg="; }; proxyVendor = true; From fe6bc59a67f4fefedba57aa7dd58fbf24ee0fa52 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 10:31:21 +0000 Subject: [PATCH 37/72] gopass-summon-provider: 1.15.13 -> 1.15.14 --- pkgs/tools/security/gopass/summon.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix index ddb93ef9fe37..f36db1e9791d 100644 --- a/pkgs/tools/security/gopass/summon.nix +++ b/pkgs/tools/security/gopass/summon.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gopass-summon-provider"; - version = "1.15.13"; + version = "1.15.14"; src = fetchFromGitHub { owner = "gopasspw"; repo = "gopass-summon-provider"; rev = "v${version}"; - hash = "sha256-cYr9yk5AyTxEo+bO6TgBBZRDWsTR+lvGcCr4kF1aMik="; + hash = "sha256-L/wX3qUrx6YfA6flCJ32WyEiBV0dSwAGdWQCU++/Iz8="; }; - vendorHash = "sha256-s1Zouw1619DbGjnZY26N6En91lzDaeDRZmul/te2z7M="; + vendorHash = "sha256-ZNHAjFzMMxodxb/AGVq8q+sP36qR5+8eaKdmmjIaMjs="; subPackages = [ "." ]; From 60f6403102b65d063929c9c5fe2898aff1ee6e3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 10:39:05 +0000 Subject: [PATCH 38/72] python312Packages.fastcore: 1.6.3 -> 1.6.7 --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index b3082c4d28a2..d124bae7d33f 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.6.3"; + version = "1.6.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "fastai"; repo = "fastcore"; rev = "refs/tags/${version}"; - hash = "sha256-WCPO/JLc39EoUyaRNUgaJZvPlyt8WogRct73aOzhyH8="; + hash = "sha256-f31aQKYM1qawGrNtUZH3K+Zq9JerKNm+fEJ938bhHKc="; }; build-system = [ setuptools ]; From 02726a69c9f3fb9c85d9a994cd2875b98ac1b286 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 12:11:54 +0000 Subject: [PATCH 39/72] emacsPackages.consult-gh: 1.0-unstable-2024-08-02 -> 1.0-unstable-2024-08-11 --- .../elisp-packages/manual-packages/consult-gh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix index 03adc5fd1f78..7b6c33915d7c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix @@ -12,13 +12,13 @@ melpaBuild { pname = "consult-gh"; - version = "1.0-unstable-2024-08-02"; + version = "1.0-unstable-2024-08-11"; src = fetchFromGitHub { owner = "armindarvish"; repo = "consult-gh"; - rev = "e12b24e68116ac6c171d628c547c017458d6aa2b"; - hash = "sha256-skZkpYUWncGUf9k0IfEq3LAqDXHIfCJJ3p3b3ey+Rks="; + rev = "640d4b9c71aa6dfff4f29c0207cc02316f1d61c8"; + hash = "sha256-hFHex4cUAP1U5aK1bfa+va1jiWS8tRqtnMGxr17NWio="; }; packageRequires = [ From 43b49c7638201b37cc18358e1698ad49a1fa410b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 12:59:51 +0000 Subject: [PATCH 40/72] cargo-about: 0.6.2 -> 0.6.3 --- pkgs/development/tools/rust/cargo-about/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix index 67a7220031a6..512f176e5686 100644 --- a/pkgs/development/tools/rust/cargo-about/default.nix +++ b/pkgs/development/tools/rust/cargo-about/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-about"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-about"; rev = version; - sha256 = "sha256-W2qE4QqwVgC/J6NQkUcC501Dcc1qHnAhTIDvlr2El2k="; + sha256 = "sha256-J86tX/g3FW7fM24WVTZ8Afwu9hzXrac3qgYPcvUo8z4="; }; - cargoHash = "sha256-9Cw9FKbpGNsoWTqJtsm+dplvvPkZghj2uQ1M/WMw/LM="; + cargoHash = "sha256-Uyki5iDv5eKKcGZOZQwpNYe6jELg3zUNY5LzFKUfzXY="; nativeBuildInputs = [ pkg-config ]; From 308c58a5607d0c2ec1d20b90f80a3ddc27bcdc47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 13:28:18 +0000 Subject: [PATCH 41/72] iir1: 1.9.4 -> 1.9.5 --- pkgs/by-name/ii/iir1/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ii/iir1/package.nix b/pkgs/by-name/ii/iir1/package.nix index 88e317e436dd..3b9b37eb344b 100644 --- a/pkgs/by-name/ii/iir1/package.nix +++ b/pkgs/by-name/ii/iir1/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "iir1"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "berndporr"; repo = "iir1"; rev = finalAttrs.version; - hash = "sha256-T8gl51IkZIGq+6D5ge4Kb3wm5aw7Rhphmnf6TTGwHbs="; + hash = "sha256-8u+V3+p/nVfl1Izht27OE6D1kkA6all6aUEL9APwXmk="; }; nativeBuildInputs = [ cmake ]; From 2b91e637535bdebaa689e78d2f4e919d1da3cc84 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 13:32:24 +0000 Subject: [PATCH 42/72] git-credential-keepassxc: 0.14.0 -> 0.14.1 --- .../version-management/git-credential-keepassxc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-credential-keepassxc/default.nix b/pkgs/applications/version-management/git-credential-keepassxc/default.nix index 2d3e511fcbfd..5f4f7c6daf71 100644 --- a/pkgs/applications/version-management/git-credential-keepassxc/default.nix +++ b/pkgs/applications/version-management/git-credential-keepassxc/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "git-credential-keepassxc"; - version = "0.14.0"; + version = "0.14.1"; src = fetchFromGitHub { owner = "Frederick888"; repo = "git-credential-keepassxc"; rev = "v${version}"; - hash = "sha256-AvnnzLiDQEdfAHPns8ufhdiPPn9d23AnI8Aq2DQS+To="; + hash = "sha256-qxNzWuuIoK9BJLVcWtrER+MyA5cyd03xAwGljh8DZC4="; }; - cargoHash = "sha256-c2YucWs0UzyWDKWS5KebT3ps+XvWzlI0+ziJ8JX6oiQ="; + cargoHash = "sha256-jBUp0jes4wtr8cmqceEBb6noqGkJUHbIfYgWOw5KMF4="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation ]; From b1051a8e7b52ef555da30ed7db679c59b4f74943 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 14:26:42 +0000 Subject: [PATCH 43/72] python312Packages.cyclopts: 2.9.4 -> 2.9.5 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index 665ac9260888..833608c353eb 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "2.9.4"; + version = "2.9.5"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; rev = "refs/tags/v${version}"; - hash = "sha256-s+MHy5L6Lof2Hd5gsEbKP5bmwMdbZCgHjOzR81lCoHk="; + hash = "sha256-KZGsYaEcOs8NoUCRG4MqW9wqrqDJ1Ygv6U7QfyGqNhQ="; }; build-system = [ From c76220c6740a5c4d70cf7e0d7fb2c97282274feb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 14:27:49 +0000 Subject: [PATCH 44/72] python312Packages.django-cachalot: 2.6.2 -> 2.6.3 --- pkgs/development/python-modules/django-cachalot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-cachalot/default.nix b/pkgs/development/python-modules/django-cachalot/default.nix index 9632291b2a10..95772d937b6c 100644 --- a/pkgs/development/python-modules/django-cachalot/default.nix +++ b/pkgs/development/python-modules/django-cachalot/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "django-cachalot"; - version = "2.6.2"; + version = "2.6.3"; format = "setuptools"; src = fetchFromGitHub { owner = "noripyt"; repo = "django-cachalot"; rev = "refs/tags/v${version}"; - hash = "sha256-8sC0uvfnGh3rp6C9/GsEevVDxAiI6MafIBfUuvnPeas="; + hash = "sha256-q4w2goxdDqivGVZCRDGOvYARbzmx6P8Gnw9YlYn9Few="; }; patches = [ From 7408c9f9e6f854f29a67a68d571fabef493756d7 Mon Sep 17 00:00:00 2001 From: eljamm Date: Mon, 12 Aug 2024 15:35:25 +0100 Subject: [PATCH 45/72] pavucontrol-qt: format with nixfmt --- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index ace3003e7b66..9a488258ed66 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -1,15 +1,16 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, libpulseaudio -, lxqt-build-tools -, pkg-config -, qtbase -, qttools -, qtwayland -, wrapQtAppsHook -, gitUpdater +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + libpulseaudio, + lxqt-build-tools, + pkg-config, + qtbase, + qttools, + qtwayland, + wrapQtAppsHook, + gitUpdater, }: stdenv.mkDerivation rec { From 78e8739f0947338c7f583a9e002c278d1523779a Mon Sep 17 00:00:00 2001 From: eljamm Date: Mon, 12 Aug 2024 15:36:32 +0100 Subject: [PATCH 46/72] pavucontrol-qt: remove `with lib;` from meta --- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index 9a488258ed66..bffef9975fc6 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -40,12 +40,12 @@ stdenv.mkDerivation rec { passthru.updateScript = gitUpdater { }; - meta = with lib; { + meta = { homepage = "https://github.com/lxqt/pavucontrol-qt"; description = "Pulseaudio mixer in Qt (port of pavucontrol)"; mainProgram = "pavucontrol-qt"; - license = licenses.gpl2Plus; - platforms = with platforms; linux; - maintainers = teams.lxqt.members; + license = lib.licenses.gpl2Plus; + platforms = with lib.platforms; linux; + maintainers = lib.teams.lxqt.members; }; } From a8adee37edfe1e79b3f5ca5468a9e2687a2a50ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 14:36:40 +0000 Subject: [PATCH 47/72] python312Packages.influxdb3-python: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/influxdb3-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb3-python/default.nix b/pkgs/development/python-modules/influxdb3-python/default.nix index 8fc53603db00..e54b39c03846 100644 --- a/pkgs/development/python-modules/influxdb3-python/default.nix +++ b/pkgs/development/python-modules/influxdb3-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "influxdb3-python"; - version = "0.7.0"; + version = "0.8.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "InfluxCommunity"; repo = "influxdb3-python"; rev = "refs/tags/v${version}"; - hash = "sha256-jncJUurkH1XzC6Hjcpet1fZejcYjcPq2OWI//FmZcmI="; + hash = "sha256-Knub5rZ27OXsiJanA+sI85DaUIskiGcuedKk1wF5zss="; }; build-system = [ setuptools ]; From bee9f561686ecd915d1d32e6e863a384f1770b98 Mon Sep 17 00:00:00 2001 From: eljamm Date: Mon, 12 Aug 2024 15:38:40 +0100 Subject: [PATCH 48/72] pavucontrol-qt: add missing `qtsvg` dependency For qt6, `qtsvg` needs to be explicitly installed for the icons to work properly. --- pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix index bffef9975fc6..208d741a9a61 100644 --- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix +++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix @@ -7,6 +7,7 @@ lxqt-build-tools, pkg-config, qtbase, + qtsvg, qttools, qtwayland, wrapQtAppsHook, @@ -35,6 +36,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpulseaudio qtbase + qtsvg qtwayland ]; From b07a15d778add0734c40a8bf69e445c502e92804 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 14:39:53 +0000 Subject: [PATCH 49/72] python312Packages.influxdb-client: 1.44.0 -> 1.45.0 --- pkgs/development/python-modules/influxdb-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix index 7fe84b567d36..21792943efac 100644 --- a/pkgs/development/python-modules/influxdb-client/default.nix +++ b/pkgs/development/python-modules/influxdb-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "influxdb-client"; - version = "1.44.0"; + version = "1.45.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "influxdata"; repo = "influxdb-client-python"; rev = "refs/tags/v${version}"; - hash = "sha256-iG9edGHqhExUoL+1q8s5QvY/mrYOMosgtA2P1zwO3o8="; + hash = "sha256-Mhbje/wRltU04jrDQBZVG4OuGdBn20gmBRnnPqyzjcU="; }; build-system = [ setuptools ]; From 74a3a56752ddc790e55422a177e325e0fe06e769 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 14:49:45 +0000 Subject: [PATCH 50/72] python312Packages.nebula3-python: 3.8.1 -> 3.8.2 --- pkgs/development/python-modules/nebula3-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nebula3-python/default.nix b/pkgs/development/python-modules/nebula3-python/default.nix index 6f56b321f1fc..c746e8c52180 100644 --- a/pkgs/development/python-modules/nebula3-python/default.nix +++ b/pkgs/development/python-modules/nebula3-python/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "nebula3-python"; - version = "3.8.1"; + version = "3.8.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vesoft-inc"; repo = "nebula-python"; rev = "refs/tags/v${version}"; - hash = "sha256-AcfKcrfDBY5K5xDDA7rLzKnsnhwhtpLXHkPLd0SfC4M="; + hash = "sha256-XwrrT5Vuwqw57u3Xt9nS4NjmFG2VD62gWSVfeek2478="; }; build-system = [ pdm-backend ]; From f236fa1d011bd5e298a98e41bcae0b24e1574f4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 14:59:54 +0000 Subject: [PATCH 51/72] seafile-client: 9.0.7 -> 9.0.8 --- pkgs/applications/networking/seafile-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index efe9ea9735c8..2575d3b4e480 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "seafile-client"; - version = "9.0.7"; + version = "9.0.8"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "sha256-Q/Dimm4oJH6mh0mCbVhkqJuRI9wytGmeBGNjMWiPil4="; + sha256 = "sha256-1E/PgQEg8lQntKpafCubPNUIF/L3kjA/rp1xAL8vFfs="; }; nativeBuildInputs = [ From 6256bc35a73d1d2091f91187834090746d629a54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 15:10:45 +0000 Subject: [PATCH 52/72] tlsx: 1.1.6 -> 1.1.7 --- pkgs/tools/security/tlsx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tlsx/default.nix b/pkgs/tools/security/tlsx/default.nix index 2ba9be6315b7..2a392b33a65c 100644 --- a/pkgs/tools/security/tlsx/default.nix +++ b/pkgs/tools/security/tlsx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tlsx"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "tlsx"; rev = "refs/tags/v${version}"; - hash = "sha256-FF5/STjf8joyJM6qPds1wFeRfncSamy/wWfNRZcG5kc="; + hash = "sha256-vCB1sUT5auZmIg3lHFdV905wDfay5R8v+5lEKIuVzEQ="; }; - vendorHash = "sha256-sJravmpvwOSZiVNWFUTLlTA4xk6drItDj4JzR8JNrOo="; + vendorHash = "sha256-Tgvs5BUuRTGSU05O+8SSvHvReACqIXqt9MEJWB7O8p4="; ldflags = [ "-s" From 67d7b980c66d044d520ccdcf418e636fc8568607 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 15:11:24 +0000 Subject: [PATCH 53/72] transifex-cli: 1.6.14 -> 1.6.15 --- pkgs/applications/misc/transifex-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/transifex-cli/default.nix b/pkgs/applications/misc/transifex-cli/default.nix index 1be49361f5b5..3f517699376e 100644 --- a/pkgs/applications/misc/transifex-cli/default.nix +++ b/pkgs/applications/misc/transifex-cli/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "transifex-cli"; - version = "1.6.14"; + version = "1.6.15"; src = fetchFromGitHub { owner = "transifex"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-yKkRoeq0hPYMjZcoL9h3l8FimnCjjVSlk9whliEnkzE="; + sha256 = "sha256-NW3vPjXfusBQKDbH8DnU/LMyOP2qkzArD7RYjJ1IQvM="; }; - vendorHash = "sha256-rcimaHr3fFeHSjZXw1w23cKISCT+9t8SgtPnY/uYGAU="; + vendorHash = "sha256-3gi2ysIb5256CdmtX38oIfeDwNCQojK+YB9aEm8H01Q="; ldflags = [ "-s" "-w" "-X 'github.com/transifex/cli/internal/txlib.Version=${version}'" From 96a8c02aaa1decbcce269265cc892d872c40ee1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 15:29:00 +0000 Subject: [PATCH 54/72] trayscale: 0.13.0 -> 0.13.1 --- pkgs/applications/networking/trayscale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index e302fd7ddb5f..7e8648c3bb0e 100644 --- a/pkgs/applications/networking/trayscale/default.nix +++ b/pkgs/applications/networking/trayscale/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "trayscale"; - version = "0.13.0"; + version = "0.13.1"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-uaHForU+0dAkLPczHr6ZBpNZ6iirvsje+6i8rHrNXdQ="; + hash = "sha256-uOPTF6AD70POD1y0R5aXo7t9WtyFGbRrgL8U++nTRl0="; }; - vendorHash = "sha256-RvGKPIXdkeTdpFraxie76xrtfqRsIpzpBricEQZNFYc="; + vendorHash = "sha256-8lrszfxTKLA3KRuuQ312s+1GfK63DwQEK8xDwb1JdrI="; subPackages = [ "cmd/trayscale" ]; From 6569c9dd6b2b331812fbd4b64d1a8378f4e2d8b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 16:16:09 +0000 Subject: [PATCH 55/72] flyctl: 0.2.104 -> 0.2.109 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index 2b9e137ad6e1..536bf6542faf 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.2.104"; + version = "0.2.109"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-WMWOXgFsUOdN2MivOlfrN2X9RRiTp3iXv2D3hKGenWM="; + hash = "sha256-5+WOc/mVFSO20E6ENFzMSSLYioMkCV8mKIVAVpdFWzU="; }; - vendorHash = "sha256-Q9GQyIEdTp0ua7pa8sQth61lM149th96sFQesYHPvtI="; + vendorHash = "sha256-XXyDHyH1XSh0gJedaQB4HKexz4DMz6rcBlrYoWSKacg="; subPackages = [ "." ]; From 885fb8e2371f9fb34fa21cd09cbefe34611526de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 16:37:00 +0000 Subject: [PATCH 56/72] fend: 1.5.0 -> 1.5.1 --- pkgs/tools/misc/fend/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/fend/default.nix b/pkgs/tools/misc/fend/default.nix index 4d6da1d3694d..46639ea92bbb 100644 --- a/pkgs/tools/misc/fend/default.nix +++ b/pkgs/tools/misc/fend/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "printfn"; repo = "fend"; rev = "v${version}"; - hash = "sha256-owWBbeZtkjLiMYnXB5d4PfFX4i5BWo0OOnWd3C02VLE="; + hash = "sha256-lfn9RKN2TiHEroDaKJTeQ7wLU2tjoUTyD5Ar5QTNOlY="; }; - cargoHash = "sha256-pxy6TPDvAnbXJ6QMxWUCwVeWVzKmvwYxysJWhZpeVvI="; + cargoHash = "sha256-zmqkGmN0fEYW+6U6cUQK27/OSV4JZW1EQiRswvBnA3M="; nativeBuildInputs = [ pandoc installShellFiles pkg-config copyDesktopItems ]; buildInputs = [ pkg-config openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; From 9d09888fab248e71ce6e86bf2257306e612c06a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 16:59:40 +0000 Subject: [PATCH 57/72] godns: 3.1.7 -> 3.1.8 --- pkgs/by-name/go/godns/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/go/godns/package.nix b/pkgs/by-name/go/godns/package.nix index 4f4a48c257b5..164c90f05fc4 100644 --- a/pkgs/by-name/go/godns/package.nix +++ b/pkgs/by-name/go/godns/package.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "godns"; - version = "3.1.7"; + version = "3.1.8"; src = fetchFromGitHub { owner = "TimothyYe"; repo = "godns"; rev = "refs/tags/v${version}"; - hash = "sha256-aTCYnjv9DTlCohdESGAjMz7JQG0BsLTNMiknyB6Ut50="; + hash = "sha256-a8qa8dlFn0+mE2SeDJPZ0OI4EkA/GGFYxkNQE5yKjvM="; }; - vendorHash = "sha256-E15h5p4ppRb91EUoz5dyWNFl745rt419NMCSurMLxis="; + vendorHash = "sha256-ui7GiLR5um8TGrVS+MCXzop1tkeysxBYFrD2Fh0tnBI="; npmDeps = fetchNpmDeps { src = "${src}/web"; - hash = "sha256-gnAUI3lLDhjZ+nLap41COq765ymR6a8FgVY/aqqidTQ="; + hash = "sha256-oPE69+R66r1LpryAu3ImKKRVDrzXAiDpeCwdQKRmVj0="; }; npmRoot = "web"; From 72df0bb84486151896a4b00f1e181a97c466d83d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Aug 2024 17:14:03 +0000 Subject: [PATCH 58/72] bruno: 1.23.1 -> 1.24.0 --- pkgs/by-name/br/bruno/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index bf59bf348ca8..3a62debde824 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -26,20 +26,20 @@ let in buildNpmPackage' rec { pname = "bruno"; - version = "1.23.1"; + version = "1.24.0"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; rev = "v${version}"; - hash = "sha256-uQe+j7EH62SH64z9mTpsR/tiYm4vSMDbAkYRhfkjf68="; + hash = "sha256-+rnZid+2E3xP6GTHKXki+MeRuoU8gAB34/MVyKu9oEQ="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json ''; }; - npmDepsHash = "sha256-157hm7h5FWuOuxoo6WTtlMPq5LcRZIsSt5NDg0pvim8="; + npmDepsHash = "sha256-/1/QPKjSgJJDtmUipgbiVR+Buea9cXO+HvICfKVX/2g="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = From db08064d3b861a4fdf1938c7c3fb0f94c23be42b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 Aug 2024 20:05:12 +0200 Subject: [PATCH 59/72] dnstwist: 20240116 -> 20240812 Diff: https://github.com/elceef/dnstwist/compare/refs/tags/20240116...20240812 Changelog: https://github.com/elceef/dnstwist/releases/tag/20240812 --- pkgs/tools/networking/dnstwist/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/dnstwist/default.nix b/pkgs/tools/networking/dnstwist/default.nix index 9165c550eaec..51f6f5287fcc 100644 --- a/pkgs/tools/networking/dnstwist/default.nix +++ b/pkgs/tools/networking/dnstwist/default.nix @@ -5,21 +5,21 @@ python3.pkgs.buildPythonApplication rec { pname = "dnstwist"; - version = "20240116"; + version = "20240812"; pyproject = true; src = fetchFromGitHub { owner = "elceef"; repo = "dnstwist"; rev = "refs/tags/${version}"; - hash = "sha256-areFRDi728SedArhUy/rbPzhoFabNoT/WdyyN+6OQK0="; + hash = "sha256-J6MfPKj7iACsiiSUU/2gxQdwtmqw9NKnjDoSdhxKoAw="; }; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3.pkgs; [ setuptools ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3.pkgs; [ dnspython geoip ppdeep @@ -37,10 +37,10 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Domain name permutation engine for detecting homograph phishing attacks"; - mainProgram = "dnstwist"; homepage = "https://github.com/elceef/dnstwist"; changelog = "https://github.com/elceef/dnstwist/releases/tag/${version}"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ fab ]; + mainProgram = "dnstwist"; }; } From b55e87e603de31f60658b75fafb0ac230c4b4468 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 12 Aug 2024 19:26:52 +0100 Subject: [PATCH 60/72] homepage-dashboard: 0.9.5 -> 0.9.6 --- pkgs/servers/homepage-dashboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index c3bf5d6191fc..fd4baa56a339 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -27,16 +27,16 @@ let in buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-j5DGi5bLoUOoeu8RupiN+qeixNcpPAu3XG4PidZ5Bsg="; + hash = "sha256-jUKXAqq6Oj8CmOuBUlsf0zDIcK+3MX/czzNDmakN9VM="; }; - npmDepsHash = "sha256-jYZUVwrOxoAbfHHSBkN5IlYhC6yZVVwRoZErkbYrjUs="; + npmDepsHash = "sha256-YjcF8FkURnTurcJ0Iq0ghv/bhu5sFA860jXrn3TkRds="; preBuild = '' mkdir -p config From d93019e848da1cd37ad42a9fa99df90f8fb711c0 Mon Sep 17 00:00:00 2001 From: Jon Seager Date: Mon, 12 Aug 2024 19:27:26 +0100 Subject: [PATCH 61/72] homepage-dashboard: reformat with nixfmt-rfc-style --- pkgs/servers/homepage-dashboard/default.nix | 33 +++++++++------------ 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index fd4baa56a339..03fd2a3efe3a 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -1,14 +1,15 @@ -{ buildNpmPackage -, fetchFromGitHub -, nodePackages -, python3 -, stdenv -, cctools -, IOKit -, lib -, nixosTests -, enableLocalIcons ? false -, nix-update-script +{ + buildNpmPackage, + fetchFromGitHub, + nodePackages, + python3, + stdenv, + cctools, + IOKit, + lib, + nixosTests, + enableLocalIcons ? false, + nix-update-script, }: let dashboardIcons = fetchFromGitHub { @@ -48,15 +49,9 @@ buildNpmPackage rec { patchShebangs .next/standalone/server.js ''; - nativeBuildInputs = lib.optionals stdenv.isDarwin [ - cctools - ]; + nativeBuildInputs = lib.optionals stdenv.isDarwin [ cctools ]; - buildInputs = [ - nodePackages.node-gyp-build - ] ++ lib.optionals stdenv.isDarwin [ - IOKit - ]; + buildInputs = [ nodePackages.node-gyp-build ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; env.PYTHON = "${python3}/bin/python"; From 96f040ea07bee5c044cf243d0162bf4d37a434b2 Mon Sep 17 00:00:00 2001 From: Jean-Francois Chevrette Date: Mon, 12 Aug 2024 11:05:18 -0400 Subject: [PATCH 62/72] rosa: 1.2.39 -> 1.2.43 --- pkgs/by-name/ro/rosa/package.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix index 25ac1e682584..5660350587df 100644 --- a/pkgs/by-name/ro/rosa/package.nix +++ b/pkgs/by-name/ro/rosa/package.nix @@ -1,17 +1,26 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, rosa, nix-update-script }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles, testers, rosa, nix-update-script }: buildGoModule rec { pname = "rosa"; - version = "1.2.39"; + version = "1.2.43"; src = fetchFromGitHub { owner = "openshift"; repo = "rosa"; rev = "v${version}"; - hash = "sha256-K1FGiUNXSyCTmF//dculpnkTyn3hfqWrOiMUGk9kHrA="; + hash = "sha256-1/go7mL2uRzzV/iiTXsgZHGNW8EIONwEnb4jcMiKkv4="; }; vendorHash = null; + patches = [ + # https://github.com/openshift/rosa/pull/2326/ + # TODO: remove on next version bump + (fetchpatch { + url = "https://github.com/openshift/rosa/commit/9ed236880f91f0e9514ba0a6f3be93ee115d1689.patch"; + hash = "sha256-KNGqJRFyfzcDs336Lj/KwR1yd5M7zfehu7IO0z/KUtg="; + }) + ]; + ldflags = [ "-s" "-w" ]; __darwinAllowLocalNetworking = true; From ab4905749606f729a611806cf8472f025bfae25a Mon Sep 17 00:00:00 2001 From: delliottxyz <150736012+delliottxyz@users.noreply.github.com> Date: Mon, 12 Aug 2024 21:01:04 +0200 Subject: [PATCH 63/72] Revert "ddns-updater: 2.7.0 -> 2.6.1" --- pkgs/by-name/dd/ddns-updater/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/dd/ddns-updater/package.nix b/pkgs/by-name/dd/ddns-updater/package.nix index 5f78205cf534..8ceaeecd14de 100644 --- a/pkgs/by-name/dd/ddns-updater/package.nix +++ b/pkgs/by-name/dd/ddns-updater/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "ddns-updater"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "qdm12"; repo = "ddns-updater"; rev = "v${version}"; - hash = "sha256-wS2RP9UkKfYrE9HK1R1QfEkmseZC8vkjfcPeiCuw84M="; + hash = "sha256-U8Vw7dsj/efqvpooT3QQjNp41AuGYJ/Gz/pA8Em3diE="; }; - vendorHash = "sha256-Ibrv0m3Tz/5JbkHYmiJ9Ijo37fjHc7TP100K7ZTwO8I="; + vendorHash = "sha256-M9Al3zl2Ltv4yWdyRB3+9zpTr3foliu5WweImHltz3M="; ldflags = [ "-s" From 730e3a8bbeb957f475cb498256417e23650ede46 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 12 Aug 2024 21:37:20 +0200 Subject: [PATCH 64/72] trustymail: refactor --- pkgs/tools/security/trustymail/default.nix | 44 +++++++++++----------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/security/trustymail/default.nix b/pkgs/tools/security/trustymail/default.nix index 4df51400dd8b..9935cbdb842f 100644 --- a/pkgs/tools/security/trustymail/default.nix +++ b/pkgs/tools/security/trustymail/default.nix @@ -1,48 +1,50 @@ -{ lib -, fetchFromGitHub -, python3 +{ + lib, + fetchFromGitHub, + python3, }: python3.pkgs.buildPythonApplication rec { pname = "trustymail"; version = "1.0.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "cisagov"; - repo = pname; + repo = "trustymail"; rev = "refs/tags/v${version}"; hash = "sha256-Zkw+NfeVtIArrBxR1qR9bAQe5yd7mAtNiT0x5Mqr3Ic="; }; postPatch = '' substituteInPlace pytest.ini \ - --replace " --cov" "" + --replace-fail " --cov" "" ''; - propagatedBuildInputs = with python3.pkgs; [ - dnspython - docopt - publicsuffixlist - pydns - pyspf - requests - ] ++ publicsuffixlist.optional-dependencies.update; + build-system = with python3.pkgs; [ setuptools ]; - nativeCheckInputs = with python3.pkgs; [ - pytestCheckHook - ]; + dependencies = + with python3.pkgs; + [ + dnspython + docopt + publicsuffixlist + pydns + pyspf + requests + ] + ++ publicsuffixlist.optional-dependencies.update; - pythonImportsCheck = [ - "trustymail" - ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; + + pythonImportsCheck = [ "trustymail" ]; meta = with lib; { description = "Tool to scan domains and return data based on trustworthy email best practices"; - mainProgram = "trustymail"; homepage = "https://github.com/cisagov/trustymail"; changelog = "https://github.com/cisagov/trustymail/releases/tag/v${version}"; license = with licenses; [ cc0 ]; maintainers = with maintainers; [ fab ]; + mainProgram = "trustymail"; }; } From d61c03fe460f6349e5173e007fb2b678c33bed36 Mon Sep 17 00:00:00 2001 From: Edwin Mackenzie-Owen Date: Mon, 12 Aug 2024 18:41:24 +0200 Subject: [PATCH 65/72] minetest: 5.8.0 -> 5.9.0 * remove irrlichtmt input. Minetest's irrlicht fork has been moved into the minetest repo and is now statically linked. * remove mesa from buildInputs for darwin. Otherwise startup fails with "OpenGL driver version is not 1.2 or better." and "Shaders are enabled but GLSL is not supported by the driver.". Presumably that happens because minetest tries to use an incomplete OpenGL driver from mesa instead of the drivers provided by macOS. * remove withTouchSupport arg, as the upstream CMake option has been removed. Touch support should now always be enabled. * make minetest-touch an alias for minetestclient * remove unused args --- pkgs/games/minetest/default.nix | 17 +++++------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 3 +-- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 302e989a6570..bd004bc0e8c2 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , gitUpdater , cmake -, irrlichtmt , coreutils , libpng , bzip2 @@ -15,7 +14,6 @@ , openal , libvorbis , sqlite -, lua5_1 , luajit , freetype , gettext @@ -29,37 +27,32 @@ , postgresql , hiredis , libiconv -, zlib -, libXrandr -, libX11 , ninja , prometheus-cpp -, mesa , OpenGL , OpenAL ? openal , Carbon , Cocoa -, withTouchSupport ? false +, Kernel , buildClient ? true , buildServer ? true }: stdenv.mkDerivation (finalAttrs: { pname = "minetest"; - version = "5.8.0"; + version = "5.9.0"; src = fetchFromGitHub { owner = "minetest"; repo = "minetest"; rev = finalAttrs.version; - hash = "sha256-Oct8nQORSH8PjYs+gHU9QrKObMfapjAlGvycj+AJnOs="; + hash = "sha256-cxbiuoD1J3WFoveUgxeR/XXdE7MMR0UEDFleDiaxnsA="; }; cmakeFlags = [ (lib.cmakeBool "BUILD_CLIENT" buildClient) (lib.cmakeBool "BUILD_SERVER" buildServer) (lib.cmakeBool "ENABLE_PROMETHEUS" buildServer) - (lib.cmakeBool "ENABLE_TOUCH" withTouchSupport) # Ensure we use system libraries (lib.cmakeBool "ENABLE_SYSTEM_GMP" true) (lib.cmakeBool "ENABLE_SYSTEM_JSONCPP" true) @@ -85,7 +78,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - irrlichtmt jsoncpp gettext freetype @@ -97,12 +89,12 @@ stdenv.mkDerivation (finalAttrs: { libspatialindex ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform luajit) luajit ++ lib.optionals stdenv.hostPlatform.isDarwin [ - mesa # for libiconv OpenGL OpenAL Carbon Cocoa + Kernel ] ++ lib.optionals buildClient [ libpng libjpeg @@ -112,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: { libvorbis ] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin) [ xorg.libX11 + xorg.libXi ] ++ lib.optionals buildServer [ leveldb postgresql diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 6273a3571af3..83d087c0ff59 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -947,6 +947,7 @@ mapAliases ({ miopen-hip = throw "'miopen-hip' has been replaced with 'rocmPackages.miopen-hip'"; # Added 2023-10-08 miopen-opencl = throw "'miopen-opencl' has been replaced with 'rocmPackages.miopen-opencl'"; # Added 2023-10-08 mime-types = mailcap; # Added 2022-01-21 + minetest-touch = minetestclient; # Added 2024-08-12 minetestclient_5 = minetestclient; # Added 2023-12-11 minetestserver_5 = minetestserver; # Added 2023-12-11 minizip2 = pkgs.minizip-ng; # Added 2022-12-28 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a8e717d4047..e89a26f00ac7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36046,10 +36046,9 @@ with pkgs; moon-buggy = callPackage ../games/moon-buggy { }; minetest = callPackage ../games/minetest { - inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa; + inherit (darwin.apple_sdk.frameworks) OpenGL OpenAL Carbon Cocoa Kernel; }; minetestclient = minetest.override { buildServer = false; }; - minetest-touch = minetest.override { buildServer = false; withTouchSupport = true; }; minetestserver = minetest.override { buildClient = false; }; mnemosyne = callPackage ../games/mnemosyne { From e9761ca2ae6c793ad3578444b5644bbdbcd0d607 Mon Sep 17 00:00:00 2001 From: Edwin Mackenzie-Owen Date: Mon, 12 Aug 2024 20:35:44 +0200 Subject: [PATCH 66/72] minetest: add arg for using irrlicht's SDL backend Irrlicht's SDL device (=backend) was enabled by default for the 5.9.0 pre-release, but was disabled again at the last minute before the release due to issues reported by some users. NOTE: the irrlicht device is a compile time option and cannot be switched at runtime. --- pkgs/games/minetest/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index bd004bc0e8c2..d17be89b4721 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -36,6 +36,8 @@ , Kernel , buildClient ? true , buildServer ? true +, SDL2 +, useSDL2 ? false }: stdenv.mkDerivation (finalAttrs: { @@ -53,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "BUILD_CLIENT" buildClient) (lib.cmakeBool "BUILD_SERVER" buildServer) (lib.cmakeBool "ENABLE_PROMETHEUS" buildServer) + (lib.cmakeBool "USE_SDL2" useSDL2) # Ensure we use system libraries (lib.cmakeBool "ENABLE_SYSTEM_GMP" true) (lib.cmakeBool "ENABLE_SYSTEM_JSONCPP" true) @@ -102,7 +105,9 @@ stdenv.mkDerivation (finalAttrs: { openal libogg libvorbis - ] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin) [ + ] ++ lib.optionals (buildClient && useSDL2) [ + SDL2 + ] ++ lib.optionals (buildClient && !stdenv.hostPlatform.isDarwin && !useSDL2) [ xorg.libX11 xorg.libXi ] ++ lib.optionals buildServer [ From 873934134d0a0b237aa39a3ed31521d7a2df8326 Mon Sep 17 00:00:00 2001 From: Edwin Mackenzie-Owen Date: Mon, 12 Aug 2024 20:47:57 +0200 Subject: [PATCH 67/72] irrlichtmt: remove at 1.9.0mt13 Minetest's irrlicht fork has been moved into the minetest repo. --- .../libraries/irrlichtmt/default.nix | 52 ------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 -- 3 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 pkgs/development/libraries/irrlichtmt/default.nix diff --git a/pkgs/development/libraries/irrlichtmt/default.nix b/pkgs/development/libraries/irrlichtmt/default.nix deleted file mode 100644 index 538858904291..000000000000 --- a/pkgs/development/libraries/irrlichtmt/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, stdenv -, fetchFromGitHub -, cmake -, zlib -, libpng -, libjpeg -, libGL -, libX11 -, libXi -, libXext -, Cocoa -, Kernel -}: -stdenv.mkDerivation (finalAttrs: { - pname = "irrlichtmt"; - version = "1.9.0mt13"; - - src = fetchFromGitHub { - owner = "minetest"; - repo = "irrlicht"; - rev = finalAttrs.version; - hash = "sha256-BlQd7zbpvQnxqLv3IaHWrXzJ1pJFbQQ3DNWDAj14/YY="; - }; - - nativeBuildInputs = [ - cmake - ]; - - buildInputs = [ - zlib - libpng - libjpeg - libGL - ] ++ (if stdenv.hostPlatform.isDarwin then [ - Cocoa - Kernel - ] else [ - libX11 - libXi - libXext - ]); - - outputs = [ "out" "dev" ]; - - meta = { - homepage = "https://github.com/minetest/irrlicht"; - license = lib.licenses.zlib; - maintainers = with lib.maintainers; [ DeeUnderscore ]; - description = "Minetest project's fork of Irrlicht, a realtime 3D engine written in C++"; - }; -}) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 83d087c0ff59..9c57df4f68d6 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -680,6 +680,7 @@ mapAliases ({ ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27 ipfs-migrator = kubo-migrator; # Added 2022-09-27 iproute = iproute2; # moved from top-level 2021-03-14 + irrlichtmt = throw "irrlichtmt has been removed because it was moved into the Minetest repo"; # Added 2024-08-12 iso-flags-png-320x420 = lib.warn "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17 ### J ### diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e89a26f00ac7..5abbc65131f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20960,10 +20960,6 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Cocoa OpenGL IOKit; }; - irrlichtmt = callPackage ../development/libraries/irrlichtmt { - inherit (darwin.apple_sdk.frameworks) Cocoa Kernel; - }; - isocodes = callPackage ../development/libraries/iso-codes { }; iso-flags = callPackage ../data/icons/iso-flags { }; From a429de9480104eb4984ce9305c60f636353410fb Mon Sep 17 00:00:00 2001 From: Will Fancher Date: Thu, 1 Aug 2024 16:59:39 -0400 Subject: [PATCH 68/72] calamares-nixos-extensions: 0.3.16 -> 0.3.18 --- pkgs/tools/misc/calamares-nixos-extensions/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/calamares-nixos-extensions/default.nix b/pkgs/tools/misc/calamares-nixos-extensions/default.nix index 481ed56f3de5..89535a02edb5 100644 --- a/pkgs/tools/misc/calamares-nixos-extensions/default.nix +++ b/pkgs/tools/misc/calamares-nixos-extensions/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, lib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "calamares-nixos-extensions"; - version = "0.3.16"; + version = "0.3.18"; src = fetchFromGitHub { owner = "NixOS"; repo = "calamares-nixos-extensions"; - rev = version; - hash = "sha256-ajQWmZVY60Q2cGJcLqMT2ypIi7bMMiyHMgdlp3g9874="; + rev = finalAttrs.version; + hash = "sha256-j+9iZtw9QIKHLo5sr9nkCVoZS7QQCnDDyTGFXD+R+WU="; }; installPhase = '' @@ -27,4 +27,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ vlinkz ]; platforms = platforms.linux; }; -} +}) From d176239d50cb268e2dfe63e44a1da2b976c17c71 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 12 Aug 2024 13:58:48 -0700 Subject: [PATCH 69/72] kakoune-lsp: nixfmt --- pkgs/by-name/ka/kakoune-lsp/package.nix | 36 +++++++++++++++++++------ 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index a13c2bf6bd73..8dc64d99c288 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -1,8 +1,13 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, substituteAll, perl -, stdenv, CoreServices, Security, SystemConfiguration +{ + lib, + rustPlatform, + fetchFromGitHub, + substituteAll, + perl, + stdenv, + CoreServices, + Security, + SystemConfiguration, }: rustPlatform.buildRustPackage rec { @@ -25,13 +30,28 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-XnhYODMzqInwbgM8wveY048sljZ8OKw4hLYJG5h8Twc="; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; + buildInputs = lib.optionals stdenv.isDarwin [ + CoreServices + Security + SystemConfiguration + ]; meta = { description = "Kakoune Language Server Protocol Client"; homepage = "https://github.com/kakoune-lsp/kakoune-lsp"; - license = with lib.licenses; [ unlicense /* or */ mit ]; - maintainers = with lib.maintainers; [ philiptaron spacekookie poweredbypie ]; + + # See https://github.com/kakoune-lsp/kakoune-lsp/commit/55dfc83409b9b7d3556bacda8ef8b71fc33b58cd + license = with lib.licenses; [ + unlicense + mit + ]; + + maintainers = with lib.maintainers; [ + philiptaron + spacekookie + poweredbypie + ]; + mainProgram = "kak-lsp"; }; } From 6d151f1e1931702078eaafc38a24f516fde47209 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 12 Aug 2024 14:02:55 -0700 Subject: [PATCH 70/72] kakoune-lsp: use replaceVars --- pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch | 8 ++++---- pkgs/by-name/ka/kakoune-lsp/package.nix | 9 ++------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch b/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch index 747a9481025b..a83e208c1716 100644 --- a/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch +++ b/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch @@ -21,13 +21,13 @@ index b173478..015c3ca 100644 - fi echo >$kak_command_fifo "echo -to-file $kak_response_fifo -quoting kakoune -- %reg{a}" - perl < $kak_response_fifo -we ' -+ @perl@ < $kak_response_fifo -we ' ++ @perl@/bin/perl < $kak_response_fifo -we ' use strict; my $Q = "'\''"; my @args = (); @@ -2410,11 +2406,6 @@ define-command -hidden lsp-snippets-insert-completion -params 1 %{ evaluate-comm }} - + define-command lsp-snippets-insert -hidden -params 1 %[ - evaluate-commands %sh{ - if ! command -v perl > /dev/null; then @@ -42,10 +42,10 @@ index b173478..015c3ca 100644 set-register x nop evaluate-commands %sh[ # $kak_quoted_selections - perl -e ' -+ @perl@ -e ' ++ @perl@/bin/perl -e ' use strict; use warnings; use Text::ParseWords(); --- +-- 2.44.0 diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index 8dc64d99c288..1135fa3430a7 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -2,7 +2,7 @@ lib, rustPlatform, fetchFromGitHub, - substituteAll, + replaceVars, perl, stdenv, CoreServices, @@ -21,12 +21,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-uXKquAjfytUn/Q0kx+0BGRQTkVMQ9rMRnTCy622upag="; }; - patches = [ - (substituteAll { - src = ./Hardcode-perl.patch; - perl = lib.getExe perl; - }) - ]; + patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ]; cargoHash = "sha256-XnhYODMzqInwbgM8wveY048sljZ8OKw4hLYJG5h8Twc="; From fd77255de410133dc772a418a569575e887089ff Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Mon, 12 Aug 2024 14:07:28 -0700 Subject: [PATCH 71/72] kakoune-lsp: 17.0.1 -> 17.1.1 --- pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch | 16 ++++++++-------- pkgs/by-name/ka/kakoune-lsp/package.nix | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch b/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch index a83e208c1716..14201b96b061 100644 --- a/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch +++ b/pkgs/by-name/ka/kakoune-lsp/Hardcode-perl.patch @@ -1,4 +1,4 @@ -From 17cec4d94bc04bd02b91361ca72f561f1eebce60 Mon Sep 17 00:00:00 2001 +From 14bdb9c39cfd813697a4f5d83ed2b4c4c043a309 Mon Sep 17 00:00:00 2001 From: V Date: Tue, 9 Apr 2024 06:15:00 +0200 Subject: [PATCH] Hardcode perl @@ -8,7 +8,7 @@ Subject: [PATCH] Hardcode perl 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/rc/lsp.kak b/rc/lsp.kak -index b173478..015c3ca 100644 +index 306b405..6662d29 100644 --- a/rc/lsp.kak +++ b/rc/lsp.kak @@ -280,12 +280,8 @@ define-command -hidden lsp-menu -params 1.. %{ @@ -16,7 +16,7 @@ index b173478..015c3ca 100644 define-command -hidden lsp-menu-impl %{ evaluate-commands %sh{ - if ! command -v perl > /dev/null; then -- printf "fail %{'perl' must be installed to use the 'lsp-menu' command}" +- echo "lsp-show-error %{'perl' must be installed to use the 'lsp-menu' command}" - exit - fi echo >$kak_command_fifo "echo -to-file $kak_response_fifo -quoting kakoune -- %reg{a}" @@ -25,9 +25,9 @@ index b173478..015c3ca 100644 use strict; my $Q = "'\''"; my @args = (); -@@ -2410,11 +2406,6 @@ define-command -hidden lsp-snippets-insert-completion -params 1 %{ evaluate-comm +@@ -2467,11 +2463,6 @@ define-command -hidden lsp-snippets-insert-completion -params 1 %{ evaluate-comm }} - + define-command lsp-snippets-insert -hidden -params 1 %[ - evaluate-commands %sh{ - if ! command -v perl > /dev/null; then @@ -37,7 +37,7 @@ index b173478..015c3ca 100644 evaluate-commands -draft -save-regs '^"' %[ set-register '"' %arg{1} execute-keys -@@ -2469,7 +2460,7 @@ define-command lsp-snippets-insert -hidden -params 1 %[ +@@ -2526,7 +2517,7 @@ define-command lsp-snippets-insert -hidden -params 1 %[ define-command -hidden lsp-snippets-insert-perl-impl %[ set-register x nop evaluate-commands %sh[ # $kak_quoted_selections @@ -46,6 +46,6 @@ index b173478..015c3ca 100644 use strict; use warnings; use Text::ParseWords(); --- -2.44.0 +-- +2.45.2 diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index 1135fa3430a7..2a2d7a83a175 100644 --- a/pkgs/by-name/ka/kakoune-lsp/package.nix +++ b/pkgs/by-name/ka/kakoune-lsp/package.nix @@ -12,18 +12,18 @@ rustPlatform.buildRustPackage rec { pname = "kakoune-lsp"; - version = "17.0.1"; + version = "17.1.1"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "kakoune-lsp"; + repo = "kakoune-lsp"; rev = "v${version}"; - sha256 = "sha256-uXKquAjfytUn/Q0kx+0BGRQTkVMQ9rMRnTCy622upag="; + sha256 = "sha256-XBH2pMDiHJNXrx90Lt0IcsbMFUM+X7GAHgiHpdlIdR4="; }; patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ]; - cargoHash = "sha256-XnhYODMzqInwbgM8wveY048sljZ8OKw4hLYJG5h8Twc="; + cargoHash = "sha256-Yi+T+9E3Wvce4kDLsRgZ07RAGLrq7dkinKpvvGeLeS0="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices From aea7d0b73a4c0a2250f32d5892bbe1c477da9628 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Tue, 13 Aug 2024 06:30:05 +0800 Subject: [PATCH 72/72] emacsPackages.ligo-mode: mark as broken on darwin Source hash on darwin is different from that on linux. --- .../emacs/elisp-packages/manual-packages/ligo-mode/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix index 7b1a19fe3a3c..ed8dfd3cece8 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix @@ -1,4 +1,5 @@ { + stdenv, lib, melpaBuild, fetchFromGitLab, @@ -25,5 +26,6 @@ melpaBuild { homepage = "https://gitlab.com/ligolang/ligo"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ AndersonTorres ]; + broken = stdenv.isDarwin; # different src hash on darwin }; }