From 601e20354eef924e99f6d0bdebcca94ac4fbc2e7 Mon Sep 17 00:00:00 2001 From: Nuno Alves Date: Tue, 29 Aug 2023 11:43:19 +0100 Subject: [PATCH 01/95] nixos/pixiecore: fix port 4011 from tcp to udp --- nixos/modules/services/networking/pixiecore.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/networking/pixiecore.nix b/nixos/modules/services/networking/pixiecore.nix index f410be471646..1f47a1d0b631 100644 --- a/nixos/modules/services/networking/pixiecore.nix +++ b/nixos/modules/services/networking/pixiecore.nix @@ -16,7 +16,7 @@ in type = types.bool; default = false; description = lib.mdDoc '' - Open ports (67, 69 UDP and 4011, 'port', 'statusPort' TCP) in the firewall for Pixiecore. + Open ports (67, 69, 4011 UDP and 'port', 'statusPort' TCP) in the firewall for Pixiecore. ''; }; @@ -103,8 +103,8 @@ in }; networking.firewall = mkIf cfg.openFirewall { - allowedTCPPorts = [ 4011 cfg.port cfg.statusPort ]; - allowedUDPPorts = [ 67 69 ]; + allowedTCPPorts = [ cfg.port cfg.statusPort ]; + allowedUDPPorts = [ 67 69 4011 ]; }; systemd.services.pixiecore = { From 922c530087f04e5f076addf274628e0bd5d4d4da Mon Sep 17 00:00:00 2001 From: Alex James Date: Sat, 7 Oct 2023 18:59:24 -0500 Subject: [PATCH 02/95] transmission_4: fix web UI path in AppArmor rules The web UI directory was renamed from transmission/web in 3.00 [1] to transmission/public_html in 4.0.0 [2]. This change updates the AppArmor rules to fix the web UI when AppArmor is enabled. [1]: https://github.com/transmission/transmission/blob/3.00/libtransmission/platform.c#L627 [2]: https://github.com/transmission/transmission/blob/4.0.x/libtransmission/platform.cc#L324 --- pkgs/applications/networking/p2p/transmission/4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 78f5b6cf2543..68a072687cc1 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { r @{PROC}/@{pid}/mounts, rwk /tmp/tr_session_id_*, - r $out/share/transmission/web/**, + r $out/share/transmission/public_html/**, include } From 71ab0b6c1c94fdc5d702bbe401bbf841f0d2257b Mon Sep 17 00:00:00 2001 From: Alex James Date: Sat, 7 Oct 2023 19:03:06 -0500 Subject: [PATCH 03/95] transmission_4: add option to allow additional paths in AppArmor rules This change adds an extraAppArmorPaths option to the transmission_4 derivation to allow additional read-only paths to be added to the ppArmor rules. This can be combined with the TRANSMISSION_WEB_HOME environment variable to override the web UI. --- pkgs/applications/networking/p2p/transmission/4.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index 68a072687cc1..f6fc83b1f98b 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -35,6 +35,7 @@ , enableCli ? true , installLib ? false , apparmorRulesFromClosure +, extraAppArmorPaths ? [] }: stdenv.mkDerivation (finalAttrs: { @@ -135,6 +136,7 @@ stdenv.mkDerivation (finalAttrs: { rwk /tmp/tr_session_id_*, r $out/share/transmission/public_html/**, + ${lib.strings.concatMapStrings (x: "r ${x},\n") extraAppArmorPaths} include } From f57a4b0ac1b954eec0c8def2a99e2a464ac6ff7a Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sun, 29 Oct 2023 09:56:26 +0100 Subject: [PATCH 04/95] libtiff: introduce libtiff_4_5 With the update to libtiff 4.6 in 0a74a54ac2600656cd0b640d5ea1c8efb5c35d68 , many tiff-processing utility executables got dropped: http://www.simplesystems.org/libtiff/releases/v4.6.0.html Some of these executables can still be "restored" with the configure switch `--enable-tools-unsupported`, but unfortunatelly, at least hylafaxplus (maybe more packages) relies on utilities that even cannot be restored with this switch. The commit at hand reintroduces the old libtiff version 4.5.1 as `libtiff_4_5` into nixpkgs. It restores the old build recipe with the following changes: * passthru.updateScript is dropped as it is of no use here * passthru.tests is dropped as it only contains packages that now build with the new libtiff version * patches are applied for the two CVEs that are fixed in 4.6.0 As libtiff 4.5 is no longer supported by libtiff developers, new vulnerabilities will likely go unnoticed unless they also affect the current version. To not disable hydra builds, we don't add `knownVulnerabilities` *for now*, but add comments to alert updaters of the current libtiff version so patches can be backported or the situation be reevaluated as a whole. --- pkgs/development/libraries/libtiff/4.5.nix | 86 +++++++++++++++++++ .../development/libraries/libtiff/default.nix | 3 + .../libraries/libtiff/headers-4.5.patch | 16 ++++ .../libtiff/rename-version-4.5.patch | 21 +++++ pkgs/top-level/all-packages.nix | 1 + 5 files changed, 127 insertions(+) create mode 100644 pkgs/development/libraries/libtiff/4.5.nix create mode 100644 pkgs/development/libraries/libtiff/headers-4.5.patch create mode 100644 pkgs/development/libraries/libtiff/rename-version-4.5.patch diff --git a/pkgs/development/libraries/libtiff/4.5.nix b/pkgs/development/libraries/libtiff/4.5.nix new file mode 100644 index 000000000000..3b24c6f1a2e1 --- /dev/null +++ b/pkgs/development/libraries/libtiff/4.5.nix @@ -0,0 +1,86 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch + +, autoreconfHook +, pkg-config +, sphinx + +, libdeflate +, libjpeg +, xz +, zlib +}: + +stdenv.mkDerivation rec { + pname = "libtiff"; + version = "4.5.1"; + + src = fetchFromGitLab { + owner = "libtiff"; + repo = "libtiff"; + rev = "v${version}"; + hash = "sha256-qQEthy6YhNAQmdDMyoCIvK8f3Tx25MgqhJZW74CB93E="; + }; + + patches = [ + # cf. https://bugzilla.redhat.com/2224974 + (fetchpatch { + name = "CVE-2023-40745.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/bdf7b2621c62e04d0408391b7d5611502a752cd0.diff"; + hash = "sha256-HdU02YJ1/T3dnCT+yG03tUyAHkgeQt1yjZx/auCQxyw="; + }) + # cf. https://bugzilla.redhat.com/2224971 + (fetchpatch { + name = "CVE-2023-41175.patch"; + url = "https://gitlab.com/libtiff/libtiff/-/commit/965fa243004e012adc533ae8e38db3055f101a7f.diff"; + hash = "sha256-Pvg6JfJWOIaTrfFF0YSREZkS9saTG9IsXnsXtcyKILA="; + }) + # FreeImage needs this patch + ./headers-4.5.patch + # libc++abi 11 has an `#include `, this picks up files name + # `version` in the project's include paths + ./rename-version-4.5.patch + ]; + + postPatch = '' + mv VERSION VERSION.txt + ''; + + outputs = [ "bin" "dev" "dev_private" "out" "man" "doc" ]; + + postFixup = '' + moveToOutput include/tif_config.h $dev_private + moveToOutput include/tif_dir.h $dev_private + moveToOutput include/tif_hash_set.h $dev_private + moveToOutput include/tiffiop.h $dev_private + ''; + + # If you want to change to a different build system, please make + # sure cross-compilation works first! + nativeBuildInputs = [ autoreconfHook pkg-config sphinx ]; + + propagatedBuildInputs = [ + libdeflate + libjpeg + xz + zlib + ]; + + enableParallelBuilding = true; + + doCheck = true; + + meta = with lib; { + description = "Library and utilities for working with the TIFF image file format"; + homepage = "https://libtiff.gitlab.io/libtiff"; + changelog = "https://libtiff.gitlab.io/libtiff/v${version}.html"; + # XXX not enabled for now to keep hydra builds running, + # but we have to keep an eye on security updates in supported version + #knownVulnerabilities = [ "support for version 4.5 ended in Sept 2023" ]; + maintainers = with maintainers; [ yarny ]; + license = licenses.libtiff; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 8055704b0890..22b0f8af2043 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation rec { pname = "libtiff"; version = "4.6.0"; + # if you update this, please consider adding patches and/or + # setting `knownVulnerabilities` in libtiff `4.5.nix` + src = fetchFromGitLab { owner = "libtiff"; repo = "libtiff"; diff --git a/pkgs/development/libraries/libtiff/headers-4.5.patch b/pkgs/development/libraries/libtiff/headers-4.5.patch new file mode 100644 index 000000000000..49af1abb0a54 --- /dev/null +++ b/pkgs/development/libraries/libtiff/headers-4.5.patch @@ -0,0 +1,16 @@ +export private headers for freeimage +--- i/libtiff/Makefile.am ++++ w/libtiff/Makefile.am +@@ -36,8 +36,12 @@ EXTRA_DIST = \ + tiffconf.h.cmake.in + + libtiffinclude_HEADERS = \ ++ tif_config.h \ ++ tif_dir.h \ ++ tif_hash_set.h \ + tiff.h \ + tiffio.h \ ++ tiffiop.h \ + tiffvers.h + + if HAVE_CXX diff --git a/pkgs/development/libraries/libtiff/rename-version-4.5.patch b/pkgs/development/libraries/libtiff/rename-version-4.5.patch new file mode 100644 index 000000000000..3e93569d4245 --- /dev/null +++ b/pkgs/development/libraries/libtiff/rename-version-4.5.patch @@ -0,0 +1,21 @@ +fix case-insensitive build +--- a/Makefile.am ++++ b/Makefile.am +@@ -34,7 +34,7 @@ docfiles = \ + README.md \ + RELEASE-DATE \ + TODO \ +- VERSION ++ VERSION.txt + + EXTRA_DIST = \ + cmake \ +@@ -61,7 +61,7 @@ SUBDIRS = port libtiff tools build contrib test doc + + release: + (rm -f $(top_srcdir)/RELEASE-DATE && echo $(LIBTIFF_RELEASE_DATE) > $(top_srcdir)/RELEASE-DATE) +- (rm -f $(top_srcdir)/VERSION && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION) ++ (rm -f $(top_srcdir)/VERSION.txt && echo $(LIBTIFF_VERSION) > $(top_srcdir)/VERSION.txt) + (rm -f $(top_srcdir)/libtiff/tiffvers.h && sed 's,LIBTIFF_VERSION,$(LIBTIFF_VERSION),;s,LIBTIFF_RELEASE_DATE,$(LIBTIFF_RELEASE_DATE),;s,LIBTIFF_MAJOR_VERSION,$(LIBTIFF_MAJOR_VERSION),;s,LIBTIFF_MINOR_VERSION,$(LIBTIFF_MINOR_VERSION),;s,LIBTIFF_MICRO_VERSION,$(LIBTIFF_MICRO_VERSION),' $(top_srcdir)/libtiff/tiffvers.h.in > $(top_srcdir)/libtiff/tiffvers.h) + + pkgconfigdir = $(libdir)/pkgconfig diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b100c5c3633a..9ad483982cbd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23537,6 +23537,7 @@ with pkgs; libtifiles2 = callPackage ../development/libraries/libtifiles2 { }; libtiff = callPackage ../development/libraries/libtiff { }; + libtiff_4_5 = callPackage ../development/libraries/libtiff/4.5.nix { }; libtiger = callPackage ../development/libraries/libtiger { }; From cd3771c7097b1ce25b0b3cd4e16361bf2929aa15 Mon Sep 17 00:00:00 2001 From: Yarny0 <41838844+Yarny0@users.noreply.github.com> Date: Sun, 29 Oct 2023 10:06:30 +0100 Subject: [PATCH 05/95] hylafaxplus: fix by downgrading libtiff to 4.5.1 libtiff 4.6.0 (updated with 0a74a54ac2600656cd0b640d5ea1c8efb5c35d68) drops many tiff-processing utility executables, like tiff2ps and fax2ps, that are needed by hylafaxplus. As a result, the build fails with > FATAL ERROR: /nix/store/5i80biwsgjb4yhp4z81nsk3kp5rivd8f-libtiff-4.6.0-bin/bin/tiff2ps does not exist or is not an executable program! see https://hydra.nixos.org/build/239580858 . The commit at hand fixes the package by using libtiff_4_5 which got introduced in the previous commit. Note on long-term prospect for this situation: According to hylafaxplus developer Lee Howard, it might take months before one of these options (or a combination thereof) might be implemented: * a new package "tifftools" with the utility executables emerges * The hylafaxplus package incorporates the source of these executables and builds them by itself * hylafaxplus is rewritten so as to not use these programs * libtiff reincorporates the programs, maybe after fixing them Cf. https://sourceforge.net/p/hylafax/mailman/message/38259441/ Another reference: a discussion on the libtiff mailing list: https://www.asmail.be/msg0054915176.html --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9ad483982cbd..504a206948b1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9296,7 +9296,10 @@ with pkgs; stdenv = gcc8Stdenv; }; - hylafaxplus = callPackage ../servers/hylafaxplus { }; + hylafaxplus = callPackage ../servers/hylafaxplus { + # libtiff >= 4.6 dropped many executables needed by hylafaxplus + libtiff = libtiff_4_5; + }; hyphen = callPackage ../development/libraries/hyphen { }; From efdbdab8b511f8cf1e361938f36246709acd6d2f Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 2 Nov 2023 01:28:05 +0100 Subject: [PATCH 06/95] nixos/ocsinventory-agent: init --- nixos/modules/module-list.nix | 1 + .../services/monitoring/ocsinventory-agent.md | 33 +++++ .../monitoring/ocsinventory-agent.nix | 134 ++++++++++++++++++ 3 files changed, 168 insertions(+) create mode 100644 nixos/modules/services/monitoring/ocsinventory-agent.md create mode 100644 nixos/modules/services/monitoring/ocsinventory-agent.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2a6ca202024b..272fb6edae4d 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -797,6 +797,7 @@ ./services/monitoring/munin.nix ./services/monitoring/nagios.nix ./services/monitoring/netdata.nix + ./services/monitoring/ocsinventory-agent.nix ./services/monitoring/opentelemetry-collector.nix ./services/monitoring/osquery.nix ./services/monitoring/parsedmarc.nix diff --git a/nixos/modules/services/monitoring/ocsinventory-agent.md b/nixos/modules/services/monitoring/ocsinventory-agent.md new file mode 100644 index 000000000000..50e246fb6531 --- /dev/null +++ b/nixos/modules/services/monitoring/ocsinventory-agent.md @@ -0,0 +1,33 @@ +# OCS Inventory Agent {#module-services-ocsinventory-agent} + +[OCS Inventory NG](https://ocsinventory-ng.org/) or Open Computers and Software inventory +is an application designed to help IT administrator to keep track of the hardware and software +configurations of computers that are installed on their network. + +OCS Inventory collects information about the hardware and software of networked machines +through the **OCS Inventory Agent** program. + +This NixOS module enables you to install and configure this agent so that it sends information from your computer to the OCS Inventory server. + +For more technical information about OCS Inventory Agent, refer to [the Wiki documentation](https://wiki.ocsinventory-ng.org/03.Basic-documentation/Setting-up-the-UNIX-agent-manually-on-client-computers/). + + +## Basic Usage {#module-services-ocsinventory-agent-basic-usage} + +A minimal configuration looks like this: + +```nix +{ + services.ocsinventory-agent = { + enable = true; + settings = { + server = "https://ocsinventory.localhost:8080/ocsinventory"; + tag = "01234567890123"; + }; + }; +} +``` + +This configuration will periodically run the ocsinventory-agent SystemD service. + +The OCS Inventory Agent will inventory the computer and then sends the results to the specified OCS Inventory Server. diff --git a/nixos/modules/services/monitoring/ocsinventory-agent.nix b/nixos/modules/services/monitoring/ocsinventory-agent.nix new file mode 100644 index 000000000000..7585ae863750 --- /dev/null +++ b/nixos/modules/services/monitoring/ocsinventory-agent.nix @@ -0,0 +1,134 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.services.ocsinventory-agent; + + settingsFormat = pkgs.formats.keyValue { + mkKeyValue = lib.generators.mkKeyValueDefault { } "="; + }; + +in +{ + meta = { + doc = ./ocsinventory-agent.md; + maintainers = with lib.maintainers; [ anthonyroussel ]; + }; + + options = { + services.ocsinventory-agent = { + enable = lib.mkEnableOption (lib.mdDoc "OCS Inventory Agent"); + + package = lib.mkPackageOptionMD pkgs "ocsinventory-agent" { }; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type.nestedTypes.elemType; + + options = { + server = lib.mkOption { + type = lib.types.nullOr lib.types.str; + example = "https://ocsinventory.localhost:8080/ocsinventory"; + default = null; + description = lib.mdDoc '' + The URI of the OCS Inventory server where to send the inventory file. + + This option is ignored if {option}`services.ocsinventory-agent.settings.local` is set. + ''; + }; + + local = lib.mkOption { + type = lib.types.nullOr lib.types.path; + example = "/var/lib/ocsinventory-agent/reports"; + default = null; + description = lib.mdDoc '' + If specified, the OCS Inventory Agent will run in offline mode + and the resulting inventory file will be stored in the specified path. + ''; + }; + + ca = lib.mkOption { + type = lib.types.path; + default = "/etc/ssl/certs/ca-certificates.crt"; + description = lib.mdDoc '' + Path to CA certificates file in PEM format, for server + SSL certificate validation. + ''; + }; + + tag = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + example = "01234567890123"; + description = lib.mdDoc "Tag for the generated inventory."; + }; + + debug = lib.mkEnableOption (lib.mdDoc "debug mode"); + }; + }; + default = { }; + example = { + ca = "/etc/ssl/certs/ca-certificates.crt"; + debug = true; + server = "https://ocsinventory.localhost:8080/ocsinventory"; + tag = "01234567890123"; + }; + description = lib.mdDoc '' + Configuration for /etc/ocsinventory-agent/ocsinventory-agent.cfg. + + Refer to + {manpage}`ocsinventory-agent(1)` for available options. + ''; + }; + + interval = lib.mkOption { + type = lib.types.str; + default = "daily"; + example = "06:00"; + description = lib.mdDoc '' + How often we run the ocsinventory-agent service. Runs by default every daily. + + The format is described in + {manpage}`systemd.time(7)`. + ''; + }; + }; + }; + + config = + let + configFile = settingsFormat.generate "ocsinventory-agent.cfg" cfg.settings; + + in lib.mkIf cfg.enable { + # Path of the configuration file is hard-coded and cannot be changed + # https://github.com/OCSInventory-NG/UnixAgent/blob/v2.10.0/lib/Ocsinventory/Agent/Config.pm#L78 + # + environment.etc."ocsinventory-agent/ocsinventory-agent.cfg".source = configFile; + + systemd.services.ocsinventory-agent = { + description = "OCS Inventory Agent service"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + reloadTriggers = [ configFile ]; + + serviceConfig = { + ExecStart = lib.getExe cfg.package; + ConfigurationDirectory = "ocsinventory-agent"; + StateDirectory = "ocsinventory-agent"; + }; + }; + + systemd.timers.ocsinventory-agent = { + description = "Launch OCS Inventory Agent regularly"; + wantedBy = [ "timers.target" ]; + + timerConfig = { + OnCalendar = cfg.interval; + AccuracySec = "1h"; + RandomizedDelaySec = 240; + Persistent = true; + Unit = "ocsinventory-agent.service"; + }; + }; + }; +} From c72a44718c5aca8c42763dc61ff1197e7bde7738 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 2 Nov 2023 01:28:20 +0100 Subject: [PATCH 07/95] nixosTests.ocsinventory-agent: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/ocsinventory-agent.nix | 33 +++++++++++++++++++ .../by-name/oc/ocsinventory-agent/package.nix | 14 +++++--- 3 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 nixos/tests/ocsinventory-agent.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f7f8ac8fec88..651a794a35bd 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -615,6 +615,7 @@ in { openstack-image-userdata = (handleTestOn ["x86_64-linux"] ./openstack-image.nix {}).userdata or {}; opentabletdriver = handleTest ./opentabletdriver.nix {}; opentelemetry-collector = handleTest ./opentelemetry-collector.nix {}; + ocsinventory-agent = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./ocsinventory-agent.nix {}; owncast = handleTest ./owncast.nix {}; outline = handleTest ./outline.nix {}; image-contents = handleTest ./image-contents.nix {}; diff --git a/nixos/tests/ocsinventory-agent.nix b/nixos/tests/ocsinventory-agent.nix new file mode 100644 index 000000000000..67b0c8c91103 --- /dev/null +++ b/nixos/tests/ocsinventory-agent.nix @@ -0,0 +1,33 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "ocsinventory-agent"; + + nodes.machine = { pkgs, ... }: { + services.ocsinventory-agent = { + enable = true; + settings = { + debug = true; + local = "/var/lib/ocsinventory-agent/reports"; + tag = "MY_INVENTORY_TAG"; + }; + }; + }; + + testScript = '' + path = "/var/lib/ocsinventory-agent/reports" + + # Run the agent to generate the inventory file in offline mode + start_all() + machine.succeed("mkdir -p {}".format(path)) + machine.wait_for_unit("ocsinventory-agent.service") + machine.wait_until_succeeds("journalctl -u ocsinventory-agent.service | grep 'Inventory saved in'") + + # Fetch the path to the generated inventory file + report_file = machine.succeed("find {}/*.ocs -type f | head -n1".format(path)) + + with subtest("Check the tag value"): + tag = machine.succeed( + "${pkgs.libxml2}/bin/xmllint --xpath 'string(/REQUEST/CONTENT/ACCOUNTINFO/KEYVALUE)' {}".format(report_file) + ).rstrip() + assert tag == "MY_INVENTORY_TAG", f"tag is not valid, was '{tag}'" + ''; +}) diff --git a/pkgs/by-name/oc/ocsinventory-agent/package.nix b/pkgs/by-name/oc/ocsinventory-agent/package.nix index 0240966e2d86..7e5782cba0f1 100644 --- a/pkgs/by-name/oc/ocsinventory-agent/package.nix +++ b/pkgs/by-name/oc/ocsinventory-agent/package.nix @@ -15,6 +15,7 @@ , pciutils , usbutils , util-linux +, nixosTests , testers , ocsinventory-agent , nix-update-script @@ -75,11 +76,14 @@ perlPackages.buildPerlPackage rec { ''; passthru = { - tests.version = testers.testVersion { - package = ocsinventory-agent; - command = "ocsinventory-agent --version"; - # upstream has not updated version in lib/Ocsinventory/Agent/Config.pm - version = "2.10.0"; + tests = { + inherit (nixosTests) ocsinventory-agent; + version = testers.testVersion { + package = ocsinventory-agent; + command = "ocsinventory-agent --version"; + # upstream has not updated version in lib/Ocsinventory/Agent/Config.pm + version = "2.10.0"; + }; }; updateScript = nix-update-script { }; }; From 33918e56791de36cf6faf5ff2cbb51772d927f28 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Fri, 3 Nov 2023 00:45:04 +0100 Subject: [PATCH 08/95] fossil: 2.22 -> 2.23 --- pkgs/applications/version-management/fossil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 4731355ac0f3..59dcaf9fdd31 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fossil"; - version = "2.22"; + version = "2.23"; src = fetchurl { url = "https://www.fossil-scm.org/home/tarball/version-${finalAttrs.version}/fossil-${finalAttrs.version}.tar.gz"; - hash = "sha256-gdgj/29dF1s4TfqE7roNBS2nOjfNZs1yt4bnFnEhDWs="; + hash = "sha256-dfgI6BNRAYqXFnRtnvGh/huxkEcz6LQYZDiB04GYhZM="; }; # required for build time tool `./tools/translate.c` From 270feb78e7109fb7f9c8c0979c944394fcdc268e Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Fri, 3 Nov 2023 00:45:56 +0100 Subject: [PATCH 09/95] fossil: add mainProgram --- pkgs/applications/version-management/fossil/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index 59dcaf9fdd31..15d6bc84caa5 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -66,5 +66,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd2; maintainers = with maintainers; [ maggesi viric ]; platforms = platforms.all; + mainProgram = "fossil"; }; }) From 79e7841ff70dff996d1e64edc7cf2b7f65171114 Mon Sep 17 00:00:00 2001 From: Jonathan Davies Date: Sat, 4 Nov 2023 14:19:14 +0000 Subject: [PATCH 10/95] nixos/caddy: Set systemd unit to restart on-failure whilst ignoring error code 1. This is what's recommended by systemd for long-running services and helps with recovering from crashes. --- nixos/modules/services/web-servers/caddy/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index ce74e243a181..dcacb40e4681 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -376,7 +376,9 @@ in ReadWriteDirectories = cfg.dataDir; StateDirectory = mkIf (cfg.dataDir == "/var/lib/caddy") [ "caddy" ]; LogsDirectory = mkIf (cfg.logDir == "/var/log/caddy") [ "caddy" ]; - Restart = "on-abnormal"; + Restart = "on-failure"; + RestartPreventExitStatus = 1; + RestartSecs = "5s"; # TODO: attempt to upstream these options NoNewPrivileges = true; From e626f8468bc61c97665fff4dc57c02a9b4c4dc9c Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Tue, 7 Nov 2023 22:56:48 +0100 Subject: [PATCH 11/95] nixos/stage1: make append_initrd_secrets script reproducible --- nixos/modules/system/boot/stage-1.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index a3551f68dbe8..64ab28d1806b 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -432,7 +432,7 @@ let } # mindepth 1 so that we don't change the mode of / - (cd "$tmp" && find . -mindepth 1 -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @-) | \ + (cd "$tmp" && find . -mindepth 1 | xargs touch -amt 197001010000 && find . -mindepth 1 -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @-) | \ ${compressorExe} ${lib.escapeShellArgs initialRamdisk.compressorArgs} >> "$1" ''; From bb09ba5e566c83a34467f63bc8e5e6a7cf135587 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 8 Nov 2023 21:29:13 +0100 Subject: [PATCH 12/95] roundcube: 1.6.4 -> 1.6.5 ChangeLog: https://github.com/roundcube/roundcubemail/releases/tag/1.6.5 --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index a7e71c722fb5..959c9bf4633e 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.6.4"; + version = "1.6.5"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-peq8fggo4CYYea7JCp1KbcAgPpiOFN4vk9bAYeZIkcg="; + sha256 = "sha256-Fktyy3jeidEEdB7pCQ9AJOY7+tpDlJA0hENl8/pwtf0="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From 3dd50eaa8ff6dff42837b8f5ae45106bdeb35d8f Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 25 Oct 2023 11:29:27 +0200 Subject: [PATCH 13/95] nixos/amazon-ssm-agent: fix missing seelog.xml file --- nixos/modules/services/misc/amazon-ssm-agent.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/amazon-ssm-agent.nix b/nixos/modules/services/misc/amazon-ssm-agent.nix index 0be79e759c31..02e44c73d87a 100644 --- a/nixos/modules/services/misc/amazon-ssm-agent.nix +++ b/nixos/modules/services/misc/amazon-ssm-agent.nix @@ -33,19 +33,22 @@ in { }; config = mkIf cfg.enable { + # See https://github.com/aws/amazon-ssm-agent/blob/mainline/packaging/linux/amazon-ssm-agent.service systemd.services.amazon-ssm-agent = { inherit (cfg.package.meta) description; - after = [ "network.target" ]; + after = [ "network-online.target" ]; wantedBy = [ "multi-user.target" ]; path = [ fake-lsb-release pkgs.coreutils ]; + serviceConfig = { ExecStart = "${cfg.package}/bin/amazon-ssm-agent"; KillMode = "process"; # We want this restating pretty frequently. It could be our only means # of accessing the instance. Restart = "always"; - RestartSec = "1min"; + RestartPreventExitStatus = 194; + RestartSec = "90"; }; }; @@ -70,7 +73,7 @@ in { group = "ssm-user"; }; - environment.etc."amazon/ssm/seelog.xml".source = "${cfg.package}/seelog.xml.template"; + environment.etc."amazon/ssm/seelog.xml".source = "${cfg.package}/etc/amazon/ssm/seelog.xml.template"; environment.etc."amazon/ssm/amazon-ssm-agent.json".source = "${cfg.package}/etc/amazon/ssm/amazon-ssm-agent.json.template"; From 4f7eab6de1fb2c3abee2b0fd7cc503752f60270a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Wed, 25 Oct 2023 11:29:11 +0200 Subject: [PATCH 14/95] nixosTests.amazon-ssm-agent: init --- nixos/tests/all-tests.nix | 1 + nixos/tests/amazon-ssm-agent.nix | 17 +++++++++++++++++ pkgs/by-name/am/amazon-ssm-agent/package.nix | 12 ++++++++---- 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 nixos/tests/amazon-ssm-agent.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f44fcfcf54ab..a0796721e80e 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -117,6 +117,7 @@ in { allTerminfo = handleTest ./all-terminfo.nix {}; alps = handleTest ./alps.nix {}; amazon-init-shell = handleTest ./amazon-init-shell.nix {}; + amazon-ssm-agent = handleTest ./amazon-ssm-agent.nix {}; amd-sev = runTest ./amd-sev.nix; anbox = runTest ./anbox.nix; anuko-time-tracker = handleTest ./anuko-time-tracker.nix {}; diff --git a/nixos/tests/amazon-ssm-agent.nix b/nixos/tests/amazon-ssm-agent.nix new file mode 100644 index 000000000000..957e9e0e02c5 --- /dev/null +++ b/nixos/tests/amazon-ssm-agent.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: { + name = "amazon-ssm-agent"; + meta.maintainers = [ lib.maintainers.anthonyroussel ]; + + nodes.machine = { config, pkgs, ... }: { + services.amazon-ssm-agent.enable = true; + }; + + testScript = '' + start_all() + + machine.wait_for_file("/etc/amazon/ssm/seelog.xml") + machine.wait_for_file("/etc/amazon/ssm/amazon-ssm-agent.json") + + machine.wait_for_unit("amazon-ssm-agent.service") + ''; +}) diff --git a/pkgs/by-name/am/amazon-ssm-agent/package.nix b/pkgs/by-name/am/amazon-ssm-agent/package.nix index 4816ac1bdc73..4de3ee4f53b1 100644 --- a/pkgs/by-name/am/amazon-ssm-agent/package.nix +++ b/pkgs/by-name/am/amazon-ssm-agent/package.nix @@ -10,6 +10,7 @@ , dmidecode , bashInteractive , nix-update-script +, nixosTests , testers , amazon-ssm-agent , overrideEtc ? true @@ -136,11 +137,14 @@ buildGoModule rec { ''; passthru = { - updateScript = nix-update-script { }; - tests.version = testers.testVersion { - package = amazon-ssm-agent; - command = "amazon-ssm-agent --version"; + tests = { + inherit (nixosTests) amazon-ssm-agent; + version = testers.testVersion { + package = amazon-ssm-agent; + command = "amazon-ssm-agent --version"; + }; }; + updateScript = nix-update-script { }; }; meta = with lib; { From 8ffe19c0996b6f077459637edfb3c3731709112a Mon Sep 17 00:00:00 2001 From: Luka Blaskovic Date: Sat, 11 Nov 2023 06:15:23 +0000 Subject: [PATCH 15/95] build-rust-crate: set CARGO_MANIFEST_LINKS if links is set --- pkgs/build-support/rust/build-rust-crate/configure-crate.nix | 2 ++ pkgs/build-support/rust/build-rust-crate/default.nix | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 60310f178747..29447aa751a9 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -7,6 +7,7 @@ , completeBuildDeps , completeDeps , crateAuthors +, crateLinks , crateDescription , crateHomepage , crateFeatures @@ -134,6 +135,7 @@ in '' export CARGO_CFG_TARGET_VENDOR=${stdenv.hostPlatform.parsed.vendor.name} export CARGO_MANIFEST_DIR=$(pwd) + export CARGO_MANIFEST_LINKS=${crateLinks} export DEBUG="${toString (!release)}" export OPT_LEVEL="${toString optLevel}" export TARGET="${rust.toRustTargetSpec stdenv.hostPlatform}" diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index d977fb9f7c27..672a96226634 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -240,6 +240,7 @@ crate_: lib.makeOverridable "edition" "buildTests" "codegenUnits" + "links" ]; extraDerivationAttrs = builtins.removeAttrs crate processedAttrs; nativeBuildInputs_ = nativeBuildInputs; @@ -322,6 +323,7 @@ crate_: lib.makeOverridable crateDescription = crate.description or ""; crateAuthors = if crate ? authors && lib.isList crate.authors then crate.authors else [ ]; crateHomepage = crate.homepage or ""; + crateLinks = crate.links or ""; crateType = if lib.attrByPath [ "procMacro" ] false crate then [ "proc-macro" ] else if lib.attrByPath [ "plugin" ] false crate then [ "dylib" ] else @@ -342,7 +344,7 @@ crate_: lib.makeOverridable configurePhase = configureCrate { inherit crateName buildDependencies completeDeps completeBuildDeps crateDescription - crateFeatures crateRenames libName build workspace_member release libPath crateVersion + crateFeatures crateRenames libName build workspace_member release libPath crateVersion crateLinks extraLinkFlags extraRustcOptsForBuildRs crateAuthors crateHomepage verbose colors codegenUnits; }; From 9b0817cf743b8207f4c92fc0d3e24689e34b0873 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 9 Oct 2023 22:56:02 +0200 Subject: [PATCH 16/95] thanos: 0.31.0 -> 0.32.5 https://github.com/thanos-io/thanos/releases/tag/v0.32.0 https://github.com/thanos-io/thanos/releases/tag/v0.32.1 https://github.com/thanos-io/thanos/releases/tag/v0.32.2 https://github.com/thanos-io/thanos/releases/tag/v0.32.3 https://github.com/thanos-io/thanos/releases/tag/v0.32.4 Co-authored-by: Jonathan Davies --- pkgs/servers/monitoring/thanos/default.nix | 25 +++++++++++----------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 37814a417491..644fe6109590 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -1,24 +1,21 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: +{ lib +, buildGoModule +, fetchFromGitHub +, go +}: + buildGoModule rec { pname = "thanos"; - version = "0.31.0"; + version = "0.32.5"; src = fetchFromGitHub { - rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "sha256-EJZGc4thu0WhVSSRolIRYg39S81Cgm+JHwpW5eE7mDc="; + rev = "refs/tags/v${version}"; + hash = "sha256-A4bDCyvctHmDBYzvWpeEO4u6KhoICN7BbRQK4aZCbIA="; }; - patches = [ - # https://github.com/thanos-io/thanos/pull/6126 - (fetchpatch { - url = "https://github.com/thanos-io/thanos/commit/a4c218bd690259fc0c78fe67e0739bd33d38541e.patch"; - hash = "sha256-Hxc1s5IXAyw01/o4JvOXuyYuOFy0+cBUv3OkRv4DCXs="; - }) - ]; - - vendorHash = "sha256-8+MUMux6v/O2syVyTx758yUBfJkertzibz6yFB05nWk="; + vendorHash = "sha256-ZjkMvbWq96Rte9WoxAWzeouVA/6mBqanvY9yHr9F5MM="; doCheck = true; @@ -30,11 +27,13 @@ buildGoModule rec { "-X ${t}.Branch=unknown" "-X ${t}.BuildUser=nix@nixpkgs" "-X ${t}.BuildDate=unknown" + "-X ${t}.GoVersion=${lib.getVersion go}" ]; meta = with lib; { description = "Highly available Prometheus setup with long term storage capabilities"; homepage = "https://github.com/thanos-io/thanos"; + changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ basvandijk ]; }; From b2c956e071b25a4a4bbd9cf84978a2fdb9525794 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Mon, 9 Oct 2023 22:56:28 +0200 Subject: [PATCH 17/95] thanos: add passthru.tests and passthru.updateScript --- pkgs/servers/monitoring/thanos/default.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 644fe6109590..46524efa4e36 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -2,6 +2,10 @@ , buildGoModule , fetchFromGitHub , go +, nix-update-script +, nixosTests +, testers +, thanos }: buildGoModule rec { @@ -30,6 +34,17 @@ buildGoModule rec { "-X ${t}.GoVersion=${lib.getVersion go}" ]; + passthru = { + updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) prometheus; + version = testers.testVersion { + command = "thanos --version"; + package = thanos; + }; + }; + }; + meta = with lib; { description = "Highly available Prometheus setup with long term storage capabilities"; homepage = "https://github.com/thanos-io/thanos"; From 2074409c8652cd176202965a7d38649c8f3f79f4 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 10 Oct 2023 00:42:05 +0200 Subject: [PATCH 18/95] nixos/thanos: add query-frontend SystemD service --- nixos/modules/services/monitoring/thanos.nix | 25 ++++++++++++++++++++ nixos/tests/prometheus.nix | 10 ++++++++ 2 files changed, 35 insertions(+) diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index e6d8afc66624..872916931f94 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -430,6 +430,12 @@ let ''; }; + query-frontend = params.common cfg.query-frontend // { + query-frontend.downstream-url = mkParamDef types.str "http://localhost:9090" '' + URL of downstream Prometheus Query compatible API. + ''; + }; + rule = params.common cfg.rule // params.objstore cfg.rule // { labels = mkAttrsParam "label" '' @@ -684,6 +690,13 @@ in { arguments = mkArgumentsOption "query"; }; + query-frontend = paramsToOptions params.query-frontend // { + enable = mkEnableOption + (lib.mdDoc ("the Thanos query frontend implements a service deployed in front of queriers to + improve query parallelization and caching.")); + arguments = mkArgumentsOption "query-frontend"; + }; + rule = paramsToOptions params.rule // { enable = mkEnableOption (lib.mdDoc ("the Thanos ruler service which evaluates Prometheus rules against" + @@ -768,6 +781,18 @@ in { }; }) + (mkIf cfg.query-frontend.enable { + systemd.services.thanos-query-frontend = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + DynamicUser = true; + Restart = "always"; + ExecStart = thanos "query-frontend"; + }; + }; + }) + (mkIf cfg.rule.enable (mkMerge [ (assertRelativeStateDir "rule") { diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index a075cfc1f1b7..ac987dffd7ce 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -3,6 +3,7 @@ let queryPort = 9090; minioPort = 9000; pushgwPort = 9091; + frontPort = 9092; s3 = { accessKey = "BKIKJAA5BMMU2RHO6IBB"; @@ -156,6 +157,11 @@ in import ./make-test-python.nix { "prometheus:${toString grpcPort}" ]; }; + services.thanos.query-frontend = { + enable = true; + http-address = "0.0.0.0:${toString frontPort}"; + query-frontend.downstream-url = "http://127.0.0.1:${toString queryPort}"; + }; }; store = { pkgs, ... }: { @@ -262,6 +268,10 @@ in import ./make-test-python.nix { query.wait_for_unit("thanos-query.service") wait_for_metric(query) + # Test Thanos query frontend service + query.wait_for_unit("thanos-query-frontend.service") + query.succeed("curl -sS http://localhost:${toString frontPort}/-/healthy") + # Test if the Thanos sidecar has correctly uploaded its TSDB to S3, if the # Thanos storage service has correctly downloaded it from S3 and if the Thanos # query service running on $store can correctly retrieve the metric: From 0d9bef343be739e4976501f98858337a4304ad18 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 10 Oct 2023 00:45:37 +0200 Subject: [PATCH 19/95] nixos/thanos: fix services.thanos.receive.labels config --- nixos/modules/services/monitoring/thanos.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index 872916931f94..dec2d0a513bc 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -631,7 +631,7 @@ let Data directory relative to `/var/lib` of TSDB. ''; - labels = mkAttrsParam "labels" '' + labels = mkAttrsParam "label" '' External labels to announce. This flag will be removed in the future when handling multiple tsdb From 312e7f8ae0195f122bffcb51803f754d0a2f16e4 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 10 Oct 2023 06:30:33 +0200 Subject: [PATCH 20/95] nixos/thanos: add ExecReload command to SystemD services --- nixos/modules/services/monitoring/thanos.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index dec2d0a513bc..3a60cc01660e 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -749,6 +749,7 @@ in { User = "prometheus"; Restart = "always"; ExecStart = thanos "sidecar"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; }) @@ -764,6 +765,7 @@ in { StateDirectory = cfg.store.stateDir; Restart = "always"; ExecStart = thanos "store"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; } @@ -777,6 +779,7 @@ in { DynamicUser = true; Restart = "always"; ExecStart = thanos "query"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; }) @@ -789,6 +792,7 @@ in { DynamicUser = true; Restart = "always"; ExecStart = thanos "query-frontend"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; }) @@ -804,6 +808,7 @@ in { StateDirectory = cfg.rule.stateDir; Restart = "always"; ExecStart = thanos "rule"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; } @@ -822,6 +827,7 @@ in { DynamicUser = true; StateDirectory = cfg.compact.stateDir; ExecStart = thanos "compact"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; } // optionalAttrs (!wait) { inherit (cfg.compact) startAt; }; } @@ -838,6 +844,7 @@ in { StateDirectory = cfg.downsample.stateDir; Restart = "always"; ExecStart = thanos "downsample"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; } @@ -854,6 +861,7 @@ in { StateDirectory = cfg.receive.stateDir; Restart = "always"; ExecStart = thanos "receive"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; }; }; } From abed24c0d69dae85128a34db36269ee1073cb24c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 10 Oct 2023 06:49:57 +0200 Subject: [PATCH 21/95] nixos/thanos: fix documentation --- nixos/modules/services/monitoring/thanos.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index 3a60cc01660e..4a3c6b24a77e 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -130,7 +130,7 @@ let description = lib.mdDoc '' Path to YAML file that contains tracing configuration. - See format details: + See format details: ''; }; }; @@ -147,7 +147,7 @@ let If {option}`tracing.config-file` is set this option has no effect. - See format details: + See format details: ''; }; }; @@ -195,7 +195,7 @@ let description = lib.mdDoc '' Path to YAML file that contains object store configuration. - See format details: + See format details: ''; }; }; @@ -212,7 +212,7 @@ let If {option}`objstore.config-file` is set this option has no effect. - See format details: + See format details: ''; }; }; @@ -718,8 +718,7 @@ in { receive = paramsToOptions params.receive // { enable = mkEnableOption - (lib.mdDoc ("the Thanos receiver which accept Prometheus remote write API requests " + - "and write to local tsdb (EXPERIMENTAL, this may change drastically without notice)")); + (lib.mdDoc ("the Thanos receiver which accept Prometheus remote write API requests and write to local tsdb")); arguments = mkArgumentsOption "receive"; }; }; From 9abb2a211672132f9f8f591f9f44cab81998a88c Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 10 Oct 2023 20:34:50 +0200 Subject: [PATCH 22/95] nixos/thanos: remove deprecations * replaced store.grpc.series-sample-limit by store.limits.request-samples * replaced query.replica-label by query.replica-labels * replaced store.addresses by endpoints * removed block-sync-concurrency (removed upstream) --- nixos/modules/services/monitoring/thanos.nix | 33 +++++++++----------- nixos/tests/prometheus.nix | 4 +-- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index 4a3c6b24a77e..3c92db6dfaf7 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -266,14 +266,14 @@ let Maximum size of concurrently allocatable bytes for chunks. ''; - store.grpc.series-sample-limit = mkParamDef types.int 0 '' - Maximum amount of samples returned via a single Series call. + store.limits.request-samples = mkParamDef types.int 0 '' + The maximum samples allowed for a single Series request. + The Series call fails if this limit is exceeded. `0` means no limit. - NOTE: for efficiency we take 120 as the number of samples in chunk (it - cannot be bigger than that), so the actual number of samples might be - lower, even though the maximum could be hit. + NOTE: For efficiency the limit is internally implemented as 'chunks limit' + considering each chunk contains a maximum of 120 samples. ''; store.grpc.series-max-concurrency = mkParamDef types.int 20 '' @@ -371,24 +371,25 @@ let Maximum number of queries processed concurrently by query node. ''; - query.replica-label = mkParam types.str '' - Label to treat as a replica indicator along which data is + query.replica-labels = mkAttrsParam "query.replica-label" '' + Labels to treat as a replica indicator along which data is + deduplicated. Still you will be able to query without deduplication using - `dedup=false` parameter. + 'dedup=false' parameter. Data includes time series, recording + rules, and alerting rules. ''; selector-labels = mkAttrsParam "selector-label" '' Query selector labels that will be exposed in info endpoint. ''; - store.addresses = mkListParam "store" '' - Addresses of statically configured store API servers. + endpoints = mkListParam "endpoint" '' + Addresses of statically configured Thanos API servers (repeatable). - The scheme may be prefixed with `dns+` or - `dnssrv+` to detect store API servers through - respective DNS lookups. + The scheme may be prefixed with 'dns+' or 'dnssrv+' to detect + Thanos API servers through respective DNS lookups. ''; store.sd-files = mkListParam "store.sd-files" '' @@ -453,7 +454,7 @@ let Rule files that should be used by rule manager. Can be in glob format. ''; - eval-interval = mkParamDef types.str "30s" '' + eval-interval = mkParamDef types.str "1m" '' The default evaluation interval to use. ''; @@ -603,10 +604,6 @@ let to render all samples for a human eye anyway ''; - block-sync-concurrency = mkParamDef types.int 20 '' - Number of goroutines to use when syncing block metadata from object storage. - ''; - compact.concurrency = mkParamDef types.int 1 '' Number of goroutines to use when compacting groups. ''; diff --git a/nixos/tests/prometheus.nix b/nixos/tests/prometheus.nix index ac987dffd7ce..011127389377 100644 --- a/nixos/tests/prometheus.nix +++ b/nixos/tests/prometheus.nix @@ -153,7 +153,7 @@ in import ./make-test-python.nix { services.thanos.query = { enable = true; http-address = "0.0.0.0:${toString queryPort}"; - store.addresses = [ + endpoints = [ "prometheus:${toString grpcPort}" ]; }; @@ -184,7 +184,7 @@ in import ./make-test-python.nix { services.thanos.query = { enable = true; http-address = "0.0.0.0:${toString queryPort}"; - store.addresses = [ + endpoints = [ "localhost:${toString grpcPort}" ]; }; From 65be712043d309591207095024014f589a164b2a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 26 Oct 2023 06:25:53 +0200 Subject: [PATCH 23/95] nixos/thanos: use mkPackageOptionMD --- nixos/modules/services/monitoring/thanos.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index 3c92db6dfaf7..a69de072fb3c 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -659,14 +659,7 @@ in { options.services.thanos = { - package = mkOption { - type = types.package; - default = pkgs.thanos; - defaultText = literalExpression "pkgs.thanos"; - description = lib.mdDoc '' - The thanos package that should be used. - ''; - }; + package = lib.mkPackageOptionMD pkgs "thanos" {}; sidecar = paramsToOptions params.sidecar // { enable = mkEnableOption From f5b47791bcf8d2ee97cca060c3195994cedb2888 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 7 Nov 2023 11:43:52 +0100 Subject: [PATCH 24/95] thanos: add anthonyroussel to maintainers --- pkgs/servers/monitoring/thanos/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 46524efa4e36..b6493c7a7dff 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -50,6 +50,6 @@ buildGoModule rec { homepage = "https://github.com/thanos-io/thanos"; changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}"; license = licenses.asl20; - maintainers = with maintainers; [ basvandijk ]; + maintainers = with maintainers; [ basvandijk anthonyroussel ]; }; } From 3bbf0779d5606cf53bba2aa590bb88032222b74a Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 12 Nov 2023 11:05:08 +0100 Subject: [PATCH 25/95] thanos: add meta.mainProgram --- pkgs/servers/monitoring/thanos/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index b6493c7a7dff..156bd4a6ec23 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -50,6 +50,7 @@ buildGoModule rec { homepage = "https://github.com/thanos-io/thanos"; changelog = "https://github.com/thanos-io/thanos/releases/tag/v${version}"; license = licenses.asl20; + mainProgram = "thanos"; maintainers = with maintainers; [ basvandijk anthonyroussel ]; }; } From d4d6602ce35a78e573de5a1281e206b362a38949 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 12 Nov 2023 11:16:09 +0100 Subject: [PATCH 26/95] nixos/thanos: remove `with lib;` notation https://nix.dev/guides/best-practices#with-scopes --- nixos/modules/services/monitoring/thanos.nix | 63 +++++++++++++------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/nixos/modules/services/monitoring/thanos.nix b/nixos/modules/services/monitoring/thanos.nix index a69de072fb3c..db8641aa6146 100644 --- a/nixos/modules/services/monitoring/thanos.nix +++ b/nixos/modules/services/monitoring/thanos.nix @@ -1,14 +1,37 @@ { config, lib, pkgs, ... }: -with lib; - let + inherit (lib) + collect + concatLists + concatStringsSep + flip + getAttrFromPath + hasPrefix + isList + length + literalExpression + literalMD + mapAttrsRecursiveCond + mapAttrsToList + mdDoc + mkEnableOption + mkIf + mkMerge + mkOption + mkPackageOptionMD + optional + optionalAttrs + optionalString + types + ; + cfg = config.services.thanos; nullOpt = type: description: mkOption { type = types.nullOr type; default = null; - description = lib.mdDoc description; + description = mdDoc description; }; optionToArgs = opt: v : optional (v != null) ''--${opt}="${toString v}"''; @@ -32,7 +55,7 @@ let option = mkOption { type = types.bool; default = false; - description = lib.mdDoc description; + description = mdDoc description; }; }; @@ -41,7 +64,7 @@ let option = mkOption { type = types.listOf types.str; default = []; - description = lib.mdDoc description; + description = mdDoc description; }; }; @@ -50,7 +73,7 @@ let option = mkOption { type = types.attrsOf types.str; default = {}; - description = lib.mdDoc description; + description = mdDoc description; }; }; @@ -59,7 +82,7 @@ let option = mkOption { type = types.str; inherit default; - description = lib.mdDoc description; + description = mdDoc description; }; }; @@ -86,7 +109,7 @@ let defaultText = literalMD '' calculated from `config.services.thanos.${cmd}` ''; - description = lib.mdDoc '' + description = mdDoc '' Arguments to the `thanos ${cmd}` command. Defaults to a list of arguments formed by converting the structured @@ -127,7 +150,7 @@ let if config.services.thanos..tracing.config == null then null else toString (toYAML "tracing.yaml" config.services.thanos..tracing.config); ''; - description = lib.mdDoc '' + description = mdDoc '' Path to YAML file that contains tracing configuration. See format details: @@ -192,7 +215,7 @@ let if config.services.thanos..objstore.config == null then null else toString (toYAML "objstore.yaml" config.services.thanos..objstore.config); ''; - description = lib.mdDoc '' + description = mdDoc '' Path to YAML file that contains object store configuration. See format details: @@ -231,7 +254,7 @@ let type = types.str; default = "/var/lib/${config.services.prometheus.stateDir}/data"; defaultText = literalExpression ''"/var/lib/''${config.services.prometheus.stateDir}/data"''; - description = lib.mdDoc '' + description = mdDoc '' Data directory of TSDB. ''; }; @@ -659,56 +682,56 @@ in { options.services.thanos = { - package = lib.mkPackageOptionMD pkgs "thanos" {}; + package = mkPackageOptionMD pkgs "thanos" {}; sidecar = paramsToOptions params.sidecar // { enable = mkEnableOption - (lib.mdDoc "the Thanos sidecar for Prometheus server"); + (mdDoc "the Thanos sidecar for Prometheus server"); arguments = mkArgumentsOption "sidecar"; }; store = paramsToOptions params.store // { enable = mkEnableOption - (lib.mdDoc "the Thanos store node giving access to blocks in a bucket provider."); + (mdDoc "the Thanos store node giving access to blocks in a bucket provider."); arguments = mkArgumentsOption "store"; }; query = paramsToOptions params.query // { enable = mkEnableOption - (lib.mdDoc ("the Thanos query node exposing PromQL enabled Query API " + + (mdDoc ("the Thanos query node exposing PromQL enabled Query API " + "with data retrieved from multiple store nodes")); arguments = mkArgumentsOption "query"; }; query-frontend = paramsToOptions params.query-frontend // { enable = mkEnableOption - (lib.mdDoc ("the Thanos query frontend implements a service deployed in front of queriers to + (mdDoc ("the Thanos query frontend implements a service deployed in front of queriers to improve query parallelization and caching.")); arguments = mkArgumentsOption "query-frontend"; }; rule = paramsToOptions params.rule // { enable = mkEnableOption - (lib.mdDoc ("the Thanos ruler service which evaluates Prometheus rules against" + + (mdDoc ("the Thanos ruler service which evaluates Prometheus rules against" + " given Query nodes, exposing Store API and storing old blocks in bucket")); arguments = mkArgumentsOption "rule"; }; compact = paramsToOptions params.compact // { enable = mkEnableOption - (lib.mdDoc "the Thanos compactor which continuously compacts blocks in an object store bucket"); + (mdDoc "the Thanos compactor which continuously compacts blocks in an object store bucket"); arguments = mkArgumentsOption "compact"; }; downsample = paramsToOptions params.downsample // { enable = mkEnableOption - (lib.mdDoc "the Thanos downsampler which continuously downsamples blocks in an object store bucket"); + (mdDoc "the Thanos downsampler which continuously downsamples blocks in an object store bucket"); arguments = mkArgumentsOption "downsample"; }; receive = paramsToOptions params.receive // { enable = mkEnableOption - (lib.mdDoc ("the Thanos receiver which accept Prometheus remote write API requests and write to local tsdb")); + (mdDoc ("the Thanos receiver which accept Prometheus remote write API requests and write to local tsdb")); arguments = mkArgumentsOption "receive"; }; }; From 8ddb6c272a6c4719a13e6fb88acea601476e65ed Mon Sep 17 00:00:00 2001 From: Van Tuan Vo Date: Sun, 12 Nov 2023 17:05:49 +0100 Subject: [PATCH 27/95] klipper-firmware: update simulator config --- pkgs/servers/klipper/simulator.cfg | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/klipper/simulator.cfg b/pkgs/servers/klipper/simulator.cfg index 4dc19b1e40ff..6a4122ce3aa5 100644 --- a/pkgs/servers/klipper/simulator.cfg +++ b/pkgs/servers/klipper/simulator.cfg @@ -4,8 +4,10 @@ # CONFIG_MACH_ATSAMD is not set # CONFIG_MACH_LPC176X is not set # CONFIG_MACH_STM32 is not set +# CONFIG_MACH_HC32F460 is not set # CONFIG_MACH_RP2040 is not set # CONFIG_MACH_PRU is not set +# CONFIG_MACH_AR100 is not set # CONFIG_MACH_LINUX is not set CONFIG_MACH_SIMU=y CONFIG_BOARD_DIRECTORY="simulator" @@ -16,6 +18,12 @@ CONFIG_SERIAL_BAUD=250000 CONFIG_USB_VENDOR_ID=0x1d50 CONFIG_USB_DEVICE_ID=0x614e CONFIG_USB_SERIAL_NUMBER="12345" +CONFIG_WANT_GPIO_BITBANGING=y +CONFIG_WANT_DISPLAYS=y +CONFIG_WANT_SENSORS=y +CONFIG_WANT_LIS2DW=y +CONFIG_WANT_SOFTWARE_SPI=y +CONFIG_CANBUS_FREQUENCY=1000000 CONFIG_HAVE_GPIO=y CONFIG_HAVE_GPIO_ADC=y CONFIG_HAVE_GPIO_SPI=y From c4c81ac8a219e8725dae514f49c7c1b960632e67 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Thu, 20 Jul 2023 19:13:51 -0400 Subject: [PATCH 28/95] buildMozillaMach: support disabling extension signing enforcement Previously, derivations specified the environment variable themselves, which did not actually disable signing enforcement. --- pkgs/applications/networking/browsers/firefox/common.nix | 3 +++ pkgs/applications/networking/browsers/firefox/packages.nix | 7 +++---- pkgs/applications/networking/browsers/firefox/wrapper.nix | 7 ++----- .../applications/networking/browsers/librewolf/default.nix | 7 +++---- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 348c93d0c383..26145c69fd83 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -6,6 +6,7 @@ , application ? "browser" , applicationName ? "Mozilla Firefox" , branding ? null +, requireSigning ? true , src , unpackPhase ? null , extraPatches ? [] @@ -367,6 +368,8 @@ buildStdenv.mkDerivation { configureFlagsArray+=("--with-mozilla-api-keyfile=$TMPDIR/mls-api-key") '' + lib.optionalString (enableOfficialBranding && !stdenv.is32bit) '' export MOZILLA_OFFICIAL=1 + '' + lib.optionalString (!requireSigning) '' + export MOZ_REQUIRE_SIGNING= '' + lib.optionalString stdenv.hostPlatform.isMusl '' # linking firefox hits the vm.max_map_count kernel limit with the default musl allocator # TODO: Default vm.max_map_count has been increased, retest without this diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 27f3ec022ce3..bd9794b0cde9 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -54,10 +54,11 @@ }; }; - firefox-devedition = (buildMozillaMach rec { + firefox-devedition = buildMozillaMach rec { pname = "firefox-devedition"; version = "116.0b3"; applicationName = "Mozilla Firefox Developer Edition"; + requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; @@ -81,9 +82,7 @@ versionSuffix = "b[0-9]*"; baseUrl = "https://archive.mozilla.org/pub/devedition/releases/"; }; - }).overrideAttrs (prev: { - env.MOZ_REQUIRE_SIGNING = ""; - }); + }; firefox-esr-102 = buildMozillaMach rec { pname = "firefox-esr-102"; diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 6b08a891ec69..7ff74a971ca6 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -102,15 +102,12 @@ let nameArray = builtins.map(a: a.name) (lib.optionals usesNixExtensions nixExtensions); - requiresSigning = browser ? MOZ_REQUIRE_SIGNING - -> toString browser.MOZ_REQUIRE_SIGNING != ""; - # Check that every extension has a unqiue .name attribute # and an extid attribute extensions = if nameArray != (lib.unique nameArray) then throw "Firefox addon name needs to be unique" - else if requiresSigning && !lib.hasSuffix "esr" browser.name then - throw "Nix addons are only supported without signature enforcement (eg. Firefox ESR)" + else if browser.requireSigning then + throw "Nix addons are only supported with signature enforcement disabled" else builtins.map (a: if ! (builtins.hasAttr "extid" a) then throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index 4dde2d57d7e0..49f48db6858f 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -3,12 +3,13 @@ let librewolf-src = callPackage ./librewolf.nix { }; in -((buildMozillaMach rec { +(buildMozillaMach rec { pname = "librewolf"; applicationName = "LibreWolf"; binaryName = "librewolf"; version = librewolf-src.packageVersion; src = librewolf-src.firefox; + requireSigning = false; inherit (librewolf-src) extraConfigureFlags extraPatches extraPostPatch extraPassthru; meta = { @@ -29,6 +30,4 @@ in }).override { crashreporterSupport = false; enableOfficialBranding = false; -}).overrideAttrs (prev: { - MOZ_REQUIRE_SIGNING = ""; -}) +} From 101fc1b99ac22a6e652f32a189a91dcd6ee85a6c Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 14 Nov 2023 09:40:05 -0500 Subject: [PATCH 29/95] buildMozillaMach: support addon sideloading --- pkgs/applications/networking/browsers/firefox/common.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 26145c69fd83..ac8bf05fae75 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -7,6 +7,7 @@ , applicationName ? "Mozilla Firefox" , branding ? null , requireSigning ? true +, allowAddonSideload ? false , src , unpackPhase ? null , extraPatches ? [] @@ -411,6 +412,7 @@ buildStdenv.mkDerivation { # https://bugzilla.mozilla.org/show_bug.cgi?id=1482204 ++ lib.optional (ltoSupport && (buildStdenv.isAarch32 || buildStdenv.isi686 || buildStdenv.isx86_64)) "--disable-elf-hack" ++ lib.optional (!drmSupport) "--disable-eme" + ++ lib.optional (allowAddonSideload) "--allow-addon-sideload" ++ [ (enableFeature alsaSupport "alsa") (enableFeature crashreporterSupport "crashreporter") From a997db8e4fd2339e75afec4ea0ccd13d83327bf2 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 14 Nov 2023 09:33:06 -0500 Subject: [PATCH 30/95] librewolf: allow addon sideloading LibreWolf's build configuration[1] already disables addon sideloading, so this isn't a change in behavior. [1] https://codeberg.org/librewolf/source/src/commit/e5762e9d5badf50bbc72f578d01111ed6e92dd74/assets/mozconfig.new#L3 --- pkgs/applications/networking/browsers/librewolf/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index 49f48db6858f..1d1575090deb 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -10,6 +10,7 @@ in version = librewolf-src.packageVersion; src = librewolf-src.firefox; requireSigning = false; + allowAddonSideload = true; inherit (librewolf-src) extraConfigureFlags extraPatches extraPostPatch extraPassthru; meta = { From c09e1762318d2d078b2590b5702710ded49bc287 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 14 Nov 2023 09:40:31 -0500 Subject: [PATCH 31/95] firefox: consider sideloading capability in extension handling --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 7ff74a971ca6..0b5fca6adcb9 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -106,8 +106,8 @@ let # and an extid attribute extensions = if nameArray != (lib.unique nameArray) then throw "Firefox addon name needs to be unique" - else if browser.requireSigning then - throw "Nix addons are only supported with signature enforcement disabled" + else if browser.requireSigning || !browser.allowAddonSideload then + throw "Nix addons are only supported with signature enforcement disabled and addon sideloading enabled (eg. LibreWolf)" else builtins.map (a: if ! (builtins.hasAttr "extid" a) then throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" From db262d35698b91db20582d92cd8cac8995978df9 Mon Sep 17 00:00:00 2001 From: Infinidoge Date: Tue, 7 Nov 2023 18:08:10 -0500 Subject: [PATCH 32/95] firefox: correct capitalization in extension check error --- pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 0b5fca6adcb9..91adf1d7e96d 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -110,7 +110,7 @@ let throw "Nix addons are only supported with signature enforcement disabled and addon sideloading enabled (eg. LibreWolf)" else builtins.map (a: if ! (builtins.hasAttr "extid" a) then - throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" + throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchFirefoxAddon" else a ) (lib.optionals usesNixExtensions nixExtensions); From e958ffafbc8072be7f342b653571130c2fef99f8 Mon Sep 17 00:00:00 2001 From: fin444 Date: Thu, 19 Oct 2023 11:38:24 -0400 Subject: [PATCH 33/95] onlyoffice-bin_latest: 7.4.1 -> 7.5.1 --- pkgs/applications/office/onlyoffice-bin/{7_4.nix => 7_5.nix} | 4 ++-- pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/applications/office/onlyoffice-bin/{7_4.nix => 7_5.nix} (98%) diff --git a/pkgs/applications/office/onlyoffice-bin/7_4.nix b/pkgs/applications/office/onlyoffice-bin/7_5.nix similarity index 98% rename from pkgs/applications/office/onlyoffice-bin/7_4.nix rename to pkgs/applications/office/onlyoffice-bin/7_5.nix index bf587a4c9bc2..612e1af36a4b 100644 --- a/pkgs/applications/office/onlyoffice-bin/7_4.nix +++ b/pkgs/applications/office/onlyoffice-bin/7_5.nix @@ -76,11 +76,11 @@ let derivation = stdenv.mkDerivation rec { pname = "onlyoffice-desktopeditors"; - version = "7.4.1"; + version = "7.5.1"; minor = null; src = fetchurl { url = "https://github.com/ONLYOFFICE/DesktopEditors/releases/download/v${version}/onlyoffice-desktopeditors_amd64.deb"; - sha256 = "sha256-vaBF3GJyLBldWdEruOeVpRvwGNwaRl7IKPguDLRoe8M="; + sha256 = "sha256-Hf5CNbUUMuHZHDY3fgD4qpF4UASevscK8DTZlauyHhY="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1063f9dc59b4..fcf30f2d6479 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34089,9 +34089,9 @@ with pkgs; okteto = callPackage ../development/tools/okteto { }; onlyoffice-bin_7_2 = callPackage ../applications/office/onlyoffice-bin/7_2.nix { }; - onlyoffice-bin_7_4 = callPackage ../applications/office/onlyoffice-bin/7_4.nix { }; + onlyoffice-bin_7_5 = callPackage ../applications/office/onlyoffice-bin/7_5.nix { }; onlyoffice-bin = onlyoffice-bin_7_2; - onlyoffice-bin_latest = onlyoffice-bin_7_4; + onlyoffice-bin_latest = onlyoffice-bin_7_5; onmetal-image = callPackage ../tools/virtualization/onmetal-image { }; From 8f8e2bcf04a2d188b60e7554044461ce3f4bf8c8 Mon Sep 17 00:00:00 2001 From: fin444 Date: Thu, 19 Oct 2023 12:43:59 -0400 Subject: [PATCH 34/95] onlyoffice-bin_latest: use nixpkgs noto cjk instead of a custom one --- .../office/onlyoffice-bin/7_5.nix | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/office/onlyoffice-bin/7_5.nix b/pkgs/applications/office/onlyoffice-bin/7_5.nix index 612e1af36a4b..33744bb3831e 100644 --- a/pkgs/applications/office/onlyoffice-bin/7_5.nix +++ b/pkgs/applications/office/onlyoffice-bin/7_5.nix @@ -26,6 +26,7 @@ , libdrm , makeWrapper , mesa +, noto-fonts-cjk-sans , nspr , nss , pulseaudio @@ -54,18 +55,6 @@ let # TODO: Find out which of these fonts we'd be allowed to distribute along # with this package, or how to make this easier for users otherwise. - # Not using the `noto-fonts-cjk` package from nixpkgs, because it was - # reported that its `.ttc` file is not picked up by OnlyOffice, see: - # https://github.com/NixOS/nixpkgs/pull/116343#discussion_r593979816 - noto-fonts-cjk = fetchurl { - url = - let - version = "v20201206-cjk"; - in - "https://github.com/googlefonts/noto-cjk/raw/${version}/NotoSansCJKsc-Regular.otf"; - sha256 = "sha256-aJXSVNJ+p6wMAislXUn4JQilLhimNSedbc9nAuPVxo4="; - }; - runtimeLibs = lib.makeLibraryPath [ curl glibc @@ -134,10 +123,6 @@ let dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner ''; - preConfigure = '' - cp --no-preserve=mode,ownership ${noto-fonts-cjk} opt/onlyoffice/desktopeditors/fonts/ - ''; - installPhase = '' runHook preInstall @@ -179,12 +164,14 @@ in # In order to download plugins, OnlyOffice uses /usr/bin/curl so we have to wrap it. # Curl still needs to be in runtimeLibs because the library is used directly in other parts of the code. +# Fonts are also discovered by looking in /usr/share/fonts, so adding fonts to targetPkgs will include them buildFHSEnv { name = derivation.name; targetPkgs = pkgs': [ curl derivation + noto-fonts-cjk-sans ]; runScript = "/bin/onlyoffice-desktopeditors"; From 7565e18097c71c0926014c3428827bb9619dfac1 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 14 Nov 2023 20:43:40 +0900 Subject: [PATCH 35/95] python311Packages.xdg: fetch from PyPI instead of GitHub the github source uses `xdg_base_dirs`, but pypi's sdist maintains `xdg` for compatibility. there are actually breaking changes in xdg_base_dirs, and libraries that want to support python 3.9 and below need to use xdg. --- .../python-modules/xdg/default.nix | 26 ++++++++++++------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/xdg/default.nix b/pkgs/development/python-modules/xdg/default.nix index f44d2e443566..065f434bd7ee 100644 --- a/pkgs/development/python-modules/xdg/default.nix +++ b/pkgs/development/python-modules/xdg/default.nix @@ -1,20 +1,23 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder , clikit , poetry-core -, pytestCheckHook }: buildPythonPackage rec { version = "6.0.0"; pname = "xdg"; - disabled = isPy27; + disabled = pythonOlder "3.7"; format = "pyproject"; - src = fetchFromGitHub { - owner = "srstevenson"; - repo = pname; - rev = "refs/tags/${version}"; - hash = "sha256-yVuruSKv99IZGNCpY9cKwAe6gJNAWjL+Lol2D1/0hiI="; + # the github source uses `xdg_base_dirs`, but pypi's sdist maintains `xdg` for compatibility. + # there are actually breaking changes in xdg_base_dirs, + # and libraries that want to support python 3.9 and below need to use xdg. + src = fetchPypi { + inherit pname version; + hash = "sha256-JCeAlPLUXoRtHrKKLruS17Z/wMq1JJ7jzojJX2SaHJI="; }; nativeBuildInputs = [ poetry-core ]; @@ -23,7 +26,12 @@ buildPythonPackage rec { clikit ]; - nativeCheckInputs = [ pytestCheckHook ]; + # sdist has no tests + doCheck = false; + + pythonImportsCheck = [ + "xdg" + ]; meta = with lib; { description = "XDG Base Directory Specification for Python"; From 000e9024535eb84654a893fa134e21a270319855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=84=A1=E5=90=8D=E6=B0=8F?= Date: Thu, 16 Nov 2023 20:30:07 +0800 Subject: [PATCH 36/95] maintainers: add sg-qwt --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 911f71a2cf05..339f551fe505 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16171,6 +16171,13 @@ githubId = 75371; name = "Stig Palmquist"; }; + sg-qwt = { + email = "hello@edgerunners.eu.org"; + matrix = "@dhl:edgerunners.eu.org"; + github = "sg-qwt"; + name = "sg-qwt"; + githubId = 115715554; + }; sgraf = { email = "sgraf1337@gmail.com"; github = "sgraf812"; From 1800280207de200e802341d49c49cc1f420dcbd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=84=A1=E5=90=8D=E6=B0=8F?= Date: Thu, 16 Nov 2023 20:30:32 +0800 Subject: [PATCH 37/95] cljfmt: init at 0.11.2 --- pkgs/by-name/cl/cljfmt/package.nix | 44 ++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/cl/cljfmt/package.nix diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix new file mode 100644 index 000000000000..1c6f30cc9d76 --- /dev/null +++ b/pkgs/by-name/cl/cljfmt/package.nix @@ -0,0 +1,44 @@ +{ lib +, buildGraalvmNativeImage +, fetchurl +, nix-update-script +, testers +, cljfmt +}: + +buildGraalvmNativeImage rec { + pname = "cljfmt"; + version = "0.11.2"; + + src = fetchurl { + url = "https://github.com/weavejester/${pname}/releases/download/${version}/${pname}-${version}-standalone.jar"; + sha256 = "sha256-vEldQ7qV375mHMn3OUdn0FaPd+f/v9g+C+PuzbSTWtk="; + }; + + extraNativeImageBuildArgs = [ + "-H:+ReportExceptionStackTraces" + "-H:Log=registerResource:" + "--initialize-at-build-time" + "--diagnostics-mode" + "--report-unsupported-elements-at-runtime" + "--no-fallback" + ]; + + passthru.updateScript = nix-update-script { }; + + passthru.tests.version = testers.testVersion { + inherit version; + package = cljfmt; + command = "cljfmt --version"; + }; + + meta = with lib; { + mainProgram = "cljfmt"; + description = "A tool for formatting Clojure code"; + homepage = "https://github.com/weavejester/cljfmt"; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + license = licenses.epl10; + changelog = "https://github.com/weavejester/cljfmt/blob/${version}/CHANGELOG.md"; + maintainers = with maintainers; [ sg-qwt ]; + }; +} From 18f3c1fb556e77e6e48fad880c023e74e5ffbe49 Mon Sep 17 00:00:00 2001 From: joris Date: Fri, 17 Nov 2023 13:55:21 +0100 Subject: [PATCH 38/95] services/squid: explicit usage of coreutils' kill on ExecReload --- nixos/modules/services/networking/squid.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/squid.nix b/nixos/modules/services/networking/squid.nix index 914cd7f320c9..f93bcf19f2b3 100644 --- a/nixos/modules/services/networking/squid.nix +++ b/nixos/modules/services/networking/squid.nix @@ -176,7 +176,7 @@ in serviceConfig = { PIDFile="/run/squid.pid"; ExecStart = "${cfg.package}/bin/squid --foreground -YCs -f ${squidConfig}"; - ExecReload="kill -HUP $MAINPID"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; KillMode="mixed"; NotifyAccess="all"; }; From def5df923f14ab858ec2882591d6cf851be6a6bf Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 18 Nov 2023 04:54:05 +0100 Subject: [PATCH 39/95] tests.nixpkgs-check-by-name: More reliable .envrc reloading See also https://github.com/nix-community/nix-direnv/issues/408 and https://github.com/nix-community/nix-direnv/pull/407 --- pkgs/test/nixpkgs-check-by-name/.envrc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/test/nixpkgs-check-by-name/.envrc b/pkgs/test/nixpkgs-check-by-name/.envrc index 1d953f4bd735..4555ccf0921f 100644 --- a/pkgs/test/nixpkgs-check-by-name/.envrc +++ b/pkgs/test/nixpkgs-check-by-name/.envrc @@ -1 +1,7 @@ +if has nix_direnv_watch_file; then + nix_direnv_watch_file default.nix shell.nix +else + watch_file default.nix shell.nix +fi + use nix From 911e746520af0e4ef52044fc3c3f0aa4c4a26dbd Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Fri, 17 Nov 2023 20:31:09 -0800 Subject: [PATCH 40/95] squeak: fix build with LLVM 16 Part of ZHF for 23.11: https://hydra.nixos.org/build/241300457 I bisected this failure to this first bad commit: [9ed7bfe46bf193e55a6fd8ae89dfe54b4dca2c18] llvmPackages: 11 -> 16 on Linux, then looked around for other repairs made to assuage LLVM's errors. This appears to be the pattern. --- pkgs/development/compilers/squeak/default.nix | 51 +++++++++++++++---- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 45 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix index 79627eba7c83..0494539c4435 100644 --- a/pkgs/development/compilers/squeak/default.nix +++ b/pkgs/development/compilers/squeak/default.nix @@ -1,15 +1,40 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, fetchzip -, autoconf, automake, autoreconfHook, clang, dos2unix, file, perl +{ lib +, stdenv +, fetchFromGitHub +, fetchurl +, fetchzip +, autoconf +, automake +, autoreconfHook +, dos2unix +, file +, perl , pkg-config -, alsa-lib, coreutils, freetype, glib, glibc, gnugrep, libGL, libpulseaudio -, libtool, libuuid, openssl, pango, xorg -, squeakImageHash ? null, squeakSourcesHash ? null, squeakSourcesVersion ? null -, squeakVersion ? null, squeakVmCommitHash ? null, squeakVmCommitHashHash ? null +, alsa-lib +, coreutils +, freetype +, glib +, glibc +, gnugrep +, libGL +, libpulseaudio +, libtool +, libuuid +, openssl +, pango +, xorg +, squeakImageHash ? null +, squeakSourcesHash ? null +, squeakSourcesVersion ? null +, squeakVersion ? null +, squeakVmCommitHash ? null +, squeakVmCommitHashHash ? null , squeakVmVersion ? null } @ args: let - inherit (builtins) elemAt; + inherit (builtins) elemAt toString; + nullableOr = o: default: if o == null then default else o; bits = stdenv.hostPlatform.parsed.cpu.bits; @@ -75,7 +100,6 @@ in stdenv.mkDerivation { autoconf automake autoreconfHook - clang dos2unix file perl @@ -140,7 +164,16 @@ in stdenv.mkDerivation { # Workaround build failure on -fno-common toolchains: # ld: vm/vm.a(cogit.o):spur64src/vm/cogitX64SysV.c:2552: multiple definition of # `traceStores'; vm/vm.a(gcc3x-cointerp.o):spur64src/vm/cogit.h:140: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; + env.NIX_CFLAGS_COMPILE = toString ( + [ "-fcommon" ] + ++ (lib.optionals stdenv.cc.isClang [ + # LLVM 16 turned these into errors (rightly, perhaps.) + # Allow this package to continue to build despite this change. + "-Wno-error=int-conversion" + "-Wno-error=implicit-function-declaration" + "-Wno-error=incompatible-function-pointer-types" + ]) + ); preAutoreconf = '' pushd ./platforms/unix/config > /dev/null diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7fb9cdafdd72..2c463f4d4369 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17287,7 +17287,9 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation Security; }; - squeak = callPackage ../development/compilers/squeak { }; + squeak = callPackage ../development/compilers/squeak { + stdenv = clangStdenv; + }; squirrel-sql = callPackage ../development/tools/database/squirrel-sql { drivers = [ jtds_jdbc mssql_jdbc mysql_jdbc postgresql_jdbc ]; From 74cfdda9ee7a364a0dfce6f34923f0e7ce64e814 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 16 Nov 2023 20:22:06 +0100 Subject: [PATCH 41/95] python311Packages.nettigo-air-monitor: refactor --- .../python-modules/nettigo-air-monitor/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index 1612bfac0d96..ac6da73af2ab 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -9,22 +9,27 @@ , pytest-error-for-skips , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "nettigo-air-monitor"; version = "2.2.1"; - format = "setuptools"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "bieniu"; - repo = pname; + repo = "nettigo-air-monitor"; rev = "refs/tags/${version}"; hash = "sha256-24O9Yl0+boxDtyPW4tBTsk2iDGGXf8ofkDHu8B+GxhE="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp aqipy-atmotech From add7a091c6fa845135452aec11bdc76b3b002dac Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 18 Nov 2023 17:01:10 +0100 Subject: [PATCH 42/95] nginx: fix build on darwin --- pkgs/servers/http/nginx/generic.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix index 6194548a6a99..4ca4bd75d6b6 100644 --- a/pkgs/servers/http/nginx/generic.nix +++ b/pkgs/servers/http/nginx/generic.nix @@ -124,7 +124,11 @@ stdenv.mkDerivation { ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [ # fix build vts module on gcc11 "-Wno-error=stringop-overread" - ] ++ lib.optional stdenv.isDarwin "-Wno-error=deprecated-declarations"); + ] ++ lib.optionals stdenv.isDarwin [ + "-Wno-error=deprecated-declarations" + "-Wno-error=gnu-folding-constant" + "-Wno-error=unused-but-set-variable" + ]); configurePlatforms = []; From 49a9eca573bbb3c23c4236982874881590c8aa91 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 18 Nov 2023 13:07:56 +0100 Subject: [PATCH 43/95] typst-preview: 0.9.0 -> 0.9.1 --- .../editors/vscode/extensions/default.nix | 12 +++ .../ty}/typst-preview/Cargo.lock | 2 +- .../ty}/typst-preview/package.json | 0 pkgs/by-name/ty/typst-preview/package.nix | 94 +++++++++++++++++++ .../typesetting/typst-preview/default.nix | 73 -------------- pkgs/top-level/all-packages.nix | 2 - 6 files changed, 107 insertions(+), 76 deletions(-) rename pkgs/{tools/typesetting => by-name/ty}/typst-preview/Cargo.lock (99%) rename pkgs/{tools/typesetting => by-name/ty}/typst-preview/package.json (100%) create mode 100644 pkgs/by-name/ty/typst-preview/package.nix delete mode 100644 pkgs/tools/typesetting/typst-preview/default.nix diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 365b26642b3e..7969f6e8122d 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -20,6 +20,7 @@ , millet , shfmt , typst-lsp +, typst-preview , autoPatchelfHook , zlib , stdenv @@ -2329,6 +2330,17 @@ let buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; + buildInputs = [ + typst-preview + ]; + + nativeBuildInputs = [ jq moreutils ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '.contributes.configuration.properties."typst-preview.executable".default = "${lib.getExe typst-preview}"' package.json | sponge package.json + ''; + meta = { description = "Typst Preview is an extension for previewing your Typst files in vscode instantly"; downloadPage = "https://marketplace.visualstudio.com/items?itemName=mgt19937.typst-preview"; diff --git a/pkgs/tools/typesetting/typst-preview/Cargo.lock b/pkgs/by-name/ty/typst-preview/Cargo.lock similarity index 99% rename from pkgs/tools/typesetting/typst-preview/Cargo.lock rename to pkgs/by-name/ty/typst-preview/Cargo.lock index 3d988b591865..81618b1902ea 100644 --- a/pkgs/tools/typesetting/typst-preview/Cargo.lock +++ b/pkgs/by-name/ty/typst-preview/Cargo.lock @@ -3390,7 +3390,7 @@ dependencies = [ [[package]] name = "typst-preview" -version = "0.9.0" +version = "0.9.1" dependencies = [ "anyhow", "chrono", diff --git a/pkgs/tools/typesetting/typst-preview/package.json b/pkgs/by-name/ty/typst-preview/package.json similarity index 100% rename from pkgs/tools/typesetting/typst-preview/package.json rename to pkgs/by-name/ty/typst-preview/package.json diff --git a/pkgs/by-name/ty/typst-preview/package.nix b/pkgs/by-name/ty/typst-preview/package.nix new file mode 100644 index 000000000000..880e7288ca97 --- /dev/null +++ b/pkgs/by-name/ty/typst-preview/package.nix @@ -0,0 +1,94 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, mkYarnPackage +, fetchYarnDeps +, pkg-config +, libgit2 +, openssl +, zlib +, stdenv +, darwin +}: + +let + # Keep the vscode "mgt19937.typst-preview" extension in sync when updating + # this package at pkgs/applications/editors/vscode/extensions/default.nix + version = "0.9.1"; + + src = fetchFromGitHub { + owner = "Enter-tainer"; + repo = "typst-preview"; + rev = "v${version}"; + hash = "sha256-VmUcnmTe5Ngcje0SSpOY13HUIfdxBMg8KwvZ1wupCqc="; + }; + + frontendSrc = "${src}/addons/frontend"; + + frontend = mkYarnPackage { + inherit version; + pname = "typst-preview-frontend"; + src = frontendSrc; + packageJSON = ./package.json; + + offlineCache = fetchYarnDeps { + yarnLock = "${frontendSrc}/yarn.lock"; + hash = "sha256-7a7/UOfau84nLIAKj6Tn9rTUmeBJ7rYDFAdr55ZDLgA="; + }; + + buildPhase = '' + runHook preBuild + yarn --offline build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp -R deps/typst-preview-frontend/dist $out + runHook postInstall + ''; + + doDist = false; + }; +in +rustPlatform.buildRustPackage { + pname = "typst-preview"; + inherit version src; + + cargoLock = { + lockFile = ./Cargo.lock; + outputHashes = { + "hayagriva-0.4.0" = "sha256-377lXL3+TO8U91OopMYEI0NrWWwzy6+O7B65bLhP+X4="; + "typst-0.9.0" = "sha256-+rnsUSGi3QZlbC4i8racsM4U6+l8oA9YjjUOtQAIWOk="; + "typst-ts-compiler-0.4.0-rc9" = "sha256-NVmbAodDRJBJlGGDRjaEcTHGoCeN4hNjIynIDKqvNbM="; + }; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + libgit2 + openssl + zlib + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.CoreFoundation + darwin.apple_sdk.frameworks.CoreServices + darwin.apple_sdk.frameworks.Security + darwin.apple_sdk.frameworks.SystemConfiguration + ]; + + prePatch = '' + mkdir -p addons/vscode/out/frontend + cp -R ${frontend}/* addons/vscode/out/frontend/ + ''; + + meta = { + description = "Typst preview extension for VSCode"; + homepage = "https://github.com/Enter-tainer/typst-preview/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ berberman ]; + mainProgram = "typst-preview"; + }; +} diff --git a/pkgs/tools/typesetting/typst-preview/default.nix b/pkgs/tools/typesetting/typst-preview/default.nix deleted file mode 100644 index ac3786f5513b..000000000000 --- a/pkgs/tools/typesetting/typst-preview/default.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ lib, fetchFromGitHub, rustPlatform, fetchYarnDeps, mkYarnPackage, darwin -, stdenv }: - -let - name = "typst-preview"; - version = "0.9.0"; - src = fetchFromGitHub { - owner = "Enter-tainer"; - repo = name; - rev = "v${version}"; - hash = "sha256-r/zDvfMvfvZqa3Xkzk70tIEyhc5LDwqc2A5MUuK2xC0="; - }; - frontendSrc = "${src}/addons/frontend"; - frontend = mkYarnPackage rec { - inherit version; - pname = "${name}-frontend"; - src = frontendSrc; - packageJSON = ./package.json; - - offlineCache = fetchYarnDeps { - yarnLock = "${frontendSrc}/yarn.lock"; - hash = "sha256-7a7/UOfau84nLIAKj6Tn9rTUmeBJ7rYDFAdr55ZDLgA="; - }; - - buildPhase = '' - runHook preBuild - yarn --offline build - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - cp -R deps/${pname}/dist $out - runHook postInstall - ''; - doDist = false; - }; - -in rustPlatform.buildRustPackage rec { - - pname = name; - inherit version src; - - buildInputs = lib.optionals stdenv.isDarwin - (with darwin.apple_sdk.frameworks; [ - Security - SystemConfiguration - CoreServices - ]); - - cargoLock = { - lockFile = ./Cargo.lock; - outputHashes = { - "hayagriva-0.4.0" = "sha256-377lXL3+TO8U91OopMYEI0NrWWwzy6+O7B65bLhP+X4="; - "typst-0.9.0" = "sha256-+rnsUSGi3QZlbC4i8racsM4U6+l8oA9YjjUOtQAIWOk="; - "typst-ts-compiler-0.4.0-rc9" = - "sha256-NVmbAodDRJBJlGGDRjaEcTHGoCeN4hNjIynIDKqvNbM="; - }; - }; - - prePatch = '' - mkdir -p addons/vscode/out/frontend - cp -R ${frontend}/* addons/vscode/out/frontend/ - ''; - - meta = with lib; { - description = "Preview your Typst files in vscode"; - homepage = "https://github.com/Enter-tainer/typse-preview"; - license = licenses.mit; - maintainers = with maintainers; [ berberman ]; - mainProgram = "typst-preview"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b01cf47b547..27fac118ebd2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14235,8 +14235,6 @@ with pkgs; typst-live = callPackage ../tools/typesetting/typst-live { }; - typst-preview = callPackage ../tools/typesetting/typst-preview { }; - tz = callPackage ../tools/misc/tz { }; u9fs = callPackage ../servers/u9fs { }; From 6596aa020c3b6cda05340a991d8b0737dd5edaf2 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 18 Nov 2023 13:07:37 +0100 Subject: [PATCH 44/95] vscode-extensions.mgt19937.typst-preview: 0.6.1 -> 0.9.1 --- .../editors/vscode/extensions/default.nix | 34 ++++--------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 7969f6e8122d..54b4ba9a974a 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2298,37 +2298,15 @@ let }; }; + # Keep pkgs/tools/typesetting/typst-preview/default.nix in sync with this + # extension mgt19937.typst-preview = buildVscodeMarketplaceExtension { - mktplcRef = - let - sources = { - "x86_64-linux" = { - arch = "linux-x64"; - sha256 = "sha256-O8sFv23tlhJS6N8LRKkHcTJTupZejCLDRdVVCdDlWbA="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - sha256 = "1npzjch67agswh3nm14dbbsx777daq2rdw1yny10jf3858z2qynr"; - }; - "aarch64-linux" = { - arch = "linux-arm64"; - sha256 = "1vv1jfgnyjbmshh4w6rf496d9dpdsk3f0049ii4d9vi23igk4xpk"; - }; - "aarch64-darwin" = { - arch = "darwin-arm64"; - sha256 = "0dfchzqm61kddq20zvp1pcpk1625b9wgj32ymc08piq06pbadk29"; - }; - }; - in - { + mktplcRef = { name = "typst-preview"; publisher = "mgt19937"; - version = "0.6.1"; - } // sources.${stdenv.system}; - - nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - - buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; + version = "0.9.1"; + sha256 = "sha256-GHD/i+QOnItGEYG0bl/pVl+a4Dvn7SHhICJ14VfqMjE="; + }; buildInputs = [ typst-preview From 6a2fc4017b445e3bbbee18ec935a46d3c35f03e4 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sat, 18 Nov 2023 13:14:55 +0100 Subject: [PATCH 45/95] vscode-extensions.nvarner.typst-lsp: minor fix --- pkgs/applications/editors/vscode/extensions/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 54b4ba9a974a..b583e8135609 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2735,7 +2735,6 @@ let }; }; - nvarner.typst-lsp = buildVscodeMarketplaceExtension { mktplcRef = { name = "typst-lsp"; @@ -2748,9 +2747,13 @@ let nativeBuildInputs = [ jq moreutils ]; + buildInputs = [ + typst-lsp + ]; + postInstall = '' cd "$out/$installPrefix" - jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${typst-lsp}/bin/typst-lsp"' package.json | sponge package.json + jq '.contributes.configuration.properties."typst-lsp.serverPath".default = "${lib.getExe typst-lsp}"' package.json | sponge package.json ''; meta = { From e4964afa740dd74327e3bf0e1d894b21c6957819 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 18 Nov 2023 17:28:10 -0500 Subject: [PATCH 46/95] gtree: 1.10.2 -> 1.10.3 Diff: https://github.com/ddddddO/gtree/compare/v1.10.2...v1.10.3 Changelog: https://github.com/ddddddO/gtree/releases/tag/v1.10.3 --- pkgs/tools/text/gtree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/gtree/default.nix b/pkgs/tools/text/gtree/default.nix index 4925ce397190..e151a1467446 100644 --- a/pkgs/tools/text/gtree/default.nix +++ b/pkgs/tools/text/gtree/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gtree"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "ddddddO"; repo = "gtree"; rev = "v${version}"; - hash = "sha256-sfw+Si6g6NVUWZdB6q3wnoabMAqIR9/KT1HsXtbafDY="; + hash = "sha256-KFEYkhCLMcJ4NkHu0kkuG70EvJQ3HYDvicmomcMJZjc="; }; - vendorHash = "sha256-3g47EuDElz1lrw7pgzD1jtTAs2Up97WWWFHe6aFE9zk="; + vendorHash = "sha256-rvVrVv73gW26UUy1MyxKDjUgX1mrMMii+l8qU2hLOek="; subPackages = [ "cmd/gtree" From b07228bd236d5ea062f7872088a8684a76f338ac Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 18 Nov 2023 17:30:18 -0500 Subject: [PATCH 47/95] poethepoet: 0.24.2 -> 0.24.4 Diff: https://github.com/nat-n/poethepoet/compare/v0.24.2...v0.24.4 Changelog: https://github.com/nat-n/poethepoet/releases/tag/v0.24.4 --- pkgs/by-name/po/poethepoet/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix index cdaccc6b436a..4faecc29cff1 100644 --- a/pkgs/by-name/po/poethepoet/package.nix +++ b/pkgs/by-name/po/poethepoet/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "poethepoet"; - version = "0.24.2"; + version = "0.24.4"; pyproject = true; src = fetchFromGitHub { owner = "nat-n"; repo = "poethepoet"; rev = "v${version}"; - hash = "sha256-tumEwaHXFLSXOmyQba4wBU5irvzZBL3BsCtF+Nlly+c="; + hash = "sha256-RTV3TVNciJE7dC/gtViZcSWFXR2A4qNMAJ/1OEzMAus="; }; nativeBuildInputs = [ From 4c2b555075a44bb53526621d39d9218277c626e9 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 18 Nov 2023 17:26:17 -0500 Subject: [PATCH 48/95] pipe-rename: disable failing tests --- pkgs/tools/misc/pipe-rename/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/tools/misc/pipe-rename/default.nix b/pkgs/tools/misc/pipe-rename/default.nix index 826d77815bc3..dc8e545a7d8e 100644 --- a/pkgs/tools/misc/pipe-rename/default.nix +++ b/pkgs/tools/misc/pipe-rename/default.nix @@ -13,6 +13,12 @@ rustPlatform.buildRustPackage rec { nativeCheckInputs = [ python3 ]; + checkFlags = [ + # tests are failing upstream + "--skip=test_dot" + "--skip=test_dotdot" + ]; + preCheck = '' patchShebangs tests/editors/env-editor.py ''; From 61a9c1163a2daf0297fb4dfd5026694b578e9a1f Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 18 Nov 2023 17:38:21 -0500 Subject: [PATCH 49/95] cargo-binstall: 1.4.5 -> 1.4.6 Diff: https://github.com/cargo-bins/cargo-binstall/compare/v1.4.5...v1.4.6 Changelog: https://github.com/cargo-bins/cargo-binstall/releases/tag/v1.4.6 --- pkgs/development/tools/rust/cargo-binstall/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-binstall/default.nix b/pkgs/development/tools/rust/cargo-binstall/default.nix index 74b5a5dd3a4d..8613b15aa5ca 100644 --- a/pkgs/development/tools/rust/cargo-binstall/default.nix +++ b/pkgs/development/tools/rust/cargo-binstall/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binstall"; - version = "1.4.5"; + version = "1.4.6"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; rev = "v${version}"; - hash = "sha256-OVtSvlmMRngxhUeq4u+exVc7WQUqBnksDpb8esbly9Y="; + hash = "sha256-zCivxYHhaVqzPe3qBUKXgMgEE6niGqkHJM77rfEUoFo="; }; - cargoHash = "sha256-3OuyN+nm2t+LH8lue3xYoBQp7OYjzhDbnc2LCGqFJgY="; + cargoHash = "sha256-O8X+oLKhKeQGeUrsRVeakZjaMKPiXdIns48rV8Q9JA8="; nativeBuildInputs = [ pkg-config From 89c0c0c9f1a94c6100c4857034e9b515dfe5f2b5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 18 Nov 2023 18:46:50 -0500 Subject: [PATCH 50/95] python311Packages.edk2-pytool-library: 0.19.4 -> 0.19.5 Diff: https://github.com/tianocore/edk2-pytool-library/compare/v0.19.4...v0.19.5 Changelog: https://github.com/tianocore/edk2-pytool-library/releases/tag/v0.19.5 --- .../python-modules/edk2-pytool-library/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix index 73d377e78b15..9a5e3b53d94c 100644 --- a/pkgs/development/python-modules/edk2-pytool-library/default.nix +++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "edk2-pytool-library"; - version = "0.19.4"; + version = "0.19.5"; pyproject = true; disabled = pythonOlder "3.10"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "tianocore"; repo = "edk2-pytool-library"; rev = "v${version}"; - hash = "sha256-7pTi3pDD7245hbWqINchZNImv53a4afzaydE7vTtbVw="; + hash = "sha256-Gxza9bVLVVHejKNI9CQZQxfJuT71LBsxDQ8e4xAozS0="; }; nativeBuildInputs = [ From 25f7a1003f740362a5a126c7264be3562123d8dc Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 18 Nov 2023 18:49:10 -0500 Subject: [PATCH 51/95] v2ray-domain-list-community: 20231031055637 -> 20231118232758 Diff: https://github.com/v2fly/domain-list-community/compare/20231031055637...20231118232758 --- pkgs/data/misc/v2ray-domain-list-community/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/v2ray-domain-list-community/default.nix b/pkgs/data/misc/v2ray-domain-list-community/default.nix index 40cce28dc5d2..bc4aaf72ae9e 100644 --- a/pkgs/data/misc/v2ray-domain-list-community/default.nix +++ b/pkgs/data/misc/v2ray-domain-list-community/default.nix @@ -3,12 +3,12 @@ let generator = pkgsBuildBuild.buildGoModule rec { pname = "v2ray-domain-list-community"; - version = "20231031055637"; + version = "20231118232758"; src = fetchFromGitHub { owner = "v2fly"; repo = "domain-list-community"; rev = version; - hash = "sha256-wdWmpWsWroA7ecNRSVh3hEUSXz/MW+9kYDWhThWL44k="; + hash = "sha256-m4B1O8h6lRxArEyuE4XUF9eJtoBhl59QNXkVjWKx2ko="; }; vendorHash = "sha256-6167kRAC5m5FlBr7uk+qKUcjWsb45P5Vvovyb6hHSVQ="; meta = with lib; { From 91b82333acf796e0f5b751e06463f0e57a7d6449 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 18 Nov 2023 19:34:41 -0500 Subject: [PATCH 52/95] typioca: 2.6.0 -> 2.7.0 Diff: https://github.com/bloznelis/typioca/compare/2.6.0...2.7.0 Changelog: https://github.com/bloznelis/typioca/releases/tag/2.7.0 --- pkgs/applications/misc/typioca/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/typioca/default.nix b/pkgs/applications/misc/typioca/default.nix index 888913dd1e2d..71475cdf224b 100644 --- a/pkgs/applications/misc/typioca/default.nix +++ b/pkgs/applications/misc/typioca/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "typioca"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "bloznelis"; repo = "typioca"; rev = version; - hash = "sha256-m6vt4wpLpKJJNP8qCCeLMgNfAAZengDGjBVmFI5ZeSQ="; + hash = "sha256-PVyEvPktb2ortmPf1afk6vXmcp91Zei8BLwGkRazFGA="; }; - vendorHash = "sha256-q22t4/eum/RSWyzVQfJ0VZkEHgBu12nyRgmkJffi7PM="; + vendorHash = "sha256-XiKn18WCbhVvsrIvTN/Yquj4mhq4n1X1jqdGUaMacV4="; ldflags = [ "-s" From 25c7520b73784b58ae2ab96d24a6ae1cb1562290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= Date: Sun, 19 Nov 2023 02:10:06 +0100 Subject: [PATCH 53/95] qlog: init at 0.29.2 --- pkgs/applications/radio/qlog/default.nix | 53 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/radio/qlog/default.nix diff --git a/pkgs/applications/radio/qlog/default.nix b/pkgs/applications/radio/qlog/default.nix new file mode 100644 index 000000000000..098b51954a4e --- /dev/null +++ b/pkgs/applications/radio/qlog/default.nix @@ -0,0 +1,53 @@ +{ fetchFromGitHub +, qtbase +, stdenv +, lib +, wrapQtAppsHook +, qmake +, qtcharts +, qtwebengine +, qtserialport +, qtwebchannel +, hamlib +, qtkeychain +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "qlog"; + version = "0.29.2"; + + src = fetchFromGitHub { + owner = "foldynl"; + repo = "QLog"; + rev = "v${version}"; + hash = "sha256-g7WgFQPMOaD+3YllZqpykslmPYT/jNVK7/1xaPdbti4="; + fetchSubmodules = true; + }; + + env.NIX_LDFLAGS = "-lhamlib"; + + buildInputs = [ + qtbase + qtcharts + qtwebengine + qtserialport + qtwebchannel + hamlib + qtkeychain + ]; + + nativeBuildInputs = [ + wrapQtAppsHook + qmake + pkg-config + ]; + + meta = with lib; { + description = "Amateur radio logbook software"; + license = with licenses; [ gpl3Only ]; + homepage = "https://github.com/foldynl/QLog"; + maintainers = with maintainers; [ mkg20001 ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 236ac992be80..053eda8883ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12493,6 +12493,8 @@ with pkgs; qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { }; + qlog = qt6Packages.callPackage ../applications/radio/qlog { }; + qnial = callPackage ../development/interpreters/qnial { }; quickbms = pkgsi686Linux.callPackage ../tools/archivers/quickbms { }; From c25e6a041e43ec87d43af7e087696e056844b4b8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 04:08:14 +0000 Subject: [PATCH 54/95] python310Packages.pvextractor: 0.3 -> 0.4 --- pkgs/development/python-modules/pvextractor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pvextractor/default.nix b/pkgs/development/python-modules/pvextractor/default.nix index 315d0411b8e9..efee87277cb5 100644 --- a/pkgs/development/python-modules/pvextractor/default.nix +++ b/pkgs/development/python-modules/pvextractor/default.nix @@ -17,15 +17,15 @@ buildPythonPackage rec { pname = "pvextractor"; - version = "0.3"; + version = "0.4"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "radio-astro-tools"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-HYus2Gk3hzKq+3lJLOJQ+EE6LeO+DrvqLK3NpqrUYeI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-TjwoTtoGWU6C6HdFuS+gJj69PUnfchPHs7UjFqwftVQ="; }; buildInputs = [ pyqt-builder ]; From f63924b63710e22d217bb2eb2c1fb4a1e63db154 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 04:56:45 +0000 Subject: [PATCH 55/95] python311Packages.umap-learn: 0.5.4 -> 0.5.5 --- pkgs/development/python-modules/umap-learn/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix index 4083810195a9..e68d0be6ad35 100644 --- a/pkgs/development/python-modules/umap-learn/default.nix +++ b/pkgs/development/python-modules/umap-learn/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "umap-learn"; - version = "0.5.4"; + version = "0.5.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lmcinnes"; repo = "umap"; - rev = version; - hash = "sha256-cvAq9b7xDowLIfIAzV+X08SUEL0QOisr/wBXMYeQ/8A="; + rev = "refs/tags/release-${version}"; + hash = "sha256-bXAQjq7xBYn34tIZF96Sr5jDUii3s4FGkNx65rGKXkY="; }; propagatedBuildInputs = [ From 2e455394763f73c31b0774eb730cc97e070c1263 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 05:55:11 +0000 Subject: [PATCH 56/95] dbmate: 2.7.0 -> 2.8.0 --- pkgs/development/tools/database/dbmate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index fe89b0c791e3..69797da5af87 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dbmate"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "refs/tags/v${version}"; - hash = "sha256-gT+1ptQUZNobUG2etknCuyV2xxct5F6+P2J6/6yQkTk="; + hash = "sha256-6NeReekizEBRfsiRBshBD5WrGJpDdNpvvC7jslpsQoI="; }; - vendorHash = "sha256-2HY5eqiVRKvP1YrlNtbEj7QvDfoMV6DF+WgQOwo9VuQ="; + vendorHash = "sha256-r3IuE5qdN3B9IZyRjLokaRZ99Ziypbfg4H/uiMzSB+w="; doCheck = false; From b7f15935d9bbc61814db83e42e562022c7148ee0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 07:27:50 +0000 Subject: [PATCH 57/95] python310Packages.floret: 0.10.4 -> 0.10.5 --- pkgs/development/python-modules/floret/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/floret/default.nix b/pkgs/development/python-modules/floret/default.nix index 08f59292a206..72248cf8dbaa 100644 --- a/pkgs/development/python-modules/floret/default.nix +++ b/pkgs/development/python-modules/floret/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "floret"; - version = "0.10.4"; + version = "0.10.5"; pyproject = true; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "explosion"; repo = "floret"; rev = "refs/tags/v${version}"; - hash = "sha256-cOVyvRwprR7SvZjH4rtDK8uifv6+JGyRR7XYzOP5NLk="; + hash = "sha256-7vkw6H0ZQoHEwNusY6QWh/vPbSCdP1ZaaqABHsZH6hQ="; }; nativeBuildInputs = [ From 49119155125e4ce346e2881eb5dd2f79515b8e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 19 Nov 2023 08:30:20 +0100 Subject: [PATCH 58/95] nixos/dockerTools: fixup proot/fakeroot code Not sure how this ever worked but tar was trying to archive /proc and /sys, which failed to work. Since this is never useful for containers to do, we exclude this now in the proot case. Also fakeroot is not needed when proot is used as it provideds the same feature. We now cleanly seperate those cases as both are kind of hacks and it's more likely that the combination will just trigger new bugs. --- pkgs/build-support/docker/default.nix | 35 ++++++++++++++++++--------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 70fd3635b745..7218d67062e7 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -914,17 +914,30 @@ rec { (cd old_out; eval "$extraCommands" ) mkdir $out - ${optionalString enableFakechroot ''proot -r $PWD/old_out ${bind-paths} --pwd=/ ''}fakeroot bash -c ' - source $stdenv/setup - ${optionalString (!enableFakechroot) ''cd old_out''} - eval "$fakeRootCommands" - tar \ - --sort name \ - --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ - --hard-dereference \ - -cf $out/layer.tar . - ' - + ${if enableFakechroot then '' + proot -r $PWD/old_out ${bind-paths} --pwd=/ --root-id bash -c ' + source $stdenv/setup + eval "$fakeRootCommands" + tar \ + --sort name \ + --exclude=./proc \ + --exclude=./sys \ + --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + -cf $out/layer.tar . + ' + '' else '' + fakeroot bash -c ' + source $stdenv/setup + cd old_out + eval "$fakeRootCommands" + tar \ + --sort name \ + --numeric-owner --mtime "@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + -cf $out/layer.tar . + ' + ''} sha256sum $out/layer.tar \ | cut -f 1 -d ' ' \ > $out/checksum From 610baa9a3d4d739b142a4fc8bc356f8776923604 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 07:44:42 +0000 Subject: [PATCH 59/95] python310Packages.weasel: 0.3.3 -> 0.3.4 --- pkgs/development/python-modules/weasel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weasel/default.nix b/pkgs/development/python-modules/weasel/default.nix index 6b1ffcb31f52..727ec482c161 100644 --- a/pkgs/development/python-modules/weasel/default.nix +++ b/pkgs/development/python-modules/weasel/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "weasel"; - version = "0.3.3"; + version = "0.3.4"; pyproject = true; disabled = pythonOlder "3.6"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "explosion"; repo = "weasel"; rev = "refs/tags/v${version}"; - hash = "sha256-I8Omrez1wfAbCmr9hivqKN2fNgnFQRGm8OP7lb7YClk="; + hash = "sha256-6Ck8R10/YW2Nc6acNk2bzgyqSg+OPqwyJjhUgXP/umw="; }; nativeBuildInputs = [ From 0b645c685a43456bd1927877401a29d6ca4b2cea Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sun, 19 Nov 2023 11:45:52 +0300 Subject: [PATCH 60/95] subtitleedit: refactor --- .../video/subtitleedit/default.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/video/subtitleedit/default.nix b/pkgs/applications/video/subtitleedit/default.nix index 7ab14d8c1e67..0b14a332d9a2 100644 --- a/pkgs/applications/video/subtitleedit/default.nix +++ b/pkgs/applications/video/subtitleedit/default.nix @@ -1,17 +1,19 @@ { lib , stdenv -, copyDesktopItems -, makeDesktopItem -, makeWrapper , fetchzip +, makeDesktopItem +, nix-update-script + +, copyDesktopItems +, icoutils +, makeWrapper + , ffmpeg , gtk2 , hunspell -, icoutils , mono , mpv , tesseract4 -, nix-update-script }: stdenv.mkDerivation rec { @@ -80,16 +82,16 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A subtitle editor"; - homepage = "https://nikse.dk/subtitleedit"; - license = licenses.gpl3Plus; longDescription = '' With Subtitle Edit you can easily adjust a subtitle if it is out of sync with the video in several different ways. You can also use it for making new subtitles from scratch (using the time-line /waveform/spectrogram) or for translating subtitles. ''; - maintainers = with maintainers; [ paveloom ]; + homepage = "https://nikse.dk/subtitleedit"; + license = licenses.gpl3Plus; platforms = platforms.all; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ paveloom ]; }; } From bd38dae3015463667079455109475b6cd9e8950b Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Sun, 19 Nov 2023 11:54:09 +0300 Subject: [PATCH 61/95] subtitleedit: 4.0.1 -> 4.0.2 --- pkgs/applications/video/subtitleedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/subtitleedit/default.nix b/pkgs/applications/video/subtitleedit/default.nix index 0b14a332d9a2..88018e5a5612 100644 --- a/pkgs/applications/video/subtitleedit/default.nix +++ b/pkgs/applications/video/subtitleedit/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "subtitleedit"; - version = "4.0.1"; + version = "4.0.2"; src = fetchzip { url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip"; - hash = "sha256-Z7NVn4F19Hx55YWPNmbpWZ8yQulXd50bcy2A/8pCqJ4="; + hash = "sha256-kcs2h6HeWniJhGDNsy+EBauXbiDIlLCOJkVOCIzLBzM="; stripRoot = false; }; From fef8db6162506e0388c635a8e25f867263c9c048 Mon Sep 17 00:00:00 2001 From: Scott Techau Date: Tue, 1 Feb 2022 17:10:46 -0800 Subject: [PATCH 62/95] open-fprintd: init at 0.6 --- pkgs/by-name/op/open-fprintd/package.nix | 44 ++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/op/open-fprintd/package.nix diff --git a/pkgs/by-name/op/open-fprintd/package.nix b/pkgs/by-name/op/open-fprintd/package.nix new file mode 100644 index 000000000000..b8c8b765d550 --- /dev/null +++ b/pkgs/by-name/op/open-fprintd/package.nix @@ -0,0 +1,44 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "open-fprintd"; + version = "0.6"; + + src = fetchFromGitHub { + owner = "uunicorn"; + repo = pname; + rev = version; + sha256 = "sha256-uVFuwtsmR/9epoqot3lJ/5v5OuJjuRjL7FJF7oXNDzU="; + }; + + propagatedBuildInputs = with python3Packages; [ dbus-python pygobject3 ]; + + checkInputs = with python3Packages; [ dbus-python ]; + + postInstall = '' + install -D -m 644 debian/open-fprintd.service \ + $out/lib/systemd/system/open-fprintd.service + install -D -m 644 debian/open-fprintd-resume.service \ + $out/lib/systemd/system/open-fprintd-resume.service + install -D -m 644 debian/open-fprintd-suspend.service \ + $out/lib/systemd/system/open-fprintd-suspend.service + substituteInPlace $out/lib/systemd/system/open-fprintd.service \ + --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" + substituteInPlace $out/lib/systemd/system/open-fprintd-resume.service \ + --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" + substituteInPlace $out/lib/systemd/system/open-fprintd-suspend.service \ + --replace /usr/lib/open-fprintd "$out/lib/open-fprintd" + ''; + + postFixup = '' + wrapPythonProgramsIn "$out/lib/open-fprintd" "$out $pythonPath" + ''; + + meta = with lib; { + description = + "Fprintd replacement which allows you to have your own backend as a standalone service"; + homepage = "https://github.com/uunicorn/open-fprintd"; + license = licenses.gpl2Only; + platforms = platforms.linux; + }; +} From f7bdfcda1d39f86678a096e5b829cfde9d5c8a1d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 13:00:54 +0000 Subject: [PATCH 63/95] vipsdisp: 2.6.0 -> 2.6.1 --- pkgs/applications/graphics/vipsdisp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/vipsdisp/default.nix b/pkgs/applications/graphics/vipsdisp/default.nix index c40de85767a3..4c516e3ac82c 100644 --- a/pkgs/applications/graphics/vipsdisp/default.nix +++ b/pkgs/applications/graphics/vipsdisp/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "vipsdisp"; - version = "2.6.0"; + version = "2.6.1"; src = fetchFromGitHub { owner = "jcupitt"; repo = "vipsdisp"; rev = "v${version}"; - hash = "sha256-iLjS3vBhdPPQNtIaM++xKekYTsr1X9f6ED2A7DYV7Lc="; + hash = "sha256-vY3BTbCLf3JOB+eILMvaFUIgG3UBkSdckFAdC4W0OnU="; }; postPatch = '' From 1282d0ee3d7707bf1f12b6c2da9ab275b890472f Mon Sep 17 00:00:00 2001 From: Kiskae Date: Sun, 19 Nov 2023 14:03:10 +0100 Subject: [PATCH 64/95] linuxPackages.nvidia_x11.open: apply brightness patch --- pkgs/os-specific/linux/nvidia-x11/open.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/open.nix b/pkgs/os-specific/linux/nvidia-x11/open.nix index a6795c3fd5e7..0625985c908f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/open.nix +++ b/pkgs/os-specific/linux/nvidia-x11/open.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , kernel , nvidia_x11 , hash @@ -18,6 +19,13 @@ stdenv.mkDerivation ({ inherit hash; }; + patches = lib.optionals (nvidia_x11.version == "545.29.02")[ + (fetchpatch { + url = "https://github.com/NVIDIA/open-gpu-kernel-modules/files/13310810/0001-nvkms-initialize-brightnessType-in-_BACKLIGHT_BRIGHT.patch.txt"; + hash = "sha256-9N+DbyT4VmGNTHXWf23PJU4YWZS+0JK7yqkmkpnINPk="; + }) + ]; + nativeBuildInputs = kernel.moduleBuildDependencies; makeFlags = kernel.makeFlags ++ [ From 228df50ff927e3b715ebfb54992432c4a91bd847 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sat, 18 Nov 2023 23:46:50 +0100 Subject: [PATCH 65/95] lib.fileset: Move introduction section above the functions Previously the introductory section and the function listings were in different places. But now nixdoc supports having them together with https://github.com/nix-community/nixdoc/pull/70! --- doc/functions.md | 1 - doc/functions/fileset.section.md | 48 ------------------------------- lib/fileset/default.nix | 49 ++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 49 deletions(-) delete mode 100644 doc/functions/fileset.section.md diff --git a/doc/functions.md b/doc/functions.md index 551ba522a904..09033c9e3c19 100644 --- a/doc/functions.md +++ b/doc/functions.md @@ -8,5 +8,4 @@ functions/generators.section.md functions/debug.section.md functions/prefer-remote-fetch.section.md functions/nix-gitignore.section.md -functions/fileset.section.md ``` diff --git a/doc/functions/fileset.section.md b/doc/functions/fileset.section.md deleted file mode 100644 index c42337feaba4..000000000000 --- a/doc/functions/fileset.section.md +++ /dev/null @@ -1,48 +0,0 @@ - - -# File sets {#sec-fileset} - -The [`lib.fileset`](#sec-functions-library-fileset) library allows you to work with _file sets_. -A file set is a mathematical set of local files that can be added to the Nix store for use in Nix derivations. -File sets are easy and safe to use, providing obvious and composable semantics with good error messages to prevent mistakes. - -See the [function reference](#sec-functions-library-fileset) for function-specific documentation. - -## Implicit coercion from paths to file sets {#sec-fileset-path-coercion} - -All functions accepting file sets as arguments can also accept [paths](https://nixos.org/manual/nix/stable/language/values.html#type-path) as arguments. -Such path arguments are implicitly coerced to file sets containing all files under that path: -- A path to a file turns into a file set containing that single file. -- A path to a directory turns into a file set containing all files _recursively_ in that directory. - -If the path points to a non-existent location, an error is thrown. - -::: {.note} -Just like in Git, file sets cannot represent empty directories. -Because of this, a path to a directory that contains no files (recursively) will turn into a file set containing no files. -::: - -:::{.note} -File set coercion does _not_ add any of the files under the coerced paths to the store. -Only the [`toSource`](#function-library-lib.fileset.toSource) function adds files to the Nix store, and only those files contained in the `fileset` argument. -This is in contrast to using [paths in string interpolation](https://nixos.org/manual/nix/stable/language/values.html#type-path), which does add the entire referenced path to the store. -::: - -### Example {#sec-fileset-path-coercion-example} - -Assume we are in a local directory with a file hierarchy like this: -``` -├─ a/ -│ ├─ x (file) -│ └─ b/ -│   └─ y (file) -└─ c/ -   └─ d/ -``` - -Here's a listing of which files get included when different path expressions get coerced to file sets: -- `./.` as a file set contains both `a/x` and `a/b/y` (`c/` does not contain any files and is therefore omitted). -- `./a` as a file set contains both `a/x` and `a/b/y`. -- `./a/x` as a file set contains only `a/x`. -- `./a/b` as a file set contains only `a/b/y`. -- `./c` as a file set is empty, since neither `c` nor `c/d` contain any files. diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix index 15af0813eec7..ea2475284ac6 100644 --- a/lib/fileset/default.nix +++ b/lib/fileset/default.nix @@ -1,3 +1,52 @@ +/* + + []{#sec-fileset} + + The [`lib.fileset`](#sec-functions-library-fileset) library allows you to work with _file sets_. + A file set is a mathematical set of local files that can be added to the Nix store for use in Nix derivations. + File sets are easy and safe to use, providing obvious and composable semantics with good error messages to prevent mistakes. + + See the [function reference](#sec-functions-library-fileset) for function-specific documentation. + + ## Implicit coercion from paths to file sets {#sec-fileset-path-coercion} + + All functions accepting file sets as arguments can also accept [paths](https://nixos.org/manual/nix/stable/language/values.html#type-path) as arguments. + Such path arguments are implicitly coerced to file sets containing all files under that path: + - A path to a file turns into a file set containing that single file. + - A path to a directory turns into a file set containing all files _recursively_ in that directory. + + If the path points to a non-existent location, an error is thrown. + + ::: {.note} + Just like in Git, file sets cannot represent empty directories. + Because of this, a path to a directory that contains no files (recursively) will turn into a file set containing no files. + ::: + + :::{.note} + File set coercion does _not_ add any of the files under the coerced paths to the store. + Only the [`toSource`](#function-library-lib.fileset.toSource) function adds files to the Nix store, and only those files contained in the `fileset` argument. + This is in contrast to using [paths in string interpolation](https://nixos.org/manual/nix/stable/language/values.html#type-path), which does add the entire referenced path to the store. + ::: + + ### Example {#sec-fileset-path-coercion-example} + + Assume we are in a local directory with a file hierarchy like this: + ``` + ├─ a/ + │ ├─ x (file) + │ └─ b/ + │   └─ y (file) + └─ c/ +   └─ d/ + ``` + + Here's a listing of which files get included when different path expressions get coerced to file sets: + - `./.` as a file set contains both `a/x` and `a/b/y` (`c/` does not contain any files and is therefore omitted). + - `./a` as a file set contains both `a/x` and `a/b/y`. + - `./a/x` as a file set contains only `a/x`. + - `./a/b` as a file set contains only `a/b/y`. + - `./c` as a file set is empty, since neither `c` nor `c/d` contain any files. +*/ { lib }: let From 8fdab85cb6ae5a64827f271924aff1d97dced3dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 14:12:39 +0000 Subject: [PATCH 66/95] argocd: 2.8.5 -> 2.9.1 --- pkgs/applications/networking/cluster/argocd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index e20ad8c68e51..1764bf610eb5 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.8.5"; + version = "2.9.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-oYREaXUm60AkWO/2X6Cu55F+gCaPYpYqRigJW0ocDL0="; + hash = "sha256-5oSuExdkP+69AJD5U74yLD4e+5pvbFOY6T9mcKnJ5Jw="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-KzH4GmOeurcEMIDN3B8QSMZY1Fk+tNqy0SYzCXiRVlo="; + vendorHash = "sha256-/MmcWusqgEe8KEJcEBOqOkv1lJb06R3TKYFk4wvdWHk="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 From 86ca3e1810af05430e3b5e418296285fdc4c5e47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 14:13:02 +0000 Subject: [PATCH 67/95] go-ethereum: 1.13.4 -> 1.13.5 --- pkgs/applications/blockchains/go-ethereum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 9a03c3b4b562..f56fdb09a707 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.13.4"; + version = "1.13.5"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RQlWWHoij3gtFwjJeEGsmd5YJNTGX0I84nOAQyWBx/M="; + sha256 = "sha256-UbRsY9fSUYAwPcLfGGDHeqvSsLKUKR+2a93jH5xA9uQ="; }; - vendorHash = "sha256-YmUgKO3JtVOE/YACqL/QBiyR1jT/jPCH+Gb0xYwkJEc="; + vendorHash = "sha256-dOvpOCMxxmcAaticSLVlro1L4crAVJWyvgx/JZZ7buE="; doCheck = false; From efaeb2fdc47ab3808f2433f0b30965764dd8f305 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sun, 19 Nov 2023 11:36:36 -0300 Subject: [PATCH 68/95] rio: fix Darwin build and move cmake to Linux nativeBuildInputs Signed-off-by: Otavio Salvador --- pkgs/applications/terminal-emulators/rio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/terminal-emulators/rio/default.nix b/pkgs/applications/terminal-emulators/rio/default.nix index 314e127b6a44..6ebd8f6f521d 100644 --- a/pkgs/applications/terminal-emulators/rio/default.nix +++ b/pkgs/applications/terminal-emulators/rio/default.nix @@ -30,7 +30,7 @@ let rlinkLibs = if stdenv.isDarwin then [ darwin.libobjc - darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk_11_0.frameworks.AppKit ] else [ (lib.getLib gcc-unwrapped) fontconfig @@ -62,8 +62,8 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ ncurses - cmake ] ++ lib.optionals stdenv.isLinux [ + cmake pkg-config autoPatchelfHook ]; From 5ca5dea7cb987c2fae5155cdd1b526f5e53c2ac6 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 19 Nov 2023 22:49:33 +0800 Subject: [PATCH 69/95] prometheus-rabbitmq-exporter: fix build on Darwin --- pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix index 90207be3343a..213b2285c5e7 100644 --- a/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix @@ -13,6 +13,13 @@ buildGoModule rec { vendorHash = "sha256-ER0vK0xYUbQT3bqUosQMFT7HBycb3U8oI4Eak72myzs="; + ldflags = [ "-s" "-w" ]; + + checkFlags = [ + # Disable flaky tests on Darwin + "-skip=TestWholeApp|TestExporter" + ]; + meta = with lib; { description = "Prometheus exporter for RabbitMQ"; homepage = "https://github.com/kbudde/rabbitmq_exporter"; From c5b1cb3795f64affd090e04b291c2c23b295d091 Mon Sep 17 00:00:00 2001 From: David Flatz Date: Fri, 29 Sep 2023 11:03:53 +0200 Subject: [PATCH 70/95] androidStudioPackages.stable: 2022.3.1.19 -> 2022.3.1.20 https://developer.android.com/studio/releases/fixed-bugs/studio/2022.3.1#android-studio-giraffe-|-2022.3.1-patch-2 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index ccabb6b11947..313627c090bd 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,8 +10,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2022.3.1.19"; # "Android Studio Giraffe (2022.3.1)" - sha256Hash = "sha256-JQYl3KsYPgxo6/Eu+KUir3NpUn128e/HBPk8BbAv+p4="; + version = "2022.3.1.20"; # "Android Studio Giraffe (2022.3.1) Patch 2" + sha256Hash = "sha256-IkxOt6DI4cBPUOztEBNJV0DHGruJjVdJ0skxcue+rdg="; }; betaVersion = { version = "2023.1.1.17"; # "Android Studio Hedgehog (2023.3.1)" From 50cc4f3f04ea06109940651bbe47ecca3aaf7e8e Mon Sep 17 00:00:00 2001 From: David Flatz Date: Fri, 29 Sep 2023 11:17:45 +0200 Subject: [PATCH 71/95] androidStudioPackages.beta: 2023.1.1.17 -> 2023.1.1.25 https://developer.android.com/studio/releases/fixed-bugs/studio/2023.1.1#android-studio-hedgehog-%7C-2023.1.1-rc-3 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 313627c090bd..f9c2c18900ce 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,8 +14,8 @@ let sha256Hash = "sha256-IkxOt6DI4cBPUOztEBNJV0DHGruJjVdJ0skxcue+rdg="; }; betaVersion = { - version = "2023.1.1.17"; # "Android Studio Hedgehog (2023.3.1)" - sha256Hash = "sha256-0sN+B1RxxlbgxXrEs8gft4qjvIYtazJS6DllHZ2h768="; + version = "2023.1.1.25"; # "Android Studio Hedgehog | 2023.1.1 RC 3" + sha256Hash = "sha256-jOqTAHYAk8j9+Ir01TLBsp20u7/iBKV8T/joZLITDs4="; }; latestVersion = { version = "2023.2.1.1"; # Android Studio Iguana (2023.2.1) Canary 1 From 4e2ca40223fca2a48121d40173be84c99266df7d Mon Sep 17 00:00:00 2001 From: David Flatz Date: Fri, 29 Sep 2023 11:22:37 +0200 Subject: [PATCH 72/95] androidStudioPackages.canary: 2023.2.1.1 -> 2023.2.1.14 https://developer.android.com/studio/releases/fixed-bugs/studio/2023.2.1#android-studio-iguana-%7C-2023.2.1-canary-14 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index f9c2c18900ce..ec5bc924f0ca 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,8 +18,8 @@ let sha256Hash = "sha256-jOqTAHYAk8j9+Ir01TLBsp20u7/iBKV8T/joZLITDs4="; }; latestVersion = { - version = "2023.2.1.1"; # Android Studio Iguana (2023.2.1) Canary 1 - sha256Hash = "sha256-7ub9GkJd9J37nG2drXOuU7r4w/gI+m9nlWANqIk2ddk="; + version = "2023.2.1.14"; # "Android Studio Iguana | 2023.2.1 Canary 14" + sha256Hash = "sha256-8szERftch1JWJ66BclJBq5DZcH1Xf1cyVj08WknLoS8="; }; in { # Attributes are named by their corresponding release channels From 9ce73e272faa38c4802e5d54e0efac6216e4ffe7 Mon Sep 17 00:00:00 2001 From: Dmitry Ivankov Date: Sun, 19 Nov 2023 15:57:44 +0100 Subject: [PATCH 73/95] darwin.CoreSymbolication: fix C99 compilation https://hydra.nixos.org/build/241116326/nixlog/1 ``` build flags: SHELL=/nix/store/x1xxsh1gp6y389hyl40a0i74dkxiprl7-bash-5.2-p15/bin/bash PREFIX=\$\(out\) CC=cc cc -F/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include -fblocks -c -o CoreSymbolication.o CoreSymbolication.c In file included from CoreSymbolication.c:1: ./CoreSymbolication.h:393:1: error: type specifier missing, defaults to 'int'; ISO C99 and later do not support implicit int [-Wimplicit-int] CSSymbolOwnerSetTransientUserData(CSSymbolOwnerRef owner, uint32_t gen); ^ int 1 error generated. ``` Also submitted patch upstream at https://github.com/matthewbauer/CoreSymbolication/pull/1 ZHF: #265948 --- pkgs/os-specific/darwin/CoreSymbolication/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/CoreSymbolication/default.nix b/pkgs/os-specific/darwin/CoreSymbolication/default.nix index 5cf92a41a6f8..d9a2b378134a 100644 --- a/pkgs/os-specific/darwin/CoreSymbolication/default.nix +++ b/pkgs/os-specific/darwin/CoreSymbolication/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, stdenv }: +{ lib, fetchFromGitHub, fetchpatch, stdenv }: stdenv.mkDerivation { pname = "core-symbolication"; @@ -11,6 +11,15 @@ stdenv.mkDerivation { hash = "sha256-PzvLq94eNhP0+rLwGMKcMzxuD6MlrNI7iT/eV0obtSE="; }; + patches = [ + # C99 compilation fix + # https://github.com/matthewbauer/CoreSymbolication/pull/1 + (fetchpatch { + url = "https://github.com/boltzmannrain/CoreSymbolication/commit/1c26cc93f260bda9230a93e91585284e80aa231f.patch"; + hash = "sha256-d/ieDEnvZ9kVOjBVUdJzGmdvC1AF3Jk4fbwp04Q6l/I="; + }) + ]; + makeFlags = [ "PREFIX=$(out)" "CC=${stdenv.cc.targetPrefix}cc" ]; meta = with lib; { From b514f0433cdbafbe05899f4dbd420bbdf1c5c7b9 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 12 Nov 2023 19:16:37 +0100 Subject: [PATCH 74/95] lib.fileset: Minor changes - Make fromSource's missing file error message more consistent with others, and add a test for it - Indent some function arguments - Fix an internal type --- lib/fileset/default.nix | 2 +- lib/fileset/internal.nix | 8 ++++---- lib/fileset/tests.sh | 7 ++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix index 15af0813eec7..6d0e8ebab735 100644 --- a/lib/fileset/default.nix +++ b/lib/fileset/default.nix @@ -263,7 +263,7 @@ in { lib.fileset.fromSource: The source origin of the argument is of type ${typeOf path}, but it should be a path instead.'' else if ! pathExists path then throw '' - lib.fileset.fromSource: The source origin (${toString path}) of the argument does not exist.'' + lib.fileset.fromSource: The source origin (${toString path}) of the argument is a path that does not exist.'' else if isFiltered then _fromSourceFilter path source.filter else diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix index 0769e654c8fb..23d7b847204c 100644 --- a/lib/fileset/internal.nix +++ b/lib/fileset/internal.nix @@ -381,7 +381,7 @@ rec { # Turn a fileset into a source filter function suitable for `builtins.path` # Only directories recursively containing at least one files are recursed into - # Type: Path -> fileset -> (String -> String -> Bool) + # Type: fileset -> (String -> String -> Bool) _toSourceFilter = fileset: let # Simplify the tree, necessary to make sure all empty directories are null @@ -753,9 +753,9 @@ rec { resultingTree = _differenceTree - positive._internalBase - positive._internalTree - negativeTreeWithPositiveBase; + positive._internalBase + positive._internalTree + negativeTreeWithPositiveBase; in # If the first file set is empty, we can never have any files in the result if positive._internalIsEmptyWithoutBase then diff --git a/lib/fileset/tests.sh b/lib/fileset/tests.sh index 3c88ebdd0559..06f92f297d88 100755 --- a/lib/fileset/tests.sh +++ b/lib/fileset/tests.sh @@ -1064,13 +1064,18 @@ rm -rf -- * ## lib.fileset.fromSource # Check error messages -expectFailure 'fromSource null' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.' +# String-like values are not supported expectFailure 'fromSource (lib.cleanSource "")' 'lib.fileset.fromSource: The source origin of the argument is a string-like value \(""\), but it should be a path instead. \s*Sources created from paths in strings cannot be turned into file sets, use `lib.sources` or derivations instead.' +# Wrong type +expectFailure 'fromSource null' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.' expectFailure 'fromSource (lib.cleanSource null)' 'lib.fileset.fromSource: The source origin of the argument is of type null, but it should be a path instead.' +# fromSource on non-existent paths gives an error +expectFailure 'fromSource ./a' 'lib.fileset.fromSource: The source origin \('"$work"'/a\) of the argument is a path that does not exist.' + # fromSource on a path works and is the same as coercing that path mkdir a touch a/b c From b30601bba22b6ad5ac5d1776d8d19b06187b4f63 Mon Sep 17 00:00:00 2001 From: Adrian Pistol Date: Sat, 18 Nov 2023 18:08:21 +0100 Subject: [PATCH 75/95] nixos/chrony: Add missing rtcsync assertion. Due to a lot of rebasing, I dropped my added assertion in #259405. This is important. --- .../services/networking/ntp/chrony.nix | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index d370e6946d7b..3f10145033c5 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -162,7 +162,7 @@ in }; extraFlags = mkOption { - default = []; + default = [ ]; example = [ "-s" ]; type = types.listOf types.str; description = lib.mdDoc "Extra flags passed to the chronyd command."; @@ -178,7 +178,8 @@ in users.groups.chrony.gid = config.ids.gids.chrony; users.users.chrony = - { uid = config.ids.uids.chrony; + { + uid = config.ids.uids.chrony; group = "chrony"; description = "chrony daemon user"; home = stateDir; @@ -202,12 +203,13 @@ in ]; systemd.services.chronyd = - { description = "chrony NTP daemon"; + { + description = "chrony NTP daemon"; wantedBy = [ "multi-user.target" ]; - wants = [ "time-sync.target" ]; - before = [ "time-sync.target" ]; - after = [ "network.target" "nss-lookup.target" ]; + wants = [ "time-sync.target" ]; + before = [ "time-sync.target" ]; + after = [ "network.target" "nss-lookup.target" ]; conflicts = [ "ntpd.service" "systemd-timesyncd.service" ]; path = [ chronyPkg ]; @@ -255,5 +257,18 @@ in SystemCallFilter = [ "~@cpu-emulation @debug @keyring @mount @obsolete @privileged @resources" "@clock" "@setuid" "capset" "@chown" ]; }; }; + + assertions = [ + { + assertion = !(cfg.enableRTCTrimming && builtins.any (line: (builtins.match "^ *rtcsync" line) != null) (lib.strings.splitString "\n" cfg.extraConfig)); + message = '' + The chrony module now configures `rtcfile` and `rtcautotrim` for you. + These options conflict with `rtcsync` and cause chrony to crash. + Unless you are very sure the former isn't what you want, please remove + `rtcsync` from `services.chrony.extraConfig`. + Alternatively, disable this behaviour by `services.chrony.enableRTCTrimming = false;` + ''; + } + ]; }; } From 775e65049771c691fcbd34346a418360336d5b38 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 15:54:00 +0000 Subject: [PATCH 76/95] go-musicfox: 4.2.1 -> 4.3.0 --- pkgs/applications/audio/go-musicfox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index e4a10d82c139..0432224fa3c3 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -9,13 +9,13 @@ buildGo121Module rec { pname = "go-musicfox"; - version = "4.2.1"; + version = "4.3.0"; src = fetchFromGitHub { owner = "go-musicfox"; repo = pname; rev = "v${version}"; - hash = "sha256-yl7PirSt4zEy8ZoDGq3dn5TjJtbJeAgXgbynw/D0d38="; + hash = "sha256-JDR3D3tILT0q9jqcZmbfQC3yn7cmaSL/GEpCguqCFXI="; }; deleteVendor = true; From deda3d49ad93178ba4757cc9cc1ff4687554ad83 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 16:27:47 +0000 Subject: [PATCH 77/95] gpxsee: 13.10 -> 13.11 --- pkgs/applications/misc/gpxsee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix index 72acbe02bbae..d4b89db84ef5 100644 --- a/pkgs/applications/misc/gpxsee/default.nix +++ b/pkgs/applications/misc/gpxsee/default.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "13.10"; + version = "13.11"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = finalAttrs.version; - hash = "sha256-84F4B2yQREPosH1bK74nOby3o/C0isKq4t2CJprsblU="; + hash = "sha256-EJpyWuOyUVb34F5Pg8KPF9R3f3VpvZVeg8WBZ1oGbbE="; }; buildInputs = [ From 644d659dd9bd9426530acbf61ec79b5933a2cb33 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Nov 2023 17:34:38 +0100 Subject: [PATCH 78/95] python311Packages.kombu: 5.3.3 -> 5.3.4 Changelog: https://github.com/celery/kombu/blob/v5.3.4/Changelog.rst --- pkgs/development/python-modules/kombu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/kombu/default.nix b/pkgs/development/python-modules/kombu/default.nix index f2fb806f4750..cdab3aac8ff4 100644 --- a/pkgs/development/python-modules/kombu/default.nix +++ b/pkgs/development/python-modules/kombu/default.nix @@ -27,14 +27,14 @@ buildPythonPackage rec { pname = "kombu"; - version = "5.3.3"; + version = "5.3.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-FJHfgmz8UXjIDz6J3W37po5ITvM024EHDrXLgJSzEWc="; + hash = "sha256-C7LieGRNEd6mJywXl0o9u5aIqUnzu2CutbeRMpxE+tw="; }; propagatedBuildInputs = [ @@ -104,7 +104,7 @@ buildPythonPackage rec { meta = with lib; { description = "Messaging library for Python"; homepage = "https://github.com/celery/kombu"; - changelog = "https://github.com/celery/kombu/releases/tag/v${version}"; + changelog = "https://github.com/celery/kombu/blob/v${version}/Changelog.rst"; license = licenses.bsd3; maintainers = with maintainers; [ fab ]; }; From 5d1c30e7f8550ed548002872373457c3fff59c7c Mon Sep 17 00:00:00 2001 From: Matthieu Barthel Date: Sun, 19 Nov 2023 17:42:43 +0100 Subject: [PATCH 79/95] clipqr: 1.0.1 -> 1.1.0 --- pkgs/applications/misc/clipqr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/clipqr/default.nix b/pkgs/applications/misc/clipqr/default.nix index f87f971012d9..8e9852334e20 100644 --- a/pkgs/applications/misc/clipqr/default.nix +++ b/pkgs/applications/misc/clipqr/default.nix @@ -17,13 +17,13 @@ buildGoModule rec { pname = "clipqr"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitLab { owner = "imatt-foss"; repo = "clipqr"; rev = "v${version}"; - hash = "sha256-RIzOkJx1eSik+3N6rSh+3LY2VZmbzNYyV5wpLQHFU2A="; + hash = "sha256-OQ45GV+bViIejGC03lAuvw/y8v1itA+6pFC4H/qL744="; }; vendorHash = null; From 3ea085d8d7f689d80cf14283ce0a5ffd9ba3280e Mon Sep 17 00:00:00 2001 From: Tobias Bora Date: Sun, 19 Nov 2023 17:44:56 +0100 Subject: [PATCH 80/95] glaxnimate: 0.5.1 -> 0.5.4 + fix #263731 (#264387) --- pkgs/applications/video/glaxnimate/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/glaxnimate/default.nix b/pkgs/applications/video/glaxnimate/default.nix index 0878c2f1ed59..4ab5222c54ba 100644 --- a/pkgs/applications/video/glaxnimate/default.nix +++ b/pkgs/applications/video/glaxnimate/default.nix @@ -37,19 +37,20 @@ let in stdenv.mkDerivation rec { pname = "glaxnimate"; - version = "0.5.1"; + version = "0.5.4"; src = fetchFromGitLab { owner = "mattbas"; repo = "${pname}"; rev = version; - sha256 = "G4ykcOvXXnVIQZUYpRIrALtDSsGqxMvDtcmobjjtlKw="; + sha256 = "sha256-8oHJCQdP2xxSSDM0MDkSrG89WgCtMKm1AKlddnq3gig="; fetchSubmodules = true; }; nativeBuildInputs = [ cmake wrapQtAppsHook + qttools ]; buildInputs = [ @@ -65,6 +66,10 @@ stdenv.mkDerivation rec { python3WithLibs ]; + # Translation needs to be separately compiled + # https://gitlab.com/mattbas/glaxnimate/-/issues/648 + buildFlags = [ "translations" ]; + qtWrapperArgs = [ ''--prefix PATH : ${python3WithLibs}/bin'' ]; passthru.tests.version = lib.optionalAttrs stdenv.isLinux (testers.testVersion { From df00bdf50b026912b5cc1687bfad51d15a21b87a Mon Sep 17 00:00:00 2001 From: kashw2 Date: Mon, 20 Nov 2023 02:57:56 +1000 Subject: [PATCH 81/95] turso-cli: 0.87.2 -> 0.87.4 --- pkgs/development/tools/turso-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 0cf07a9c29cb..d5ad729050ce 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -8,16 +8,16 @@ }: buildGo121Module rec { pname = "turso-cli"; - version = "0.87.2"; + version = "0.87.4"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-EZSVKmOIzwokCKreLnZj4DWEhjjXo3TFhieGVR7w7NM="; + hash = "sha256-e5HuDWMmikTlWC2ezZ5zxxKYFlgz9jrpHtNfIwSiiok="; }; - vendorHash = "sha256-3IV0MgDe71lqLQ6tB2NM2kYokXGWvR+hh4lvxw5QWjA="; + vendorHash = "sha256-EcWhpx93n+FzkXDOHwAxhn13qR4n9jLFeaKoe49x1x4="; nativeBuildInputs = [ installShellFiles ]; From 3dbf2a0ba572c571f3c79d1e8f8e1a802f6472f0 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Mon, 20 Nov 2023 03:33:36 +1000 Subject: [PATCH 82/95] terragrunt: 0.53.2 -> 0.53.4 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 638a3089033f..f559df2747d8 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.53.2"; + version = "0.53.4"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nolZ660rU7WisQdufswrH5vqAedKlA3Y0AQMul/+sTo="; + hash = "sha256-UPbiqo0HvBEIAimugNa7WwqwPsLk8C2gS0KqfgFMGQU="; }; - vendorHash = "sha256-1+ebqMqtil2/KrFjRIfCx60aWu8ByIFV1my8RiUrSNo="; + vendorHash = "sha256-h1rDXxvPhQfGUpxOmnksy3l8kMq93nxOQ9adJFyZnOY="; doCheck = false; From 25b859ae0eaaf1b8a36a2511713ffae4ae511fb8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 19 Nov 2023 20:35:42 +0100 Subject: [PATCH 83/95] python311Packages.adafruit-nrfutil: 1 -> 0.5.3.post17 Fixes the build and applies various updates: https://github.com/adafruit/Adafruit_nRF52_nrfutil/releases/tag/0.5.3.post17 https://github.com/adafruit/Adafruit_nRF52_nrfutil/releases/tag/0.5.3.post16 https://github.com/adafruit/Adafruit_nRF52_nrfutil/releases/tag/0.5.3.post15 https://github.com/adafruit/Adafruit_nRF52_nrfutil/releases/tag/0.5.3.post14 https://github.com/adafruit/Adafruit_nRF52_nrfutil/releases/tag/0.5.3.post13 https://github.com/adafruit/Adafruit_nRF52_nrfutil/releases/tag/%24(APPVEYOR_REPO_TAG_NAME) https://github.com/adafruit/Adafruit_nRF52_nrfutil/releases/tag/0.5.3.post10 https://github.com/adafruit/Adafruit_nRF52_nrfutil/releases/tag/0.5.3.post9 https://github.com/adafruit/Adafruit_nRF52_nrfutil/releases/tag/0.5.3.post8 --- .../adafruit-nrfutil/default.nix | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-nrfutil/default.nix b/pkgs/development/python-modules/adafruit-nrfutil/default.nix index 0197bf21927f..7c3aad0f2d92 100644 --- a/pkgs/development/python-modules/adafruit-nrfutil/default.nix +++ b/pkgs/development/python-modules/adafruit-nrfutil/default.nix @@ -1,43 +1,40 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch -, pythonOlder + +# build-system +, setuptools + +# dependencies , pyserial , click , ecdsa + +# tests , behave , nose }: buildPythonPackage rec { pname = "adafruit-nrfutil"; - version = "1"; - format = "setuptools"; - - disabled = pythonOlder "3.7"; + version = "0.5.3.post17"; + pyproject = true; src = fetchFromGitHub { owner = "adafruit"; repo = "Adafruit_nRF52_nrfutil"; - rev = "refs/tags/appveyor-test-release-${version}"; - hash = "sha256-wsspDg8XwEtJwJye6Z3TXaIN1TcfI7gYDah3L/xiiLo="; + rev = "refs/tags/${version}"; + hash = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4="; }; - patches = [ - # Pull a patch which fixes the tests, but is not yet released in a new version: - # https://github.com/adafruit/Adafruit_nRF52_nrfutil/pull/38 - (fetchpatch { - name = "fix-tests.patch"; - url = "https://github.com/adafruit/Adafruit_nRF52_nrfutil/commit/e5fbcc8ee5958041db38c04139ba686bf7d1b845.patch"; - hash = "sha256-0tbJldGtYcDdUzA3wZRv0lenXVn6dqV016U9nMpQ6/w="; - }) + nativeBuildInputs = [ + setuptools ]; propagatedBuildInputs = [ - pyserial click ecdsa + pyserial ]; nativeCheckInputs = [ From 50ddafc93189834c69eb159a336e5388be999457 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 19 Nov 2023 20:41:43 +0100 Subject: [PATCH 84/95] adafruit-nrfutil: migrate from python package set We only keep libraries in the python package set, not applications. --- .../ad/adafruit-nrfutil/package.nix} | 22 +++++-------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 6 insertions(+), 19 deletions(-) rename pkgs/{development/python-modules/adafruit-nrfutil/default.nix => by-name/ad/adafruit-nrfutil/package.nix} (77%) diff --git a/pkgs/development/python-modules/adafruit-nrfutil/default.nix b/pkgs/by-name/ad/adafruit-nrfutil/package.nix similarity index 77% rename from pkgs/development/python-modules/adafruit-nrfutil/default.nix rename to pkgs/by-name/ad/adafruit-nrfutil/package.nix index 7c3aad0f2d92..64dc160ff1fb 100644 --- a/pkgs/development/python-modules/adafruit-nrfutil/default.nix +++ b/pkgs/by-name/ad/adafruit-nrfutil/package.nix @@ -1,21 +1,9 @@ { lib -, buildPythonPackage +, python3Packages , fetchFromGitHub - -# build-system -, setuptools - -# dependencies -, pyserial -, click -, ecdsa - -# tests -, behave -, nose }: -buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "adafruit-nrfutil"; version = "0.5.3.post17"; pyproject = true; @@ -27,17 +15,17 @@ buildPythonPackage rec { hash = "sha256-mHHKOQE9AGBX8RAyaPOy+JS3fTs98+AFdq9qsVy7go4="; }; - nativeBuildInputs = [ + nativeBuildInputs = with python3Packages; [ setuptools ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3Packages; [ click ecdsa pyserial ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3Packages; [ behave nose ]; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 6f105d0fcccf..c6514dbdc63c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -35,6 +35,7 @@ in mapAliases ({ abodepy = jaraco-abode; # added 2023-02-01 acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19 + adafruit-nrfutil = throw "adafruit-nrfutil has been promoted to a top-level attribute."; # Added 2023-11-19 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27 aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4b29edee0ec6..a612e6b98524 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -54,8 +54,6 @@ self: super: with self; { adafruit-io = callPackage ../development/python-modules/adafruit-io { }; - adafruit-nrfutil = callPackage ../development/python-modules/adafruit-nrfutil { }; - adafruit-platformdetect = callPackage ../development/python-modules/adafruit-platformdetect { }; adafruit-pureio = callPackage ../development/python-modules/adafruit-pureio { }; From 0fa6b3b73a01dd6b5659c1f29b3de2756f48278a Mon Sep 17 00:00:00 2001 From: Payas Relekar Date: Thu, 16 Nov 2023 19:34:39 +0530 Subject: [PATCH 85/95] elpa-packages: updated 2023-11-16 (from overlay) --- .../emacs/elisp-packages/elpa-generated.nix | 51 ++++++++++++------- 1 file changed, 33 insertions(+), 18 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 6152ef002fd2..c214731a2289 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -569,10 +569,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/bufferlo-0.2.tar"; - sha256 = "1dvpzxlnzs037wz9xhiwiz2qrc7r2i05z6p6p0sy8i4kb6scc6gy"; + url = "https://elpa.gnu.org/packages/bufferlo-0.3.tar"; + sha256 = "16fj1wiqymyys0wjnbmmfwpvqxnm3mlqfrg7nrsryfgpv2mv9z17"; }; packageRequires = [ emacs ]; meta = { @@ -877,10 +877,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.3"; + version = "29.1.4.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-29.1.4.3.tar"; - sha256 = "08lg6jph1hqkamf1fhm5ajwy4klh2a2260llr1z7wlbbq52032k5"; + url = "https://elpa.gnu.org/packages/compat-29.1.4.4.tar"; + sha256 = "0710g552b1nznnfx2774gmg6yizs27s0bakqm95nsjrp6kgznbfr"; }; packageRequires = [ emacs seq ]; meta = { @@ -1177,10 +1177,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-2.0.0.tar"; - sha256 = "1wrfbirkzf9szss1rgpmgdr0gy2dvhnbzlnyhw3sp2jvw5sb1xz9"; + url = "https://elpa.gnu.org/packages/denote-2.1.0.tar"; + sha256 = "1igp9h327b9x3fxrp34bz0x5slk659r3asjdia3jm8amajm4bw6s"; }; packageRequires = [ emacs ]; meta = { @@ -1318,10 +1318,10 @@ elpaBuild { pname = "dired-duplicates"; ename = "dired-duplicates"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-duplicates-0.2.tar"; - sha256 = "1n5n961f1mrvcqfrz56734qj1ynajdjblyf4y60pw9m3fn03db4s"; + url = "https://elpa.gnu.org/packages/dired-duplicates-0.3.tar"; + sha256 = "1b9drjkbs9anqil274jrn031agpkir9mhs96l2ylm13n8imx9msl"; }; packageRequires = [ emacs ]; meta = { @@ -1449,6 +1449,21 @@ license = lib.licenses.free; }; }) {}; + drepl = callPackage ({ comint-mime, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "drepl"; + ename = "drepl"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/drepl-0.1.tar"; + sha256 = "0lx94kcxgp8s13w7hz9857r9baqfswvj7vc9frjq4crc4ps7fi7r"; + }; + packageRequires = [ comint-mime emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/drepl.html"; + license = lib.licenses.free; + }; + }) {}; dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dts-mode"; @@ -2357,10 +2372,10 @@ elpaBuild { pname = "gpr-mode"; ename = "gpr-mode"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gpr-mode-1.0.4.tar"; - sha256 = "1c97m28i6lym07kb05jgssjxj6p9v3v56qrn48xwv55sriqrha4l"; + url = "https://elpa.gnu.org/packages/gpr-mode-1.0.5.tar"; + sha256 = "1ksafa4nfd4n1kdxpjk6i59l5rxfdmcqjkkpmmc8w402xka0vwn4"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -3753,10 +3768,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.6.11"; + version = "9.6.12"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.6.11.tar"; - sha256 = "18hp5jx90wn9xsg8frql3r1kmn2q9qph6plcssj64fp34wcwxsd8"; + url = "https://elpa.gnu.org/packages/org-9.6.12.tar"; + sha256 = "0qkq7vx3kga18001clsac4rbg9bw5cp9k5qnixw7s39xajd4bcv3"; }; packageRequires = [ emacs ]; meta = { From a7a1cd3019672c83555aa5112c65563db0408237 Mon Sep 17 00:00:00 2001 From: Payas Relekar Date: Thu, 16 Nov 2023 19:34:39 +0530 Subject: [PATCH 86/95] elpa-devel-packages: updated 2023-11-16 (from overlay) --- .../elisp-packages/elpa-devel-generated.nix | 188 ++++++++++-------- 1 file changed, 103 insertions(+), 85 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index ffd8253ae2c4..8a8aa1119ead 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -654,10 +654,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "0.2.0.20231106.215852"; + version = "0.3.0.20231111.144610"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bufferlo-0.2.0.20231106.215852.tar"; - sha256 = "17qjjifdl3y8p4ldzami9b3ns9mzzqdacvkzsryv5885hzas67zz"; + url = "https://elpa.gnu.org/devel/bufferlo-0.3.0.20231111.144610.tar"; + sha256 = "02vsgmfn7z4772dgfy9laraqrslzz7nqdaibzpj5qx2k0gxrh0nb"; }; packageRequires = [ emacs ]; meta = { @@ -920,14 +920,17 @@ license = lib.licenses.free; }; }) {}; - company = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + company = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib }: elpaBuild { pname = "company"; ename = "company"; - version = "0.10.2.0.20231110.5234"; + version = "0.10.2.0.20231115.182802"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231110.5234.tar"; - sha256 = "18533dlk7k77if51kjhwlf2yb872ixjf1cffg197bnfy29sdrm11"; + url = "https://elpa.gnu.org/devel/company-0.10.2.0.20231115.182802.tar"; + sha256 = "0l18qi7m8anawl466xd7r3i3cjvhqprhwzclpw92x7hzgnjv73nl"; }; packageRequires = [ emacs ]; meta = { @@ -1000,10 +1003,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "29.1.4.3.0.20231107.184238"; + version = "29.1.4.4.0.20231113.72021"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-29.1.4.3.0.20231107.184238.tar"; - sha256 = "1mcfx5my48zr14syzmpidgr1kjji2v63sqmx3zh7spxxd274yviq"; + url = "https://elpa.gnu.org/devel/compat-29.1.4.4.0.20231113.72021.tar"; + sha256 = "0w6dy2356k1k0g4kbr81wv431fb9by03nc7rdgwnsyq4cs3dd46s"; }; packageRequires = [ emacs seq ]; meta = { @@ -1015,10 +1018,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.35.0.20231107.212252"; + version = "0.35.0.20231115.174657"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-0.35.0.20231107.212252.tar"; - sha256 = "1p9l79sxxa06cxky5z08mccf34hbbp742iza57riknf0zmrglkpc"; + url = "https://elpa.gnu.org/devel/consult-0.35.0.20231115.174657.tar"; + sha256 = "0j8kj3d2svqns4z2pp18rc6x9blfz0w41r73934wdjxw2fri9wbd"; }; packageRequires = [ compat emacs ]; meta = { @@ -1067,10 +1070,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.38.0.20231108.174629"; + version = "0.38.0.20231112.81933"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-0.38.0.20231108.174629.tar"; - sha256 = "1ynkyw7mkl8y66kxwy51gwdj60b4nadk9qbwsjljbfdnc80y6ws5"; + url = "https://elpa.gnu.org/devel/corfu-0.38.0.20231112.81933.tar"; + sha256 = "1zmd13qbdknw03l65fir3a4niq5lbacj28j5kqknka87f3lz4pd2"; }; packageRequires = [ compat emacs ]; meta = { @@ -1332,10 +1335,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "2.0.0.0.20231107.64253"; + version = "2.1.0.0.20231115.111152"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-2.0.0.0.20231107.64253.tar"; - sha256 = "143pgnsfi3mf42n1yrwjr79b32k0081i19zdkwg97xhvfbqhiddw"; + url = "https://elpa.gnu.org/devel/denote-2.1.0.0.20231115.111152.tar"; + sha256 = "0mp57k3z1gyc21lj010yi9nb3qpqd6yirysf9ljcy9h5bxnqafmh"; }; packageRequires = [ emacs ]; meta = { @@ -1491,10 +1494,10 @@ elpaBuild { pname = "dired-duplicates"; ename = "dired-duplicates"; - version = "0.2.0.20231109.135341"; + version = "0.3.0.20231114.215046"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-duplicates-0.2.0.20231109.135341.tar"; - sha256 = "07ridbcy3n0v3dax7kj3d7nk2k0w57dnapd4kki4xhkm4fklx6w6"; + url = "https://elpa.gnu.org/devel/dired-duplicates-0.3.0.20231114.215046.tar"; + sha256 = "0rla938sj1zig7qcdxybl7qm4x1b0ndpf9xf9ikj0vfdghyg7z2s"; }; packageRequires = [ emacs ]; meta = { @@ -1634,6 +1637,21 @@ license = lib.licenses.free; }; }) {}; + drepl = callPackage ({ comint-mime, elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "drepl"; + ename = "drepl"; + version = "0.1.0.20231112.180047"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/drepl-0.1.0.20231112.180047.tar"; + sha256 = "09s55hfy11y7v1d2l6nggz8b27mrsvqabb5xwpipnnynkmif2q2q"; + }; + packageRequires = [ comint-mime emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/drepl.html"; + license = lib.licenses.free; + }; + }) {}; dts-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dts-mode"; @@ -1800,10 +1818,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.15.0.20231107.90944"; + version = "1.15.0.20231115.41203"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.15.0.20231107.90944.tar"; - sha256 = "135a3zyzjpv2n0c988b9g9mh93y7p1dp9nvmchm4i26mdmzn6jbz"; + url = "https://elpa.gnu.org/devel/eglot-1.15.0.20231115.41203.tar"; + sha256 = "0xybf9czzkdpv94qsbmq725scmjjkm4gwn74ffa8r99a0i1w2nki"; }; packageRequires = [ eldoc @@ -1911,10 +1929,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "0.23.0.20231104.193345"; + version = "0.23.0.20231112.53804"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-0.23.0.20231104.193345.tar"; - sha256 = "10qny8wp74np12sczz08gfrxspvapwvz2zkdig76wcrpd4kdpjk4"; + url = "https://elpa.gnu.org/devel/embark-0.23.0.20231112.53804.tar"; + sha256 = "056kgr14msd6fhzwpdazzaxzmn65wm6qp59z22l5ykpr8awl4jxi"; }; packageRequires = [ compat emacs ]; meta = { @@ -1931,10 +1949,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "0.8.0.20231104.193345"; + version = "0.8.0.20231112.53804"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231104.193345.tar"; - sha256 = "15syrabv26yq69g2lz2dqs8w4drw1v3whr0h2vzmc1p0pv9jpks2"; + url = "https://elpa.gnu.org/devel/embark-consult-0.8.0.20231112.53804.tar"; + sha256 = "1fxk8hfid2ii912can7b1gp8fzkq31y1cfi53n9mw6p0nj26c1fh"; }; packageRequires = [ consult emacs embark ]; meta = { @@ -1956,10 +1974,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.14pre0.20231029.40923"; + version = "0.14pre0.20231111.212243"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.14pre0.20231029.40923.tar"; - sha256 = "06r0s8dxlxr63a1zgdk0qxzd6x27r6mlymi6hxp8923yvwqddkdf"; + url = "https://elpa.gnu.org/devel/ement-0.14pre0.20231111.212243.tar"; + sha256 = "13xd7m5pigfvqnrxqr40dg9139djb0m9l3p7scvi0fi05247kf5l"; }; packageRequires = [ emacs @@ -1985,10 +2003,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "16.0.20231106.173540"; + version = "16.0.20231110.185602"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emms-16.0.20231106.173540.tar"; - sha256 = "08l7nzz596jwqr4wcjcvsihdhai4faqihavrshvja2nhrdxxm79x"; + url = "https://elpa.gnu.org/devel/emms-16.0.20231110.185602.tar"; + sha256 = "114dsyncfcgrxjypf475n5kabcmm08szq4sa2grqv5gcm9l63qwr"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -2054,10 +2072,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6snapshot0.20231104.154155"; + version = "5.6snapshot0.20231112.203749"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231104.154155.tar"; - sha256 = "0z22cw6hgn4lsc1bp4ci75v03mvlra1nyfj8g7xkfdv75nbv2yga"; + url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20231112.203749.tar"; + sha256 = "1zag35hnzc72gbjr00ljfz803z8rmz8qhyxxvcxaia769vhmh5j8"; }; packageRequires = [ compat emacs ]; meta = { @@ -2633,10 +2651,10 @@ elpaBuild { pname = "gpr-mode"; ename = "gpr-mode"; - version = "1.0.4.0.20231015.114428"; + version = "1.0.5.0.20231115.90848"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gpr-mode-1.0.4.0.20231015.114428.tar"; - sha256 = "1y3571ymlrgiq5jxbwlyw43pmfxgq776pajb9hlvyz9l3w195c8g"; + url = "https://elpa.gnu.org/devel/gpr-mode-1.0.5.0.20231115.90848.tar"; + sha256 = "1z7v8kwamh217k0lfwcdycj4wnq4dj9lrryppqhjdqb7cj02bmdz"; }; packageRequires = [ emacs gnat-compiler wisi ]; meta = { @@ -2683,10 +2701,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.6.0.0.20231104.45848"; + version = "0.6.0.0.20231113.71128"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.6.0.0.20231104.45848.tar"; - sha256 = "1ppvgi17agzrsjfd9jaa5zszvqcm1n4rfy7z82da4rl5mbgnml9p"; + url = "https://elpa.gnu.org/devel/greader-0.6.0.0.20231113.71128.tar"; + sha256 = "19aj5bp72ic2j9fv4lygnpj01bl89ifcw4s75lqasff60mlv0320"; }; packageRequires = [ emacs ]; meta = { @@ -3113,10 +3131,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "0.9.0.20231104.142700"; + version = "0.9.0.20231111.85046"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231104.142700.tar"; - sha256 = "16qq42qmklyls2fc482x2pv1l14x3kn78l41imvg8jrv3z64j89p"; + url = "https://elpa.gnu.org/devel/jinx-0.9.0.20231111.85046.tar"; + sha256 = "1dp2sclzrr5918n2zjzyxhxcf3sd393a3a4xr4c8wdi2wdpmn1vs"; }; packageRequires = [ compat emacs ]; meta = { @@ -3720,10 +3738,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "4.3.0.0.20231031.71656"; + version = "4.3.0.0.20231115.130235"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20231031.71656.tar"; - sha256 = "04hjhg596qfkrnll0wrg4f50ilns28jpf2ws7021wivr370xajki"; + url = "https://elpa.gnu.org/devel/modus-themes-4.3.0.0.20231115.130235.tar"; + sha256 = "025iqd3c9kwrv1hwdr1szp1cl23bkf1vahad6nhx00x351rxv0r0"; }; packageRequires = [ emacs ]; meta = { @@ -4139,10 +4157,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.0.0.20231107.210315"; + version = "1.0.0.20231110.144817"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.0.0.20231107.210315.tar"; - sha256 = "0j5fkmw4qy40ab2c6d0mf6637s8q95gi3sp7w477d6ymck5i2ck8"; + url = "https://elpa.gnu.org/devel/orderless-1.0.0.20231110.144817.tar"; + sha256 = "0cfspqc7livr0m3s021gp2cl74qnv1pvyxba83af0088nb9z0aqz"; }; packageRequires = [ emacs ]; meta = { @@ -4154,10 +4172,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.7pre0.20231108.95550"; + version = "9.7pre0.20231115.92033"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-9.7pre0.20231108.95550.tar"; - sha256 = "01dk4sq5wfiwj9g5bfriqqkfrgdfy3c7kixd7y4cf9k6pbjl4sfp"; + url = "https://elpa.gnu.org/devel/org-9.7pre0.20231115.92033.tar"; + sha256 = "18sbwnw57xp9ss78f3xva3jysdvzk0lcppr2g4qgb696fkglp6w1"; }; packageRequires = [ emacs ]; meta = { @@ -4773,10 +4791,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "1.0.1.0.20231101.62313"; + version = "1.0.1.0.20231115.55251"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20231101.62313.tar"; - sha256 = "10k57sd29hkbja85sn5yf7wm0g5wyk216ykdjl4vr03891ic03dg"; + url = "https://elpa.gnu.org/devel/pulsar-1.0.1.0.20231115.55251.tar"; + sha256 = "15pvf6f0g423w3vi86l8djxvzzrvziml7rlqp314xskp8kz7w6g6"; }; packageRequires = [ emacs ]; meta = { @@ -4940,10 +4958,10 @@ elpaBuild { pname = "realgud"; ename = "realgud"; - version = "1.5.1.0.20231020.222710"; + version = "1.5.1.0.20231113.141045"; src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20231020.222710.tar"; - sha256 = "0lmq7x7x8cm6y8vp2gin1h6h7chkflj5fyzls4b61rh15yg8m1h0"; + url = "https://elpa.gnu.org/devel/realgud-1.5.1.0.20231113.141045.tar"; + sha256 = "1lidmlrsg0jax0mmsxgpjk70x4i4vhiv5ira744rj7m3w0mwgmrw"; }; packageRequires = [ emacs load-relative loc-changes test-simple ]; meta = { @@ -5621,10 +5639,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.1.0.0.20230606.175440"; + version = "0.1.0.0.20231115.114712"; src = fetchurl { - url = "https://elpa.gnu.org/devel/spacious-padding-0.1.0.0.20230606.175440.tar"; - sha256 = "01541k8j5g920vnj3ds6ancqyi36n6ak00g4rq5vc6ia1ybxiijh"; + url = "https://elpa.gnu.org/devel/spacious-padding-0.1.0.0.20231115.114712.tar"; + sha256 = "1why1wwbpasmag8czsgb65f8gkqjcg5hckgmk9106ml834krhhx5"; }; packageRequires = [ emacs ]; meta = { @@ -5719,10 +5737,10 @@ elpaBuild { pname = "srht"; ename = "srht"; - version = "0.3.0.20231103.213748"; + version = "0.3.0.20231114.102408"; src = fetchurl { - url = "https://elpa.gnu.org/devel/srht-0.3.0.20231103.213748.tar"; - sha256 = "1nr6faizww1nzv5lpdikbqxkc6i1hswg2qa50cybl05ycqq9b10a"; + url = "https://elpa.gnu.org/devel/srht-0.3.0.20231114.102408.tar"; + sha256 = "0s5xa8vqb6wzxmv3vx8cc8lkpnnkfzdjljra7lz105m3v2adz1a0"; }; packageRequires = [ emacs plz ]; meta = { @@ -6042,10 +6060,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.8.0.20231106.72513"; + version = "0.8.0.20231111.112832"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tempel-0.8.0.20231106.72513.tar"; - sha256 = "1pbw7wrhz5h1xykbc1ihhpzqc0kki6k637wagx8yfz95n606808d"; + url = "https://elpa.gnu.org/devel/tempel-0.8.0.20231111.112832.tar"; + sha256 = "1gd4dvill1vvdncibjfv7vl1rxlkhcq2nfppczyp2sr565fgcb0c"; }; packageRequires = [ compat emacs ]; meta = { @@ -6230,10 +6248,10 @@ elpaBuild { pname = "transient"; ename = "transient"; - version = "0.4.3.0.20231027.212124"; + version = "0.4.3.0.20231112.92348"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20231027.212124.tar"; - sha256 = "0rzc5ks0b9nlnvggj7hn9648y5siw9qjpg8n3swlmkb68m3b2c05"; + url = "https://elpa.gnu.org/devel/transient-0.4.3.0.20231112.92348.tar"; + sha256 = "01yvwx8psllys34fry1vp2h7w3jll8kcrglsri8p2d3bps45pn14"; }; packageRequires = [ compat emacs seq ]; meta = { @@ -6408,10 +6426,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.3.0snapshot0.20231101.193012"; + version = "0.3.0snapshot0.20231110.152111"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20231101.193012.tar"; - sha256 = "12hmms0yr0vybayvzkbqbp5j428lsnirzwg93f1l8m05xxs3xm9w"; + url = "https://elpa.gnu.org/devel/urgrep-0.3.0snapshot0.20231110.152111.tar"; + sha256 = "15vbi4vjqr9kz1q1525snl5pz35mgbzrjkysl7gm4zpj6s6qcbar"; }; packageRequires = [ compat emacs project ]; meta = { @@ -6643,10 +6661,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "1.4.0.20231108.202420"; + version = "1.4.0.20231115.164627"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-1.4.0.20231108.202420.tar"; - sha256 = "1c34pq5l7ckjlyimpa528d8a7q5pakz3li5bc4ka86mwf861kd7v"; + url = "https://elpa.gnu.org/devel/vertico-1.4.0.20231115.164627.tar"; + sha256 = "1rb2lvk2h7qxddws53n0qp5mg71b6gy94rdqy6nz77f1p3rrxqwf"; }; packageRequires = [ compat emacs ]; meta = { @@ -6663,10 +6681,10 @@ elpaBuild { pname = "vertico-posframe"; ename = "vertico-posframe"; - version = "0.7.3.0.20230818.15224"; + version = "0.7.3.0.20231115.51213"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.3.0.20230818.15224.tar"; - sha256 = "0q23yw8dy9abawqlcpwjrk668kvxyffv972j0s6579z37i643gv6"; + url = "https://elpa.gnu.org/devel/vertico-posframe-0.7.3.0.20231115.51213.tar"; + sha256 = "1ymjcby120181rfl353kdx1i4jpg5vb6vrag5775bknr3ijjqax9"; }; packageRequires = [ emacs posframe vertico ]; meta = { From ca129aaa3a36144945bcbaf6a2302968414e22f6 Mon Sep 17 00:00:00 2001 From: Payas Relekar Date: Thu, 16 Nov 2023 19:34:39 +0530 Subject: [PATCH 87/95] melpa-packages: updated 2023-11-16 (from overlay) --- .../elisp-packages/recipes-archive-melpa.json | 934 +++++++++--------- 1 file changed, 493 insertions(+), 441 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 3c839bdb0419..eb98b6176fea 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -3811,17 +3811,17 @@ }, { "ename": "apheleia", - "commit": "118ec831528f718f0dc4bc331a708ecb4a0eefd5", - "sha256": "17aknfx1ii97lsqm4228rxawa6klnxpi948pl5bzwls9fx91g31v", + "commit": "b2cbf8111f532b35eb1c818d8c1f8297f3241000", + "sha256": "0sahfd897g34b59r80kl697yfcfx9s62v8b1p66iv3ivfl9wvswd", "fetcher": "github", "repo": "radian-software/apheleia", "unstable": { "version": [ - 20231105, - 2008 + 20231112, + 32 ], - "commit": "54a192c3454e82be9d5ad910d80796b27d58035f", - "sha256": "0wac6qhv89c6x2scbdxhxdrjhqm3jmm7fzzvirxibyd94fxjzzd3" + "commit": "ddea9bea708ce029cea6126b5be8e9f8979c58b3", + "sha256": "05lg9qych2x31cw8clfngrhzqgs858kcawnk07pyp45563pm0zjl" }, "stable": { "version": [ @@ -4576,20 +4576,26 @@ "repo": "meedstrom/asyncloop", "unstable": { "version": [ - 20231110, - 1334 + 20231115, + 2156 ], - "commit": "10e38a1b603ee0dfee69c25e7f10a4b1b66f3a8d", - "sha256": "0155yg9i3q6zda061zvsq42nbwyvq7dkfzfw7aa89jp4jyq9c2nx" + "deps": [ + "named-timer" + ], + "commit": "e988dac99390b2cfb889c8610c7f8f1f15708ecc", + "sha256": "0zlaypbr9v02ivvcjqizg52wvapzhgbc0kb1amx270pwzfzhp3zq" }, "stable": { "version": [ 0, 4, - 1 + 5 ], - "commit": "10e38a1b603ee0dfee69c25e7f10a4b1b66f3a8d", - "sha256": "0155yg9i3q6zda061zvsq42nbwyvq7dkfzfw7aa89jp4jyq9c2nx" + "deps": [ + "named-timer" + ], + "commit": "e988dac99390b2cfb889c8610c7f8f1f15708ecc", + "sha256": "0zlaypbr9v02ivvcjqizg52wvapzhgbc0kb1amx270pwzfzhp3zq" } }, { @@ -6196,11 +6202,11 @@ "repo": "nverno/awk-ts-mode", "unstable": { "version": [ - 20231022, - 1757 + 20231115, + 1037 ], - "commit": "a32d83a2c8714c5f2fdb8cc8cb6733a2eb1a4e87", - "sha256": "1k3nyp4h9iqz6cx90g469jf2j7kvr4q8mqn2i0han2a406izk9n5" + "commit": "7b3f26d24be4732e001ae3a0e0db35111e68c38f", + "sha256": "00zgkg3biy3lkaj9jsmn7b4nmnlyj0bqsjfc4qabm2mk0yar0is6" } }, { @@ -9248,11 +9254,11 @@ "url": "https://git.madhouse-project.org/algernon/brutalist-theme.el.git", "unstable": { "version": [ - 20231110, - 943 + 20231112, + 1455 ], - "commit": "0238406db380b733708e4ad7e5a75aeafe6a2640", - "sha256": "1rrjhkhsgfgzcbwgn6hlzh3n87205jj9yk3qpaflqhw83axms5jh" + "commit": "dbe094221fd727b8d3a4bffa84fc754df83c0450", + "sha256": "1m9z3sswm79rawivgz4fw51cp20qznsa9911dci3b2xpnnhpz89i" } }, { @@ -11662,16 +11668,16 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20231109, - 1008 + 20231112, + 904 ], "deps": [ "f", "s", "yaml-mode" ], - "commit": "ac122af751ba9903599c6eb9c3e9e12a375e19d0", - "sha256": "1712a7dhiw6a2bj4qq916dx2gk3124g7shxnizyy3nsvc6q08cdi" + "commit": "2640b72b7eed0b5f702377d3e0d723c23dda792f", + "sha256": "1g31lyzl3fx3bqgd1yrjrpb7a8zbl3sr8jqsssn5f6yp4lm4bqzb" }, "stable": { "version": [ @@ -11800,14 +11806,14 @@ "repo": "positron-solutions/champagne", "unstable": { "version": [ - 20230511, - 1540 + 20231111, + 358 ], "deps": [ "posframe" ], - "commit": "069452fa162d6aefc693c8d0546a84d967218289", - "sha256": "1qby7d95rl1vrkvq5y1i2bmy1bijv9pxm4whfwnhz9fkb3s88r9f" + "commit": "a99e1584207bc03a0cb776f715bd47de1d651010", + "sha256": "09ms3yx7h2ynqyf9mdjp90asahncq7k1mvnbkvj1g9f1l59zk6ns" }, "stable": { "version": [ @@ -11932,14 +11938,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231108, - 1115 + 20231113, + 356 ], "deps": [ "shell-maker" ], - "commit": "a05e30073f42eb6c10dfe0741ff86d3c22e914b4", - "sha256": "07j4pvb7li43c6ldakzfyj88s20f0dnfzn0ilpvf76i5q66hpqcr" + "commit": "50984ba1e833be89c41b9779e8dca5d04cb16a29", + "sha256": "1fvcd3gyipxq9x3yfl5q6i3yx2fq5vwqf6wx4c200awqc1crs89l" } }, { @@ -12571,8 +12577,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20231108, - 2054 + 20231114, + 1140 ], "deps": [ "clojure-mode", @@ -12583,14 +12589,14 @@ "spinner", "transient" ], - "commit": "bf9dceca17e912605e2d8327c44ed241e2a556e2", - "sha256": "1wca624gdnrqlkadlqafj0xibma8xgsh9qqpzynr6b8q2vmff98j" + "commit": "5261886ad7c0a8828d022812c7c1c6b503ddd6ba", + "sha256": "1m9bva5wi4mna80qrr401pvghxk54nh773544c5i11fanisyq9sc" }, "stable": { "version": [ 1, 11, - 0 + 1 ], "deps": [ "clojure-mode", @@ -12601,8 +12607,8 @@ "spinner", "transient" ], - "commit": "6e5294624959736c486f7a466bd5e78ce6183ab9", - "sha256": "0zr3p8isidfh9w44cjq50wk13balbswyyn2ycs368afkraqbry5w" + "commit": "9c605cd4938c0055c2766c55606f19ecbf664e8e", + "sha256": "15s8nvzgz4ymayg0k3nia9h7kcrn5c8m4clspgz2pzz3ywh10cfw" } }, { @@ -12883,16 +12889,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20231019, - 2047 + 20231112, + 1605 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "e21bf22b29d8ca40649517bb7dc503765f240282", - "sha256": "07q94iplkx29lggrs5xfzj42rxfcn2cnbr90jgifk29jshcz30pv" + "commit": "8115bed9d4ce0b7a0765de6fbe6b4efdad23b89e", + "sha256": "1mmlax5z437d96wn3v2gjck3cmx8k8r370rrymiisgjar8sj8bg9" }, "stable": { "version": [ @@ -13524,8 +13530,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20231009, - 1104 + 20231116, + 525 ], "deps": [ "cider", @@ -13538,8 +13544,8 @@ "seq", "yasnippet" ], - "commit": "b476345c580ae7cbc6b356ba0157db782684c47f", - "sha256": "100ngpgvff0xvw1h5krvh40sa3ympl241imwskcv62yk29m9z411" + "commit": "05e90bd9a0f24027011aab1bf041c16a24797e0c", + "sha256": "0y91034nkvx9sz69k5wfynf0cj4rcwnav33n8bq72cknvv67zll8" }, "stable": { "version": [ @@ -14221,20 +14227,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20231006, - 1308 + 20231115, + 1355 ], - "commit": "9532e1cf5b238ee5da2ea0b2fbb0194eaa5aaf03", - "sha256": "0nc3g5cv49mzn3g4zakprc8z2iqwa19x8lyzic1691857n0im5k3" + "commit": "9cfff766eb26ab8b29aa509e42d6b367dd00c7b7", + "sha256": "0z1f9hrrmgrpcigavadkzdz31m2fl2mm099gwqn550awwaqdp7y3" }, "stable": { "version": [ 3, 27, - 7 + 8 ], - "commit": "9532e1cf5b238ee5da2ea0b2fbb0194eaa5aaf03", - "sha256": "0nc3g5cv49mzn3g4zakprc8z2iqwa19x8lyzic1691857n0im5k3" + "commit": "9cfff766eb26ab8b29aa509e42d6b367dd00c7b7", + "sha256": "0z1f9hrrmgrpcigavadkzdz31m2fl2mm099gwqn550awwaqdp7y3" } }, { @@ -15266,11 +15272,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20231110, - 52 + 20231115, + 2254 ], - "commit": "07d1c41f83d5ad5f6263e726283a05ad12cd37a5", - "sha256": "0f2hnypzdggfw8dxyysf05n51za86qs1z6b8syrdnkyxcm41j793" + "commit": "e22230561ef559b032b4a2d79bef686d494b8ea6", + "sha256": "02lhq2iaxyarvq0h194ivzvw8fncvv0a1hp9dxhd47jr83k0wj84" }, "stable": { "version": [ @@ -17620,14 +17626,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20231110, - 926 + 20231115, + 1746 ], "deps": [ "compat" ], - "commit": "f36be0c05b9bea10cc7b477a7c82a196cee7c58a", - "sha256": "0n604z8xviwc58944d33zxq20xyn3i01rvh28av1mx4hvlgjd1zp" + "commit": "d7a0415c4ff3a84b696e5ddbc2ef15d0d45c405d", + "sha256": "15lvjb0hv3vb7xylavi2xsqdxq3b2ryi0zd866h5a3njhkk1sv76" }, "stable": { "version": [ @@ -17890,28 +17896,26 @@ "repo": "tomoya/consult-ghq", "unstable": { "version": [ - 20210606, - 2047 + 20231111, + 1303 ], "deps": [ - "affe", "consult" ], - "commit": "c8619d66bd8f8728e43ed15096078b89eb4d2083", - "sha256": "1zrxigf7bnx6l9lv2xvnn3ba6c9dndijw1vlnli56cv215i0r4f6" + "commit": "65a99980fb313d473376542cb87464a8a44ff25e", + "sha256": "1zvbz7xpgsg8y9ak8cvqhj415ym0i5sxv6b2cigvsb8j6kmp9cch" }, "stable": { "version": [ 0, 0, - 4 + 5 ], "deps": [ - "affe", "consult" ], - "commit": "c8619d66bd8f8728e43ed15096078b89eb4d2083", - "sha256": "1zrxigf7bnx6l9lv2xvnn3ba6c9dndijw1vlnli56cv215i0r4f6" + "commit": "65a99980fb313d473376542cb87464a8a44ff25e", + "sha256": "1zvbz7xpgsg8y9ak8cvqhj415ym0i5sxv6b2cigvsb8j6kmp9cch" } }, { @@ -18406,26 +18410,26 @@ "repo": "sshaw/copy-as-format", "unstable": { "version": [ - 20231104, - 1933 + 20231112, + 1710 ], "deps": [ "cl-lib" ], - "commit": "d4a88544d3e89385cc401f2026e8d46ca02e7ca4", - "sha256": "09c5ic11iikldqhdfrym57ry167dxln5bv75vv459xzf0nw9iqaw" + "commit": "b9f6f725ca9701c5a02bfb479573fdfcce2e1e30", + "sha256": "120b465p79bss4njqm320yfg4fydhpsx7rlczvgnn1vrxw78kisz" }, "stable": { "version": [ 0, 0, - 8 + 9 ], "deps": [ "cl-lib" ], - "commit": "d2376c64334fe3de65d89d6d138a2187f9bf802f", - "sha256": "0i158bkra7zgq75j08knq2camvlhbs2v8zrsxiyp0mc4q949xysd" + "commit": "b9f6f725ca9701c5a02bfb479573fdfcce2e1e30", + "sha256": "120b465p79bss4njqm320yfg4fydhpsx7rlczvgnn1vrxw78kisz" } }, { @@ -18548,14 +18552,14 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20231108, - 1746 + 20231112, + 819 ], "deps": [ "compat" ], - "commit": "42efcfd28f6286110cc2ba0d90ffd67a81e0667b", - "sha256": "0ns0xli4l53vxmw8bshnqqi0zm85nld6p2vw30psfpgaz70j2zqy" + "commit": "41e35c23a3512df658cdea95b246977923af56f5", + "sha256": "1gpzlrq631839jds991pzplqnz92yifsmvxbylh4rswpzcmrn46g" }, "stable": { "version": [ @@ -20907,14 +20911,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231109, - 913 + 20231112, + 449 ], "deps": [ "shell-maker" ], - "commit": "ad7caa8bde9d9e3e4f09458e6542ae1318949b2b", - "sha256": "1hd4df6ykifkkrl4ywczmiv0np2ai0q2xs7wabh24wi6cs3nzapw" + "commit": "bca784daa620767b5e57a5020289cb547c40f8b3", + "sha256": "1gzzfsw0bdyqbq6fgfsl0vwy0z639618sq74kdvk0hnssrbx1f01" } }, { @@ -21021,8 +21025,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20231110, - 659 + 20231113, + 706 ], "deps": [ "bui", @@ -21035,8 +21039,8 @@ "posframe", "s" ], - "commit": "f6706fa917aecdd1ebf71ee217724622cc6a97e4", - "sha256": "0jjnhl5hrpvdd4qb3jz6pdjgrp9qjxbm5dbgdhi6bkl2jhxy93fv" + "commit": "755845ae053bbfdd3f7b3dca13efa4be480370b5", + "sha256": "0rj0y85gkn50cly77dmy8g1z16czi1vg6qc9sh75x1vl7s1wr615" }, "stable": { "version": [ @@ -23438,11 +23442,11 @@ "repo": "hjudt/dired-duplicates", "unstable": { "version": [ - 20231109, - 1353 + 20231114, + 2150 ], - "commit": "349eebbd8b3fc10fa2a4551426769d20744e2eb2", - "sha256": "0zpv0112xphvci5rdw04qai9pdjf2ig6jf4kianwjzlgcrma5zar" + "commit": "e07552323b26ce68956f8b03aa66af145bae4d86", + "sha256": "1psa217zsl91qkvlrkysw7ycv9rc6vk8462rf6lfjmvb9bf5hpqm" } }, { @@ -26401,11 +26405,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20231109, - 856 + 20231113, + 759 ], - "commit": "642a907fdec8b765e777d0c9656388694a15dae9", - "sha256": "15fsn7dp6jngyl8457rcrsq243r93plamn4wdlidgm3kb05lyaqk" + "commit": "e4a139fe181ed1b576302fb36f3761fbf9914580", + "sha256": "03rincnyz895d0g49gifbjn8b7gr5b37c8fbpk7anrrp29gfr6n1" } }, { @@ -26869,26 +26873,26 @@ "repo": "emacs-eask/eask", "unstable": { "version": [ - 20231103, - 840 + 20231113, + 908 ], "deps": [ "dash" ], - "commit": "2f8ad56c8d9b3e6226b6641de1f8b61571225950", - "sha256": "01dbyplh6gwkk85amrx916h1lxjdbnvps7wqai3ny9wfixh7w0q8" + "commit": "98c53882a6b6703c62d7a59e0dcdf5e29ca2ca95", + "sha256": "17isgyg85fdhhhzn9jh6d0cba19ag7zwkppc1n34i2knm91411hm" }, "stable": { "version": [ 0, 8, - 3 + 6 ], "deps": [ "dash" ], - "commit": "be79e9fd4ba705308ed26a801c1072c0fd46a58c", - "sha256": "14wxlmmm6pylj6zw18q76p82bmlvd4sqgfwmd57fs7gjdv0qgqis" + "commit": "224798a5660717fd4325f13d66ba275a4d2031dc", + "sha256": "0ixm0dkzdxn35il16ff2r2xjqw7sbfqirkf3w664lrdwa56wzm1b" } }, { @@ -27181,11 +27185,11 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20221122, - 427 + 20231113, + 748 ], - "commit": "0c6cf404a49bd68800221446df186fffa0139325", - "sha256": "09fkzmcvzdbdjaa167wiybj0kir7y12pcq2varjywshvq2l7niz4" + "commit": "c854d128cba8576fe9693c19109b5deafb573e99", + "sha256": "0zfgns9q8bqiwjckfqcywzv00j3984r5kni5xp5rz3wxx8pgqvkv" } }, { @@ -28210,11 +28214,11 @@ "url": "https://forge.tedomum.net/hjuvi/eide.git", "unstable": { "version": [ - 20230525, - 651 + 20231112, + 2210 ], - "commit": "8cabc6d77b41bf0c9982ab56530c088d980bc353", - "sha256": "02hbvs6dqjcjiws3672frgbnr62l2biqjqs0npkhz6b50h99gzzr" + "commit": "1979bec36dba95168c9e6c68bd7d9248502de68e", + "sha256": "0dizx7clclwlgg858kbhg6ds4aj4949anwk0hf72dn08dxadwk81" }, "stable": { "version": [ @@ -28347,28 +28351,28 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20231007, - 340 + 20231111, + 513 ], "deps": [ "llm", "triples" ], - "commit": "bd7bb3bde2508455471a848d7013e169a81f1de0", - "sha256": "00sj500009y45jf1apdvdl8p5l163vxjk07bryzp4bbk2q6qsfyp" + "commit": "adbe9bfb6faf603fcd4958d4b4d6473829d4e7f2", + "sha256": "10c33xmzay4lm3hi84gsy5vq3sff8ys0r0nn6f1k3kjvwfpyjcr8" }, "stable": { "version": [ 0, 4, - 1 + 2 ], "deps": [ "llm", "triples" ], - "commit": "74d43f53cf9b11c40cf97de26d871a39c2ec596f", - "sha256": "0gj7ka0whp7wv1izfzgrsrkcizzpvmpjc0v1kzc1hqm8wsd9l4sq" + "commit": "adbe9bfb6faf603fcd4958d4b4d6473829d4e7f2", + "sha256": "10c33xmzay4lm3hi84gsy5vq3sff8ys0r0nn6f1k3kjvwfpyjcr8" } }, { @@ -28889,19 +28893,19 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20231107, - 2029 + 20231115, + 1824 ], - "commit": "ce5f3e14d7c5ab21dfb3e50235bfe495808b705a", - "sha256": "01ax4nzdby25szjmy63fmxjd8hf0a6hkkj555xylldq9bx5ax899" + "commit": "2aefc4d2820d922073917c7f87ea83c80c930ca6", + "sha256": "0z98cwzfj71xnq5wk5hgvdf2ar150cr6xs8mxwdi2204mqzzdsnd" }, "stable": { "version": [ 1, - 7 + 8 ], - "commit": "9ae24a8b62643d6e194d0754611dc014304c1183", - "sha256": "1q30r6di3r8dxxfbxfyii7kfvjj83c16bxx8ixadki3ix6imd6l5" + "commit": "c207e9537255d9167f9c578b2effc864f7e87743", + "sha256": "1jzknbdcvq4dp36f7p5abksd524lrlnmh6wycf0h3513wqnrprf8" } }, { @@ -28912,11 +28916,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20231008, - 2250 + 20231115, + 519 ], - "commit": "06c905bb4ac6bb35035d65ef5de0de9ce6dff763", - "sha256": "0fzdzks18lyx19kigydbdi2lg260p3wiq0v6sf4xb13ypsx6pyfv" + "commit": "c36f31074b09930e8425963f39d5508da6d2c32d", + "sha256": "0vglh3sp9x6z537jngh5jh9j3szbfadryzlwhmrlq7asiinnjq01" }, "stable": { "version": [ @@ -29325,26 +29329,26 @@ "repo": "rnadler/elfeed-curate", "unstable": { "version": [ - 20231001, - 1926 + 20231110, + 1646 ], "deps": [ "elfeed" ], - "commit": "1f687356d5c5c0a661e22c16ef8c8062cf3d375b", - "sha256": "0xx1fd8gkr2clwijqggskqgwhy17hcqnhw2y0mzwkfnxpimpsyy2" + "commit": "8d3628c81fc7dd9fefb9c5beca9fe4eab3575238", + "sha256": "16577gvlxs3dw8i02jgghlnnvq5r8b9d0b833j0d1fy67wj4dj1h" }, "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "elfeed" ], - "commit": "1f687356d5c5c0a661e22c16ef8c8062cf3d375b", - "sha256": "0xx1fd8gkr2clwijqggskqgwhy17hcqnhw2y0mzwkfnxpimpsyy2" + "commit": "8d3628c81fc7dd9fefb9c5beca9fe4eab3575238", + "sha256": "16577gvlxs3dw8i02jgghlnnvq5r8b9d0b833j0d1fy67wj4dj1h" } }, { @@ -29681,11 +29685,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20231026, - 2028 + 20231112, + 552 ], - "commit": "d5d6010a1bc1b1f5a2422474f701d4573a95aa5b", - "sha256": "055k3za0c5jpa5lgqic9749zsf7vrfzfhcinhhpkrw95amyhpy76" + "commit": "ac9f2cc1482a7ef4b84d87bd990208030bfc5f57", + "sha256": "1nr5x9mq24w5dib39zyb95c7ksdp3k7scgsb1r5ldywjss4z44da" } }, { @@ -29947,14 +29951,14 @@ "repo": "wkirschbaum/elixir-ts-mode", "unstable": { "version": [ - 20231025, - 640 + 20231115, + 1851 ], "deps": [ "heex-ts-mode" ], - "commit": "cb536ff3e70b70004687bbf583757f6929ce0238", - "sha256": "1x55zig1jj8qiarhv6hzmam96jzafwlnsanjq3jqnl5rybr8nsxy" + "commit": "d56d5915d4540a4f55f495e27407637d0359c774", + "sha256": "02jys0wnp2s601mgqa6fi3jamjy1dprima1q594wdjf82av2n8sv" } }, { @@ -31110,14 +31114,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20231105, - 133 + 20231112, + 1138 ], "deps": [ "compat" ], - "commit": "8c57c361d686d352f22bd570fee4976f6ab42bcc", - "sha256": "0cnv6lzbrl8pa8p4v3llm1alas5p1zs32nndsi626l2aqbjyfx8z" + "commit": "3f08fc8ede9dddad3752223e01643058594781b2", + "sha256": "1a08mpfq79mc1n4g9d07wjf7cm0bgi9a3gxkfdsyw52sy82fdr1b" }, "stable": { "version": [ @@ -31315,16 +31319,16 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20231106, - 2235 + 20231110, + 2356 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "f3701eea3d0159ea9a2b44c5cce3886be73ff3df", - "sha256": "0dblq6d938hxw0y4920653qqp8m6p1g91qgg311idc5azzy3hdp0" + "commit": "e4bba7abbcebdc76d9b709846867d50f8bc98513", + "sha256": "05c63pq3wjmg3ahndsnk67mvv6hv38p5wfd2v7awbngf3la9rrcv" }, "stable": { "version": [ @@ -36173,11 +36177,11 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20231026, - 1357 + 20231115, + 1445 ], - "commit": "b98c1c6d0b08317c9094bb222739ee037afbe7cd", - "sha256": "05y2sy9kbxk81pg6s45n9d1pymfm7zd0bz5zp6b240hyqc5qx8m8" + "commit": "9a9edd42a2dca9dfd0bc6026d47f689fa117b90f", + "sha256": "0j2zrhdffr3i9bwnaam5n908xmaq9z230sx6flid94cp9pvsxmxb" } }, { @@ -37936,11 +37940,14 @@ "repo": "martianh/fedi.el", "unstable": { "version": [ - 20231016, - 1415 + 20231112, + 911 ], - "commit": "a9f5c41f14dcde42bd384274de9b45c2d39f1dc2", - "sha256": "00gacr1rf40r8zgy7gkd7maq905mx6g4mcnczjc2jlxh4iwp6gw1" + "deps": [ + "markdown-mode" + ], + "commit": "e606fd40de36ad2131d027dec4f254e59a120dd5", + "sha256": "1chzzpk19z0siylh3z9sc05pjhibj9ld37iakc2v082dhd3f3sxk" } }, { @@ -39153,11 +39160,11 @@ "repo": "crmsnbleyd/flexoki-emacs-theme", "unstable": { "version": [ - 20231026, - 905 + 20231114, + 1714 ], - "commit": "149d00ee4cd17ab465db004910b67456db142802", - "sha256": "056hzf4r8bzzmmhlrgh6f0pppsr3spbrpiwb2kpkdbg1fwi9bjkf" + "commit": "5305cc3deaf361f57c67c57d10ade2bd448603e9", + "sha256": "1pg8mp3nghpmif2f94blrbv50xb9xp7pibnyfm0kpgh5gnciz3ab" } }, { @@ -43265,14 +43272,14 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20230417, - 1142 + 20231114, + 1120 ], "deps": [ "phpstan" ], - "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b", - "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp" + "commit": "495e22f98e3075d0d9a14ebec87771eaf967b996", + "sha256": "1khbknia1vhif6a26mcvx1d1mawvkxb84m16ghhp5vfna6g3sk64" }, "stable": { "version": [ @@ -45926,14 +45933,14 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20231001, - 1932 + 20231111, + 1149 ], "deps": [ "project" ], - "commit": "58bd510da5d09d9de52f4a6e60882b35445ca17a", - "sha256": "0n4346dc6kd0czj666lpmfq6ir6mrw0i45nkwpym6fhpg9cdynhy" + "commit": "49d12a14482ce9a193c049a5ccdd2fed90b0bdbe", + "sha256": "05kk8pa8dgm2bv9k2rfxi0m1kdpzz40csn7jgl5a38w1l1yjcffl" }, "stable": { "version": [ @@ -46273,6 +46280,21 @@ "sha256": "0jp16la1v4l8mdnxsia9w11a33s5jxs9rdgwp2snxq3h40wyv0is" } }, + { + "ename": "gemtext-mode", + "commit": "5f16cf1dd7fd792ed631d2925edc6203fe0d231d", + "sha256": "1hbcsah3z1h95z93srdf5rkjq3icb6gcmq5r8sv6z8k026xy56sb", + "fetcher": "sourcehut", + "repo": "arjca/gemtext-mode.el", + "unstable": { + "version": [ + 20231029, + 2010 + ], + "commit": "431b3b1d7c4310ef09ba16adbc870bc0af2c0e9b", + "sha256": "1zizjq3cx5y7mdgapm2kzc4bs13fcg55nay996350ha986isa834" + } + }, { "ename": "general", "commit": "d86383b443622d78f6d8ff7b8ac74c8d72879d26", @@ -50204,11 +50226,11 @@ "repo": "stuhlmueller/gpt.el", "unstable": { "version": [ - 20231108, - 150 + 20231112, + 2012 ], - "commit": "fb0ab4b1e95a6ba97c09ff072fc91ac7c7f22afa", - "sha256": "0vqxf5zfsaa1ddqp80fhyyfpgpi5my1dzxpsd9zzbf7cma383r00" + "commit": "c1091d25db420320de4b121baba99d7ac2e23932", + "sha256": "0b9fcj7zkqxj5928038gnk93shi7k4mpikqir80lypbnnbn96l5f" } }, { @@ -50275,14 +50297,14 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20231108, - 2129 + 20231113, + 211 ], "deps": [ "transient" ], - "commit": "0109d0d1c067aee8fc3228f1f34d766043258cc3", - "sha256": "15lwqgydkzqc4zp9dfyiqlphm14pr5f588gwi8pxw36dmpgik927" + "commit": "17a58d38e7299f254d02c29bbcc9211146394758", + "sha256": "1cy1kkbg477dnf8lz137h7bc7hvm3apvxdq3ycqifwwhfks4cyk4" }, "stable": { "version": [ @@ -52081,19 +52103,19 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20231026, - 1602 + 20231115, + 1812 ], - "commit": "ef3fe51f7c207db3c55b9a3a720b3af665d2e606", - "sha256": "15d4wkpv35bbzskiwia0jzl9m5pvs5pl70qs6np6yz7hwq4c524r" + "commit": "8d0f44bfe2a9ab6b0969c9bafb75089f315ff5ae", + "sha256": "0ndi986rxq9gz61ss2vazadn7rn0niv1gnpk9nfq9sw3m336glsf" }, "stable": { "version": [ 17, - 4 + 5 ], - "commit": "79af559b6d750aff32a916a81cc4fb63ecfd588d", - "sha256": "03j94fgw1bljbjqmikbn9mnrfifxf7g9zrb727zmnnrjwyi0wd4n" + "commit": "8d0f44bfe2a9ab6b0969c9bafb75089f315ff5ae", + "sha256": "0ndi986rxq9gz61ss2vazadn7rn0niv1gnpk9nfq9sw3m336glsf" } }, { @@ -52408,16 +52430,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20231108, - 1729 + 20231114, + 1504 ], "deps": [ "helm-core", "popup", "wfnames" ], - "commit": "2534c228ef6699cb2588349c44627835fc444278", - "sha256": "1iq9cpf4nywfiw1f3ki5jcxpb2mlyqm6pgqfa6alfkkpvgrap9l3" + "commit": "74887ba26071fba4c66ac3b4dc11d7d632832394", + "sha256": "1gyd03dln19cjwgrh3m72qik77hdc2waiv61knzk30pq3dds965j" }, "stable": { "version": [ @@ -53269,28 +53291,28 @@ "repo": "Sodel-the-Vociferous/helm-company", "unstable": { "version": [ - 20231108, - 612 + 20231113, + 701 ], "deps": [ "company", "helm" ], - "commit": "a653ff05023a21dfa087d196d6ca27e382eb28b2", - "sha256": "0zg878i48kmgw9lj772c3kx5v13k9k2afz98j65jx2bjbcm9f338" + "commit": "4622b82353220ee6cc33468f710fa5b6b253b7f1", + "sha256": "0lschnr15c39bnfvm2zdp7f3qvyzrdk8gzzwcb1g2d9jy3mkcq05" }, "stable": { "version": [ 0, 2, - 7 + 8 ], "deps": [ "company", "helm" ], - "commit": "a653ff05023a21dfa087d196d6ca27e382eb28b2", - "sha256": "0zg878i48kmgw9lj772c3kx5v13k9k2afz98j65jx2bjbcm9f338" + "commit": "4622b82353220ee6cc33468f710fa5b6b253b7f1", + "sha256": "0lschnr15c39bnfvm2zdp7f3qvyzrdk8gzzwcb1g2d9jy3mkcq05" } }, { @@ -57944,26 +57966,26 @@ "repo": "mihaimaruseac/hindent", "unstable": { "version": [ - 20230517, - 1404 + 20231112, + 1536 ], "deps": [ "cl-lib" ], - "commit": "e36786e7a54b0ebfd662bc6ddedea656d08a4033", - "sha256": "1hl42vi28v075csilja906v52vg9hz43540x6fd59ddrv61zj6w5" + "commit": "a83adf2edc9503c0ee836beb7745bdfd4ba1ea50", + "sha256": "0yzsxnfzwhrqpjnrn6pxrvyy4pkay3dg5qic5lanl1j24hspfmjf" }, "stable": { "version": [ 6, 1, - 0 + 1 ], "deps": [ "cl-lib" ], - "commit": "e36786e7a54b0ebfd662bc6ddedea656d08a4033", - "sha256": "1hl42vi28v075csilja906v52vg9hz43540x6fd59ddrv61zj6w5" + "commit": "a83adf2edc9503c0ee836beb7745bdfd4ba1ea50", + "sha256": "0yzsxnfzwhrqpjnrn6pxrvyy4pkay3dg5qic5lanl1j24hspfmjf" } }, { @@ -59309,8 +59331,8 @@ "repo": "ushin/hyperdrive.el", "unstable": { "version": [ - 20231108, - 2105 + 20231112, + 920 ], "deps": [ "compat", @@ -59320,8 +59342,8 @@ "taxy-magit-section", "transient" ], - "commit": "0bb8c90827781241b7c04904e7a348133e084453", - "sha256": "1y8c8dpzj4fvym2sk3ci0sdrkm70w9anyvgpb6q2sa5b25hwgm7f" + "commit": "8aff760d4a8d3a172a6694e1816f309bac1eac95", + "sha256": "0zml0m0y5k1bs6d627f0la9ax9ag74rmxpxzwky5v8r8zqclynfa" }, "stable": { "version": [ @@ -60423,15 +60445,15 @@ "repo": "KarimAziev/igist", "unstable": { "version": [ - 20231110, - 851 + 20231114, + 928 ], "deps": [ "ghub", "transient" ], - "commit": "92e3c429c0da07025624cceb5796ac41edf753e2", - "sha256": "10hw58zln8x8kjyzmfl1vfqj5mqascix9c7rdq884f8ypfynx7p1" + "commit": "7a72a4ea40668a7c4f0f8d60990a5ac298429936", + "sha256": "0v02cjjabm1f14bvhqp559xfv14my9ibjyx2gh3kzb67lhsrlcsr" }, "stable": { "version": [ @@ -63688,6 +63710,21 @@ "sha256": "1f55fkmhs4vjjsvf4mvhmqp7qjjl0m2qdgz2gbrkgx45v8hzzyx0" } }, + { + "ename": "jack-ts-mode", + "commit": "d01c726fc20b97e6127603f7bc347a5cf5e21cf8", + "sha256": "12lih23ci6jl6hqg9lv3cfdadvg60k1j6hgxk8w1x04677ri73nw", + "fetcher": "github", + "repo": "nverno/jack-ts-mode", + "unstable": { + "version": [ + 20231110, + 1615 + ], + "commit": "f57f211d96608a90142619a925caeb8808e7c632", + "sha256": "0zvd2xxv5wsljbvpzp7i121hgj7mnlgjd5wjblmf2hhx49al5n01" + } + }, { "ename": "jade-mode", "commit": "877b5a3e612e1b1d6d51e60c66b0b79f231abdb2", @@ -64412,14 +64449,14 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20231104, - 1427 + 20231111, + 850 ], "deps": [ "compat" ], - "commit": "6f6108896744d1da4887b08e4fe4fff403ac10ac", - "sha256": "0jf9p75r13p28n1kv9w85kk9n3nfp4d8p34y76n3rqhh3sib2asg" + "commit": "25279e36701ad0bea1331ccfa009c07fda2f85d0", + "sha256": "0z05znl1cb26j67h7g0wlfazn9sr7p5j59mwdayy3l9157ic6b4i" }, "stable": { "version": [ @@ -64561,19 +64598,19 @@ "repo": "SebastianMeisel/journalctl-mode", "unstable": { "version": [ - 20231110, - 1253 + 20231113, + 809 ], - "commit": "cb3185081cc8eba06de30936efa227639fb8a60c", - "sha256": "0805nvz7kssjm3gahm9g8s25by44dm16anz69087jqfkdwxly023" + "commit": "d9ecbd2f1ca15c90a05f11441886ab2e66b9a51f", + "sha256": "1mpqr8ls3xd8iirnjsk2rg3ibr13n853dj3y0hr6baddka1hydfx" }, "stable": { "version": [ - 0, - 8 + 1, + 1 ], - "commit": "457e38af67427e92d6217abbb362ca9673b33ed5", - "sha256": "1lnjgpbvs3b7h1m1lnd4g3965pjn1sw4vyjd3f4106s10llmkd8x" + "commit": "aef9162171118ef8e6ab411b26b763c9c6ea9e2f", + "sha256": "13xa05a798qbpxgkidvf42xxvi582n7sblwvv9kx0b0glclzkpb1" } }, { @@ -64669,11 +64706,11 @@ "repo": "nverno/jq-ts-mode", "unstable": { "version": [ - 20231025, - 2319 + 20231111, + 208 ], - "commit": "b1abef71843dd99349133a75245804aee503c05d", - "sha256": "0xjmpk33rhqlw5f9qjhmyc057l8rbrrzhz460zsljx2wm11cvp6d" + "commit": "0201e351ed0074a72c0987282079c775f3c8fe52", + "sha256": "157f300w61dq9s11f71p4z0nykg8h1f64rnpy3199y6sfjhhglyl" } }, { @@ -65522,8 +65559,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20231026, - 2200 + 20231113, + 2330 ], "deps": [ "dash", @@ -65532,8 +65569,8 @@ "s", "spinner" ], - "commit": "97ca00411e16a2c1815090ca5aa05b3a36776a75", - "sha256": "168x8g2m30ci2msjfk09bbczpa33h4ax57b23hcwy5czk9511w70" + "commit": "16cf8ffafe5ea0925beb97e37a64eab58b2ad95d", + "sha256": "1231rkk629dqi15011bjslwvspvlgnx74xm2q9j1y37ql4zxjx2n" }, "stable": { "version": [ @@ -66118,14 +66155,14 @@ "repo": "Meritamen/kanagawa-theme", "unstable": { "version": [ - 20231023, - 114 + 20231112, + 414 ], "deps": [ "autothemer" ], - "commit": "08debfc56e052ed69c7ecc3b08c687bb5af4a33c", - "sha256": "1mf4w05zhmhdrknfnpfrcvc3126i3vqcsyjwp0n83km1d8wcd1sx" + "commit": "692cc627ccdd0595de3bbc67e313a0363002e444", + "sha256": "0abckxxifh5aw55wk7ykfxi6cm4rd6ya0m8pql9591lyxfi5whxw" } }, { @@ -67406,11 +67443,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20231110, - 1334 + 20231114, + 1243 ], - "commit": "b9ccc4896c8af8e8b60a26eb16fffe8a185551d0", - "sha256": "1dy1j72i8ymxlvhrbh3k94l90p3vwfn8bimbrlw100aqz41nz2jd" + "commit": "9688741a59a5ffd71850660dd320b0309a2ba119", + "sha256": "1gxj3fys3py0ldz31f8frmj12f9jyyqj9g8valsy2c87qvg70ag3" } }, { @@ -67543,8 +67580,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20231013, - 1753 + 20231114, + 1528 ], "deps": [ "dash", @@ -67552,8 +67589,8 @@ "transient", "yaml-mode" ], - "commit": "b882de32b6f6a6ee371eb7a7a308f3936031e681", - "sha256": "1ddavmfyyd2rxffvb3cbv28dxrjsa58jbywzgplnx6zyv05frx44" + "commit": "4e3d362b2df2307f7b13140810a3142b835bc9ff", + "sha256": "0lq0c5dd63d19ziw16cfhhzk4z3vjqal1vqjflvdrd2xhdzjk0xn" }, "stable": { "version": [ @@ -67835,8 +67872,8 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20231106, - 1250 + 20231112, + 2208 ], "deps": [ "f", @@ -67844,8 +67881,8 @@ "request", "s" ], - "commit": "c79bf975ad799e11ead0e2f2ca909222044b35cd", - "sha256": "1n9xnpz6yv7rczl0cjk7qd5962swcf19022hpaf46kva2sw43333" + "commit": "9f0f738c46712f5365d9d75c37ce6d1f8b6e9ba7", + "sha256": "0k54x2znxwq3ji8cvxc37h9fnr0krpyyx954f106fa7gylp86kz4" } }, { @@ -71687,8 +71724,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20231110, - 716 + 20231115, + 1221 ], "deps": [ "dash", @@ -71699,8 +71736,8 @@ "markdown-mode", "spinner" ], - "commit": "3c1c583b549d81ab8e23ddd58b0a7f065e6b6f2a", - "sha256": "0di1hg5hxm6ybqz063yjj6b9rpjaxgqgia6k753hyp9p95c0619y" + "commit": "91dbd0240afb5223b2ddfca8326d1c2fb3e8cf7f", + "sha256": "1anibzm7w9arzqpfm6p01v0522j022g2mwa01w0p1idwg6jjiivf" }, "stable": { "version": [ @@ -72638,8 +72675,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20231109, - 935 + 20231112, + 914 ], "deps": [ "compat", @@ -72650,8 +72687,8 @@ "transient", "with-editor" ], - "commit": "02630b51896929011a420d9382779c98ecaef687", - "sha256": "06cnhwzxjpqb29km9nxjynapxiajaa87s7q32c4igq4yjp3jy0h0" + "commit": "f4ff817cb2a48f0f7887050c3be469c03a059567", + "sha256": "0y0sfxky27yx0wsxfbqydigm2x4596dyf1x1psn66gfgjm9yjcff" }, "stable": { "version": [ @@ -74057,6 +74094,21 @@ "sha256": "0fcyspz7n97n84d9203mxgn8ar4rn52qa49s3vayfrbkn038j5qw" } }, + { + "ename": "mark-yank", + "commit": "d186dbd15e567113418449cf1830f7a5fc342580", + "sha256": "1vbqvw55bzvfaf9nxy3bvp8gzg0hxag7srnjyxpy2a1jwy5crq6i", + "fetcher": "github", + "repo": "mkleehammer/mark-yank", + "unstable": { + "version": [ + 20231105, + 2027 + ], + "commit": "7207aabe9edd0872ec6d506a58b942b43926c122", + "sha256": "0r94mm6x9n53ck2gqbrmi0gdahf1xyhp09jpnnv3m1klhi4hwbzg" + } + }, { "ename": "markdown-changelog", "commit": "1ca43b6cf089d7c75b1fb483d8356a3ca7fec5bd", @@ -74800,14 +74852,14 @@ "repo": "knu/mc-extras.el", "unstable": { "version": [ - 20181109, - 1735 + 20231113, + 1359 ], "deps": [ "multiple-cursors" ], - "commit": "053abc52181b8718559d7361a587bbb795faf164", - "sha256": "16y48qrd20m20vypvys5jp4v4gc1qrqlkm75s1pk1r68i9zrw481" + "commit": "abd98a7c92e71d38494a6bf20853f3ff20e1f013", + "sha256": "0zv8cxhyqkxc3gyyzd18zygjy0xd3fk1x3v5h24yr998wg0fb050" }, "stable": { "version": [ @@ -75188,11 +75240,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20231108, - 1124 + 20231115, + 1306 ], - "commit": "f46ebad2216460cf58293b913bb76c5e9bdc968c", - "sha256": "1wirkcwi21s8z3210h9fwqbman2fg2366b05vgmgasphirsjdsw0" + "commit": "53eaad5df01bbdabc9e655dbadebc302d0475f31", + "sha256": "1a2snly1iraxmyal8f61jj0zhcywmyzq6gglf1fqmmcx3xpv8xra" }, "stable": { "version": [ @@ -75931,20 +75983,20 @@ "repo": "liuyinz/mini-echo.el", "unstable": { "version": [ - 20231107, - 1317 + 20231115, + 13 ], - "commit": "9d89e352b73ff2222d62b43b8944206582723fef", - "sha256": "14gr1fc1bdwwzll1yq2sc5yaadvb4360lqypvq805bnnhdjqb6hb" + "commit": "5dfd1608d384be3176c4f06fef908933e2fd4a02", + "sha256": "0pknwad9mm0szb4a0ar7wrc8lnwn45vf3vfq0wbflh6071mdnmkv" }, "stable": { "version": [ 0, 5, - 3 + 4 ], - "commit": "89061feace09249a93e8bdaf2474cc953eee604b", - "sha256": "143i9ih18mh26mdq9d9pxnb468n9zmz2xxs49hgzkpyhc5hdcdy9" + "commit": "58b7c6129f941d4eb6cb5c04525970f8e409623a", + "sha256": "146nlsflzfbsdkwni15vhassq7kgf4xjn7vlwn05v1sny2wpscg2" } }, { @@ -76919,11 +76971,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20231031, - 716 + 20231115, + 1302 ], - "commit": "ff70fd4136df589945d06de6926286d70243345b", - "sha256": "16qr26ihf50w536r6646csd2vxl6xgyyzywn095cxs8mq2qp7jzq" + "commit": "bdb18b2ee27344e44e2a17c78524205d02d5174c", + "sha256": "08m6mzh87q05dx7xvfnyqpj0jsg59g626qq8y5nrnmscf7pf0rkz" }, "stable": { "version": [ @@ -79714,20 +79766,20 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20231002, - 1014 + 20231113, + 1036 ], - "commit": "f597921dcbf4774d799be62d8fbbce7171b12c3f", - "sha256": "143lbva2bh723qgk6mjnbawbx9sr3x3pnpgp42hvnr072gcpl9nd" + "commit": "076fb8339e4ea935c1a530a740b6eb6257c55962", + "sha256": "1vz50fkf1nw1md8p239pisvpba9q1y3ygvs6yfb37jvrxh6a1k4r" }, "stable": { "version": [ 0, 2, - 62 + 63 ], - "commit": "f597921dcbf4774d799be62d8fbbce7171b12c3f", - "sha256": "143lbva2bh723qgk6mjnbawbx9sr3x3pnpgp42hvnr072gcpl9nd" + "commit": "076fb8339e4ea935c1a530a740b6eb6257c55962", + "sha256": "1vz50fkf1nw1md8p239pisvpba9q1y3ygvs6yfb37jvrxh6a1k4r" } }, { @@ -79815,11 +79867,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20231105, - 653 + 20231115, + 1110 ], - "commit": "a506b43dc241ee07c28ce815068277084afbf09c", - "sha256": "0jahmqvi0hb8jsraj21d1n6wdp827yak2f4bs9ljpmggqvxp40pl" + "commit": "cfda588dc1e865a8a121b9071f3720fd4937492b", + "sha256": "0cnhcyh7s50k60hx572zz2cq83qjjp72qs6ad9gc6abhzzrzr6bj" }, "stable": { "version": [ @@ -80880,14 +80932,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20231024, - 854 + 20231115, + 2126 ], "deps": [ "compat" ], - "commit": "1fb3271e991fb941e8cc480beff74000e3a08a3a", - "sha256": "0ahlri3hlkrlmm6bh094ays6qrw9yd02rghq0hgin006817r8pqz" + "commit": "722c44210a5f2697f449bd6cb2cdcff638b8c0bd", + "sha256": "109z231gz4afg4z0dzyccsx69znvzwy3z4c5z48441brssvna6nj" }, "stable": { "version": [ @@ -82233,14 +82285,14 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20231109, - 914 + 20231111, + 2324 ], "deps": [ "chatgpt-shell" ], - "commit": "58bb4d8eb9218be4925201a39596387d160f4593", - "sha256": "1mqwc2wkz2ax4pzi76vqq59v4qjwp221sw4nw91nr6zbk5ws1780" + "commit": "03f8edabb95c6ffc64050d79fdb3091532711b59", + "sha256": "0h94zdx1nn98pg3mdlj6zvlswmj6i1yldnm1hb9pj2hccsdfj3bj" } }, { @@ -83602,11 +83654,11 @@ "repo": "ideasman42/emacs-theme-oblivion", "unstable": { "version": [ - 20230415, - 551 + 20231111, + 1100 ], - "commit": "f0b180eeb5ed19bacbce9d6a39e3123f4751f54b", - "sha256": "03xr38xdsjxlcfbw2637wwiwadymhb60pc9ik0zzk69d2ks097k2" + "commit": "f8e3e1cb02f83624624a4e42070059d91f2e8d5c", + "sha256": "0mb5mmw1110a4czg459c4dl6xj99vzp5vgkhp7kkdgakck0pz17z" } }, { @@ -84674,20 +84726,20 @@ "repo": "knu/operate-on-number.el", "unstable": { "version": [ - 20150707, - 623 + 20231114, + 1921 ], - "commit": "ceb3be565a29326c1098244fac0c50606723a56e", - "sha256": "0iw3c8sn702ziki59mvd5gxm484i7f0bwsy8fz95y08s9gknjjf9" + "commit": "0ddebae1885c1b54eae1d79e66204d6d83c5065b", + "sha256": "0y3a8qp9b6cgx61xs665l6g6xqc208jqvhv9vqyl517v6gwcpq0b" }, "stable": { "version": [ 1, - 1, + 3, 0 ], - "commit": "6a17272e2b6e23260edb1b5eeb01905a1f37e0a6", - "sha256": "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb" + "commit": "0ddebae1885c1b54eae1d79e66204d6d83c5065b", + "sha256": "0y3a8qp9b6cgx61xs665l6g6xqc208jqvhv9vqyl517v6gwcpq0b" } }, { @@ -89172,8 +89224,8 @@ "repo": "ichernyshovvv/org-timeblock", "unstable": { "version": [ - 20231109, - 843 + 20231112, + 1748 ], "deps": [ "compat", @@ -89182,8 +89234,8 @@ "persist", "svg" ], - "commit": "7ac198c48646f864f18aef1c7e55c15ab8d8b679", - "sha256": "0m6gzjzv4criydhsz2s3q1kqc3bs11zg5svgjaksb7piks9368ds" + "commit": "72a72bad4644f7b6045403e93e99d7a362b03b9c", + "sha256": "045vrp9d8d6wnmi82vi337w5w7i3cs0jprwiyhkf033bwvvdywwb" }, "stable": { "version": [ @@ -92185,29 +92237,29 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20231110, - 1025 + 20231113, + 1518 ], "deps": [ "cl-lib", "compat", "let-alist" ], - "commit": "c541e67dbb7f93b888edac908e9b25813ee7e6f7", - "sha256": "0y3qq1hn43xkmv3x807ja088s75hs06lj8fgxa7a16ifaaa0958c" + "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", + "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" }, "stable": { "version": [ 0, - 20 + 21 ], "deps": [ "cl-lib", "compat", "let-alist" ], - "commit": "5eba825d657b490c320b2ea2c302b1fa0c999610", - "sha256": "1v12l8mbsrgkq5rmgzypkiabhfrd5cq6nrnmsairnpw8rrz4w739" + "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", + "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" } }, { @@ -92218,25 +92270,25 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20231103, - 1810 + 20231113, + 1518 ], "deps": [ "package-lint" ], - "commit": "5eba825d657b490c320b2ea2c302b1fa0c999610", - "sha256": "1v12l8mbsrgkq5rmgzypkiabhfrd5cq6nrnmsairnpw8rrz4w739" + "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", + "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" }, "stable": { "version": [ 0, - 20 + 21 ], "deps": [ "package-lint" ], - "commit": "5eba825d657b490c320b2ea2c302b1fa0c999610", - "sha256": "1v12l8mbsrgkq5rmgzypkiabhfrd5cq6nrnmsairnpw8rrz4w739" + "commit": "dd81a5b9224cc6e6dc4bbb6b4a2928df89c01317", + "sha256": "1y0h8rrmvi3j5maig6i69kxxr1igb96075vpzbycaqln3xn11g36" } }, { @@ -96894,28 +96946,28 @@ "repo": "aki2o/emacs-pophint", "unstable": { "version": [ - 20200420, - 1429 + 20231112, + 658 ], "deps": [ "log4e", "yaxception" ], - "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d", - "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8" + "commit": "e17fb22d34f904b4473f6bad0d445e3ca1521669", + "sha256": "1k18qc7s75bfv5z3mrs5snsjh16kcz1r5kxrw7p5rbfk002bgqw7" }, "stable": { "version": [ 1, 3, - 0 + 1 ], "deps": [ "log4e", "yaxception" ], - "commit": "5e13da4578ae7ba00e6f7bae31eb546d713cc19d", - "sha256": "01bwfswzzrjxrjaqysaqnav7h3swwyigxw7nj0cgrm3w8cp1y2a8" + "commit": "e17fb22d34f904b4473f6bad0d445e3ca1521669", + "sha256": "1k18qc7s75bfv5z3mrs5snsjh16kcz1r5kxrw7p5rbfk002bgqw7" } }, { @@ -99003,19 +99055,19 @@ "repo": "protocolbuffers/protobuf", "unstable": { "version": [ - 20231101, - 2003 + 20230506, + 330 ], - "commit": "6b5d8db01fe47478e8d400f550e797e6230d464e", - "sha256": "1pzkb3kdr374cxs7vw8lxpkl6ncg4mkjdqyzhnijri6m250sjwip" + "commit": "0d3b0c61f4f44c3d8770b89edffe481aaf56f4f1", + "sha256": "06xl81cm55g0dcpfh8b8za8mrs5cgjv656z23q5q0ph3war6ifbn" }, "stable": { "version": [ 25, - 0 + 1 ], - "commit": "6b5d8db01fe47478e8d400f550e797e6230d464e", - "sha256": "1pzkb3kdr374cxs7vw8lxpkl6ncg4mkjdqyzhnijri6m250sjwip" + "commit": "7f94235e552599141950d7a4a3eaf93bc87d1b22", + "sha256": "0apvjl43f751iy3472cc17wqmnmzlcgn9sw2wxsmddaz9km7kbn3" } }, { @@ -99501,11 +99553,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20230910, - 1438 + 20231111, + 1538 ], - "commit": "67fd542d9b633d729bdc46fca50a8d0bb6ec6ffb", - "sha256": "06r3i7j090pqgxx40ssix34zbjyzl8mpilwakamw6jlzcdhl4lg9" + "commit": "518a5362870b6ef01d2d4a158bd38c7280687256", + "sha256": "1m7gvizfmvf1f6s4x72fszja90zq7sslmywgihzs7585107wy8s3" } }, { @@ -101274,11 +101326,11 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20231110, - 1508 + 20231115, + 1544 ], - "commit": "24d59b1546d963c2b92f67a8efde951db90182da", - "sha256": "10s29phk21scdgyyl8ya7l23xr07gm5li7kyni25hh91q6fkldaa" + "commit": "296de3c15580805f2d84dd30e01eb9b12f18bc3f", + "sha256": "1w6pxgmm7s769g7falshpvnb0klql3pz3h9461rvgmvxmrraas93" } }, { @@ -102037,16 +102089,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20231021, - 227 + 20231113, + 1910 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "445340ebc5819eeedd73695c9182349349c90b6a", - "sha256": "1x493djnj5012c7jr29gmzy6sdw7s6xh855dgslr16aqimkz7zg8" + "commit": "365063ea8ce8ec6a852cb388088d84147421c3c2", + "sha256": "1ankjwwsbkv5i9x9dbv0lzbs5qrqb486ds2qymdb0w4kg2g3d11z" }, "stable": { "version": [ @@ -102693,14 +102745,14 @@ "repo": "emacs-pe/redis.el", "unstable": { "version": [ - 20220429, - 1758 + 20231111, + 1733 ], "deps": [ "cl-lib" ], - "commit": "a6ad30d6a43b7be083c13f8725b45571d623001a", - "sha256": "048jvvxb6cskhs95n2ngl4cfgf8hbqidvbi1xsyb0gyzvvqbrhj1" + "commit": "84382456beae70677aed2f9558a0b446f8ccc17a", + "sha256": "0zrjfikpnj6pxaj348wnknv9dnzhzqwsi8b26dbsln5zcwl131jz" } }, { @@ -107611,11 +107663,11 @@ "repo": "xenodium/chatgpt-shell", "unstable": { "version": [ - 20230709, - 2036 + 20231112, + 442 ], - "commit": "1ec51235295f4685f6cc1a7601255fdcabffc1b3", - "sha256": "1yijz5hx5pidl29kfzf7skdvmvkl8vj7xnlha5p1r2v9l54n5asq" + "commit": "b9f193703f34a5ec923b0fdd34f38b3579d04140", + "sha256": "18sw8whar1r3y4jcml2yjf8symm8a6dvmw9ld80cacwyia3d20fn" } }, { @@ -109321,15 +109373,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20231004, - 1552 + 20231112, + 2019 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "0cc2e736112a0bc2a048ef6efd11dd67e3fbf7ad", - "sha256": "14yqa8m44d5qll1fidh0d4g9hmpri8ywxfvgq43bzy00lshnprzg" + "commit": "735258a26bb97e85d25f39e4bef83c1f80c12f5d", + "sha256": "1dxy14dp6z4907vdj5mahj6fxv211rxvldyiq29k494bmapixhxw" }, "stable": { "version": [ @@ -111699,11 +111751,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20231110, - 101 + 20231111, + 59 ], - "commit": "db107d1e9a716ffe531a0f73e7044bb8046d34c4", - "sha256": "13iyxz88ckzydhmy4wgfrfwp8dcj0dgb1rxwr5zcpqxrl1aifpjp" + "commit": "18d7cfd411d79d8bc81027a023c72bae96d77059", + "sha256": "0kj1amrxa1ldc4ss0lx1y2jl4iskg68zm20yldw059gwlg61p13q" } }, { @@ -112450,11 +112502,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20231030, - 539 + 20231115, + 1901 ], - "commit": "eafeda97eb8942e5e2f1fe6ebf7472de9ce405dd", - "sha256": "1myrv3awf8v1haas63fhy7s81jkbbfv6zlbsb2nl8j723d5vm8jn" + "commit": "97fa0664ee4852b18201a3fcac265ac8c52a4a4b", + "sha256": "154r3xrif4nzdqsfyb6skw0ddbi15j1crnqrqv6yclf4s14icz1m" }, "stable": { "version": [ @@ -112991,11 +113043,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20230925, - 1808 + 20231113, + 756 ], - "commit": "6d0f9b34eba1abde6ee72e10c2b4dfdd18712065", - "sha256": "0p0pgfwd987ylsm8lhdkammqy6afx2bb582fb3lrjhj27dn572f1" + "commit": "22f449a30d6d36a42c59c1d31e3538aafff19e90", + "sha256": "11pj8fh65wz02q9mhyd4yqpis5n3k2wc919l19ygl4kh5h60ailg" } }, { @@ -114498,11 +114550,11 @@ "repo": "liushihao456/symbols-outline.el", "unstable": { "version": [ - 20231110, - 633 + 20231111, + 809 ], - "commit": "970961c63c5949599f684d7b663608e4fe5de635", - "sha256": "02p98bwwwxd7qsxb967y5glgggwh27vh7sc606zy1hyhsx8nkigi" + "commit": "48cc227507c3d079a2ceaf6939406ab158b534eb", + "sha256": "06m2dgfm61iprikv2j0nz63x84l15mzrs0qxn0j3p6flr7aq21n8" } }, { @@ -115569,15 +115621,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20231108, - 717 + 20231116, + 1 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "3e7bc49ccd579b2e68d00620424b9c10e38f56e5", - "sha256": "1bq1if84piww0mb9ciji7l2n2ac57c01kb6vldc96imhpri2fnny" + "commit": "08441b4daedbb2688edb2dd3cac0aa71cca675f7", + "sha256": "1fish0g8dvd6m0lgzy2k92g5dk52swynyyqhv6pyj2wjmwb7cx6f" }, "stable": { "version": [ @@ -116871,21 +116923,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20231106, - 1400 + 20231110, + 2354 ], - "commit": "19890bdbf8ace9df6364162f1d7284b8ecb9df4e", - "sha256": "177n2kxyk8dzrf0bsf28p7crjbmawbvrvq3f8jc9rz8yn8cc9mfp" + "commit": "ebc7d0f77dd49abe280000409954f7672eedd36d", + "sha256": "1a3a12z9dvqqmjcd9bc6y5xgwj0s8vn3mpk528381jg86lf4wrv2" }, "stable": { "version": [ 2023, 11, - 6, + 13, 0 ], - "commit": "19890bdbf8ace9df6364162f1d7284b8ecb9df4e", - "sha256": "177n2kxyk8dzrf0bsf28p7crjbmawbvrvq3f8jc9rz8yn8cc9mfp" + "commit": "ebc7d0f77dd49abe280000409954f7672eedd36d", + "sha256": "1a3a12z9dvqqmjcd9bc6y5xgwj0s8vn3mpk528381jg86lf4wrv2" } }, { @@ -117532,11 +117584,11 @@ "repo": "vifon/tmsu.el", "unstable": { "version": [ - 20230807, - 2218 + 20231114, + 1615 ], - "commit": "8207b4140fd1b3eff2ec4b9818e67148139cb72f", - "sha256": "02ipyb19s961k05kmbika302rfipzcgpvm0g1q3pxn7arxs9s3kl" + "commit": "f809e49e8a53fdfd05dd5c345b52588014668de9", + "sha256": "19f47gd1l9wdqxyrmxa7jwffh59s3dz922b4aybh73q9x5db7lbf" } }, { @@ -118247,15 +118299,15 @@ "repo": "magit/transient", "unstable": { "version": [ - 20231103, - 2312 + 20231112, + 923 ], "deps": [ "compat", "seq" ], - "commit": "b4a29636365d12a8079c3908ff8ffce5f84b85d3", - "sha256": "1ckdjqlp063gprmy74b0ghl9zhwblkahifbqailww1wcbv40fmsz" + "commit": "3cd1de1695084df089cc90cff89b32dfd6ca5a0a", + "sha256": "0j7cww8ip51nqn3qyw027ki7bcg4m7lmh6xxv8ahxsh6mb0iqcdv" }, "stable": { "version": [ @@ -118722,26 +118774,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20231105, - 656 + 20231115, + 1119 ], "deps": [ "tree-sitter" ], - "commit": "32c664eadb3c23f2327dc78fe4bec97578ad9ed6", - "sha256": "0j1fjfqkqb0xw1k87zj80zgb0qwm5m7v2hrpj2f8azpzdbcdcbhq" + "commit": "3a3ad0527d5f8c7768678878eb5cfe399bedf703", + "sha256": "0hbkb2b5i3dgax7jsjds4h6zyyzxyk5r5hcgpzlna61vqjwvvd8l" }, "stable": { "version": [ 0, 12, - 77 + 79 ], "deps": [ "tree-sitter" ], - "commit": "32c664eadb3c23f2327dc78fe4bec97578ad9ed6", - "sha256": "0j1fjfqkqb0xw1k87zj80zgb0qwm5m7v2hrpj2f8azpzdbcdcbhq" + "commit": "3a3ad0527d5f8c7768678878eb5cfe399bedf703", + "sha256": "0hbkb2b5i3dgax7jsjds4h6zyyzxyk5r5hcgpzlna61vqjwvvd8l" } }, { @@ -119156,20 +119208,20 @@ "repo": "renzmann/treesit-auto", "unstable": { "version": [ - 20231110, - 50 + 20231111, + 250 ], - "commit": "090a74deeff29530dbc0837ec3151dac8aa497e7", - "sha256": "0gswbpdnbyjp9jb6mgxsws11dp7nxi02w3f4bqc6d2z4zc7fd16d" + "commit": "e3beb757ce42de47b063023d08ebdf49613b56bd", + "sha256": "1r7bag4iyvsi8lqnwyacsk1fwclwkazwr9yz1a0kjcw7fqj9ysmd" }, "stable": { "version": [ 0, 6, - 6 + 9 ], - "commit": "f0cf4cf93f2877a07c61fb4d10d3fe51be4da3a8", - "sha256": "08kgx6a23a7g941bl6zxmkclwbiqsspx3z2vlpnzjwpqda1b3nxc" + "commit": "e3beb757ce42de47b063023d08ebdf49613b56bd", + "sha256": "1r7bag4iyvsi8lqnwyacsk1fwclwkazwr9yz1a0kjcw7fqj9ysmd" } }, { @@ -121095,20 +121147,20 @@ "repo": "ursalang/ursa-ts-mode", "unstable": { "version": [ - 20231019, - 2145 + 20231113, + 2331 ], - "commit": "e5cb898e831976d9ac0e5b73e676a7976a77e693", - "sha256": "1m6c446irknfd1n01wcm1r6zq3hqk8rgna5lykd0rysjabg5xqzc" + "commit": "b4afa0c2f2a06fca4fcba8772989e4ca09bab7b9", + "sha256": "1x9vlwwbrdghp02bpqgjni77wsnhcm0w8c0ph9v87xr21mpkwclk" }, "stable": { "version": [ 1, 3, - 3 + 4 ], - "commit": "e5cb898e831976d9ac0e5b73e676a7976a77e693", - "sha256": "1m6c446irknfd1n01wcm1r6zq3hqk8rgna5lykd0rysjabg5xqzc" + "commit": "b4afa0c2f2a06fca4fcba8772989e4ca09bab7b9", + "sha256": "1x9vlwwbrdghp02bpqgjni77wsnhcm0w8c0ph9v87xr21mpkwclk" } }, { @@ -122174,11 +122226,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20230825, - 2151 + 20231114, + 2309 ], - "commit": "e1e551f6340d58e7782f2c1df7b397229a1c4fe3", - "sha256": "0d22h72mnngi55v1ksa22gwxbyw8flwi6x8wx1c5hfvl59ww8nsl" + "commit": "1edcf0c3758c70acb9393fda7dfbc5957bb0fbeb", + "sha256": "1wjrfzmalkgk9778kc4maz7khq1dli0x27ifyhgi8zvgy899pykc" }, "stable": { "version": [ @@ -122388,14 +122440,14 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20231110, - 927 + 20231112, + 816 ], "deps": [ "compat" ], - "commit": "0492a686375cec2fab961ecd09f0eecf233810a7", - "sha256": "0fxr95780afcqw9fcc1r4yb3d5d02imqjv762iyqv7iszm61hacs" + "commit": "49a1eb5f3653a3155bff6ff631b336989de61b18", + "sha256": "0fick90jrpgpxsim3n953vbffj572jgxk0cnqlkan5v6pp2px5y6" }, "stable": { "version": [ @@ -123353,8 +123405,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20231031, - 802 + 20231113, + 717 ], "deps": [ "dash", @@ -123362,8 +123414,8 @@ "org-roam", "s" ], - "commit": "f4f220896aaaeee41b2341b74c1b9a554cf9c015", - "sha256": "03yhrrwnm5wgwy2k72cj9bgsmsbm0ylrlnr2dh5rzaaiwxq1kxvn" + "commit": "e1ea8480daf3e480effdd7ba3799126295a4a59a", + "sha256": "1xv394dx122np58p281nqgrfnp6zjwqbvmqnpjsn6vxl59rqq1c6" }, "stable": { "version": [ @@ -125041,11 +125093,11 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20231103, - 700 + 20231114, + 2224 ], - "commit": "ab0ed9cc5b4a285cddef52b193c26a979e1dcd08", - "sha256": "152hilpbjmbf8yvyr9w4m4j2q0zczzsw4mc9vkwixk8m6a0x4i9q" + "commit": "7ccee2953001b76f251a087e941f227c1f63bfec", + "sha256": "1gb3sjh25xh8d938xlprajcylxdycxfijwnnizhb1c80lr5lnprw" }, "stable": { "version": [ @@ -125064,11 +125116,11 @@ "repo": "habamax/wildcharm-theme", "unstable": { "version": [ - 20231103, - 700 + 20231114, + 2224 ], - "commit": "ab0ed9cc5b4a285cddef52b193c26a979e1dcd08", - "sha256": "152hilpbjmbf8yvyr9w4m4j2q0zczzsw4mc9vkwixk8m6a0x4i9q" + "commit": "7ccee2953001b76f251a087e941f227c1f63bfec", + "sha256": "1gb3sjh25xh8d938xlprajcylxdycxfijwnnizhb1c80lr5lnprw" }, "stable": { "version": [ From 62133d3b9a815fb75ecc30c10741fdf334bb1b9f Mon Sep 17 00:00:00 2001 From: Payas Relekar Date: Thu, 16 Nov 2023 19:34:39 +0530 Subject: [PATCH 88/95] nongnu-packages: updated 2023-11-16 (from overlay) --- .../emacs/elisp-packages/nongnu-generated.nix | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index 27ab7dbd543d..37a9e04418c6 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -361,10 +361,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.11.0"; + version = "1.11.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.11.0.tar"; - sha256 = "010sl2l9vx3k095bkgvi7w1zvb68jh7lj4plmjn98lmzmbhq7q27"; + url = "https://elpa.nongnu.org/nongnu/cider-1.11.1.tar"; + sha256 = "1zp24p67w9wcc26s0b95idvzy1ndk35a8rabj3ckg1sgddgzh0p6"; }; packageRequires = [ clojure-mode @@ -1534,10 +1534,10 @@ elpaBuild { pname = "haskell-mode"; ename = "haskell-mode"; - version = "17.4"; + version = "17.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.4.tar"; - sha256 = "0xf8smasbb53ddg4vxckpg5w48dnm16v2k5vimfqr73cig49z87f"; + url = "https://elpa.nongnu.org/nongnu/haskell-mode-17.5.tar"; + sha256 = "0ld9wjak3fzwi9w2552fzq1562h7g19q69pigp16rj30smp5gkj7"; }; packageRequires = [ emacs ]; meta = { @@ -2375,10 +2375,10 @@ elpaBuild { pname = "package-lint"; ename = "package-lint"; - version = "0.20"; + version = "0.21"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/package-lint-0.20.tar"; - sha256 = "13ff9g2lzcddi8n6bcmb7g93kxc8v9h3g9k8qcn42bl7jjy12iqf"; + url = "https://elpa.nongnu.org/nongnu/package-lint-0.21.tar"; + sha256 = "01yli62vcnh763pf1bp0f649hhrbl8y7ad89q7b98xgcciqgzm93"; }; packageRequires = [ cl-lib compat emacs let-alist ]; meta = { @@ -2608,10 +2608,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20231109.110741"; + version = "1.0.20231115.104415"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20231109.110741.tar"; - sha256 = "19d1bs0ajc28wa49f1mphdwrpfywib5cvv3mxip6az9x6faand7g"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20231115.104415.tar"; + sha256 = "01ihh66c20c2dv6apswgww8wxwn1ldqhpk70mfbgjipc9a7ykwws"; }; packageRequires = [ emacs ]; meta = { @@ -2987,10 +2987,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.2.6"; + version = "1.2.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.2.6.tar"; - sha256 = "005nzmv5i24wxwhs1l76fpk06rpf8bw19fccrqkiph5k77lg42gr"; + url = "https://elpa.nongnu.org/nongnu/subed-1.2.7.tar"; + sha256 = "1rvc17pvig3ihc74d7i25kl3lnigp0h8lh634x0676hdx38h91ib"; }; packageRequires = [ emacs ]; meta = { @@ -3002,10 +3002,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.26.2"; + version = "0.27.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.26.2.tar"; - sha256 = "14rcg6rs4dd4a0pr4makkg1flwxfrxyg5xrs5sa034bzxj6zqal5"; + url = "https://elpa.nongnu.org/nongnu/sweeprolog-0.27.0.tar"; + sha256 = "1r0qspi9qdnsa4gm9bmxzsjyalqi14jhjx96jqw725pmhvjy9933"; }; packageRequires = [ compat emacs ]; meta = { @@ -3471,10 +3471,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "24.15.20231105091131"; + version = "24.18.20231115084756"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.15.20231105091131.tar"; - sha256 = "13wvf6zn87xpglpycxmjmq6mfvpr21bsihsshx06my38832kw128"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-24.18.20231115084756.tar"; + sha256 = "1vj8l4g4hpdvs1yvgkcy79vbf2ibhwxfgcrg1mj26qj3f9naf25s"; }; packageRequires = [ emacs ]; meta = { From 3e729ac6b53acde7b1f84f4d834317269264d6bd Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sun, 19 Nov 2023 15:52:11 -0500 Subject: [PATCH 89/95] lua-language-server: fix build with clang 12+ Work around https://github.com/NixOS/nixpkgs/issues/166205. --- .../tools/language-servers/lua-language-server/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/language-servers/lua-language-server/default.nix b/pkgs/development/tools/language-servers/lua-language-server/default.nix index c6eec2aff591..e0f9b6811d9b 100644 --- a/pkgs/development/tools/language-servers/lua-language-server/default.nix +++ b/pkgs/development/tools/language-servers/lua-language-server/default.nix @@ -43,6 +43,11 @@ stdenv.mkDerivation rec { -e '/cxx_/s,$cc,clang++,' ''; + # Work around https://github.com/NixOS/nixpkgs/issues/166205. + env = lib.optionalAttrs stdenv.cc.isClang { + NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}"; + }; + ninjaFlags = [ "-fcompile/ninja/${if stdenv.isDarwin then "macos" else "linux"}.ninja" ]; From dd6c406c11be5a6e31ce6ae99a984ad0d561831e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 Nov 2023 21:16:25 +0000 Subject: [PATCH 90/95] jackett: 0.21.1096 -> 0.21.1234 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index e7df0fb7190f..c6ae81e77321 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.1096"; + version = "0.21.1234"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-j9PQa54Gv6kdCHZ9/WPnKYkxD4N0eu0KtMPpATSYVDo0mP9pXdQxSoCrKdmW2gOveuo5Z/wPW4BB4r3gvFxcOg=="; + hash = "sha512-kI5HxBCx9moxnw90tqRLJ/muULEUOqIGcfWlFmgFwuOsOIoLc3arY1HDjRzeBDLYuz8BiG99lXUeAa5eHB3+Wg=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From 8c3079a4e77661281b653b7e3fc3e01afe909441 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 19 Nov 2023 13:19:06 -0800 Subject: [PATCH 91/95] python311Packages.awkward-cpp: 25 -> 26 (#268479) --- pkgs/development/python-modules/awkward-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix index 00e01ba80bf1..2c3bd96fcf22 100644 --- a/pkgs/development/python-modules/awkward-cpp/default.nix +++ b/pkgs/development/python-modules/awkward-cpp/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "awkward-cpp"; - version = "25"; + version = "26"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Fhq6XUt5CYz/l+Lf9WcCnt9rs3byMQIQs7hFexr2tjM="; + hash = "sha256-o3wI+JEmtjfUczRUob8/KLGNn3lH0h3GuhIDfYg7HGY="; }; nativeBuildInputs = [ From 10e860ea3be494f043adff47658a411be46fe25d Mon Sep 17 00:00:00 2001 From: happysalada Date: Sun, 19 Nov 2023 06:54:22 +0100 Subject: [PATCH 92/95] windmill: 1.188.1 -> 1.210.1 --- pkgs/servers/windmill/Cargo.lock | 2779 ++++++++++++++++++++--------- pkgs/servers/windmill/default.nix | 13 +- 2 files changed, 1924 insertions(+), 868 deletions(-) diff --git a/pkgs/servers/windmill/Cargo.lock b/pkgs/servers/windmill/Cargo.lock index 89e22cadf65d..155987a1ab3a 100644 --- a/pkgs/servers/windmill/Cargo.lock +++ b/pkgs/servers/windmill/Cargo.lock @@ -34,32 +34,44 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" dependencies = [ "cfg-if", - "cipher", + "cipher 0.3.0", "cpufeatures", "opaque-debug", ] [[package]] -name = "ahash" -version = "0.7.6" +name = "aes" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2" dependencies = [ - "getrandom 0.2.10", + "cfg-if", + "cipher 0.4.4", + "cpufeatures", +] + +[[package]] +name = "ahash" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" +dependencies = [ + "getrandom 0.2.11", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" dependencies = [ "cfg-if", - "getrandom 0.2.10", + "getrandom 0.2.11", "once_cell", "version_check", + "zerocopy", ] [[package]] @@ -161,6 +173,19 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +[[package]] +name = "archiver-rs" +version = "0.5.1" +source = "git+https://github.com/gz/archiver-rs.git?branch=patch-1#a73cef92c2a5b8f48c2a4a9e889952072e03b4b7" +dependencies = [ + "bzip2", + "flate2", + "tar", + "thiserror", + "xz2", + "zip", +] + [[package]] name = "argon2" version = "0.5.2" @@ -170,7 +195,7 @@ dependencies = [ "base64ct", "blake2", "cpufeatures", - "password-hash", + "password-hash 0.5.0", ] [[package]] @@ -185,26 +210,17 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "ascii-canvas" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8824ecca2e851cec16968d54a01dd372ef8f95b244fb84b84e70128be347c3c6" -dependencies = [ - "term", -] - [[package]] name = "ast_node" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c09c69dffe06d222d072c878c3afe86eee2179806f20503faec97250268b4c24" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -214,10 +230,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" dependencies = [ "concurrent-queue", - "event-listener", + "event-listener 2.5.3", "futures-core", ] +[[package]] +name = "async-channel" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d37875bd9915b7d67c2f117ea2c30a0989874d0b2cb694fe25403c85763c0c9e" +dependencies = [ + "concurrent-queue", + "event-listener 3.1.0", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-compression" version = "0.3.15" @@ -231,15 +260,15 @@ dependencies = [ "pin-project-lite", "tokio", "xz2", - "zstd", - "zstd-safe", + "zstd 0.11.2+zstd.1.5.2", + "zstd-safe 5.0.2+zstd.1.5.2", ] [[package]] name = "async-compression" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" +checksum = "bc2d0cfb2a7388d34f590e76686704c494ed7aaceed62ee1ba35cbf363abc2a5" dependencies = [ "brotli", "flate2", @@ -255,11 +284,11 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ - "async-lock", + "async-lock 2.8.0", "async-task", "concurrent-queue", "fastrand 2.0.1", - "futures-lite", + "futures-lite 1.13.0", "slab", ] @@ -269,12 +298,12 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-executor", "async-io", - "async-lock", + "async-lock 2.8.0", "blocking", - "futures-lite", + "futures-lite 1.13.0", "once_cell", ] @@ -284,15 +313,15 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" dependencies = [ - "async-lock", + "async-lock 2.8.0", "autocfg", "cfg-if", "concurrent-queue", - "futures-lite", + "futures-lite 1.13.0", "log", "parking", "polling", - "rustix 0.37.26", + "rustix 0.37.27", "slab", "socket2 0.4.10", "waker-fn", @@ -304,7 +333,18 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" dependencies = [ - "event-listener", + "event-listener 2.5.3", +] + +[[package]] +name = "async-lock" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "deb2ab2aa8a746e221ab826c73f48bc6ba41be6763f0855cb249eb6d154cf1d7" +dependencies = [ + "event-listener 3.1.0", + "event-listener-strategy", + "pin-project-lite", ] [[package]] @@ -313,7 +353,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "beec3f8fb8f710b7be84ccd1716e17f38f2868168355cab5f2f168ae988e767e" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes", "http", "rand 0.8.5", @@ -334,7 +374,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -343,15 +383,15 @@ version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d" dependencies = [ - "async-channel", + "async-channel 1.9.0", "async-global-executor", "async-io", - "async-lock", + "async-lock 2.8.0", "crossbeam-utils", "futures-channel", "futures-core", "futures-io", - "futures-lite", + "futures-lite 1.13.0", "gloo-timers", "kv-log-macro", "log", @@ -365,11 +405,12 @@ dependencies = [ [[package]] name = "async-stripe" -version = "0.14.1" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b85eb331f5c2b6ae4ff00aabd20a8a21de88b9890c58579616bf760570b207" +checksum = "e1b39347f478f57a40cbaf82cbaebb4a350acc757cda30fc7ff88707a11d1d81" dependencies = [ "chrono", + "futures-util", "hex", "hmac", "http-types", @@ -377,7 +418,8 @@ dependencies = [ "hyper-tls", "serde", "serde_json", - "serde_qs 0.9.2", + "serde_path_to_error", + "serde_qs 0.10.1", "sha2 0.10.8", "smart-default", "smol_str", @@ -400,7 +442,7 @@ checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -418,6 +460,28 @@ dependencies = [ "tokio", ] +[[package]] +name = "asynchronous-codec" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4057f2c32adbb2fc158e22fb38433c8e9bbf76b75a4732c7c0cbaf695fb65568" +dependencies = [ + "bytes", + "futures-sink", + "futures-util", + "memchr", + "pin-project-lite", +] + +[[package]] +name = "atoi" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e" +dependencies = [ + "num-traits", +] + [[package]] name = "atoi" version = "2.0.0" @@ -439,6 +503,382 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "aws-config" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2bf00cb9416daab4ce4927c54ebe63c08b9caf4d7b9314b6d7a4a2c5a1afb09" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-sdk-sso", + "aws-sdk-ssooidc", + "aws-sdk-sts", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "fastrand 2.0.1", + "hex", + "http", + "hyper", + "ring 0.17.5", + "time", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-credential-types" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb9073c88dbf12f68ce7d0e149f989627a1d1ae3d2b680459f04ccc29d1cbd0f" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "zeroize", +] + +[[package]] +name = "aws-http" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24067106d09620cf02d088166cdaedeaca7146d4d499c41b37accecbea11b246" +dependencies = [ + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "http-body", + "pin-project-lite", + "tracing", +] + +[[package]] +name = "aws-runtime" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc6ee0152c06d073602236a4e94a8c52a327d310c1ecd596570ce795af8777ff" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "fastrand 2.0.1", + "http", + "percent-encoding", + "tracing", + "uuid 1.5.0", +] + +[[package]] +name = "aws-sdk-s3" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf188e8af89adb0b41ae2f21b6c666c618959e40242e79aaa43fafa9c0c90a8a" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-checksums", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "bytes", + "http", + "http-body", + "once_cell", + "percent-encoding", + "regex", + "tracing", + "url", +] + +[[package]] +name = "aws-sdk-sso" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb8158015232b4596ccef74a205600398e152d704b40b7ec9f486092474d7fa" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "regex", + "tracing", +] + +[[package]] +name = "aws-sdk-ssooidc" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36a1493e1c57f173e53621935bfb5b6217376168dbdb4cd459aebcf645924a48" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes", + "http", + "regex", + "tracing", +] + +[[package]] +name = "aws-sdk-sts" +version = "0.36.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e032b77f5cd1dd3669d777a38ac08cbf8ec68e29460d4ef5d3e50cffa74ec75a" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", + "aws-types", + "http", + "regex", + "tracing", +] + +[[package]] +name = "aws-sigv4" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64f81a6abc4daab06b53cabf27c54189928893283093e37164ca53aa47488a5b" +dependencies = [ + "aws-credential-types", + "aws-smithy-eventstream", + "aws-smithy-http", + "aws-smithy-runtime-api", + "bytes", + "form_urlencoded", + "hex", + "hmac", + "http", + "num-bigint", + "once_cell", + "p256", + "percent-encoding", + "regex", + "ring 0.17.5", + "sha2 0.10.8", + "time", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-async" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbe53fccd3b10414b9cae63767a15a2789b34e6c6727b6e32b33e8c7998a3e80" +dependencies = [ + "futures-util", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "aws-smithy-checksums" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fb5701fbfb40600cc0fa547f318552dfd4e632b2099bd75d95fb0faae70675d" +dependencies = [ + "aws-smithy-http", + "aws-smithy-types", + "bytes", + "crc32c", + "crc32fast", + "hex", + "http", + "http-body", + "md-5 0.10.6", + "pin-project-lite", + "sha1", + "sha2 0.10.8", + "tracing", +] + +[[package]] +name = "aws-smithy-eventstream" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b33fa99f928a5815b94ee07e1377901bcf51aa749034a2c802dc38f9dcfacf5" +dependencies = [ + "aws-smithy-types", + "bytes", + "crc32fast", +] + +[[package]] +name = "aws-smithy-http" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7972373213d1d6e619c0edc9dda2d6634154e4ed75c5e0b2bf065cd5ec9f0d1" +dependencies = [ + "aws-smithy-eventstream", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "bytes-utils", + "futures-core", + "http", + "http-body", + "once_cell", + "percent-encoding", + "pin-project-lite", + "pin-utils", + "tracing", +] + +[[package]] +name = "aws-smithy-json" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6d64d5af16dd585de9ff6c606423c1aaad47c6baa38de41c2beb32ef21c6645" +dependencies = [ + "aws-smithy-types", +] + +[[package]] +name = "aws-smithy-query" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7527bf5335154ba1b285479c50b630e44e93d1b4a759eaceb8d0bf9fbc82caa5" +dependencies = [ + "aws-smithy-types", + "urlencoding", +] + +[[package]] +name = "aws-smithy-runtime" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "839b363adf3b2bdab2742a1f540fec23039ea8bc9ec0f9f61df48470cfe5527b" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand 2.0.1", + "http", + "http-body", + "hyper", + "hyper-rustls", + "once_cell", + "pin-project-lite", + "pin-utils", + "rustls 0.21.9", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f24ecc446e62c3924539e7c18dec8038dba4fdf8718d5c2de62f9d2fecca8ba9" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "bytes", + "http", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", +] + +[[package]] +name = "aws-smithy-types" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "051de910296522a21178a2ea402ea59027eef4b63f1cef04a0be2bb5e25dea03" +dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http", + "http-body", + "itoa", + "num-integer", + "pin-project-lite", + "pin-utils", + "ryu", + "serde", + "time", + "tokio", + "tokio-util", +] + +[[package]] +name = "aws-smithy-xml" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb1e3ac22c652662096c8e37a6f9af80c6f3520cab5610b2fe76c725bce18eac" +dependencies = [ + "xmlparser", +] + +[[package]] +name = "aws-types" +version = "0.57.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "048bbf1c24cdf4eb1efcdc243388a93a90ebf63979e25fc1c7b8cbd9cb6beb38" +dependencies = [ + "aws-credential-types", + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", + "http", + "rustc_version 0.4.0", + "tracing", +] + [[package]] name = "axum" version = "0.6.20" @@ -504,6 +944,12 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base64" version = "0.13.1" @@ -518,9 +964,9 @@ checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64-simd" @@ -547,7 +993,7 @@ dependencies = [ "async-trait", "futures-channel", "futures-util", - "parking_lot", + "parking_lot 0.12.1", "tokio", ] @@ -612,15 +1058,15 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.38", + "syn 2.0.39", "which", ] [[package]] name = "bindgen" -version = "0.68.1" +version = "0.69.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +checksum = "9ffcebc3849946a7170a05992aac39da343a90676ab392c51a4280981d6379c2" dependencies = [ "bitflags 2.4.1", "cexpr", @@ -633,24 +1079,9 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.38", + "syn 2.0.39", ] -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - [[package]] name = "bitflags" version = "1.3.2" @@ -713,7 +1144,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2cb03d1bed155d89dce0f845b7899b18a9a163e148fd004e1c28421a783e2d8e" dependencies = [ "block-padding", - "cipher", + "cipher 0.3.0", ] [[package]] @@ -724,63 +1155,42 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.4.1" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" +checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ - "async-channel", - "async-lock", + "async-channel 2.1.0", + "async-lock 3.1.0", "async-task", "fastrand 2.0.1", "futures-io", - "futures-lite", + "futures-lite 2.0.1", "piper", "tracing", ] [[package]] name = "borsh" -version = "0.10.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b" +checksum = "bf617fabf5cdbdc92f774bfe5062d870f228b80056d41180797abf48bed4056e" dependencies = [ "borsh-derive", - "hashbrown 0.13.2", + "cfg_aliases", ] [[package]] name = "borsh-derive" -version = "0.10.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7" -dependencies = [ - "borsh-derive-internal", - "borsh-schema-derive-internal", - "proc-macro-crate 0.1.5", - "proc-macro2", - "syn 1.0.109", -] - -[[package]] -name = "borsh-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb" +checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" dependencies = [ + "once_cell", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", - "syn 1.0.109", -] - -[[package]] -name = "borsh-schema-derive-internal" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", + "syn 2.0.39", + "syn_derive", ] [[package]] @@ -796,23 +1206,21 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.5.0" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", ] [[package]] -name = "bstr" -version = "0.2.17" +name = "btoi" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad" dependencies = [ - "lazy_static", - "memchr", - "regex-automata 0.1.10", + "num-traits", ] [[package]] @@ -858,6 +1266,20 @@ name = "bytemuck" version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] [[package]] name = "byteorder" @@ -871,6 +1293,16 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +[[package]] +name = "bytes-utils" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dafe3a8757b027e2be6e4e5601ed563c55989fcf1546e933c66c8eb3a058d35" +dependencies = [ + "bytes", + "either", +] + [[package]] name = "bzip2" version = "0.4.4" @@ -894,12 +1326,12 @@ dependencies = [ [[package]] name = "candle-core" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d648a16c5e5a9ffa4a6630e13d32b6d7c106f6885fd6d8453e1d8b405c390322" +checksum = "d60d9b91c73bc662dc45aff607f5ffe79724b7cf7d7c8dc12a72b25921683b67" dependencies = [ "byteorder", - "candle-gemm", + "gemm", "half", "memmap2", "num-traits", @@ -913,136 +1345,11 @@ dependencies = [ "zip", ] -[[package]] -name = "candle-gemm" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef9b07a4b0ba1a304b44432006580980ddff9748c201261c279437e7b11bba68" -dependencies = [ - "candle-gemm-c32", - "candle-gemm-c64", - "candle-gemm-common", - "candle-gemm-f16", - "candle-gemm-f32", - "candle-gemm-f64", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-c32" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f595241dad99811de285e029889f57c29dd98e33de7a8a6b881867b1488d7d4a" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-c64" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648f22fd8f5a4f330e29d791845b514966421308a6a2b5fedb949ee07e54c77f" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-common" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e03c01b4ca3b9d71e4eb89e42946a08f8b0d2f1b861f7fa2ea0966233f1e0b08" -dependencies = [ - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-f16" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97f8af2a482131713d28a337abff6debf26c529afa1837caf2ba190909b2107c" -dependencies = [ - "candle-gemm-common", - "candle-gemm-f32", - "dyn-stack", - "half", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-f32" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938927961e2f0c0a6064fcf3524ea3f7f455fe5708419532a6fea9aea1ab45ae" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - -[[package]] -name = "candle-gemm-f64" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d192d7126e59b81ef4cf13cd9f194e6dbdc09171f65d0074d059dc009ac06775" -dependencies = [ - "candle-gemm-common", - "dyn-stack", - "lazy_static", - "num-complex", - "num-traits", - "paste", - "raw-cpuid", - "rayon", - "seq-macro", -] - [[package]] name = "candle-nn" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e438605fbbd1235dbfc5b10beda5ebe4bb0a19969b864a85b922c97ac9f686" +checksum = "4eb6e13e7076439309786482d4d4c1b4e1f2b102ca93513372d5419ffcf5df25" dependencies = [ "candle-core", "half", @@ -1055,10 +1362,11 @@ dependencies = [ [[package]] name = "candle-transformers" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196742c5676b9af54c782304609f3e480c871e5588451d9806b2df8fc11e324c" +checksum = "0169336de9dc62dd84e19af1408e53ef8ad07eef8fc103cfebf5b6c3e3f23c2c" dependencies = [ + "byteorder", "candle-core", "candle-nn", "num-traits", @@ -1066,6 +1374,7 @@ dependencies = [ "rayon", "serde", "serde_json", + "serde_plain", "tracing", "wav", ] @@ -1107,6 +1416,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chrono" version = "0.4.31" @@ -1124,9 +1439,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1369bc6b9e9a7dfdae2055f6ec151fe9c554a9d23d357c0237cee2e25eaabb7" +checksum = "e23185c0e21df6ed832a12e2bda87c7d1def6842881fb634a8511ced741b0d76" dependencies = [ "chrono", "chrono-tz-build", @@ -1135,13 +1450,13 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2f5ebdc942f57ed96d560a6d1a459bae5851102a25d5bf89dc04ae453e31ecf" +checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" dependencies = [ "parse-zoneinfo", "phf 0.11.2", - "phf_codegen 0.11.2", + "phf_codegen", ] [[package]] @@ -1153,6 +1468,16 @@ dependencies = [ "generic-array", ] +[[package]] +name = "cipher" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad" +dependencies = [ + "crypto-common", + "inout", +] + [[package]] name = "clang-sys" version = "1.6.1" @@ -1166,9 +1491,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.6" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" +checksum = "2275f18819641850fa26c89acc84d465c1bf91ce57bc2748b28c420473352f64" dependencies = [ "clap_builder", "clap_derive", @@ -1176,9 +1501,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.6" +version = "4.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" +checksum = "07cdf1b148b25c1e1f7a42225e30a0d99a615cd4637eae7365548dd4529b95bc" dependencies = [ "anstream", "anstyle", @@ -1188,21 +1513,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cmake" @@ -1242,6 +1567,12 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "connection-string" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "510ca239cf13b7f8d16a2b48f263de7b4f8c566f0af58d901031473c76afb1e3" + [[package]] name = "console" version = "0.15.7" @@ -1292,6 +1623,12 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "constant_time_eq" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" + [[package]] name = "convert_case" version = "0.4.0" @@ -1336,9 +1673,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4" +checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0" dependencies = [ "libc", ] @@ -1363,9 +1700,18 @@ dependencies = [ [[package]] name = "crc-catalog" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" + +[[package]] +name = "crc32c" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f48d60e5b4d2c53d5c2b1d8a58c849a70ae5e5509b08a48d047e3b65714a74" +dependencies = [ + "rustc_version 0.4.0", +] [[package]] name = "crc32fast" @@ -1460,6 +1806,18 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-bigint" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +dependencies = [ + "generic-array", + "rand_core 0.6.4", + "subtle", + "zeroize", +] + [[package]] name = "crypto-common" version = "0.1.6" @@ -1515,7 +1873,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1537,7 +1895,7 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1550,7 +1908,7 @@ dependencies = [ "hashbrown 0.14.2", "lock_api", "once_cell", - "parking_lot_core", + "parking_lot_core 0.9.9", ] [[package]] @@ -1595,7 +1953,7 @@ checksum = "3c65c2ffdafc1564565200967edc4851c7b55422d3913466688907efd05ea26f" dependencies = [ "deno-proc-macro-rules-macros", "proc-macro2", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1607,7 +1965,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -1669,7 +2027,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "pin-project", "serde", "serde_json", @@ -1719,7 +2077,7 @@ dependencies = [ "deno-proc-macro-rules", "lazy-regex", "once_cell", - "pmutil", + "pmutil 0.6.1", "proc-macro-crate 1.3.1", "proc-macro2", "quote", @@ -1727,7 +2085,7 @@ dependencies = [ "strum", "strum_macros", "syn 1.0.109", - "syn 2.0.38", + "syn 2.0.39", "thiserror", ] @@ -1739,7 +2097,7 @@ checksum = "010ce5e0a920b2364c75a9e38bcd3344bfe55a6b6cd9ef6717d78e5478f9bcb3" dependencies = [ "deno_core", "once_cell", - "rustls", + "rustls 0.21.9", "rustls-native-certs", "rustls-pemfile", "serde", @@ -1867,16 +2225,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac41dd49fb554432020d52c875fc290e110113f864c6b1b525cd62c7e7747a5d" dependencies = [ "byteorder", - "cipher", + "cipher 0.3.0", "opaque-debug", ] -[[package]] -name = "diff" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" - [[package]] name = "digest" version = "0.9.0" @@ -1898,13 +2250,22 @@ dependencies = [ "subtle", ] +[[package]] +name = "dirs" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +dependencies = [ + "dirs-sys 0.3.7", +] + [[package]] name = "dirs" version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225" dependencies = [ - "dirs-sys", + "dirs-sys 0.4.1", ] [[package]] @@ -1917,6 +2278,17 @@ dependencies = [ "dirs-sys-next", ] +[[package]] +name = "dirs-sys" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +dependencies = [ + "libc", + "redox_users", + "winapi", +] + [[package]] name = "dirs-sys" version = "0.4.1" @@ -1970,9 +2342,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.14" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "dyn-iter" @@ -1982,14 +2354,26 @@ checksum = "131726693bce13b09331bee70734fe266666332b6ddfef23e9dca5b8bf6dea66" [[package]] name = "dyn-stack" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fe7f8d7bcc523381d3c437b82cf74805de3931de0da69309ae0fe1bdf7a256e" +checksum = "56e53799688f5632f364f8fb387488dd05db9fe45db7011be066fc20e7027f8b" dependencies = [ "bytemuck", "reborrow", ] +[[package]] +name = "ecdsa" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +dependencies = [ + "der 0.6.1", + "elliptic-curve", + "rfc6979", + "signature 1.6.4", +] + [[package]] name = "either" version = "1.9.0" @@ -2000,12 +2384,35 @@ dependencies = [ ] [[package]] -name = "ena" -version = "0.14.2" +name = "elliptic-curve" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c533630cf40e9caa44bd91aadc88a75d75a4c3a12b4cfde353cbed41daa1e1f1" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" dependencies = [ - "log", + "base16ct", + "crypto-bigint", + "der 0.6.1", + "digest 0.10.7", + "ff", + "generic-array", + "group", + "pkcs8 0.9.0", + "rand_core 0.6.4", + "sec1", + "subtle", + "zeroize", +] + +[[package]] +name = "embed-doc-image" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af36f591236d9d822425cb6896595658fa558fcebf5ee8accac1d4b92c47166e" +dependencies = [ + "base64 0.13.1", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] @@ -2014,6 +2421,70 @@ version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" +[[package]] +name = "encoding" +version = "0.2.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" +dependencies = [ + "encoding-index-japanese", + "encoding-index-korean", + "encoding-index-simpchinese", + "encoding-index-singlebyte", + "encoding-index-tradchinese", +] + +[[package]] +name = "encoding-index-japanese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-korean" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-simpchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-singlebyte" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding-index-tradchinese" +version = "1.20141219.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" +dependencies = [ + "encoding_index_tests", +] + +[[package]] +name = "encoding_index_tests" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" + [[package]] name = "encoding_rs" version = "0.8.31" @@ -2023,6 +2494,26 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "enumflags2" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5998b4f30320c9d93aed72f63af821bfdac50465b75428fce77b48ec482c3939" +dependencies = [ + "enumflags2_derive", +] + +[[package]] +name = "enumflags2_derive" +version = "0.7.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "equivalent" version = "1.0.1" @@ -2031,9 +2522,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8" dependencies = [ "libc", "windows-sys 0.48.0", @@ -2065,6 +2556,27 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +[[package]] +name = "event-listener" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96b852f1345da36d551b9473fa1e2b1eb5c5195585c6c018118bc92a8d91160" +dependencies = [ + "event-listener 3.1.0", + "pin-project-lite", +] + [[package]] name = "fallible-iterator" version = "0.2.0" @@ -2086,6 +2598,16 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +[[package]] +name = "ff" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "filetime" version = "0.2.22" @@ -2104,12 +2626,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "flate2" version = "1.0.28" @@ -2169,10 +2685,10 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03ec5dc38ee19078d84a692b1c41181ff9f94331c76cee66ff0208c770b5e54f" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2200,7 +2716,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2212,7 +2728,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2224,7 +2740,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -2245,9 +2761,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335" dependencies = [ "futures-channel", "futures-core", @@ -2260,9 +2776,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb" dependencies = [ "futures-core", "futures-sink", @@ -2270,21 +2786,32 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" +checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc" dependencies = [ "futures-core", "futures-task", "futures-util", ] +[[package]] +name = "futures-intrusive" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5" +dependencies = [ + "futures-core", + "lock_api", + "parking_lot 0.11.2", +] + [[package]] name = "futures-intrusive" version = "0.5.0" @@ -2293,14 +2820,14 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot", + "parking_lot 0.12.1", ] [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa" [[package]] name = "futures-lite" @@ -2318,33 +2845,43 @@ dependencies = [ ] [[package]] -name = "futures-macro" -version = "0.3.28" +name = "futures-lite" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +dependencies = [ + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "futures-macro" +version = "0.3.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104" dependencies = [ "futures-channel", "futures-core", @@ -2365,12 +2902,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d3b20d3058763d26d88e6e7a49998841e5296735b00dbfb064ff7cb142933dd" dependencies = [ "async-trait", - "base64 0.21.4", + "base64 0.21.5", "dirs-next", "hyper", "hyper-rustls", "ring 0.16.20", - "rustls", + "rustls 0.21.9", "rustls-pemfile", "serde", "serde_json", @@ -2383,6 +2920,123 @@ dependencies = [ "which", ] +[[package]] +name = "gemm" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b3afa707040531a7527477fd63a81ea4f6f3d26037a2f96776e57fb843b258e" +dependencies = [ + "dyn-stack", + "gemm-c32", + "gemm-c64", + "gemm-common", + "gemm-f16", + "gemm-f32", + "gemm-f64", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c32" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3973a4c30c73f26a099113953d0c772bb17ee2e07976c0a06b8fe1f38a57d" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-c64" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30362894b93dada374442cb2edf4512ddf19513c9bec88e06a445bcb6b22e64f" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-common" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "988499faa80566b046b4fee2c5f15af55b5a20c1fe8486b112ebb34efa045ad6" +dependencies = [ + "bytemuck", + "dyn-stack", + "half", + "num-complex", + "num-traits", + "once_cell", + "paste", + "pulp", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f16" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6cf2854a12371684c38d9a865063a27661812a3ff5803454c5742e8f5a388ce" +dependencies = [ + "dyn-stack", + "gemm-common", + "gemm-f32", + "half", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "rayon", + "seq-macro", +] + +[[package]] +name = "gemm-f32" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bc84003cf6d950a7c7ca714ad6db281b6cef5c7d462f5cd9ad90ea2409c7227" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + +[[package]] +name = "gemm-f64" +version = "0.16.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35187ef101a71eed0ecd26fb4a6255b4192a12f1c5335f3a795698f2d9b6cf33" +dependencies = [ + "dyn-stack", + "gemm-common", + "num-complex", + "num-traits", + "paste", + "raw-cpuid", + "seq-macro", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -2425,9 +3079,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.10" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" +checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" dependencies = [ "cfg-if", "js-sys", @@ -2444,24 +3098,22 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "git-version" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b0decc02f4636b9ccad390dcbe77b722a77efedfa393caf8379a51d5c61899" +checksum = "13ad01ffa8221f7fe8b936d6ffb2a3e7ad428885a04fad51866a5f33eafda57c" dependencies = [ "git-version-macro", - "proc-macro-hack", ] [[package]] name = "git-version-macro" -version = "0.3.5" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe69f1cbdb6e28af2bac214e943b99ce8a0a06b447d15d3e61161b0423139f3f" +checksum = "84488ccbdb24ad6f56dc1863b4a8154a7856cd3c6c7610401634fab3cb588dae" dependencies = [ - "proc-macro-hack", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.39", ] [[package]] @@ -2508,10 +3160,21 @@ dependencies = [ ] [[package]] -name = "h2" -version = "0.3.21" +name = "group" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff", + "rand_core 0.6.4", + "subtle", +] + +[[package]] +name = "h2" +version = "0.3.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" dependencies = [ "bytes", "fnv", @@ -2519,7 +3182,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.1.0", "slab", "tokio", "tokio-util", @@ -2532,6 +3195,7 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" dependencies = [ + "bytemuck", "cfg-if", "crunchy", "num-traits", @@ -2545,7 +3209,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] @@ -2554,7 +3218,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", ] [[package]] @@ -2563,7 +3227,7 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "allocator-api2", ] @@ -2582,7 +3246,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bytes", "headers-core", "http", @@ -2627,7 +3291,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b780635574b3d92f036890d8373433d6f9fc7abb320ee42a5c25897fc8ed732" dependencies = [ - "dirs", + "dirs 5.0.1", "indicatif", "log", "native-tls", @@ -2667,9 +3331,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -2700,9 +3364,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" dependencies = [ "anyhow", - "async-channel", + "async-channel 1.9.0", "base64 0.13.1", - "futures-lite", + "futures-lite 1.13.0", "http", "infer", "pin-project-lite", @@ -2752,17 +3416,18 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http", "hyper", - "rustls", + "log", + "rustls 0.21.9", "rustls-native-certs", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", ] [[package]] @@ -2836,9 +3501,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.2" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f" dependencies = [ "equivalent", "hashbrown 0.14.2", @@ -2863,6 +3528,15 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac" +[[package]] +name = "inout" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" +dependencies = [ + "generic-array", +] + [[package]] name = "instant" version = "0.1.12" @@ -2885,9 +3559,22 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" + +[[package]] +name = "is-macro" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7d079e129b77477a49c5c4f1cfe9ce6c2c909ef52520693e8e811a714c7b20" +dependencies = [ + "Inflector", + "pmutil 0.5.3", + "proc-macro2", + "quote", + "syn 1.0.109", +] [[package]] name = "is-macro" @@ -2896,21 +3583,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4467ed1321b310c2625c5aa6c1b1ffc5de4d9e42668cf697a08fb033ee8265e" dependencies = [ "Inflector", - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", - "syn 2.0.38", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix 0.38.20", - "windows-sys 0.48.0", + "syn 2.0.39", ] [[package]] @@ -2931,6 +3607,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.9" @@ -2948,9 +3633,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "54c0c35952f67de54bb584e9fd912b3023117cbafc0a77d8f3dee1fb5f572fe8" dependencies = [ "wasm-bindgen", ] @@ -2961,7 +3646,7 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "pem 1.1.1", "ring 0.16.20", "serde", @@ -2969,6 +3654,15 @@ dependencies = [ "simple_asn1", ] +[[package]] +name = "keyed_priority_queue" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d" +dependencies = [ + "indexmap 2.1.0", +] + [[package]] name = "konst" version = "0.2.19" @@ -2993,36 +3687,11 @@ dependencies = [ "log", ] -[[package]] -name = "lalrpop" -version = "0.19.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a1cbf952127589f2851ab2046af368fd20645491bb4b376f04b7f94d7a9837b" -dependencies = [ - "ascii-canvas", - "bit-set", - "diff", - "ena", - "is-terminal", - "itertools 0.10.5", - "lalrpop-util", - "petgraph", - "regex", - "regex-syntax 0.6.29", - "string_cache", - "term", - "tiny-keccak", - "unicode-xid", -] - [[package]] name = "lalrpop-util" -version = "0.19.12" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3c48237b9604c5a4702de6b824e02006c3214327564636aef27c1028a8fa0ed" -dependencies = [ - "regex", -] +checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" [[package]] name = "lazy-regex" @@ -3062,84 +3731,11 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" -[[package]] -name = "lexical" -version = "6.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6" -dependencies = [ - "lexical-core", -] - -[[package]] -name = "lexical-core" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" -dependencies = [ - "lexical-parse-float", - "lexical-parse-integer", - "lexical-util", - "lexical-write-float", - "lexical-write-integer", -] - -[[package]] -name = "lexical-parse-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" -dependencies = [ - "lexical-parse-integer", - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-parse-integer" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" -dependencies = [ - "lexical-util", - "static_assertions", -] - -[[package]] -name = "lexical-util" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -dependencies = [ - "static_assertions", -] - -[[package]] -name = "lexical-write-float" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -dependencies = [ - "lexical-util", - "lexical-write-integer", - "static_assertions", -] - -[[package]] -name = "lexical-write-integer" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" -dependencies = [ - "lexical-util", - "static_assertions", -] - [[package]] name = "libc" -version = "0.2.149" +version = "0.2.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" +checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" [[package]] name = "libgit2-sys" @@ -3169,6 +3765,17 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.1", + "libc", + "redox_syscall 0.4.1", +] + [[package]] name = "libsqlite3-sys" version = "0.26.0" @@ -3221,9 +3828,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" +checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829" [[package]] name = "lock_api" @@ -3245,21 +3852,22 @@ dependencies = [ ] [[package]] -name = "lru" -version = "0.10.1" +name = "loki-api" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670" +checksum = "f56d36f573486ba7f462b62cbae597fef7d5d93665e7047956b457531b8a1ced" dependencies = [ - "hashbrown 0.13.2", + "prost", + "prost-types", ] [[package]] -name = "lz4_flex" -version = "0.9.5" +name = "lru" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a8cbbb2831780bc3b9c15a41f5b49222ef756b6730a95f3decfdd15903eb5a3" +checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60" dependencies = [ - "twox-hash", + "hashbrown 0.14.2", ] [[package]] @@ -3291,12 +3899,12 @@ checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" [[package]] name = "magic-crypt" -version = "3.1.12" +version = "3.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0196bd5c76f5f51d7d6563545f86262fef4c82d75466ba6f6d359c40a523318d" +checksum = "6c42f95f9d296f2dcb50665f507ed5a68a171453142663ce44d77a4eb217b053" dependencies = [ - "aes", - "base64 0.13.1", + "aes 0.7.5", + "base64 0.21.5", "block-modes", "crc-any", "des", @@ -3324,13 +3932,69 @@ dependencies = [ "base64 0.20.0", "gethostname", "mail-builder", - "rustls", + "rustls 0.21.9", "smtp-proto", "tokio", - "tokio-rustls", + "tokio-rustls 0.24.1", "webpki-roots 0.25.2", ] +[[package]] +name = "malachite" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "220cb36c52aa6eff45559df497abe0e2a4c1209f92279a746a399f622d7b95c7" +dependencies = [ + "malachite-base", + "malachite-nz", + "malachite-q", +] + +[[package]] +name = "malachite-base" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6538136c5daf04126d6be4899f7fe4879b7f8de896dd1b4210fe6de5b94f2555" +dependencies = [ + "itertools 0.11.0", + "ryu", +] + +[[package]] +name = "malachite-bigint" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76c3eca3b5df299486144c8423c45c24bdf9e82e2452c8a1eeda547c4d8b5d41" +dependencies = [ + "derive_more", + "malachite", + "num-integer", + "num-traits", + "paste", +] + +[[package]] +name = "malachite-nz" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0b05577b7a3f09433106460b10304f97fc572f0baabf6640e6cb1e23f5fc52" +dependencies = [ + "embed-doc-image", + "itertools 0.11.0", + "malachite-base", +] + +[[package]] +name = "malachite-q" +version = "0.4.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1cfdb4016292e6acd832eaee261175f3af8bbee62afeefe4420ebce4c440cb5" +dependencies = [ + "itertools 0.11.0", + "malachite-base", + "malachite-nz", +] + [[package]] name = "matchers" version = "0.1.0" @@ -3431,9 +4095,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" dependencies = [ "libc", "log", @@ -3443,9 +4107,9 @@ dependencies = [ [[package]] name = "monostate" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f370ae88093ec6b11a710dec51321a61d420fafd1bad6e30d01bd9c920e8ee" +checksum = "e404e13820ea0df0eda93aa294e0c80de76a0daa6bec590d376fbec6d7810394" dependencies = [ "monostate-impl", "serde", @@ -3453,13 +4117,13 @@ dependencies = [ [[package]] name = "monostate-impl" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "371717c0a5543d6a800cac822eac735aa7d2d2fbb41002e9856a4089532dbdce" +checksum = "531c82a934da419bed3da09bd87d6e98c72f8d4aa755427b3b009c2b8b8c433c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3475,16 +4139,16 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "termcolor", "thiserror", ] [[package]] name = "mysql_async" -version = "0.32.2" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5272f59b5b1f93d65f7f826c1f025d6e410e89fb50a67e05aa20b35a55a8c0a" +checksum = "6750b17ce50f8f112ef1a8394121090d47c596b56a6a17569ca680a9626e2ef2" dependencies = [ "bytes", "crossbeam", @@ -3492,16 +4156,17 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", + "keyed_priority_queue", "lazy_static", "lru", "mio", "mysql_common", "native-tls", "once_cell", - "pem 2.0.1", + "pem 3.0.2", "percent-encoding", "pin-project", - "priority-queue", + "rand 0.8.5", "serde", "serde_json", "socket2 0.5.5", @@ -3515,15 +4180,16 @@ dependencies = [ [[package]] name = "mysql_common" -version = "0.30.6" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57349d5a326b437989b6ee4dc8f2f34b0cc131202748414712a8e7d98952fc8c" +checksum = "06f19e4cfa0ab5a76b627cec2d81331c49b034988eaf302c3bafeada684eadef" dependencies = [ - "base64 0.21.4", - "bigdecimal 0.3.1", - "bindgen 0.68.1", + "base64 0.21.5", + "bigdecimal 0.4.2", + "bindgen 0.69.1", "bitflags 2.4.1", "bitvec", + "btoi", "byteorder", "bytes", "cc", @@ -3532,7 +4198,6 @@ dependencies = [ "flate2", "frunk", "lazy_static", - "lexical", "mysql-common-derive", "num-bigint", "num-traits", @@ -3549,6 +4214,7 @@ dependencies = [ "thiserror", "time", "uuid 1.5.0", + "zstd 0.12.4", ] [[package]] @@ -3642,8 +4308,8 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214" dependencies = [ + "bytemuck", "num-traits", - "serde", ] [[package]] @@ -3749,9 +4415,9 @@ dependencies = [ [[package]] name = "openssl" -version = "0.10.57" +version = "0.10.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" +checksum = "7a257ad03cd8fb16ad4172fedf8094451e1af1c4b70097636ef2eac9a5f0cc33" dependencies = [ "bitflags 2.4.1", "cfg-if", @@ -3770,7 +4436,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -3781,9 +4447,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.93" +version = "0.9.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" +checksum = "40a4130519a360279579c2053038317e40eff64d13fd3f004f9e1b72b8a6aaf9" dependencies = [ "cc", "libc", @@ -3809,12 +4475,34 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2 0.10.8", +] + [[package]] name = "parking" version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" +[[package]] +name = "parking_lot" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" +dependencies = [ + "instant", + "lock_api", + "parking_lot_core 0.8.6", +] + [[package]] name = "parking_lot" version = "0.12.1" @@ -3822,7 +4510,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core", + "parking_lot_core 0.9.9", +] + +[[package]] +name = "parking_lot_core" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" +dependencies = [ + "cfg-if", + "instant", + "libc", + "redox_syscall 0.2.16", + "smallvec", + "winapi", ] [[package]] @@ -3847,6 +4549,17 @@ dependencies = [ "regex", ] +[[package]] +name = "password-hash" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" +dependencies = [ + "base64ct", + "rand_core 0.6.4", + "subtle", +] + [[package]] name = "password-hash" version = "0.5.0" @@ -3870,6 +4583,18 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" +[[package]] +name = "pbkdf2" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" +dependencies = [ + "digest 0.10.7", + "hmac", + "password-hash 0.4.2", + "sha2 0.10.8", +] + [[package]] name = "peeking_take_while" version = "0.1.2" @@ -3885,23 +4610,13 @@ dependencies = [ "base64 0.13.1", ] -[[package]] -name = "pem" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" -dependencies = [ - "base64 0.21.4", - "serde", -] - [[package]] name = "pem" version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "serde", ] @@ -3930,24 +4645,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] -name = "pest" -version = "2.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" +name = "pg-embed" +version = "0.7.2" +source = "git+https://github.com/faokunega/pg-embed#72db5e053f0afac6eee51d3baa2fd5c90803e02d" dependencies = [ - "memchr", + "archiver-rs", + "async-trait", + "bytes", + "dirs 5.0.1", + "futures", + "lazy_static", + "log", + "reqwest", + "sqlx 0.6.3", "thiserror", - "ucd-trie", -] - -[[package]] -name = "petgraph" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" -dependencies = [ - "fixedbitset", - "indexmap 2.0.2", + "tokio", + "zip", ] [[package]] @@ -3971,16 +4684,6 @@ dependencies = [ "phf_shared 0.11.2", ] -[[package]] -name = "phf_codegen" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" -dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - [[package]] name = "phf_codegen" version = "0.11.2" @@ -4035,7 +4738,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4073,7 +4776,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4148,6 +4851,17 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +[[package]] +name = "pmutil" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3894e5d549cccbe44afecf72922f277f603cd4bb0219c8342631ef18fffbe004" +dependencies = [ + "proc-macro2", + "quote", + "syn 1.0.109", +] + [[package]] name = "pmutil" version = "0.6.1" @@ -4156,7 +4870,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4177,9 +4891,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.4.3" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b" +checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" [[package]] name = "postgres" @@ -4214,7 +4928,7 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "byteorder", "bytes", "fallible-iterator", @@ -4260,6 +4974,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +[[package]] +name = "pretty-hex" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fa0831dd7cc608c38a5e323422a0077678fa5744aa2be4ad91c4ece8eec8d5" + [[package]] name = "prettyplease" version = "0.1.25" @@ -4277,26 +4997,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.38", -] - -[[package]] -name = "priority-queue" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff39edfcaec0d64e8d0da38564fad195d2d51b680940295fcc307366e101e61" -dependencies = [ - "autocfg", - "indexmap 1.9.3", -] - -[[package]] -name = "proc-macro-crate" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" -dependencies = [ - "toml 0.5.11", + "syn 2.0.39", ] [[package]] @@ -4306,7 +5007,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", ] [[package]] @@ -4397,7 +5107,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "syn 2.0.38", + "syn 2.0.39", "thiserror", "typify", "unicode-ident", @@ -4417,7 +5127,7 @@ dependencies = [ "serde_json", "serde_tokenstream", "serde_yaml", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -4436,10 +5146,42 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot", + "parking_lot 0.12.1", "thiserror", ] +[[package]] +name = "prost" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +dependencies = [ + "anyhow", + "itertools 0.10.5", + "proc-macro2", + "quote", + "syn 1.0.109", +] + +[[package]] +name = "prost-types" +version = "0.11.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +dependencies = [ + "prost", +] + [[package]] name = "psm" version = "0.1.21" @@ -4469,6 +5211,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "pulp" +version = "0.18.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7057c1435edb390ebfc51743abad043377f1f698ce8e649a9b52a4b378be5e4d" +dependencies = [ + "bytemuck", + "libm", + "num-complex", + "reborrow", +] + [[package]] name = "quick-xml" version = "0.28.2" @@ -4485,10 +5239,10 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f69f8d22fa3f34f3083d9a4375c038732c7a7e964de1beb81c544da92dfc40b8" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.6", "equivalent", "hashbrown 0.14.2", - "parking_lot", + "parking_lot 0.12.1", ] [[package]] @@ -4571,7 +5325,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -4690,12 +5444,12 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.10", - "redox_syscall 0.2.16", + "getrandom 0.2.11", + "libredox", "thiserror", ] @@ -4774,8 +5528,8 @@ version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "async-compression 0.4.4", - "base64 0.21.4", + "async-compression 0.4.5", + "base64 0.21.5", "bytes", "encoding_rs", "futures-core", @@ -4794,7 +5548,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.21.9", "rustls-pemfile", "serde", "serde_json", @@ -4802,7 +5556,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-native-tls", - "tokio-rustls", + "tokio-rustls 0.24.1", "tokio-socks", "tokio-util", "tower-service", @@ -4815,6 +5569,17 @@ dependencies = [ "winreg", ] +[[package]] +name = "rfc6979" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +dependencies = [ + "crypto-bigint", + "hmac", + "zeroize", +] + [[package]] name = "riff" version = "1.0.1" @@ -4843,7 +5608,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom 0.2.10", + "getrandom 0.2.11", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -4901,21 +5666,19 @@ dependencies = [ [[package]] name = "rsa" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ab43bb47d23c1a631b4b680199a45255dce26fa9ab2fa902581f624ff13e6a8" +checksum = "86ef35bf3e7fe15a53c4ab08a998e42271eab13eb0db224126bc7bc4c4bad96d" dependencies = [ - "byteorder", "const-oid", "digest 0.10.7", "num-bigint-dig", "num-integer", - "num-iter", "num-traits", "pkcs1 0.7.5", "pkcs8 0.10.2", "rand_core 0.6.4", - "signature 2.1.0", + "signature 2.2.0", "spki 0.7.2", "subtle", "zeroize", @@ -4956,7 +5719,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.38", + "syn 2.0.39", "walkdir", ] @@ -4972,9 +5735,9 @@ dependencies = [ [[package]] name = "rust_decimal" -version = "1.32.0" +version = "1.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c4216490d5a413bc6d10fa4742bd7d4955941d062c0ef873141d6b0e7b30fd" +checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" dependencies = [ "arrayvec", "borsh", @@ -5019,22 +5782,22 @@ dependencies = [ [[package]] name = "rustfmt-wrapper" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed729e3bee08ec2befd593c27e90ca9fdd25efdc83c94c3b82eaef16e4f7406e" +checksum = "f1adc9dfed5cc999077978cc7163b9282c5751c8d39827c4ea8c8c220ca5a440" dependencies = [ "serde", "tempfile", "thiserror", - "toml 0.5.11", + "toml 0.8.8", "toolchain_find", ] [[package]] name = "rustix" -version = "0.37.26" +version = "0.37.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1d53135084e0544829d995" +checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" dependencies = [ "bitflags 1.3.2", "errno", @@ -5046,25 +5809,37 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.20" +version = "0.38.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0" +checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" dependencies = [ "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.10", + "linux-raw-sys 0.4.11", "windows-sys 0.48.0", ] [[package]] name = "rustls" -version = "0.21.7" +version = "0.20.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" +checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring 0.16.20", + "sct", + "webpki", +] + +[[package]] +name = "rustls" +version = "0.21.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +dependencies = [ + "log", + "ring 0.17.5", "rustls-webpki", "sct", ] @@ -5083,77 +5858,80 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", ] [[package]] name = "rustls-webpki" -version = "0.101.6" +version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] name = "rustpython-ast" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7b83af38212db64ecfc76b6d53a1c6de89733236e39c69d4bc8ab565ae167b2" +checksum = "fcf9438da3660e6b88bd659fdc0cd13bcff4b85c584026a48b800c75bf0f8d00" dependencies = [ - "num-bigint", - "rustpython-compiler-core", -] - -[[package]] -name = "rustpython-compiler-core" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81870eb757460989d43ce41e069f1a01d0292b33011b23b0455d0a6394e4c77a" -dependencies = [ - "bincode", - "bitflags 1.3.2", - "bstr", - "itertools 0.10.5", - "lz4_flex", - "num-bigint", - "num-complex", - "serde", + "is-macro 0.2.2", + "malachite-bigint", + "rustpython-parser-core", "static_assertions", - "thiserror", ] [[package]] name = "rustpython-parser" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7348e148144ba85bc1284d97004062137306554fd00e7eb500d91720de5e78" +checksum = "9db993974ff12f33c5be8a801741463691502f85ead5c503277937c4077bd92a" dependencies = [ - "ahash 0.7.6", "anyhow", + "is-macro 0.2.2", "itertools 0.10.5", - "lalrpop", "lalrpop-util", "log", - "num-bigint", + "malachite-bigint", "num-traits", - "phf 0.10.1", - "phf_codegen 0.10.0", + "phf 0.11.2", + "phf_codegen", "rustc-hash", "rustpython-ast", - "rustpython-compiler-core", - "thiserror", + "rustpython-parser-core", "tiny-keccak", "unic-emoji-char", "unic-ucd-ident", "unicode_names2", ] +[[package]] +name = "rustpython-parser-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9d560c6dd4dc774d4bbad48c770e074c178c4ed5f6fd0521fcdb639af21bdd" +dependencies = [ + "is-macro 0.2.2", + "memchr", + "rustpython-parser-vendored", +] + +[[package]] +name = "rustpython-parser-vendored" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17ae3062d7fe5fe38073f3a1c7145ed9a04e15f6e4a596d642c7db2d5cd2b51b" +dependencies = [ + "memchr", + "once_cell", +] + [[package]] name = "rustversion" version = "1.0.14" @@ -5182,7 +5960,7 @@ version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7af1a6bbd2d98a207abf060c0734b0b9eb8a2a679008bf7bb5296c8876e27958" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "bindgen 0.65.1", "chrono", "data-encoding", @@ -5229,9 +6007,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" +checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29" dependencies = [ "chrono", "dyn-clone", @@ -5243,9 +6021,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.15" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" +checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967" dependencies = [ "proc-macro2", "quote", @@ -5267,12 +6045,12 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.5", + "untrusted 0.9.0", ] [[package]] @@ -5281,6 +6059,20 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +[[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct", + "der 0.6.1", + "generic-array", + "pkcs8 0.9.0", + "subtle", + "zeroize", +] + [[package]] name = "security-framework" version = "2.9.2" @@ -5310,16 +6102,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" dependencies = [ - "semver-parser 0.7.0", -] - -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser 0.10.2", + "semver-parser", ] [[package]] @@ -5337,15 +6120,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "seq-macro" version = "0.3.5" @@ -5354,9 +6128,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.189" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" +checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" dependencies = [ "serde_derive", ] @@ -5394,13 +6168,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.189" +version = "1.0.192" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" +checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5416,11 +6190,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.107" +version = "1.0.108" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -5436,6 +6210,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_plain" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1fc6db65a611022b23a0dec6975d63fb80a302cb3388835ff02c097258d50" +dependencies = [ + "serde", +] + [[package]] name = "serde_qs" version = "0.8.5" @@ -5449,9 +6232,9 @@ dependencies = [ [[package]] name = "serde_qs" -version = "0.9.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6af4cee6cd4b23b45e6709150d1e9af5c748131de7e3316a7c2b3008051ed725" +checksum = "8cac3f1e2ca2fe333923a1ae72caca910b98ed0630bb35ef6f8c8517d6e81afa" dependencies = [ "percent-encoding", "serde", @@ -5460,9 +6243,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "12022b835073e5b11e90a14f86838ceb1c8fb0325b72416845c487ac0fa95e80" dependencies = [ "serde", ] @@ -5476,7 +6259,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -5509,11 +6292,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.25" +version = "0.9.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" +checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", "itoa", "ryu", "serde", @@ -5608,9 +6391,9 @@ dependencies = [ [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core 0.6.4", @@ -5651,9 +6434,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.1" +version = "1.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" [[package]] name = "smart-default" @@ -5692,6 +6475,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4b756ac662e92a0e5b360349bea5f0b0784d4be4541eff2972049dfdfd7f862" +[[package]] +name = "snap" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" + [[package]] name = "socket2" version = "0.4.10" @@ -5796,27 +6585,90 @@ dependencies = [ "unicode_categories", ] +[[package]] +name = "sqlx" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188" +dependencies = [ + "sqlx-core 0.6.3", + "sqlx-macros 0.6.3", +] + [[package]] name = "sqlx" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" dependencies = [ - "sqlx-core", - "sqlx-macros", + "sqlx-core 0.7.2", + "sqlx-macros 0.7.2", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", ] +[[package]] +name = "sqlx-core" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029" +dependencies = [ + "ahash 0.7.7", + "atoi 1.0.0", + "base64 0.13.1", + "bitflags 1.3.2", + "byteorder", + "bytes", + "crc", + "crossbeam-queue", + "dirs 4.0.0", + "dotenvy", + "either", + "event-listener 2.5.3", + "futures-channel", + "futures-core", + "futures-intrusive 0.4.2", + "futures-util", + "hashlink", + "hex", + "hkdf", + "hmac", + "indexmap 1.9.3", + "itoa", + "libc", + "log", + "md-5 0.10.6", + "memchr", + "once_cell", + "paste", + "percent-encoding", + "rand 0.8.5", + "rustls 0.20.9", + "rustls-pemfile", + "serde", + "serde_json", + "sha1", + "sha2 0.10.8", + "smallvec", + "sqlformat", + "sqlx-rt", + "stringprep", + "thiserror", + "tokio-stream", + "url", + "webpki-roots 0.22.6", + "whoami", +] + [[package]] name = "sqlx-core" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" dependencies = [ - "ahash 0.8.3", - "atoi", + "ahash 0.8.6", + "atoi 2.0.0", "bigdecimal 0.3.1", "byteorder", "bytes", @@ -5825,21 +6677,21 @@ dependencies = [ "crossbeam-queue", "dotenvy", "either", - "event-listener", + "event-listener 2.5.3", "futures-channel", "futures-core", - "futures-intrusive", + "futures-intrusive 0.5.0", "futures-io", "futures-util", "hashlink", "hex", - "indexmap 2.0.2", + "indexmap 2.1.0", "log", "memchr", "once_cell", "paste", "percent-encoding", - "rustls", + "rustls 0.21.9", "rustls-pemfile", "serde", "serde_json", @@ -5855,6 +6707,25 @@ dependencies = [ "webpki-roots 0.24.0", ] +[[package]] +name = "sqlx-macros" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9" +dependencies = [ + "dotenvy", + "either", + "heck", + "once_cell", + "proc-macro2", + "quote", + "sha2 0.10.8", + "sqlx-core 0.6.3", + "sqlx-rt", + "syn 1.0.109", + "url", +] + [[package]] name = "sqlx-macros" version = "0.7.2" @@ -5863,7 +6734,7 @@ checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" dependencies = [ "proc-macro2", "quote", - "sqlx-core", + "sqlx-core 0.7.2", "sqlx-macros-core", "syn 1.0.109", ] @@ -5884,7 +6755,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx-core", + "sqlx-core 0.7.2", "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", @@ -5900,8 +6771,8 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ - "atoi", - "base64 0.21.4", + "atoi 2.0.0", + "base64 0.21.5", "bigdecimal 0.3.1", "bitflags 2.4.1", "byteorder", @@ -5926,12 +6797,12 @@ dependencies = [ "once_cell", "percent-encoding", "rand 0.8.5", - "rsa 0.9.2", + "rsa 0.9.3", "serde", "sha1", "sha2 0.10.8", "smallvec", - "sqlx-core", + "sqlx-core 0.7.2", "stringprep", "thiserror", "tracing", @@ -5945,8 +6816,8 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ - "atoi", - "base64 0.21.4", + "atoi 2.0.0", + "base64 0.21.5", "bigdecimal 0.3.1", "bitflags 2.4.1", "byteorder", @@ -5974,7 +6845,7 @@ dependencies = [ "sha1", "sha2 0.10.8", "smallvec", - "sqlx-core", + "sqlx-core 0.7.2", "stringprep", "thiserror", "tracing", @@ -5982,25 +6853,36 @@ dependencies = [ "whoami", ] +[[package]] +name = "sqlx-rt" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024" +dependencies = [ + "once_cell", + "tokio", + "tokio-rustls 0.23.4", +] + [[package]] name = "sqlx-sqlite" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" dependencies = [ - "atoi", + "atoi 2.0.0", "chrono", "flume", "futures-channel", "futures-core", "futures-executor", - "futures-intrusive", + "futures-intrusive 0.5.0", "futures-util", "libsqlite3-sys", "log", "percent-encoding", "serde", - "sqlx-core", + "sqlx-core 0.7.2", "tracing", "url", "uuid 1.5.0", @@ -6039,7 +6921,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot", + "parking_lot 0.12.1", "phf_shared 0.10.0", "precomputed-hash", "serde", @@ -6063,11 +6945,11 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fa4d4f81d7c05b9161f8de839975d3326328b8ba2831164b465524cc2f55252" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6106,7 +6988,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6184,11 +7066,11 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5b5aaca9a0082be4515f0fbbecc191bf5829cd25b5b9c0a2810f6a2bb0d6829" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6198,7 +7080,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7191c8c57af059b75a2aadc927a2608c3962d19e4d09ce8f9c3f03739ddf833" dependencies = [ "bitflags 2.4.1", - "is-macro", + "is-macro 0.3.0", "num-bigint", "scoped-tls", "serde", @@ -6233,11 +7115,11 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcdff076dccca6cc6a0e0b2a2c8acfb066014382bc6df98ec99e755484814384" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6316,11 +7198,11 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f59c4b6ed5d78d3ad9fc7c6f8ab4f85bba99573d31d9a2c0a712077a6b45efd2" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6421,10 +7303,10 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05a95d367e228d52484c53336991fdcf47b6b553ef835d9159db4ba40efb0ee8" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6433,10 +7315,10 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a273205ccb09b51fabe88c49f3b34c5a4631c4c00a16ae20e03111d6a42e832" dependencies = [ - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6456,11 +7338,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f322730fb82f3930a450ac24de8c98523af7d34ab8cb2f46bcb405839891a99" dependencies = [ "Inflector", - "pmutil", + "pmutil 0.6.1", "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6476,15 +7358,27 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.38" +version = "2.0.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" +checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "syn_derive" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" +dependencies = [ + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "sync_wrapper" version = "0.1.2" @@ -6499,7 +7393,7 @@ checksum = "285ba80e733fac80aa4270fbcdf83772a79b80aa35c97075320abfee4a915b06" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "unicode-xid", ] @@ -6531,34 +7425,34 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] -name = "tempfile" -version = "3.8.0" +name = "tar" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +dependencies = [ + "filetime", + "libc", + "xattr", +] + +[[package]] +name = "tempfile" +version = "3.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if", "fastrand 2.0.1", - "redox_syscall 0.3.5", - "rustix 0.38.20", + "redox_syscall 0.4.1", + "rustix 0.38.24", "windows-sys 0.48.0", ] -[[package]] -name = "term" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c59df8ac95d96ff9bede18eb7300b0fda5e5d8d90960e76f8e14ae765eedbf1f" -dependencies = [ - "dirs-next", - "rustversion", - "winapi", -] - [[package]] name = "termcolor" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" +checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" dependencies = [ "winapi-util", ] @@ -6589,7 +7483,7 @@ checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6602,6 +7496,34 @@ dependencies = [ "once_cell", ] +[[package]] +name = "tiberius" +version = "0.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc6e2bf3e4b5be181a2a2ceff4b9b12e2684010d436a6958bd564fbc8094d44d" +dependencies = [ + "async-trait", + "asynchronous-codec", + "byteorder", + "bytes", + "chrono", + "connection-string", + "encoding", + "enumflags2", + "futures-util", + "num-traits", + "once_cell", + "pin-project-lite", + "pretty-hex", + "rustls-native-certs", + "rustls-pemfile", + "thiserror", + "tokio-rustls 0.23.4", + "tokio-util", + "tracing", + "uuid 1.5.0", +] + [[package]] name = "tiger" version = "0.1.0" @@ -6669,7 +7591,7 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tinyvector" version = "0.1.0" -source = "git+https://github.com/windmill-labs/tinyvector#20823b94c20f2b9093f318badd24026cf54dcc85" +source = "git+https://github.com/windmill-labs/tinyvector?rev=20823b94c20f2b9093f318badd24026cf54dcc85#20823b94c20f2b9093f318badd24026cf54dcc85" dependencies = [ "anyhow", "bincode", @@ -6691,7 +7613,7 @@ dependencies = [ "clap", "derive_builder", "esaxx-rs", - "getrandom 0.2.10", + "getrandom 0.2.11", "indicatif", "itertools 0.11.0", "lazy_static", @@ -6725,7 +7647,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot", + "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", "socket2 0.5.5", @@ -6742,7 +7664,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -6779,7 +7701,7 @@ dependencies = [ "futures-channel", "futures-util", "log", - "parking_lot", + "parking_lot 0.12.1", "percent-encoding", "phf 0.11.2", "pin-project-lite", @@ -6792,13 +7714,24 @@ dependencies = [ "whoami", ] +[[package]] +name = "tokio-rustls" +version = "0.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +dependencies = [ + "rustls 0.20.9", + "tokio", + "webpki", +] + [[package]] name = "tokio-rustls" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls", + "rustls 0.21.9", "tokio", ] @@ -6842,27 +7775,19 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.9" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", + "futures-io", "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" version = "0.7.8" @@ -6872,14 +7797,26 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -6890,7 +7827,31 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.2", + "indexmap 2.1.0", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.1.0", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.1.0", "serde", "serde_spanned", "toml_datetime", @@ -6899,14 +7860,14 @@ dependencies = [ [[package]] name = "toolchain_find" -version = "0.2.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e85654a10e7a07a47c6f19d93818f3f343e22927f2fa280c84f7c8042743413" +checksum = "ebc8c9a7f0a2966e1acdaf0461023d0b01471eeead645370cf4c3f5cff153f2a" dependencies = [ "home", - "lazy_static", + "once_cell", "regex", - "semver 0.11.0", + "semver 1.0.20", "walkdir", ] @@ -6937,7 +7898,7 @@ dependencies = [ "cookie", "futures-util", "http", - "parking_lot", + "parking_lot 0.12.1", "pin-project-lite", "tower-layer", "tower-service", @@ -6994,7 +7955,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", ] [[package]] @@ -7030,15 +7991,47 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-loki" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49bbc87d08020d7c2a9f4bb0b7d10da5381d3867f8ae57fcc54621b34567e963" +dependencies = [ + "loki-api", + "reqwest", + "serde", + "serde_json", + "snap", + "tokio", + "tokio-stream", + "tracing", + "tracing-core", + "tracing-log 0.1.4", + "tracing-serde", + "tracing-subscriber", + "url", +] + [[package]] name = "tracing-serde" version = "0.1.3" @@ -7051,9 +8044,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ "matchers", "nu-ansi-term", @@ -7066,7 +8059,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log", + "tracing-log 0.2.0", "tracing-serde", ] @@ -7132,7 +8125,7 @@ dependencies = [ "regress", "schemars", "serde_json", - "syn 2.0.38", + "syn 2.0.39", "thiserror", "unicode-ident", ] @@ -7149,16 +8142,10 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn 2.0.38", + "syn 2.0.39", "typify-impl", ] -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - [[package]] name = "ulid" version = "1.1.0" @@ -7304,9 +8291,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "unicode_names2" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029df4cc8238cefc911704ff8fa210853a0f3bce2694d8f51181dd41ee0f3301" +checksum = "446c96c6dd42604779487f0a981060717156648c1706aa1f464677f03c6cc059" [[package]] name = "unsafe-libyaml" @@ -7332,12 +8319,12 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "flate2", "log", "native-tls", "once_cell", - "rustls", + "rustls 0.21.9", "rustls-webpki", "serde", "serde_json", @@ -7388,7 +8375,7 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", ] [[package]] @@ -7397,7 +8384,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" dependencies = [ - "getrandom 0.2.10", + "getrandom 0.2.11", "serde", ] @@ -7482,9 +8469,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "7daec296f25a1bae309c0cd5c29c4b260e510e6d813c286b19eaadf409d40fce" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -7492,24 +8479,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "e397f4664c0e4e428e8313a469aaa58310d302159845980fd23b0f22a847f217" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "9afec9963e3d0994cac82455b2b3502b81a7f40f9a0d32181f7528d9f4b43e02" dependencies = [ "cfg-if", "js-sys", @@ -7519,9 +8506,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "5961017b3b08ad5f3fe39f1e79877f8ee7c23c5e5fd5eb80de95abc41f1f16b2" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -7529,28 +8516,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "c5353b8dab669f5e10f5bd76df26a9360c748f054f862ff5f3f8aae0c7fb3907" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.88" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "0d046c5d029ba91a1ed14da14dca44b68bf2f124cfbaf741c54151fdb3e0750b" [[package]] name = "wasm-bindgen-test" -version = "0.3.37" +version = "0.3.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e6e302a7ea94f83a6d09e78e7dc7d9ca7b186bc2829c24a22d0753efd680671" +checksum = "c6433b7c56db97397842c46b67e11873eda263170afeb3a2dc74a7cb370fee0d" dependencies = [ "console_error_panic_hook", "js-sys", @@ -7562,12 +8549,13 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.37" +version = "0.3.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecb993dd8c836930ed130e020e77d9b2e65dd0fbab1b67c790b0f5d80b11a575" +checksum = "493fcbab756bb764fa37e6bee8cec2dd709eb4273d06d0c282a5e74275ded735" dependencies = [ "proc-macro2", "quote", + "syn 2.0.39", ] [[package]] @@ -7594,9 +8582,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "5db499c5f66323272151db0e666cd34f78617522fb0c1604d31a27c50c206a85" dependencies = [ "js-sys", "wasm-bindgen", @@ -7645,7 +8633,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.20", + "rustix 0.38.24", ] [[package]] @@ -7691,11 +8679,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windmill" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "axum", - "base64 0.21.4", + "base64 0.21.5", "chrono", "dotenv", "futures", @@ -7703,6 +8691,7 @@ dependencies = [ "git-version", "lazy_static", "once_cell", + "pg-embed", "prometheus", "rand 0.8.5", "reqwest", @@ -7710,7 +8699,7 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx", + "sqlx 0.7.2", "tokio", "tokio-metrics", "tracing", @@ -7725,7 +8714,7 @@ dependencies = [ [[package]] name = "windmill-api" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "argon2", @@ -7733,8 +8722,10 @@ dependencies = [ "async-recursion", "async-stripe", "async_zip", + "aws-config", + "aws-sdk-s3", "axum", - "base64 0.21.4", + "base64 0.21.5", "bytes", "candle-core", "candle-nn", @@ -7749,7 +8740,7 @@ dependencies = [ "hf-hub", "hmac", "hyper", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "magic-crypt", "mail-send", @@ -7768,7 +8759,7 @@ dependencies = [ "serde_urlencoded", "sha2 0.10.8", "sql-builder", - "sqlx", + "sqlx 0.7.2", "tempfile", "time", "tinyvector", @@ -7792,9 +8783,9 @@ dependencies = [ [[package]] name = "windmill-api-client" -version = "1.188.1" +version = "1.210.1" dependencies = [ - "base64 0.21.4", + "base64 0.21.5", "chrono", "openapiv3", "prettyplease 0.1.25", @@ -7810,28 +8801,30 @@ dependencies = [ [[package]] name = "windmill-audit" -version = "1.188.1" +version = "1.210.1" dependencies = [ "chrono", "serde", "serde_json", "sql-builder", - "sqlx", + "sqlx 0.7.2", "tracing", "windmill-common", ] [[package]] name = "windmill-common" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "axum", "chrono", + "cron", + "git-version", "hex", "hmac", "hyper", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "prometheus", "rand 0.8.5", @@ -7840,18 +8833,19 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx", + "sqlx 0.7.2", "thiserror", "tokio", "tracing", "tracing-flame", + "tracing-loki", "tracing-subscriber", "uuid 1.5.0", ] [[package]] name = "windmill-parser" -version = "1.188.1" +version = "1.210.1" dependencies = [ "serde", "serde_json", @@ -7859,7 +8853,7 @@ dependencies = [ [[package]] name = "windmill-parser-bash" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "lazy_static", @@ -7870,11 +8864,11 @@ dependencies = [ [[package]] name = "windmill-parser-go" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "gosyn", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "regex", "windmill-parser", @@ -7882,7 +8876,7 @@ dependencies = [ [[package]] name = "windmill-parser-graphql" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "lazy_static", @@ -7893,10 +8887,10 @@ dependencies = [ [[package]] name = "windmill-parser-py" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", - "itertools 0.11.0", + "itertools 0.12.0", "rustpython-parser", "serde_json", "windmill-parser", @@ -7904,24 +8898,24 @@ dependencies = [ [[package]] name = "windmill-parser-py-imports" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "async-recursion", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "phf 0.11.2", "regex", "rustpython-parser", "serde_json", - "sqlx", + "sqlx 0.7.2", "windmill-common", "windmill-parser", ] [[package]] name = "windmill-parser-sql" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "lazy_static", @@ -7932,7 +8926,7 @@ dependencies = [ [[package]] name = "windmill-parser-ts" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7949,10 +8943,10 @@ dependencies = [ [[package]] name = "windmill-parser-wasm" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", - "getrandom 0.2.10", + "getrandom 0.2.11", "serde_json", "wasm-bindgen", "wasm-bindgen-test", @@ -7967,7 +8961,7 @@ dependencies = [ [[package]] name = "windmill-queue" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "async-recursion", @@ -7979,7 +8973,7 @@ dependencies = [ "futures-core", "hex", "hmac", - "itertools 0.11.0", + "itertools 0.12.0", "lazy_static", "prometheus", "reqwest", @@ -7987,7 +8981,7 @@ dependencies = [ "serde", "serde_json", "sql-builder", - "sqlx", + "sqlx 0.7.2", "tokio", "tracing", "ulid", @@ -7998,11 +8992,11 @@ dependencies = [ [[package]] name = "windmill-worker" -version = "1.188.1" +version = "1.210.1" dependencies = [ "anyhow", "async-recursion", - "base64 0.21.4", + "base64 0.21.5", "bytes", "chrono", "const_format", @@ -8018,7 +9012,8 @@ dependencies = [ "futures", "gcp_auth", "git-version", - "itertools 0.11.0", + "hex", + "itertools 0.12.0", "jsonwebtoken", "lazy_static", "mysql_async", @@ -8036,9 +9031,11 @@ dependencies = [ "serde", "serde_json", "sha2 0.10.8", - "sqlx", + "sqlx 0.7.2", + "tiberius", "tokio", "tokio-postgres", + "tokio-util", "tracing", "urlencoding", "uuid 1.5.0", @@ -8198,9 +9195,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.17" +version = "0.5.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b" dependencies = [ "memchr", ] @@ -8233,6 +9230,12 @@ dependencies = [ "libc", ] +[[package]] +name = "xmlparser" +version = "0.13.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" + [[package]] name = "xz2" version = "0.1.7" @@ -8244,9 +9247,9 @@ dependencies = [ [[package]] name = "yoke" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e38c508604d6bbbd292dadb3c02559aa7fff6b654a078a36217cad871636e4" +checksum = "65e71b2e4f287f467794c671e2b8f8a5f3716b3c829079a1c44740148eff07e4" dependencies = [ "serde", "stable_deref_trait", @@ -8256,16 +9259,36 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5e19fb6ed40002bab5403ffa37e53e0e56f914a4450c8765f533018db1db35f" +checksum = "9e6936f0cce458098a201c245a11bef556c6a0181129c7034d10d76d1ec3a2b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "synstructure", ] +[[package]] +name = "zerocopy" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "zerofrom" version = "0.1.3" @@ -8283,15 +9306,15 @@ checksum = "e6a647510471d372f2e6c2e6b7219e44d8c574d24fdc11c610a61455782f18c3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.38", + "syn 2.0.39", "synstructure", ] [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" [[package]] name = "zip" @@ -8299,9 +9322,18 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "760394e246e4c28189f19d488c058bf16f564016aefac5d32bb1f3b51d5e9261" dependencies = [ + "aes 0.8.3", "byteorder", + "bzip2", + "constant_time_eq", "crc32fast", "crossbeam-utils", + "flate2", + "hmac", + "pbkdf2", + "sha1", + "time", + "zstd 0.11.2+zstd.1.5.2", ] [[package]] @@ -8310,7 +9342,16 @@ version = "0.11.2+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20cc960326ece64f010d2d2107537f26dc589a6573a316bd5b1dba685fa5fde4" dependencies = [ - "zstd-safe", + "zstd-safe 5.0.2+zstd.1.5.2", +] + +[[package]] +name = "zstd" +version = "0.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c" +dependencies = [ + "zstd-safe 6.0.6", ] [[package]] @@ -8323,6 +9364,16 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "zstd-safe" +version = "6.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581" +dependencies = [ + "libc", + "zstd-sys", +] + [[package]] name = "zstd-sys" version = "2.0.9+zstd.1.5.5" diff --git a/pkgs/servers/windmill/default.nix b/pkgs/servers/windmill/default.nix index a10610ea1958..d40ec9f4f0cf 100644 --- a/pkgs/servers/windmill/default.nix +++ b/pkgs/servers/windmill/default.nix @@ -14,6 +14,7 @@ , openssl , pango , pixman +, giflib , pkg-config , python3 , rustfmt @@ -23,13 +24,13 @@ let pname = "windmill"; - version = "1.188.1"; + version = "1.210.1"; fullSrc = fetchFromGitHub { owner = "windmill-labs"; repo = "windmill"; rev = "v${version}"; - hash = "sha256-IiCIiP5KYRw10aPlR40RPW0ynXq5itf0LLtpDtxCNE4="; + hash = "sha256-ss3EsIqfuctPOEdI5IQtyFFcDzIqnFm6UUG1vA+OlkQ="; }; pythonEnv = python3.withPackages (ps: [ ps.pip-tools ]); @@ -42,7 +43,7 @@ let sourceRoot = "${fullSrc.name}/frontend"; - npmDepsHash = "sha256-TgAv3iUD0kP2mOvMVOW4yYCDCsf2Cr8IfXK+V+f35uw"; + npmDepsHash = "sha256-l9MRaa6TaBg9vFoVuIGZNC9jLS29TlWeSniIBRNDRgU="; # without these you get a # FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory @@ -52,7 +53,7 @@ let npm run generate-backend-client ''; - buildInputs = [ pixman cairo pango ]; + buildInputs = [ pixman cairo pango giflib ]; nativeBuildInputs = [ python3 pkg-config ]; installPhase = '' @@ -93,6 +94,8 @@ rustPlatform.buildRustPackage { outputHashes = { "progenitor-0.3.0" = "sha256-F6XRZFVIN6/HfcM8yI/PyNke45FL7jbcznIiqj22eIQ="; "tinyvector-0.1.0" = "sha256-NYGhofU4rh+2IAM+zwe04YQdXY8Aa4gTmn2V2HtzRfI="; + "archiver-rs-0.5.1" = "sha256-ZIik0mMABmhdx/ullgbOrKH5GAtqcOKq5A6vB7aBSjk="; + "pg-embed-0.7.2" = "sha256-R/SrlzNK7aAOyXVTQ/WPkiQb6FyMg9tpsmPTsiossDY="; }; }; @@ -118,6 +121,7 @@ rustPlatform.buildRustPackage { openssl rustfmt lld + stdenv.cc.cc.lib ]; nativeBuildInputs = [ @@ -146,6 +150,7 @@ rustPlatform.buildRustPackage { wrapProgram "$out/bin/windmill" \ --prefix PATH : ${lib.makeBinPath [go pythonEnv deno nsjail bash]} \ + --prefix LD_LIBRARY_PATH : "${stdenv.cc.cc.lib}/lib" \ --set PYTHON_PATH "${pythonEnv}/bin/python3" \ --set GO_PATH "${go}/bin/go" \ --set DENO_PATH "${deno}/bin/deno" \ From cdc306ebe6c383346b0aa31b6d760fb7da447bda Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Sun, 19 Nov 2023 14:46:14 -0600 Subject: [PATCH 93/95] quartus-prime-lite: fix loading of libudev.so.0 Loading without a path was broken by nixpkgs commit e2d06c56951459ab3aebfb40c366ab635a021366. Fortunately we don't want libudev.so.0 in modelsim now anyway which was the reason for loading by name only, so we move it back to being 64-bit only and load it by absolute path. --- pkgs/applications/editors/quartus-prime/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/quartus-prime/default.nix b/pkgs/applications/editors/quartus-prime/default.nix index 278296f12d40..57ad28b5b2da 100644 --- a/pkgs/applications/editors/quartus-prime/default.nix +++ b/pkgs/applications/editors/quartus-prime/default.nix @@ -28,6 +28,7 @@ in buildFHSEnv rec { xorg.libICE xorg.libSM zlib + libudev0-shim # qsys requirements xorg.libXtst xorg.libXi @@ -53,7 +54,6 @@ in buildFHSEnv rec { xorg.libX11 xorg.libXext xorg.libXrender - libudev0-shim libxcrypt-legacy ]; @@ -95,7 +95,6 @@ in buildFHSEnv rec { # LD_PRELOAD fixes issues in the licensing system that cause memory corruption and crashes when # starting most operations in many containerized environments, including WSL2, Docker, and LXC # (a similiar fix involving LD_PRELOADing tcmalloc did not solve the issue in my situation) - # we use the name so that quartus can load the 64 bit verson and modelsim can load the 32 bit version # https://community.intel.com/t5/Intel-FPGA-Software-Installation/Running-Quartus-Prime-Standard-on-WSL-crashes-in-libudev-so/m-p/1189032 # # But, as can be seen in the above resource, LD_PRELOADing libudev breaks @@ -103,7 +102,7 @@ in buildFHSEnv rec { # `(vlog-2163) Macro ` is undefined.`), so only use LD_PRELOAD # for non-ModelSim wrappers. if [ "$NIXPKGS_IS_MODELSIM_WRAPPER" != 1 ]; then - export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}libudev.so.0 + export LD_PRELOAD=''${LD_PRELOAD:+$LD_PRELOAD:}/usr/lib/libudev.so.0 fi ''; From 57801428da59dbd35e9c06846023c2dfee36732d Mon Sep 17 00:00:00 2001 From: Ivan Mincik Date: Sun, 19 Nov 2023 23:34:11 +0100 Subject: [PATCH 94/95] doc/stdenv: update manual phases execution instructions Update instructions for manual build phases execution via `nix-shell` to cover all phases. There is no easy way of getting those commands, so it makes a sense to have them all properly documented. --- doc/stdenv/stdenv.chapter.md | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 26c43bd9e943..03bb8a9ff790 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -119,13 +119,18 @@ phases="${prePhases[*]:-} unpackPhase patchPhase" genericBuild ``` Then, run more phases up until the failure is reached. -For example, if the failure is in the build phase, the following phases would be required: +If the failure is in the build or check phase, the following phases would be required: ```bash -phases="${preConfigurePhases[*]:-} configurePhase ${preBuildPhases[*]:-} buildPhase" genericBuild +phases="${preConfigurePhases[*]:-} configurePhase ${preBuildPhases[*]:-} buildPhase checkPhase" genericBuild ``` -Re-run a single phase as many times as necessary to examine the failure like so: +Use this command to run all install phases: +```bash +phases="${preInstallPhases[*]:-} installPhase ${preFixupPhases[*]:-} fixupPhase installCheckPhase" genericBuild +``` + +Single phase can be re-run as many times as necessary to examine the failure like so: ```bash phases="buildPhase" genericBuild From 89ddcdf40d9a2d02fa12033b36ddac59bfe3265d Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Wed, 15 Nov 2023 12:08:11 +0100 Subject: [PATCH 95/95] VoiceOfFaust: 1.1.4 -> 1.1.5 --- .../magnetophonDSP/VoiceOfFaust/default.nix | 39 ++++++------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix index 2135af507b6a..f85df83401e0 100644 --- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix +++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix @@ -1,13 +1,13 @@ -{ lib, stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins }: +{ lib, stdenv, fetchFromGitHub, faust2jack, faust2lv2, helmholtz, mrpeach, puredata-with-plugins, jack-example-tools }: stdenv.mkDerivation rec { pname = "VoiceOfFaust"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "magnetophon"; repo = "VoiceOfFaust"; - rev = "V${version}"; - sha256 = "0la9b806qwrlsxgbir7n1db8v3w24wmd6k43p6qpr1fjjpkhrrgw"; + rev = version; + sha256 = "sha256-vB8+ymvNuuovFXwOJ3BTIj5mGzCGa1+yhYs4nWMYIxU="; }; plugins = [ helmholtz mrpeach ]; @@ -16,35 +16,18 @@ stdenv.mkDerivation rec { buildInputs = [ faust2jack faust2lv2 ]; - runtimeInputs = [ pitchTracker ]; + enableParallelBuilding = true; dontWrapQtApps = true; + makeFlags = [ + "PREFIX=$(out)" + ]; + patchPhase = '' sed -i "s@pd -nodac@${pitchTracker}/bin/pd -nodac@g" launchers/synthWrapper - sed -i "s@../PureData/OscSendVoc.pd@$out/PureData/OscSendVoc.pd@g" launchers/pitchTracker - ''; - - buildPhase = '' - sh install.sh - # so it doesn;t end up in /bin/ : - rm -f install.sh - ''; - - installPhase = '' - mkdir -p $out/bin - - for f in $(find . -executable -type f); do - cp $f $out/bin/ - done - - cp launchers/* $out/bin/ - mkdir $out/PureData/ - # cp PureData/OscSendVoc.pd $out/PureData/OscSendVoc.pd - cp PureData/* $out/PureData/ - - mkdir -p $out/lib/lv2 - cp -r *.lv2/ $out/lib/lv2 + sed -i "s@jack_connect@${jack-example-tools}/bin/jack_connect@g" launchers/synthWrapper + sed -i "s@../PureData/OscSendVoc.pd@$out/bin/PureData/OscSendVoc.pd@g" launchers/pitchTracker ''; meta = {