From 2a6198fc81b5392f56f33d5bc6a0239441211af4 Mon Sep 17 00:00:00 2001 From: Mikhail Klementev Date: Sat, 8 Apr 2023 15:22:46 +0000 Subject: [PATCH 01/65] out-of-tree: 2.0.4 > 2.1.1 --- pkgs/development/tools/out-of-tree/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/out-of-tree/default.nix b/pkgs/development/tools/out-of-tree/default.nix index f76c96dd6f81..6a13a59243c5 100644 --- a/pkgs/development/tools/out-of-tree/default.nix +++ b/pkgs/development/tools/out-of-tree/default.nix @@ -1,15 +1,15 @@ -{ lib, buildGoModule, fetchgit, qemu, docker, which, makeWrapper }: +{ lib, buildGoModule, fetchgit, qemu, podman, makeWrapper }: buildGoModule rec { pname = "out-of-tree"; - version = "2.0.4"; + version = "2.1.1"; nativeBuildInputs = [ makeWrapper ]; src = fetchgit { rev = "refs/tags/v${version}"; url = "https://code.dumpstack.io/tools/${pname}.git"; - sha256 = "sha256-D2LiSDnF7g1h0XTulctCnZ+I6FZSLA0XRd9LQLOMP9c="; + sha256 = "sha256-XzO8NU7A5m631PjAm0F/K7qLrD+ZDSdHXaNowGaZAPo="; }; vendorSha256 = "sha256-p1dqzng3ak9lrnzrEABhE1TP1lM2Ikc8bmvp5L3nUp0="; @@ -18,7 +18,7 @@ buildGoModule rec { postFixup = '' wrapProgram $out/bin/out-of-tree \ - --prefix PATH : "${lib.makeBinPath [ qemu ]}" + --prefix PATH : "${lib.makeBinPath [ qemu podman ]}" ''; meta = with lib; { From db1b253b3abf3c5a50492445883bdf0d5da143a7 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Tue, 25 Apr 2023 14:52:09 +0200 Subject: [PATCH 02/65] mosquitto: use multiple outputs Most importantly, separate the library from the executables. When the library is used as a standalone MQTT client library, then we don't want to pull in, e.g., the broker daemon. Conveniently, the library output does not have a runtime dependency on systemd so it becomes unnecessary to use `withSystemd = false` to keep the closure size down when only wanting to use the library. --- pkgs/servers/mqtt/mosquitto/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix index f241f48ac52e..e4f804875bd6 100644 --- a/pkgs/servers/mqtt/mosquitto/default.nix +++ b/pkgs/servers/mqtt/mosquitto/default.nix @@ -53,6 +53,8 @@ stdenv.mkDerivation rec { popd ''; + outputs = [ "out" "dev" "lib" ]; + nativeBuildInputs = [ cmake docbook_xsl libxslt ]; buildInputs = [ From 1d50e695f33447906f4371ed27f2f45cf1946bc1 Mon Sep 17 00:00:00 2001 From: Roman Timushev Date: Sat, 23 Jul 2022 02:13:29 +0200 Subject: [PATCH 03/65] maintainers: add rtimush --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c35de1c22687..8f8f5d3d34d9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14974,6 +14974,12 @@ githubId = 47790121; name = "Ryan Burns"; }; + rtimush = { + email = "rtimush@gmail.com"; + github = "rtimush"; + githubId = 831307; + name = "Roman Timushev"; + }; rtreffer = { email = "treffer+nixos@measite.de"; github = "rtreffer"; From 1608bde4283b5e5a0d0b61141b87ffd7c9c72d60 Mon Sep 17 00:00:00 2001 From: Lionello Lunesu Date: Sun, 31 Jan 2021 23:30:27 -0800 Subject: [PATCH 04/65] dmd: remove references to dmd-bootstrap Fixes #111475 --- pkgs/development/compilers/dmd/generic.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/dmd/generic.nix b/pkgs/development/compilers/dmd/generic.nix index d2679c184da7..db60ebbb4fc9 100644 --- a/pkgs/development/compilers/dmd/generic.nix +++ b/pkgs/development/compilers/dmd/generic.nix @@ -6,6 +6,7 @@ { stdenv , lib , fetchFromGitHub +, removeReferencesTo , makeWrapper , which , writeTextFile @@ -20,7 +21,8 @@ , installShellFiles , git , unzip -, dmd_bin ? "${callPackage ./bootstrap.nix { }}/bin" +, dmdBootstrap ? callPackage ./bootstrap.nix { } +, dmd_bin ? "${dmdBootstrap}/bin" }: let @@ -209,6 +211,12 @@ stdenv.mkDerivation rec { runHook postInstall ''; + preFixup = '' + find $out/bin -type f -exec ${removeReferencesTo}/bin/remove-references-to -t ${dmd_bin}/dmd '{}' + + ''; + + disallowedReferences = [ dmdBootstrap ]; + meta = with lib; { description = "Official reference compiler for the D language"; homepage = "https://dlang.org/"; From bc9b360bcff29d74b0e112102dbb4c099d59768d Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Tue, 3 Oct 2023 18:05:14 +0200 Subject: [PATCH 05/65] indi-full: wrap indiserver to set correct prefix --- .../science/astronomy/indilib/indi-with-drivers.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix index 5ec1acdf21e9..f1201df1d8a0 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-with-drivers.nix @@ -1,4 +1,4 @@ -{ buildEnv, indilib ? indilib, pname ? "indi-with-drivers", version ? null, extraDrivers ? null }: +{ buildEnv, makeBinaryWrapper, indilib ? indilib, pname ? "indi-with-drivers", version ? null, extraDrivers ? null }: buildEnv { name = "${pname}-${version}"; @@ -6,5 +6,13 @@ buildEnv { indilib ] ++ extraDrivers; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + postBuild = '' + makeBinaryWrapper ${indilib}/bin/indiserver $out/bin/indiserver --set-default INDIPREFIX $out + ''; + + inherit (indilib) meta; } From f302d482045569daeb0c925ef230bbb9798c86c2 Mon Sep 17 00:00:00 2001 From: Linus Karl Date: Mon, 2 Oct 2023 18:05:34 +0200 Subject: [PATCH 06/65] indilib: fix udev rules This fixes the udev rules so that the indi packages can be added to nixos services.udev.packages option. It also fixes the loading of firmware for devices which need fxload. --- .../science/astronomy/indilib/default.nix | 11 ++++++++++ .../astronomy/indilib/indi-3rdparty.nix | 19 ++++++++++++++++ .../astronomy/indilib/indi-firmware.nix | 22 +++++++++++++++---- 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix index d6d8919ccddf..0b4526e6e1eb 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/default.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix @@ -1,9 +1,11 @@ { stdenv , lib , fetchFromGitHub +, bash , cmake , cfitsio , libusb1 +, kmod , zlib , boost , libev @@ -58,6 +60,15 @@ stdenv.mkDerivation rec { # Socket address collisions between tests enableParallelChecking = false; + postFixup = lib.optionalString stdenv.isLinux '' + for f in $out/lib/udev/rules.d/*.rules + do + substituteInPlace $f --replace "/bin/sh" "${bash}/bin/sh" \ + --replace "/sbin/modprobe" "${kmod}/sbin/modprobe" + done + ''; + + meta = with lib; { homepage = "https://www.indilib.org/"; description = "Implementation of the INDI protocol for POSIX operating systems"; diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix index 2423a6e20e34..fdbdb4db24bf 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix @@ -1,6 +1,8 @@ { stdenv , lib +, bash , cmake +, coreutils , cfitsio , libusb1 , zlib @@ -24,6 +26,10 @@ , firmware ? null }: +let + libusb-with-fxload = libusb1.override { withExamples = true;}; +in + stdenv.mkDerivation rec { pname = "indi-3rdparty"; @@ -68,6 +74,19 @@ stdenv.mkDerivation rec { "-DWITH_SBIG=off" ]; + postFixup = lib.optionalString stdenv.isLinux '' + for f in $out/lib/udev/rules.d/*.rules + do + substituteInPlace $f --replace "/sbin/fxload" "${libusb-with-fxload}/sbin/fxload" \ + --replace "/lib/firmware/" "$out/lib/firmware/" \ + --replace "/bin/sleep" "${coreutils}/bin/sleep" \ + --replace "/bin/cat" "${coreutils}/bin/cat" \ + --replace "/bin/echo" "${coreutils}/bin/echo" \ + --replace "/bin/sh" "${bash}/bin/sh" + done + ''; + + meta = with lib; { homepage = "https://www.indilib.org/"; description = "Third party drivers for the INDI astronomical software suite"; diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix index 7875051cbf79..102a8b901cce 100644 --- a/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix +++ b/pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix @@ -1,7 +1,9 @@ { stdenv , lib +, bash , cmake , cfitsio +, coreutils , libusb1 , zlib , boost @@ -21,7 +23,9 @@ , src , autoPatchelfHook }: - +let + libusb-with-fxload = libusb1.override { withExamples = true;}; +in stdenv.mkDerivation rec { pname = "indi-firmware"; @@ -39,7 +43,8 @@ stdenv.mkDerivation rec { "-DCMAKE_INSTALL_LIBDIR=lib" "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" "-DRULES_INSTALL_DIR=lib/udev/rules.d" - "-DFIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware" + "-DFIRMWARE_INSTALL_DIR=lib/firmware" + "-DQHY_FIRMWARE_INSTALL_DIR=\${CMAKE_INSTALL_PREFIX}/lib/firmware/qhy" "-DCONF_DIR=etc" "-DBUILD_LIBS=1" "-DWITH_PENTAX=off" @@ -52,8 +57,17 @@ stdenv.mkDerivation rec { done ''; - postFixup = '' - rm $out/lib/udev/rules.d/99-fli.rules + postFixup = lib.optionalString stdenv.isLinux '' + for f in $out/lib/udev/rules.d/*.rules + do + substituteInPlace "$f" --replace "/sbin/fxload" "${libusb-with-fxload}/sbin/fxload" \ + --replace "/bin/sleep" "${coreutils}/bin/sleep" \ + --replace "/bin/cat" "${coreutils}/bin/cat" \ + --replace "/bin/echo" "${coreutils}/bin/echo" \ + --replace "/bin/sh" "${bash}/bin/sh" \ + --replace "/lib/firmware/" "$out/lib/firmware/" + sed -e 's|-D $env{DEVNAME}|-p $env{BUSNUM},$env{DEVNUM}|' -i "$f" + done ''; meta = with lib; { From 1aecbe43bad52c74b9bd1fd9a7a6cc7ccc5b5fe1 Mon Sep 17 00:00:00 2001 From: Juergen Fitschen Date: Sat, 7 Oct 2023 23:06:22 +0200 Subject: [PATCH 07/65] maintainers: add jue89 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 068b1ad3d798..91a7128ca40d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8704,6 +8704,12 @@ githubId = 1189739; name = "Julio Borja Barra"; }; + jue89 = { + email = "me@jue.yt"; + github = "jue89"; + githubId = 6105784; + name = "Juergen Fitschen"; + }; jugendhacker = { name = "j.r"; email = "j.r@jugendhacker.de"; From ae5561ae2127b5c8c1b2025d3ebbb558cb74ae80 Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Thu, 5 Oct 2023 21:54:53 +0200 Subject: [PATCH 08/65] outline: 0.71.0 -> 0.72.2 --- pkgs/servers/web-apps/outline/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix index d879bc589c3a..7adf281ff9be 100644 --- a/pkgs/servers/web-apps/outline/default.nix +++ b/pkgs/servers/web-apps/outline/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "outline"; - version = "0.71.0"; + version = "0.72.2"; src = fetchFromGitHub { owner = "outline"; repo = "outline"; rev = "v${version}"; - hash = "sha256-vwYq5b+cMYf/gnpCwLEpErYKqYw/RwcvyBjhp+5+bTY="; + hash = "sha256-y54EYWI1DbxosUflp5z+b4i1vO1qDju8LxEK0nt4S/g="; }; nativeBuildInputs = [ makeWrapper yarn2nix-moretea.fixup_yarn_lock ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/yarn.lock"; - hash = "sha256-j9iaxXfMlG9dT6fvYgPQg6Y0QvCRiBU1peO0YgsGHOY="; + hash = "sha256-uXWBYZAjMA88NtADA4s2kB4Ubb2atrW6F4kAzDGA1WI="; }; configurePhase = '' @@ -63,7 +63,8 @@ stdenv.mkDerivation rec { makeWrapper ${nodejs}/bin/node $out/bin/outline-server \ --add-flags $build/server/index.js \ --set NODE_ENV production \ - --set NODE_PATH $node_modules + --set NODE_PATH $node_modules \ + --prefix PATH : ${lib.makeBinPath [ nodejs ]} # required to run migrations runHook postInstall ''; From 5fa44991c3c214d5c72f74afed88837f75e9d194 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Oct 2023 19:37:38 +0000 Subject: [PATCH 09/65] carapace: 0.27.0 -> 0.28.0 --- pkgs/shells/carapace/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/carapace/default.nix b/pkgs/shells/carapace/default.nix index ee5f254089c4..b94201c96d77 100644 --- a/pkgs/shells/carapace/default.nix +++ b/pkgs/shells/carapace/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "carapace"; - version = "0.27.0"; + version = "0.28.0"; src = fetchFromGitHub { owner = "rsteube"; repo = "${pname}-bin"; rev = "v${version}"; - hash = "sha256-UcJbWOYkNUJEilJL/LG5o+I1ugqEOEGfs+uvKUMnTMU="; + hash = "sha256-0ubZt4KsjsoIcglo/lh9JDAZjuACBNdVLJazH0Csxl0="; }; - vendorHash = "sha256-PN8ARsJQqRj333ervoy24PZoWkrCIYiGxOovzEhPNZQ="; + vendorHash = "sha256-35Gmye5NPOtUaW8zNkjK0cQ3FRB1fK7UyqT5c17rls4="; ldflags = [ "-s" From 4c5a1c771c05b337d8f9a3478cddac86478ac1ac Mon Sep 17 00:00:00 2001 From: Florian Warzecha Date: Sun, 15 Oct 2023 10:40:52 +0200 Subject: [PATCH 10/65] maintainers: add liketechnik --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d92d24f883d9..e6fb98b145ab 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -10008,6 +10008,17 @@ githubId = 3696783; name = "Leroy Hopson"; }; + liketechnik = { + name = "Florian Warzecha"; + + email = "liketechnik@disroot.org"; + github = "liketechnik"; + githubId = 24209689; + + keys = [{ + fingerprint = "92D8 A09D 03DD B774 AABD 53B9 E136 2F07 D750 DB5C"; + }]; + }; lillycham = { email = "lillycat332@gmail.com"; github = "lillycat332"; From 5b6b3c0a87f6b8bd3ed3ed3791f1827ba4cac7b6 Mon Sep 17 00:00:00 2001 From: Florian Warzecha Date: Sun, 15 Oct 2023 10:41:27 +0200 Subject: [PATCH 11/65] wb32-dfu-updater: init at 1.0.0 --- pkgs/by-name/wb/wb32-dfu-updater/package.nix | 34 ++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 pkgs/by-name/wb/wb32-dfu-updater/package.nix diff --git a/pkgs/by-name/wb/wb32-dfu-updater/package.nix b/pkgs/by-name/wb/wb32-dfu-updater/package.nix new file mode 100644 index 000000000000..df040c3a7112 --- /dev/null +++ b/pkgs/by-name/wb/wb32-dfu-updater/package.nix @@ -0,0 +1,34 @@ +{ callPackage +, lib +, stdenv +, fetchFromGitHub +, cmake +, libusb1 +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "wb32-dfu-updater"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "WestberryTech"; + repo = finalAttrs.pname; + rev = finalAttrs.version; + sha256 = "sha256-DKsDVO00JFhR9hIZksFVJLRwC6PF9LCRpf++QywFO2w="; + }; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "USB programmer for downloading and uploading firmware to/from USB devices."; + longDescription = '' + wb32-dfu-updater is a host tool used to download and upload firmware to/from WB32 MCU via USB. (wb32-dfu-updater_cli is the command line version). + ''; + homepage = "https://github.com/WestberryTech/wb32-dfu-updater"; + license = licenses.asl20; + maintainers = [ maintainers.liketechnik ]; + mainProgram = "wb32-dfu-updater_cli"; + platforms = platforms.all; + }; +}) From a56440e9afa68f2d8d4eaa968b29e68cbe59ad0d Mon Sep 17 00:00:00 2001 From: Florian Warzecha Date: Sun, 15 Oct 2023 10:43:05 +0200 Subject: [PATCH 12/65] qmk: add wb32 flash tool --- pkgs/tools/misc/qmk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/qmk/default.nix b/pkgs/tools/misc/qmk/default.nix index 598258d5cf04..ce0a11c10c83 100644 --- a/pkgs/tools/misc/qmk/default.nix +++ b/pkgs/tools/misc/qmk/default.nix @@ -5,6 +5,7 @@ , avrdude , dfu-programmer , dfu-util +, wb32-dfu-updater , gcc-arm-embedded , gnumake , teensy-loader-cli @@ -38,6 +39,7 @@ python3.pkgs.buildPythonApplication rec { avrdude dfu-programmer dfu-util + wb32-dfu-updater teensy-loader-cli gcc-arm-embedded gnumake From dd2207aae611f618582d3aa2c04154b639825806 Mon Sep 17 00:00:00 2001 From: Irene Knapp Date: Sun, 15 Oct 2023 13:53:19 -0700 Subject: [PATCH 13/65] tenacity: 1.3.1 -> 1.3.2 --- pkgs/applications/audio/tenacity/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tenacity/default.nix b/pkgs/applications/audio/tenacity/default.nix index 04dd28e0b5c9..d9c1ba89fbb8 100644 --- a/pkgs/applications/audio/tenacity/default.nix +++ b/pkgs/applications/audio/tenacity/default.nix @@ -49,14 +49,15 @@ stdenv.mkDerivation rec { pname = "tenacity"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitea { domain = "codeberg.org"; owner = "tenacityteam"; repo = pname; + fetchSubmodules = true; rev = "v${version}"; - sha256 = "sha256-wesnay+UQiPSDaRuSo86MgHdElN4s0rPIvokZhKM7GI="; + hash = "sha256-JgmAuCfXP345xgg5jac8Sa0cBSsWJbtoYmVV0DLcIkk="; }; postPatch = '' From 8bd1f2dbb3a158a1bb45315c24e7db3bb57ec7ee Mon Sep 17 00:00:00 2001 From: Yifei Sun Date: Sun, 15 Oct 2023 20:35:33 -0400 Subject: [PATCH 14/65] xwaylandvideobridge: init at 0.2 added xwaylandvideobridge (https://github.com/NixOS/nixpkgs/issues/222741) Co-authored-by: Dacio Romero --- .../wayland/xwaylandvideobridge/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/tools/wayland/xwaylandvideobridge/default.nix diff --git a/pkgs/tools/wayland/xwaylandvideobridge/default.nix b/pkgs/tools/wayland/xwaylandvideobridge/default.nix new file mode 100644 index 000000000000..83b2186c8ab1 --- /dev/null +++ b/pkgs/tools/wayland/xwaylandvideobridge/default.nix @@ -0,0 +1,50 @@ +{ lib +, stdenv +, fetchFromGitLab +, cmake +, extra-cmake-modules +, pkg-config +, qtbase +, qtquickcontrols2 +, qtx11extras +, kdelibs4support +, kpipewire +, wrapQtAppsHook +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "xwaylandvideobridge"; + version = "0.2"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "system"; + repo = "xwaylandvideobridge"; + rev = "v${finalAttrs.version}"; + hash = "sha256-79Z4BH7C85ZF+1Zivs3bTey7IdUnaDKhvZxzL6sDqUs="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + pkg-config + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + qtquickcontrols2 + qtx11extras + kdelibs4support + kpipewire + ]; + + meta = { + description = "Utility to allow streaming Wayland windows to X applications"; + homepage = "https://invent.kde.org/system/xwaylandvideobridge"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ stepbrobd ]; + platforms = lib.platforms.linux; + mainProgram = "xwaylandvideobridge"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 475afd0427e2..ccb5c81cf0c3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27497,6 +27497,8 @@ with pkgs; xwayland = callPackage ../servers/x11/xorg/xwayland.nix { }; + xwaylandvideobridge = libsForQt5.callPackage ../tools/wayland/xwaylandvideobridge { }; + yaws = callPackage ../servers/http/yaws { }; youtrack = callPackage ../servers/jetbrains/youtrack.nix { }; From 496319a38c8c3a7efee3e7cfd5cefc24fafd8fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 16 Oct 2023 20:32:33 -0400 Subject: [PATCH 15/65] picom-allusive: install manpage --- pkgs/applications/window-managers/picom/picom-allusive.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/picom/picom-allusive.nix b/pkgs/applications/window-managers/picom/picom-allusive.nix index a30efaab570f..8c2747fba7e1 100644 --- a/pkgs/applications/window-managers/picom/picom-allusive.nix +++ b/pkgs/applications/window-managers/picom/picom-allusive.nix @@ -1,4 +1,4 @@ -{ picom, lib, fetchFromGitHub }: +{ picom, lib, fetchFromGitHub, installShellFiles }: picom.overrideAttrs (oldAttrs: rec { pname = "picom-allusive"; @@ -11,8 +11,11 @@ picom.overrideAttrs (oldAttrs: rec { hash = "sha256-1zWntz2QKp/O9ZuOUZy9NkCNXFsBqRRvcd0SAr+7G/o="; }; + nativeBuildInputs = [ installShellFiles ] ++ oldAttrs.nativeBuildInputs; + postInstall = '' chmod +x $out/bin/picom-trans + installManPage $src/man/picom.1.gz '' + (lib.optionalString (oldAttrs ? postInstall) oldAttrs.postInstall); meta = { From c3c0fe45e2e571fae8a8158cbd0d2b5aaccc4113 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 16 Oct 2023 20:33:08 -0400 Subject: [PATCH 16/65] picom-allusive: preserve meta attrs, except longDescription --- pkgs/applications/window-managers/picom/picom-allusive.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/picom/picom-allusive.nix b/pkgs/applications/window-managers/picom/picom-allusive.nix index 8c2747fba7e1..eb31dd9ccdff 100644 --- a/pkgs/applications/window-managers/picom/picom-allusive.nix +++ b/pkgs/applications/window-managers/picom/picom-allusive.nix @@ -18,7 +18,7 @@ picom.overrideAttrs (oldAttrs: rec { installManPage $src/man/picom.1.gz '' + (lib.optionalString (oldAttrs ? postInstall) oldAttrs.postInstall); - meta = { + meta = (builtins.removeAttrs oldAttrs.meta [ "longDescription" ]) // { description = "A fork of picom featuring improved animations and other features"; homepage = "https://github.com/allusive-dev/picom-allusive"; license = with lib.licenses; [ mit mpl20 ]; From c566a3a095961005f115b72e547e128d33a1a00e Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 17 Oct 2023 14:11:40 +0900 Subject: [PATCH 17/65] python311Packages.augmax: unstable-2022-02-19 -> 0.3.1 Diff: https://github.com/khdlr/augmax/compare/3e5d85d6921a1e519987d33f226bc13f61e04d04...v0.3.1 Changelog: https://github.com/khdlr/augmax/blob/v0.3.1/CHANGELOG.md --- pkgs/development/python-modules/augmax/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/augmax/default.nix b/pkgs/development/python-modules/augmax/default.nix index 48eb38cad3d2..47a531863ff1 100644 --- a/pkgs/development/python-modules/augmax/default.nix +++ b/pkgs/development/python-modules/augmax/default.nix @@ -8,15 +8,14 @@ buildPythonPackage rec { pname = "augmax"; - version = "unstable-2022-02-19"; + version = "0.3.1"; format = "setuptools"; src = fetchFromGitHub { owner = "khdlr"; repo = pname; - # augmax does not have releases tagged. See https://github.com/khdlr/augmax/issues/5. - rev = "3e5d85d6921a1e519987d33f226bc13f61e04d04"; - sha256 = "046n43v7161w7najzlbi0443q60436xv24nh1mv23yw6psqqhx5i"; + rev = "refs/tags/v${version}"; + hash = "sha256-hDNNoE7KVaH3jrXZA4A8f0UoQJPl6KHA3XwMc3Ccohk="; }; propagatedBuildInputs = [ einops jax ]; From dc87377e951e0380b4d99ab39db457f74e307238 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Oct 2023 09:45:32 +0000 Subject: [PATCH 18/65] fluent-reader: 1.1.3 -> 1.1.4 --- .../networking/feedreaders/fluent-reader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/fluent-reader/default.nix b/pkgs/applications/networking/feedreaders/fluent-reader/default.nix index 968e8dd84a14..dd351ce1a27f 100644 --- a/pkgs/applications/networking/feedreaders/fluent-reader/default.nix +++ b/pkgs/applications/networking/feedreaders/fluent-reader/default.nix @@ -2,11 +2,11 @@ let pname = "fluent-reader"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { url = "https://github.com/yang991178/fluent-reader/releases/download/v${version}/Fluent.Reader.${version}.AppImage"; - hash = "sha256-CzvhOaWfZ4rt2HmL/yv6P7IxEPLoyuBhftOxcjdMInU="; + hash = "sha256-2oLV9SWBNt0j1WAS6j4dobsUEpptjTubpr8pdOcIOY4="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From c94f310af86e533019b3e6abef8ed55a93870dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 17 Oct 2023 20:53:46 +0200 Subject: [PATCH 19/65] maintainers: add gepbird --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 219ebfd6c10a..a2619c43f037 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6312,6 +6312,16 @@ fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; }]; }; + gepbird = { + email = "gutyina.gergo.2@gmail.com"; + github = "gepbird"; + githubId = 29818440; + name = "Gutyina Gergő"; + keys = [ + { fingerprint = "RoAfvqa6w1l8Vdm3W60TDXurYwJ6h03VEGD+wDNGEwc"; } + { fingerprint = "MP2UpIRtJpbFFqyucP431H/FPCfn58UhEUTro4lXtRs"; } + ]; + }; gerg-l = { email = "gregleyda@proton.me"; github = "Gerg-L"; From 2bffcc4f2843c297febed82384d5c7bc616d53da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Madrid-Menc=C3=ADa?= Date: Tue, 17 Oct 2023 13:01:54 +0200 Subject: [PATCH 20/65] coursier: Fix LD path for libz.so.1 --- pkgs/development/tools/coursier/default.nix | 22 +++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index f768064fbe87..61aec684a1ec 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -1,21 +1,34 @@ { lib, stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts -, coreutils, git, gnused, nix, nixfmt }: +, coreutils, git, gnused, nix, zlib }: +let + libPath = lib.makeLibraryPath [ + zlib # libz.so.1 + ]; +in stdenv.mkDerivation rec { pname = "coursier"; version = "2.1.7"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "aih4gkfSFTyZtw61NfB2JcNjfmxYWi1kWNGooI+110E="; + hash = "sha256-aih4gkfSFTyZtw61NfB2JcNjfmxYWi1kWNGooI+110E="; }; + dontUnpack = true; + nativeBuildInputs = [ makeWrapper ]; - buildCommand = '' + installPhase = '' + runHook preInstall + install -Dm555 $src $out/bin/cs patchShebangs $out/bin/cs - wrapProgram $out/bin/cs --prefix PATH ":" ${jre}/bin + wrapProgram $out/bin/cs \ + --prefix PATH ":" ${lib.makeBinPath [ jre ]} \ + --prefix LD_LIBRARY_PATH ":" ${libPath} + + runHook postInstall ''; passthru.updateScript = writeScript "update.sh" '' @@ -38,5 +51,6 @@ stdenv.mkDerivation rec { description = "Scala library to fetch dependencies from Maven / Ivy repositories"; license = licenses.asl20; maintainers = with maintainers; [ adelbertc nequissimus ]; + platforms = platforms.all; }; } From ca95f89a744e99ad18c604167adae1848897741d Mon Sep 17 00:00:00 2001 From: Luiz Ferraz Date: Tue, 17 Oct 2023 18:46:42 -0300 Subject: [PATCH 21/65] turso-cli: 0.85.3 -> 0.86.3 --- pkgs/development/tools/turso-cli/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 0859e1a362c2..3fde1157181f 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -4,19 +4,20 @@ buildGo121Module, fetchFromGitHub, installShellFiles, + nix-update-script, }: buildGo121Module rec { pname = "turso-cli"; - version = "0.85.3"; + version = "0.86.3"; src = fetchFromGitHub { owner = "tursodatabase"; repo = "turso-cli"; rev = "v${version}"; - hash = "sha256-dJpHrqPyikkUnE4Un1fGOEJL49U5IiInYeSWmI04r18="; + hash = "sha256-hTqjNQSScQzCUBs4pYgxRnRvUSoQXXeZIceSZAR1Oa0="; }; - vendorHash = "sha256-Hv4CacBrRX2YT3AkbNzyWrA9Ex6YMDPrPvezukwMkTE="; + vendorHash = "sha256-EqND/W+NNatoBUMXWrsjNPfxAtX0oUASUxN6Rmhp7SQ="; nativeBuildInputs = [ installShellFiles ]; @@ -38,6 +39,8 @@ buildGo121Module rec { --zsh <($out/bin/turso completion zsh) ''; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "This is the command line interface (CLI) to Turso."; homepage = "https://turso.tech"; From 7d90e85ef42ca56286b98714cc7694d874608f2b Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Tue, 17 Oct 2023 23:38:15 +0200 Subject: [PATCH 22/65] virtio-win: rename from win-virtio --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ .../virtualization/driver/win-spice/default.nix | 8 ++++---- .../default.nix => by-name/vi/virtio-win/package.nix} | 2 +- .../driver/win-virtio => by-name/vi/virtio-win}/update.sh | 2 +- pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/all-packages.nix | 1 - 6 files changed, 10 insertions(+), 8 deletions(-) rename pkgs/{applications/virtualization/driver/win-virtio/default.nix => by-name/vi/virtio-win/package.nix} (97%) rename pkgs/{applications/virtualization/driver/win-virtio => by-name/vi/virtio-win}/update.sh (88%) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index b85e7c81a651..52c2de24b6ba 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -303,6 +303,8 @@ - `dagger` was removed because using a package called `dagger` and packaging it from source violates their trademark policy. +- `win-virtio` package was renamed to `virtio-win` to be consistent with the upstream package name. + ## Other Notable Changes {#sec-release-23.11-notable-changes} - The Cinnamon module now enables XDG desktop integration by default. If you are experiencing collisions related to xdg-desktop-portal-gtk you can safely remove `xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];` from your NixOS configuration. diff --git a/pkgs/applications/virtualization/driver/win-spice/default.nix b/pkgs/applications/virtualization/driver/win-spice/default.nix index 9bbbe640148d..ff3364b1ae92 100644 --- a/pkgs/applications/virtualization/driver/win-spice/default.nix +++ b/pkgs/applications/virtualization/driver/win-spice/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, p7zip, win-virtio }: +{ lib, stdenv, fetchurl, p7zip, virtio-win }: let version_usbdk = "1.0.22"; @@ -58,9 +58,9 @@ stdenv.mkDerivation { copy_usbdk = arch: "mkdir -p $out/${arch}/usbdk; cp usbdk/${arch}/* $out/${arch}/usbdk/. \n"; copy_vdagent = arch: "mkdir -p $out/${arch}/vdagent; cp vdagent/${arch}/* $out/${arch}/vdagent/. \n"; # SPICE needs vioserial - # TODO: Link windows version in win-spice (here) to version used in win-virtio. - # That way it would never matter whether vioserial is installed from win-virtio or win-spice. - copy_vioserial = arch: version: "mkdir -p $out/${arch}/vioserial; cp ${win-virtio}/vioserial/${version}/${arch}/* $out/${arch}/vioserial/. \n"; + # TODO: Link windows version in win-spice (here) to version used in virtio-win. + # That way it would never matter whether vioserial is installed from virtio-win or win-spice. + copy_vioserial = arch: version: "mkdir -p $out/${arch}/vioserial; cp ${virtio-win}/vioserial/${version}/${arch}/* $out/${arch}/vioserial/. \n"; copy = arch: version: (copy_qxl arch version) + (copy_usbdk arch) + (copy_vdagent arch) + (copy_vioserial arch version); in '' runHook preInstall diff --git a/pkgs/applications/virtualization/driver/win-virtio/default.nix b/pkgs/by-name/vi/virtio-win/package.nix similarity index 97% rename from pkgs/applications/virtualization/driver/win-virtio/default.nix rename to pkgs/by-name/vi/virtio-win/package.nix index 97fecfaeda36..5c1bb96b9e25 100644 --- a/pkgs/applications/virtualization/driver/win-virtio/default.nix +++ b/pkgs/by-name/vi/virtio-win/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, libarchive }: stdenv.mkDerivation rec { - pname = "win-virtio"; + pname = "virtio-win"; version = "0.1.240-1"; src = fetchurl { diff --git a/pkgs/applications/virtualization/driver/win-virtio/update.sh b/pkgs/by-name/vi/virtio-win/update.sh similarity index 88% rename from pkgs/applications/virtualization/driver/win-virtio/update.sh rename to pkgs/by-name/vi/virtio-win/update.sh index b35dd1d9fcf3..99a0f30fe4a6 100755 --- a/pkgs/applications/virtualization/driver/win-virtio/update.sh +++ b/pkgs/by-name/vi/virtio-win/update.sh @@ -9,4 +9,4 @@ version="$(curl -Ls https://fedorapeople.org/groups/virt/virtio-win/repo/latest/ sort -Vu | \ tail -n1)" -update-source-version win-virtio "$version" +update-source-version virtio-win "$version" diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 12e7b72bc0c9..0aa22555d862 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -936,7 +936,8 @@ mapAliases ({ webkitgtk_5_0 = throw "'webkitgtk_5_0' has been superseded by 'webkitgtk_6_0'"; # Added 2023-02-25 wio = throw "wio has been removed from nixpkgs, it was unmaintained and required wlroots_0_14 at the time of removal"; # Added 2023-04-28 wineWayland = wine-wayland; - win-qemu = throw "'win-qemu' has been replaced by 'win-virtio'"; # Added 2023-08-16 + win-qemu = throw "'win-qemu' has been replaced by 'virtio-win'"; # Added 2023-08-16 + win-virtio = virtio-win; # Added 2023-10-17 win-signed-gplpv-drivers = throw "win-signed-gplpv-drivers has been removed from nixpkgs, as it's unmaintained: https://help.univention.com/t/installing-signed-gplpv-drivers/21828"; # Added 2023-08-17 wlroots_0_14 = throw "'wlroots_0_14' has been removed in favor of newer versions"; # Added 2023-07-29 wordpress6_1 = throw "'wordpress6_1' has been removed in favor of the latest version"; # Added 2023-10-10 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b6f366214a0b..ad15dd61a977 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36673,7 +36673,6 @@ with pkgs; xkbmon = callPackage ../applications/misc/xkbmon { }; win-spice = callPackage ../applications/virtualization/driver/win-spice { }; - win-virtio = callPackage ../applications/virtualization/driver/win-virtio { }; win-pvdrivers = callPackage ../applications/virtualization/driver/win-pvdrivers { }; xfig = callPackage ../applications/graphics/xfig { }; From 6a5f32e9aaa81b842429b25a6b99c51e7b17921f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 17 Oct 2023 22:31:51 +0000 Subject: [PATCH 23/65] python311Packages.softlayer: 6.1.9 -> 6.1.10 --- pkgs/development/python-modules/softlayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index 767d91b1220b..aa8f3bbe4141 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "softlayer"; - version = "6.1.9"; + version = "6.1.10"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "softlayer-python"; rev = "refs/tags/v${version}"; - hash = "sha256-mYezVJSBtZuNT6mG544dJhRFh26M4nN4nE3tUVB3cZQ="; + hash = "sha256-0NLa+kEArKqfqytnxbzXnX/OVhYFBKZO9odXGR0AoSA="; }; postPatch = '' From 0c16b9a0a793a71af5ead7204653b8cf4203ef43 Mon Sep 17 00:00:00 2001 From: Roman Timushev Date: Fri, 22 Jul 2022 23:28:57 +0200 Subject: [PATCH 24/65] scala-update: init at 0.2.2 --- pkgs/by-name/sc/scala-update/package.nix | 47 ++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 pkgs/by-name/sc/scala-update/package.nix diff --git a/pkgs/by-name/sc/scala-update/package.nix b/pkgs/by-name/sc/scala-update/package.nix new file mode 100644 index 000000000000..d15292c4d32e --- /dev/null +++ b/pkgs/by-name/sc/scala-update/package.nix @@ -0,0 +1,47 @@ +{ lib, stdenv, coursier, buildGraalvmNativeImage }: + +let + baseName = "scala-update"; + version = "0.2.2"; + deps = stdenv.mkDerivation { + name = "${baseName}-deps-${version}"; + buildCommand = '' + export COURSIER_CACHE=$(pwd) + ${coursier}/bin/cs fetch io.github.kitlangton:scala-update_2.13:${version} > deps + mkdir -p $out/share/java + cp $(< deps) $out/share/java/ + ''; + outputHashMode = "recursive"; + outputHashAlgo = "sha256"; + outputHash = "kNnFzzHn+rFq4taqRYjBYaDax0MHW+vIoSFVN3wxA8M="; + }; +in buildGraalvmNativeImage { + pname = baseName; + inherit version; + + buildInputs = [ deps ]; + + src = "${deps}/share/java/${baseName}_2.13-${version}.jar"; + + extraNativeImageBuildArgs = + [ "--no-fallback" "--enable-url-protocols=https" "update.Main" ]; + + buildPhase = '' + runHook preBuild + + native-image ''${nativeImageBuildArgs[@]} -cp $(JARS=("${deps}/share/java"/*.jar); IFS=:; echo "''${JARS[*]}") + + runHook postBuild + ''; + + installCheckPhase = '' + $out/bin/${baseName} --version | grep -q "${version}" + ''; + + meta = with lib; { + description = "Update your Scala dependencies interactively"; + homepage = "https://github.com/kitlangton/scala-update"; + license = licenses.asl20; + maintainers = [ maintainers.rtimush ]; + }; +} From 935646bc86aacf2e9a388023bbd2305e3d76e476 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 17 Oct 2023 17:48:50 -0700 Subject: [PATCH 25/65] onlykey-cli: 1.2.9->1.2.10 Change the test import because onlykey.cli tries to establish a connection with the hardware device. --- pkgs/tools/security/onlykey-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/onlykey-cli/default.nix b/pkgs/tools/security/onlykey-cli/default.nix index bed910da3f77..4d0b0a267a38 100644 --- a/pkgs/tools/security/onlykey-cli/default.nix +++ b/pkgs/tools/security/onlykey-cli/default.nix @@ -2,12 +2,12 @@ python3Packages.buildPythonApplication rec { pname = "onlykey-cli"; - version = "1.2.9"; + version = "1.2.10"; src = fetchPypi { inherit version; pname = "onlykey"; - sha256 = "sha256-92CzDZgtmww0eABtjeBo6HNQ00sijWakjXLPJiOXY/A="; + sha256 = "sha256-ZmQnyZx9YlIIxMMdZ0U2zb+QANfcwrtG7iR1LpgzmBQ="; }; propagatedBuildInputs = with python3Packages; [ @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { # Requires having the physical onlykey (a usb security key) doCheck = false; - pythonImportsCheck = [ "onlykey.cli" ]; + pythonImportsCheck = [ "onlykey.client" ]; meta = with lib; { description = "OnlyKey client and command-line tool"; From 768b3261c1e246cbf29a0735f0bcb4d2ee3bb4e1 Mon Sep 17 00:00:00 2001 From: "Wael M. Nasreddine" Date: Tue, 17 Oct 2023 17:49:40 -0700 Subject: [PATCH 26/65] onlykey-agent: 1.1.13->1.1.15 --- pkgs/tools/security/onlykey-agent/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/onlykey-agent/default.nix b/pkgs/tools/security/onlykey-agent/default.nix index 8d1f00388adb..48dab9b19726 100644 --- a/pkgs/tools/security/onlykey-agent/default.nix +++ b/pkgs/tools/security/onlykey-agent/default.nix @@ -17,11 +17,11 @@ let # onlykey requires a patched version of libagent lib-agent = with python3Packages; libagent.overridePythonAttrs (oa: rec{ - version = "1.0.4"; + version = "1.0.6"; src = fetchPypi { inherit version; pname = "lib-agent"; - sha256 = "sha256-MwtufyJVPWuK7bbX+9Kv6wEi/zq4ftXrfjrMOYpcIfc="; + sha256 = "sha256-IrJizIHDIPHo4tVduUat7u31zHo3Nt8gcMOyUUqkNu0="; }; propagatedBuildInputs = oa.propagatedBuildInputs or [ ] ++ [ bech32 @@ -45,11 +45,11 @@ let in python3Packages.buildPythonApplication rec { pname = "onlykey-agent"; - version = "1.1.13"; + version = "1.1.15"; src = fetchPypi { inherit pname version; - sha256 = "sha256-GAb6crtW6rLAbFtdi6fAGCPjXpKFhravguoGjuNcIxc="; + sha256 = "sha256-SbGb7CjcD7cFPvASZtip56B4uxRiFKZBvbsf6sb8fds="; }; propagatedBuildInputs = with python3Packages; [ lib-agent onlykey-cli ]; From a35f8285d423cedf97378cd09151aff823e6d5d9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Oct 2023 08:43:12 +0200 Subject: [PATCH 27/65] python311Packages.softlayer: update changelog entry --- pkgs/development/python-modules/softlayer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index aa8f3bbe4141..28c24f533d75 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -78,7 +78,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python libraries that assist in calling the SoftLayer API"; homepage = "https://github.com/softlayer/softlayer-python"; - changelog = "https://github.com/softlayer/softlayer-python/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/softlayer/softlayer-python/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ onny ]; }; From 07dbc068f8d5b9a69079c13655445fa791acd0f4 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 18 Oct 2023 19:02:56 +0800 Subject: [PATCH 28/65] deepin.deepin-compressor: 5.12.18 -> 5.12.20 --- pkgs/desktops/deepin/apps/deepin-compressor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix index 3094c1e8c699..d716bc38bce2 100644 --- a/pkgs/desktops/deepin/apps/deepin-compressor/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-compressor/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "deepin-compressor"; - version = "5.12.18"; + version = "5.12.20"; src = fetchFromGitHub { owner = "linuxdeepin"; repo = pname; rev = version; - hash = "sha256-oHJOqfvrIQTspsTTnVyruiIAdh0kX12LzgGgSCYXfLE="; + hash = "sha256-oOxto0X/GBAA9q691uwC0PtCdHDTMBqi80ov4xCXPn0="; }; postPatch = '' From d797abd1d5520b3a15acf55a35c56e1893aaad56 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 17 Oct 2023 14:16:17 +0900 Subject: [PATCH 29/65] python311Packages.augmax: refactor - add changelog to meta - use a new parameter for pyproject - disable old python version --- pkgs/development/python-modules/augmax/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/augmax/default.nix b/pkgs/development/python-modules/augmax/default.nix index 47a531863ff1..2ab159cfc6f8 100644 --- a/pkgs/development/python-modules/augmax/default.nix +++ b/pkgs/development/python-modules/augmax/default.nix @@ -4,20 +4,28 @@ , jax , jaxlib , lib +, pythonOlder +, setuptools }: buildPythonPackage rec { pname = "augmax"; version = "0.3.1"; - format = "setuptools"; + pyproject = true; + + disbaled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "khdlr"; - repo = pname; + repo = "augmax"; rev = "refs/tags/v${version}"; hash = "sha256-hDNNoE7KVaH3jrXZA4A8f0UoQJPl6KHA3XwMc3Ccohk="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ einops jax ]; # augmax does not have any tests at the time of writing (2022-02-19), but @@ -29,6 +37,7 @@ buildPythonPackage rec { meta = with lib; { description = "Efficiently Composable Data Augmentation on the GPU with Jax"; homepage = "https://github.com/khdlr/augmax"; + changelog = "https://github.com/khdlr/augmax/blob/${src.rev}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ samuela ]; }; From 5d77e9448a69d98a2b919d444d5f8111efc2875c Mon Sep 17 00:00:00 2001 From: Luiz Ferraz Date: Wed, 18 Oct 2023 10:26:49 -0300 Subject: [PATCH 30/65] turso-cli: Use ldflags to set the version instead of embedding --- pkgs/development/tools/turso-cli/default.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/turso-cli/default.nix b/pkgs/development/tools/turso-cli/default.nix index 3fde1157181f..ed1655cbd793 100644 --- a/pkgs/development/tools/turso-cli/default.nix +++ b/pkgs/development/tools/turso-cli/default.nix @@ -21,12 +21,9 @@ buildGo121Module rec { nativeBuildInputs = [ installShellFiles ]; - # Build with production code - tags = ["prod"]; - # Include version for `turso --version` reporting - preBuild = '' - echo "v${version}" > internal/cmd/version.txt - ''; + ldflags = [ + "-X github.com/tursodatabase/turso-cli/internal/cmd.version=v${version}" + ]; preCheck = '' export HOME=$(mktemp -d) From 058e7e4e8a56fa784ab8cc1335d46b3417d46d0e Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Wed, 18 Oct 2023 13:53:52 +0000 Subject: [PATCH 31/65] vgrep: 2.6.1 -> 2.7.0 --- pkgs/tools/text/vgrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vgrep/default.nix b/pkgs/tools/text/vgrep/default.nix index f6a14e6024b5..9022c5f5c03b 100644 --- a/pkgs/tools/text/vgrep/default.nix +++ b/pkgs/tools/text/vgrep/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vgrep"; - version = "2.6.1"; + version = "2.7.0"; src = fetchFromGitHub { owner = "vrothberg"; repo = pname; rev = "v${version}"; - sha256 = "sha256-8xLyk1iid3xDCAuZwz1oXsEyboLaxvzm1BEyA2snQt4="; + hash = "sha256-+KZNNkTuZyF02YDZX3u1KdhOcZ3+Ud6aDGL/sGUN1hI="; }; vendorHash = null; From 67dc5978b768192e5b0765e6b0b77f0b8cab6495 Mon Sep 17 00:00:00 2001 From: Jason Felice Date: Wed, 18 Oct 2023 09:56:00 -0400 Subject: [PATCH 32/65] kak-lsp: fix build on Darwin --- pkgs/tools/misc/kak-lsp/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/kak-lsp/default.nix b/pkgs/tools/misc/kak-lsp/default.nix index 7ef363f75aa0..baa2bb81791b 100644 --- a/pkgs/tools/misc/kak-lsp/default.nix +++ b/pkgs/tools/misc/kak-lsp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, rustPlatform, Security, SystemConfiguration }: +{ stdenv, lib, fetchFromGitHub, rustPlatform, CoreServices, Security, SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "kak-lsp"; @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-g63Kfi4xJZO/+fq6eK2iB1dUGoSGWIIRaJr8BWO/txM="; - buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; meta = with lib; { description = "Kakoune Language Server Protocol Client"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cfc14e5f991..edfde705f12f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9734,7 +9734,7 @@ with pkgs; kaffeine = libsForQt5.callPackage ../applications/video/kaffeine { }; kak-lsp = callPackage ../tools/misc/kak-lsp { - inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration; + inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; kakoune-cr = callPackage ../tools/misc/kakoune-cr { crystal = crystal_1_2; }; From fb8c33f8ef402abd50cd9aea249f5be79bb94983 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 18 Oct 2023 16:02:10 +0200 Subject: [PATCH 33/65] utm: 4.3.5 -> 4.4.3 --- pkgs/os-specific/darwin/utm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/utm/default.nix b/pkgs/os-specific/darwin/utm/default.nix index d3aea9209727..7ab35aee0b43 100644 --- a/pkgs/os-specific/darwin/utm/default.nix +++ b/pkgs/os-specific/darwin/utm/default.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation rec { pname = "utm"; - version = "4.3.5"; + version = "4.4.3"; src = fetchurl { url = "https://github.com/utmapp/UTM/releases/download/v${version}/UTM.dmg"; - hash = "sha256-aDIjf4TqhSIgYaJulI5FgXxlNiZ1qcNY+Typ7+S5Hc8="; + hash = "sha256-U1HB8uP8OzHX8LzBE8u7YSDI4vlY9vlMRE+JI+x9rvk="; }; nativeBuildInputs = [ undmg makeWrapper ]; From 66bf904401facffedfec9330e8f16ee67cdd7f79 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 18 Oct 2023 10:04:00 -0400 Subject: [PATCH 34/65] cargo-tally: 1.0.30 -> 1.0.31 Diff: https://diff.rs/cargo-tally/1.0.30/1.0.31 Changelog: https://github.com/dtolnay/cargo-tally/releases/tag/1.0.31 --- pkgs/development/tools/rust/cargo-tally/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 11b82f3fd872..a40f44e5aad7 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.30"; + version = "1.0.31"; src = fetchCrate { inherit pname version; - hash = "sha256-5k4nx4VSYN4jscCwj5NVYnV5/GS0PRCA23xR6STHr88="; + hash = "sha256-2V2JXSlFzYoSidByWGFTGwNHM9c5Go1cdHLp0b7N+hI="; }; - cargoHash = "sha256-eyGDizffuIPpa797YplD6763/JlVtoMAxybK9KsgmLE="; + cargoHash = "sha256-mcYAqzfZO0M/UQTeYp4eCD7VVIWhtHi7VxBZtrr/aCk="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ DiskArbitration From 68500e056305ed9e6093c945fd900013067397a3 Mon Sep 17 00:00:00 2001 From: Niko Cantero <97130632+Nyabinary@users.noreply.github.com> Date: Wed, 18 Oct 2023 10:17:54 -0400 Subject: [PATCH 35/65] headphones-toolbox: 0.0.4 -> 0.0.5 --- pkgs/by-name/he/headphones-toolbox/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/he/headphones-toolbox/package.nix b/pkgs/by-name/he/headphones-toolbox/package.nix index ceaa22bb66f7..9f520d7c4875 100644 --- a/pkgs/by-name/he/headphones-toolbox/package.nix +++ b/pkgs/by-name/he/headphones-toolbox/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { name = "headphones-toolbox"; - version = "0.0.4"; + version = "0.0.5"; src = fetchurl { - url = "https://github.com/george-norton/headphones-toolbox/releases/download/headphones-toolbox-beta-v5/ploopy-headphones-toolbox_${finalAttrs.version}_amd64.deb"; - hash = "sha256-47F/bTi7ctIbfRnYVbksYUsHmL+3KYWccNg5dKPGR/U="; + url = "https://github.com/ploopyco/headphones-toolbox/releases/download/app-v${finalAttrs.version}/ploopy-headphones-toolbox_${finalAttrs.version}_amd64.deb"; + hash = "sha256-lWjmpybGcL3sbBng8zCTUtwYhlrQ6cCrKkhiu+g9MsE="; }; nativeBuildInputs = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "A UI for configuring Ploopy Headphones"; - homepage = "https://github.com/george-norton/headphones-toolbox"; + homepage = "https://github.com/ploopyco/headphones-toolbox/"; maintainers = with maintainers; [ knarkzel nyanbinary ]; license = licenses.gpl3Only; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; From 7e6d2586641682d068bdcb5fbb0d2091ac6a388c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Tue, 17 Oct 2023 21:22:36 +0200 Subject: [PATCH 36/65] minecraftia: init at 1.0 --- pkgs/by-name/mi/minecraftia/package.nix | 28 +++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 pkgs/by-name/mi/minecraftia/package.nix diff --git a/pkgs/by-name/mi/minecraftia/package.nix b/pkgs/by-name/mi/minecraftia/package.nix new file mode 100644 index 000000000000..584730ea8df3 --- /dev/null +++ b/pkgs/by-name/mi/minecraftia/package.nix @@ -0,0 +1,28 @@ +{ lib, fetchzip, stdenvNoCC }: + +stdenvNoCC.mkDerivation { + pname = "minecraftia"; + version = "1.0"; + + src = fetchzip { + url = "https://fontlibrary.org/assets/downloads/minecraftia/71962a7e3d4a70435c030466a12f1d63/minecraftia.zip"; + hash = "sha256-AZFSts0GpBttbhl1LHMORiqqc9o7ZWhh5hbjhSnxAlA="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + install -D -m444 -t $out/share/fonts/truetype $src/Minecraftia.ttf + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://fontlibrary.org/en/font/minecraftia"; + description = "Cool Minecraft font"; + license = licenses.cc-by-sa-30; + platforms = platforms.all; + maintainers = with lib.maintainers; [ gepbird ]; + }; +} From c3528adc2a8bdafe84d047a72c01e25f651f1634 Mon Sep 17 00:00:00 2001 From: Florian Warzecha Date: Wed, 18 Oct 2023 17:10:13 +0200 Subject: [PATCH 37/65] wb32-dfu-updater: apply suggestions from code review Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com> --- pkgs/by-name/wb/wb32-dfu-updater/package.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wb/wb32-dfu-updater/package.nix b/pkgs/by-name/wb/wb32-dfu-updater/package.nix index df040c3a7112..fb144b7d6e2b 100644 --- a/pkgs/by-name/wb/wb32-dfu-updater/package.nix +++ b/pkgs/by-name/wb/wb32-dfu-updater/package.nix @@ -1,5 +1,4 @@ -{ callPackage -, lib +{ lib , stdenv , fetchFromGitHub , cmake @@ -14,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "WestberryTech"; repo = finalAttrs.pname; rev = finalAttrs.version; - sha256 = "sha256-DKsDVO00JFhR9hIZksFVJLRwC6PF9LCRpf++QywFO2w="; + hash = "sha256-DKsDVO00JFhR9hIZksFVJLRwC6PF9LCRpf++QywFO2w="; }; nativeBuildInputs = [ cmake ]; From 68adacd935e9d2c0b0398d058fff217ede7143d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Oct 2023 15:33:33 +0000 Subject: [PATCH 38/65] google-cloud-sql-proxy: 2.7.0 -> 2.7.1 --- pkgs/tools/misc/google-cloud-sql-proxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix index 7257f411d521..a253d1da6c3f 100644 --- a/pkgs/tools/misc/google-cloud-sql-proxy/default.nix +++ b/pkgs/tools/misc/google-cloud-sql-proxy/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "google-cloud-sql-proxy"; - version = "2.7.0"; + version = "2.7.1"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${version}"; - hash = "sha256-4PB9Eaqb8teF+gmiHD2VAIFnxqiK2Nb0u+xSNAM8iMs="; + hash = "sha256-8UoAN5z84gGV869AgOWGrC92NdEnkw5b6QME4QKQ/mM="; }; subPackages = [ "." ]; - vendorHash = "sha256-LaI7IdSyB7ETTjqIcIPDf3noEbvwlN3+KqrkSm8B6m8="; + vendorHash = "sha256-S2bt015AD25K6yrVGK3qv8Gq2fVifVV0AVBSt/8V9So="; preCheck = '' buildFlagsArray+="-short" From 0c0b23b1d0ce1c4594e759be456f6106a977b2f8 Mon Sep 17 00:00:00 2001 From: skykanin <3789764+skykanin@users.noreply.github.com> Date: Mon, 16 Oct 2023 21:06:43 +0200 Subject: [PATCH 39/65] uiua386: init at 0.0.19 --- pkgs/by-name/ui/uiua386/package.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 pkgs/by-name/ui/uiua386/package.nix diff --git a/pkgs/by-name/ui/uiua386/package.nix b/pkgs/by-name/ui/uiua386/package.nix new file mode 100644 index 000000000000..fefec669b7ba --- /dev/null +++ b/pkgs/by-name/ui/uiua386/package.nix @@ -0,0 +1,23 @@ +{ lib, stdenvNoCC, uiua }: + +stdenvNoCC.mkDerivation { + pname = "uiua386"; + + inherit (uiua) src version; + + installPhase = '' + runHook preInstall + + install -Dm444 -t $out/share/fonts/truetype ./site/Uiua386.ttf + + runHook postInstall + ''; + + meta = { + description = "An Uiua font"; + homepage = "https://uiua.org/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ skykanin ]; + platforms = lib.platforms.all; + }; +} From a4a209666e2dcd62245f205c90e0ae08fc5adc26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C6=B0=C6=A1ng=20Vi=E1=BB=87t=20Ho=C3=A0ng?= Date: Wed, 18 Oct 2023 23:53:06 +0700 Subject: [PATCH 40/65] qView: 5.0 -> 6.1 --- pkgs/applications/graphics/qview/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix index e5d148da8e6a..b52431e723e8 100644 --- a/pkgs/applications/graphics/qview/default.nix +++ b/pkgs/applications/graphics/qview/default.nix @@ -6,17 +6,19 @@ , qttools , qtimageformats , qtsvg +, qtx11extras +, x11Support ? true }: mkDerivation rec { pname = "qview"; - version = "5.0"; + version = "6.1"; src = fetchFromGitHub { owner = "jurplel"; repo = "qView"; rev = version; - hash = "sha256-VQ0H9iPrrxO9e/kMo7yZ/zN5I2qDWBCAFacS9uGuZLI="; + hash = "sha256-h1K1Smfy875NoHtgUrOvZZp0IgcQdbyuQhXU9ndM4bA="; }; nativeBuildInputs = [ qmake ]; @@ -26,7 +28,7 @@ mkDerivation rec { qttools qtimageformats qtsvg - ]; + ] ++ lib.optionals x11Support [ qtx11extras ]; meta = with lib; { description = "Practical and minimal image viewer"; From f4e599a7756807c8a23d96fb383c5b803fcc6f2a Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 19 Oct 2023 01:16:31 +0800 Subject: [PATCH 41/65] losslesscut-bin: 3.55.2 -> 3.58.0 Provide Electron update against CVE-2023-4863 and CVE-2023-5129 --- pkgs/applications/video/losslesscut-bin/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/losslesscut-bin/default.nix b/pkgs/applications/video/losslesscut-bin/default.nix index bd6f41c7fe78..0e6b52f8f7ab 100644 --- a/pkgs/applications/video/losslesscut-bin/default.nix +++ b/pkgs/applications/video/losslesscut-bin/default.nix @@ -6,7 +6,7 @@ let pname = "losslesscut"; - version = "3.55.2"; + version = "3.58.0"; metaCommon = with lib; { description = "The swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; @@ -15,22 +15,22 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - hash = "sha256-oQYDK/BHxC/zJuocDH+HcItcPQIsxAaKoD+49TAA+ds="; + hash = "sha256-wmOdW5LdGLs6Wrt/VBlbC1ScFZBmd5gVQaj/cYADnWc="; inherit (buildPackages) makeWrapper; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-dmtnGv5XQn2ANpYyFu9jtTGr1b7GdDrV3Oajd5bMr0k="; + hash = "sha256-ZNUkzxpFTmsFcdC4oJWDxvqunpaBKz7Fnmrsa4W12Bg="; isAarch64 = false; }; aarch64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-uU48Clhk4FllM7osHRR4D7xGZCmcvylqlUt6JqCrm/8="; + hash = "sha256-PpQF31qsn9TOIRVzOdDoLUqti+m1uRpBQrrqKtxFleE="; isAarch64 = true; }; x86_64-windows = callPackage ./build-from-windows.nix { inherit pname version metaCommon; - hash = "sha256-YkPF6sgL/oGXSXCdQt+7iW2n5f9Tk2ItchwRAwq7IPY="; + hash = "sha256-AgWvLU9m2q7fxZYXgHGMgEj1WLP5XzERq7tWcin2/30="; }; in ( From 5b689b360b87d6192e4a252d908510660d364e04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C6=B0=C6=A1ng=20Vi=E1=BB=87t=20Ho=C3=A0ng?= Date: Thu, 19 Oct 2023 00:18:02 +0700 Subject: [PATCH 42/65] qView: fix failed build when x11Support is false --- pkgs/applications/graphics/qview/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix index b52431e723e8..9bba92a2b5b7 100644 --- a/pkgs/applications/graphics/qview/default.nix +++ b/pkgs/applications/graphics/qview/default.nix @@ -21,6 +21,8 @@ mkDerivation rec { hash = "sha256-h1K1Smfy875NoHtgUrOvZZp0IgcQdbyuQhXU9ndM4bA="; }; + qmakeFlags = lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ]; + nativeBuildInputs = [ qmake ]; buildInputs = [ From d97ec147f2a3ede6fb561e0a28ba1f9f5aafa7a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Oct 2023 17:18:07 +0000 Subject: [PATCH 43/65] prometheus-ipmi-exporter: 1.6.1 -> 1.7.0 --- pkgs/servers/monitoring/prometheus/ipmi-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix index e2ee9ae4e59f..11264a637983 100644 --- a/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/ipmi-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ipmi_exporter"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "prometheus-community"; repo = "ipmi_exporter"; rev = "v${version}"; - hash = "sha256-hifG1lpFUVLoy7Ol3N6h+s+hZjnQxja5svpY4lFFsxw="; + hash = "sha256-yVFpYedWELqDNzmHQfMJa95iKQsn1N/wa82sQEQh1Uw="; }; - vendorHash = "sha256-UuPZmxoKVj7FusOS6H1gn6SAzQIZAKyX+m+QS657yXw="; + vendorHash = "sha256-1ntFcOmVN4I1aa/5gWnzkYNYxxFT9ZM1usNnE23KfR0="; nativeBuildInputs = [ makeWrapper ]; From 334305249f3eab41351ee907c3d08cfa82a1f4d2 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 18 Oct 2023 13:20:41 -0400 Subject: [PATCH 44/65] opentofu: 1.6.0-alpha2 -> 1.6.0-alpha3 Diff: https://github.com/opentofu/opentofu/compare/v1.6.0-alpha2...v1.6.0-alpha3 Changelog: https://github.com/opentofu/opentofu/blob/v1.6.0-alpha3/CHANGELOG.md --- pkgs/applications/networking/cluster/opentofu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix index f98f9eb110a9..1a27df9b36dd 100644 --- a/pkgs/applications/networking/cluster/opentofu/default.nix +++ b/pkgs/applications/networking/cluster/opentofu/default.nix @@ -14,15 +14,15 @@ let package = buildGoModule rec { pname = "opentofu"; - version = "1.6.0-alpha2"; + version = "1.6.0-alpha3"; src = fetchFromGitHub { owner = "opentofu"; repo = "opentofu"; rev = "v${version}"; - hash = "sha256-29vF5vWCPxJJHsQ1dkLcIaqEQVYxp2YjZ4LK5r4/dlo="; + hash = "sha256-D95YzliadhhcOx8gW+lhECiYBtezsS8rj0Tz/29azlA="; }; - vendorHash = "sha256-qhnQ47K9N7HoTMUXhX2RlUuQaCgeAB/Sshh56A5rhpk="; + vendorHash = "sha256-SbGdmPTJRSMDhqg0GEfdiQ+2Uw7xmz0Kcyrr1ANlKo4="; ldflags = [ "-s" "-w" ]; postConfigure = '' From dee28096a4ec87e84a648dcc643ac27e65bacbd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Wed, 18 Oct 2023 19:28:55 +0200 Subject: [PATCH 45/65] bemoji: init at 0.3.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Anderson Torres Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> Co-authored-by: Nikodem Rabuliński --- pkgs/by-name/be/bemoji/package.nix | 32 ++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 pkgs/by-name/be/bemoji/package.nix diff --git a/pkgs/by-name/be/bemoji/package.nix b/pkgs/by-name/be/bemoji/package.nix new file mode 100644 index 000000000000..68f83bf43287 --- /dev/null +++ b/pkgs/by-name/be/bemoji/package.nix @@ -0,0 +1,32 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "bemoji"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "marty-oehme"; + repo = "bemoji"; + rev = version; + hash = "sha256-XXNrUaS06UHF3cVfIfWjGF1sdPE709W2tFhfwTitzNs="; + }; + + strictDeps = true; + dontBuild = true; + + postInstall = '' + install -Dm555 bemoji -t $out/bin + ''; + + meta = with lib; { + homepage = "https://github.com/marty-oehme/bemoji/"; + description = "Emoji picker with support for bemenu/wofi/rofi/dmenu and wayland/X11"; + license = licenses.mit; + mainProgram = "bemoji"; + platforms = platforms.all; + maintainers = with maintainers; [ laurent-f1z1 ]; + }; +} From 2e32e89b7e078e9d4e8c1de501ca716605f276dc Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Wed, 18 Oct 2023 10:32:47 -0400 Subject: [PATCH 46/65] squeezelite: add meta.mainProgram --- pkgs/applications/audio/squeezelite/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/audio/squeezelite/default.nix b/pkgs/applications/audio/squeezelite/default.nix index d0ceec6d67a7..da126de3fc43 100644 --- a/pkgs/applications/audio/squeezelite/default.nix +++ b/pkgs/applications/audio/squeezelite/default.nix @@ -101,6 +101,7 @@ stdenv.mkDerivation { description = "Lightweight headless squeezebox client emulator"; homepage = "https://github.com/ralph-irving/squeezelite"; license = with licenses; [ gpl3Plus ] ++ optional dsdSupport bsd2; + mainProgram = binName; maintainers = with maintainers; [ adamcstephens ]; platforms = if (audioBackend == "pulse") then platforms.linux else platforms.linux ++ platforms.darwin; }; From 7f6e52f7fcd116a54d06e06bfcdc8f7d27ae8c67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Oct 2023 13:53:01 +0000 Subject: [PATCH 47/65] python311Packages.uhi: 0.3.3 -> 0.4.0 --- pkgs/development/python-modules/uhi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/uhi/default.nix b/pkgs/development/python-modules/uhi/default.nix index 948f2108d261..774ff6f27312 100644 --- a/pkgs/development/python-modules/uhi/default.nix +++ b/pkgs/development/python-modules/uhi/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "uhi"; - version = "0.3.3"; + version = "0.4.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "800caf3a5f1273b08bcc3bb4b49228fe003942e23423812b0110546aad9a24be"; + sha256 = "sha256-DctrGXdQh9OKMe44jLLHDy7P4ExP/iymMiNBDK5b7vo="; }; buildInputs = [ From 90475ceff8dc3eef81313407629798417a2689ea Mon Sep 17 00:00:00 2001 From: Julien Malka Date: Wed, 18 Oct 2023 20:44:07 +0200 Subject: [PATCH 48/65] nixos/tang: add to release notes --- nixos/doc/manual/release-notes/rl-2311.section.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index b85e7c81a651..3b6465b82d64 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -72,6 +72,8 @@ - [stalwart-mail](https://stalw.art), an all-in-one email server (SMTP, IMAP, JMAP). Available as [services.stalwart-mail](#opt-services.stalwart-mail.enable). +- [tang](https://github.com/latchset/tang), a server for binding data to network presence. Available as [services.tang](#opt-services.tang.enable). + - [Jool](https://nicmx.github.io/Jool/en/index.html), a kernelspace NAT64 and SIIT implementation, providing translation between IPv4 and IPv6. Available as [networking.jool.enable](#opt-networking.jool.enable). - [Apache Guacamole](https://guacamole.apache.org/), a cross-platform, clientless remote desktop gateway. Available as [services.guacamole-server](#opt-services.guacamole-server.enable) and [services.guacamole-client](#opt-services.guacamole-client.enable) services. From 0aa2e8f960e4296b731ef8d60f5a45b1c62691ed Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 18 Oct 2023 15:48:56 +0100 Subject: [PATCH 49/65] python310Packages.paddleocr: 2.7.0 -> 2.7.1 --- pkgs/development/python-modules/paddleocr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix index c75d6e87e07a..4cc4d283a831 100644 --- a/pkgs/development/python-modules/paddleocr/default.nix +++ b/pkgs/development/python-modules/paddleocr/default.nix @@ -28,7 +28,7 @@ }: let - version = "2.7.0"; + version = "2.7.1"; in buildPythonPackage { pname = "paddleocr"; @@ -39,7 +39,7 @@ buildPythonPackage { owner = "PaddlePaddle"; repo = "PaddleOCR"; rev = "v${version}"; - hash = "sha256-r7Y666KpY855NCSinCBBUz9PXHfZ56+oZW1/0ISpWe4="; + hash = "sha256-5Dt4UL+7dwJNjcNnCVi3o8bLCt7/m/M6oh1vPu9rza8="; }; patches = [ From 2ee12a93de090b8b735d673228c9df3c0fa49511 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 18 Oct 2023 19:58:47 +0200 Subject: [PATCH 50/65] treewide: remove myself (ma27) from a few packages It's time again, I guess :> Main motivation is to stop being pinged about software that I maintained for work now that I'm about to switch jobs. There's no point in pinging me to review/test updates or to debug issues in e.g. the Atlassian stack or on mailman since I use neither personally. But there's also a bunch of other stuff that I stopped using personally. While at it I realized that I'm still maintainer of a few tests & modules related to packages I stopped maintaining in the past already. --- nixos/modules/services/mail/mailman.nix | 2 +- nixos/modules/services/web-apps/plausible.nix | 2 +- nixos/tests/docker-registry.nix | 2 +- nixos/tests/documize.nix | 2 +- nixos/tests/gotify-server.nix | 2 +- nixos/tests/hydra/default.nix | 2 +- nixos/tests/plausible.nix | 2 +- pkgs/applications/graphics/feh/default.nix | 2 +- pkgs/applications/misc/buku/default.nix | 2 +- .../networking/instant-messengers/ferdi/default.nix | 2 +- pkgs/by-name/cr/create-react-app/package.nix | 2 +- pkgs/development/libraries/dlib/default.nix | 2 +- pkgs/servers/atlassian/confluence.nix | 2 +- pkgs/servers/atlassian/jira.nix | 2 +- pkgs/servers/mail/mailman/package.nix | 2 +- pkgs/shells/zsh/fzf-zsh/default.nix | 2 +- pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix | 2 +- pkgs/shells/zsh/zsh-you-should-use/default.nix | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/mail/mailman.nix b/nixos/modules/services/mail/mailman.nix index a61c45a43bb2..9f43d5829f09 100644 --- a/nixos/modules/services/mail/mailman.nix +++ b/nixos/modules/services/mail/mailman.nix @@ -644,7 +644,7 @@ in { }; meta = { - maintainers = with lib.maintainers; [ lheckemann qyliss ma27 ]; + maintainers = with lib.maintainers; [ lheckemann qyliss ]; doc = ./mailman.md; }; diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index e2d5cdc4f7c7..e5deb6cf511f 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -296,6 +296,6 @@ in { ]; }; - meta.maintainers = with maintainers; [ ma27 ]; + meta.maintainers = with maintainers; [ ]; meta.doc = ./plausible.md; } diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix index 316b7c9b9727..db20cb52c3e3 100644 --- a/nixos/tests/docker-registry.nix +++ b/nixos/tests/docker-registry.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "docker-registry"; meta = with pkgs.lib.maintainers; { - maintainers = [ globin ma27 ironpinguin ]; + maintainers = [ globin ironpinguin ]; }; nodes = { diff --git a/nixos/tests/documize.nix b/nixos/tests/documize.nix index fda79b1a0931..3624c0c56769 100644 --- a/nixos/tests/documize.nix +++ b/nixos/tests/documize.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "documize"; meta = with pkgs.lib.maintainers; { - maintainers = [ ma27 ]; + maintainers = [ ]; }; nodes.machine = { pkgs, ... }: { diff --git a/nixos/tests/gotify-server.nix b/nixos/tests/gotify-server.nix index d004f542b39a..c8d7fa172a7b 100644 --- a/nixos/tests/gotify-server.nix +++ b/nixos/tests/gotify-server.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { name = "gotify-server"; meta = with pkgs.lib.maintainers; { - maintainers = [ ma27 ]; + maintainers = [ ]; }; nodes.machine = { pkgs, ... }: { diff --git a/nixos/tests/hydra/default.nix b/nixos/tests/hydra/default.nix index baf18afbc569..98c3c6fbae9f 100644 --- a/nixos/tests/hydra/default.nix +++ b/nixos/tests/hydra/default.nix @@ -17,7 +17,7 @@ let makeHydraTest = with pkgs.lib; name: package: makeTest { name = "hydra-${name}"; meta = with pkgs.lib.maintainers; { - maintainers = [ lewo ma27 ]; + maintainers = [ lewo ]; }; nodes.machine = { pkgs, lib, ... }: { diff --git a/nixos/tests/plausible.nix b/nixos/tests/plausible.nix index ef32bb3a805f..9afd3db75de8 100644 --- a/nixos/tests/plausible.nix +++ b/nixos/tests/plausible.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { name = "plausible"; meta = with lib.maintainers; { - maintainers = [ ma27 ]; + maintainers = [ ]; }; nodes.machine = { pkgs, ... }: { diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 9a27e35fc148..af41424d58c3 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { # released under a variant of the MIT license # https://spdx.org/licenses/MIT-feh.html license = licenses.mit-feh; - maintainers = with maintainers; [ viric willibutz globin ma27 ]; + maintainers = with maintainers; [ viric willibutz globin ]; platforms = platforms.unix; mainProgram = "feh"; }; diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index ab047e080986..2ada67daa1e2 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -76,6 +76,6 @@ with python3.pkgs; buildPythonApplication rec { homepage = "https://github.com/jarun/Buku"; license = licenses.gpl3; platforms = platforms.unix; - maintainers = with maintainers; [ matthiasbeyer infinisil ma27 ]; + maintainers = with maintainers; [ matthiasbeyer infinisil ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/ferdi/default.nix b/pkgs/applications/networking/instant-messengers/ferdi/default.nix index 82f808be3b6e..f3362ab77501 100644 --- a/pkgs/applications/networking/instant-messengers/ferdi/default.nix +++ b/pkgs/applications/networking/instant-messengers/ferdi/default.nix @@ -28,7 +28,7 @@ mkFranzDerivation' rec { homepage = "https://getferdi.com/"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = licenses.asl20; - maintainers = with maintainers; [ davidtwco ma27 ]; + maintainers = with maintainers; [ davidtwco ]; platforms = [ "x86_64-linux" ]; hydraPlatforms = [ ]; knownVulnerabilities = [ diff --git a/pkgs/by-name/cr/create-react-app/package.nix b/pkgs/by-name/cr/create-react-app/package.nix index 16ee303ab3d6..7ce48825da75 100644 --- a/pkgs/by-name/cr/create-react-app/package.nix +++ b/pkgs/by-name/cr/create-react-app/package.nix @@ -28,6 +28,6 @@ buildNpmPackage rec { homepage = "https://github.com/facebook/create-react-app"; license = lib.licenses.mit; mainProgram = "create-react-app"; - maintainers = with lib.maintainers; [ ma27 ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 431f010eed1d..92b6397c4179 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { description = "A general purpose cross-platform C++ machine learning library"; homepage = "http://www.dlib.net"; license = licenses.boost; - maintainers = with maintainers; [ christopherpoole ma27 ]; + maintainers = with maintainers; [ christopherpoole ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index f677ce61ac55..30c5a0afc008 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -52,6 +52,6 @@ optionalWarning (crowdProperties != null) "Using `crowdProperties` is deprecated homepage = "https://www.atlassian.com/software/confluence"; sourceProvenance = with sourceTypes; [ binaryBytecode ]; license = licenses.unfree; - maintainers = with maintainers; [ globin willibutz ciil techknowlogick ma27 ]; + maintainers = with maintainers; [ globin willibutz ciil techknowlogick ]; }; }) diff --git a/pkgs/servers/atlassian/jira.nix b/pkgs/servers/atlassian/jira.nix index dbbbbe9944b6..42e0a223a6ba 100644 --- a/pkgs/servers/atlassian/jira.nix +++ b/pkgs/servers/atlassian/jira.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { description = "Proprietary issue tracking product, also providing project management functions"; homepage = "https://www.atlassian.com/software/jira"; license = licenses.unfree; - maintainers = with maintainers; [ globin ciil megheaiulian techknowlogick ma27 ]; + maintainers = with maintainers; [ globin ciil megheaiulian techknowlogick ]; }; } diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 20c1771d089f..0ae9bc5f4eae 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -78,6 +78,6 @@ buildPythonPackage rec { homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ qyliss ma27 ]; + maintainers = with lib.maintainers; [ qyliss ]; }; } diff --git a/pkgs/shells/zsh/fzf-zsh/default.nix b/pkgs/shells/zsh/fzf-zsh/default.nix index aa5af013e43e..40c4edaff86e 100644 --- a/pkgs/shells/zsh/fzf-zsh/default.nix +++ b/pkgs/shells/zsh/fzf-zsh/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/wyntau/fzf-zsh"; description = "wrap fzf to use in oh-my-zsh"; license = licenses.mit; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; platforms = platforms.unix; }; } diff --git a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix index eae5f77904b5..f64f96a60aa7 100644 --- a/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix +++ b/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = "https://github.com/halfo/lambda-mod-zsh-theme/"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/shells/zsh/zsh-you-should-use/default.nix b/pkgs/shells/zsh/zsh-you-should-use/default.nix index 95cdb3273c54..b3db825bbba6 100644 --- a/pkgs/shells/zsh/zsh-you-should-use/default.nix +++ b/pkgs/shells/zsh/zsh-you-should-use/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/MichaelAquilina/zsh-you-should-use"; license = licenses.gpl3; description = "ZSH plugin that reminds you to use existing aliases for commands you just typed"; - maintainers = with maintainers; [ ma27 ]; + maintainers = with maintainers; [ ]; }; } From 43564e5bd5d5b6f58a98fb62ece6730cb919cf28 Mon Sep 17 00:00:00 2001 From: figsoda Date: Wed, 18 Oct 2023 13:21:05 -0400 Subject: [PATCH 51/65] slippy: 0.1.0 -> 0.1.1 Diff: https://github.com/axodotdev/slippy/compare/v0.1.0...v0.1.1 Changelog: https://github.com/axodotdev/slippy/releases/tag/v0.1.1 --- pkgs/applications/misc/slippy/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/slippy/default.nix b/pkgs/applications/misc/slippy/default.nix index 85e162ec58a8..f599c4f47cfd 100644 --- a/pkgs/applications/misc/slippy/default.nix +++ b/pkgs/applications/misc/slippy/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "slippy"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitHub { owner = "axodotdev"; repo = "slippy"; rev = "v${version}"; - hash = "sha256-oxXmfvdnYmmKXvKHpJC23cvHaVdh5cpfQ1q5GPLskfY="; + hash = "sha256-7Uvo5+saxwTMQjfDliyOYC6j6LbpMf/FiONfX38xepI="; }; - cargoHash = "sha256-4MMTWhyi2/n9ESX2KJFERsXQHyGZunvArbYQmKiV7Eg="; + cargoHash = "sha256-6nB+rHBJU9qhA7azz2ynaBw1UJdwE+T7pgpoPzhD5Bk="; # the dependency css-minify contains both README.md and Readme.md, # which causes a hash mismatch on systems with a case-insensitive filesystem @@ -53,6 +53,11 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk.frameworks.Security ]; + # Cargo.lock is outdated + postConfigure = '' + cargo metadata --offline + ''; + meta = with lib; { description = "Markdown slideshows in Rust"; homepage = "https://github.com/axodotdev/slippy"; From 1a94590d27c6f544b475deb1ddfd8ded73af22a2 Mon Sep 17 00:00:00 2001 From: Siddhartha Date: Tue, 17 Oct 2023 14:03:12 -0400 Subject: [PATCH 52/65] zoom-us: 5.16.1.8561 -> 5.16.2.8828 --- .../instant-messengers/zoom-us/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index 4ed7a286c464..bfc5ad79327b 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -48,23 +48,23 @@ let # and often with different versions. We write them on three lines # like this (rather than using {}) so that the updater script can # find where to edit them. - versions.aarch64-darwin = "5.16.1.23158"; - versions.x86_64-darwin = "5.16.1.23158"; - versions.x86_64-linux = "5.16.1.8561"; + versions.aarch64-darwin = "5.16.2.23409"; + versions.x86_64-darwin = "5.16.2.23409"; + versions.x86_64-linux = "5.16.2.8828"; srcs = { aarch64-darwin = fetchurl { url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; name = "zoomusInstallerFull.pkg"; - hash = "sha256-D3eYHbnNSLLmOh7eIT2+J7PubhBZONqHThB6ibJLqGY="; + hash = "sha256-MUkxEj4G6MCCXcqyFquCrHhnu+sVw5H4HSk+sP5H+gY="; }; x86_64-darwin = fetchurl { url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; - hash = "sha256-kvnaHwwWUiJmNsef6H5S/JHHtQgfFJd9rWwzTvi05g0="; + hash = "sha256-niR/WbMq7T1PBCJMK1DdhbFc4eJDgub8LIv3X4i8S5c="; }; x86_64-linux = fetchurl { url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; - hash = "sha256-zT0qGl8ODIcBISiRQ184aVr9hE8ZHnYatolqcsS6dpo="; + hash = "sha256-eRvgNrMe/NyOnsMJ8L659C3Cl4xZ5Ij1u4qoHehj4y8="; }; }; From ac30ac808a1425ebc1b7bd513b6e851f1311c249 Mon Sep 17 00:00:00 2001 From: the-furry-hubofeverything <53921912+the-furry-hubofeverything@users.noreply.github.com> Date: Mon, 16 Oct 2023 11:57:06 -0700 Subject: [PATCH 53/65] nixos/virt-manager: init --- .../doc/manual/release-notes/rl-2311.section.md | 2 ++ nixos/modules/programs/virt-manager.nix | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 nixos/modules/programs/virt-manager.nix diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index 8ed2dea2551a..c5ebaf86482c 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -107,6 +107,8 @@ - [trunk-ng](https://github.com/ctron/trunk), A fork of `trunk`: Build, bundle & ship your Rust WASM application to the web +- [virt-manager](https://virt-manager.org/), an UI for managing virtual machines in libvirt, is now available as `programs.virt-manager`. + ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} - `network-online.target` has been fixed to no longer time out for systems with `networking.useDHCP = true` and `networking.useNetworkd = true`. diff --git a/nixos/modules/programs/virt-manager.nix b/nixos/modules/programs/virt-manager.nix new file mode 100644 index 000000000000..095db7586a03 --- /dev/null +++ b/nixos/modules/programs/virt-manager.nix @@ -0,0 +1,16 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.programs.virt-manager; +in { + options.programs.virt-manager = { + enable = lib.mkEnableOption "virt-manager, an UI for managing virtual machines in libvirt"; + + package = lib.mkPackageOption pkgs "virt-manager" {}; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + programs.dconf.enable = true; + }; +} From 825dc0f51c0675abec49d76d3d44fe29a41a62ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 18 Oct 2023 16:42:31 +0000 Subject: [PATCH 54/65] op-geth: 1.101200.1 -> 1.101301.1 --- pkgs/applications/blockchains/optimism/geth.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/optimism/geth.nix b/pkgs/applications/blockchains/optimism/geth.nix index 0bc975e58802..3bf7e923032f 100644 --- a/pkgs/applications/blockchains/optimism/geth.nix +++ b/pkgs/applications/blockchains/optimism/geth.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "op-geth"; - version = "1.101200.1"; + version = "1.101301.1"; src = fetchFromGitHub { owner = "ethereum-optimism"; repo = "op-geth"; rev = "v${version}"; - hash = "sha256-xF/KaN/O0Hn3W2a11ivdgLVr5gR14dW5807r1snQ9xw="; + hash = "sha256-3W246cY2l0ZkeaCuDbq/TvKacTKqX7iPs5MMy1+7LxY="; fetchSubmodules = true; }; @@ -33,7 +33,7 @@ buildGoModule rec { "cmd/utils" ]; - vendorHash = "sha256-5G0wPQaP2MofQQO1AiFa1BF8zarRnYyNYscbZ4Ku44o="; + vendorHash = "sha256-CqmhIz03qrcEetiWjR5A+TCW0ACrxL1UzugcKzTVme0="; # Fix for usb-related segmentation faults on darwin propagatedBuildInputs = From 24ed4844019ad22449ea3239523df27a1adf8b69 Mon Sep 17 00:00:00 2001 From: emilylange Date: Wed, 18 Oct 2023 21:39:38 +0200 Subject: [PATCH 55/65] grafana-agent: 0.37.1 -> 0.37.2 https://github.com/grafana/agent/releases/tag/v0.37.2 https://github.com/grafana/agent/blob/v0.37.2/CHANGELOG.md diff: https://github.com/grafana/agent/compare/v0.37.1...v0.37.2 --- pkgs/servers/monitoring/grafana-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index 458c84a7bd4a..96ec5a8d21d6 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -14,16 +14,16 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.37.1"; + version = "0.37.2"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-0agQAz/oR6hrokAAjCLMcDrR6/f4r0BJgQHWZvGqWAE="; + hash = "sha256-LeXJ//WbvlOtlomzws3Aa2FE9D4D4KF5iCjPyFyExig="; }; - vendorHash = "sha256-GfIzZ0fuRrlYLbGbYVE1HzMZfszokfixG+YVqkTyaQE="; + vendorHash = "sha256-DKFXJ+1EE/92BOoGVit7ZK6U2HL8JyG9HqcA8ww3mtA="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { From bcbe587526652810ed5d6f0c8896bf42df6f52dc Mon Sep 17 00:00:00 2001 From: nviets Date: Wed, 18 Oct 2023 14:44:33 -0500 Subject: [PATCH 56/65] rPackages.quarto: add quarto to propagatedBuildInputs --- pkgs/development/r-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 853469be7ee3..8d20ce0b2861 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1032,6 +1032,7 @@ let }); quarto = old.quarto.overrideAttrs (attrs: { + propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ pkgs.quarto ]; postPatch = '' substituteInPlace "R/quarto.R" \ --replace "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = NA)" "path_env <- Sys.getenv(\"QUARTO_PATH\", unset = '${lib.getBin pkgs.quarto}/bin/quarto')" From 57431777829131d7283e26845781dbba3b9a1b80 Mon Sep 17 00:00:00 2001 From: Florian Warzecha Date: Wed, 18 Oct 2023 22:28:02 +0200 Subject: [PATCH 57/65] vpn-slice: switch maintainer to liketechnik --- pkgs/tools/networking/vpn-slice/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/tools/networking/vpn-slice/default.nix index 3fb921bb44b8..75cfe2bba0e9 100644 --- a/pkgs/tools/networking/vpn-slice/default.nix +++ b/pkgs/tools/networking/vpn-slice/default.nix @@ -42,6 +42,6 @@ buildPythonApplication rec { description = "vpnc-script replacement for easy and secure split-tunnel VPN setup"; license = licenses.gpl3; - maintainers = with maintainers; [ jdbaldry ]; + maintainers = with maintainers; [ liketechnik ]; }; } From af185f46539dd174d6609fb4599b587df2ded861 Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 18 Oct 2023 16:02:06 +0100 Subject: [PATCH 58/65] windmill: 1.160.0 -> 1.184.0 --- pkgs/servers/windmill/Cargo.lock | 998 ++++++++++++++++-------------- pkgs/servers/windmill/default.nix | 12 +- 2 files changed, 536 insertions(+), 474 deletions(-) diff --git a/pkgs/servers/windmill/Cargo.lock b/pkgs/servers/windmill/Cargo.lock index ea77339fbfc1..badaac718eb9 100644 --- a/pkgs/servers/windmill/Cargo.lock +++ b/pkgs/servers/windmill/Cargo.lock @@ -64,9 +64,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "1.0.4" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -109,9 +109,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", @@ -123,15 +123,15 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.2" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15c4c2c83f81532e5845a733998b6971faca23490340a418e9b72a3ec9de12ea" +checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" dependencies = [ "utf8parse", ] @@ -147,9 +147,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys", @@ -163,9 +163,9 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "argon2" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2e554a8638bdc1e4eae9984845306cc95f8a9208ba8d49c3859fd958b46774d" +checksum = "17ba4cac0a46bc1d2912652a751c47f2a9f3a7fe89bcae2275d418f5270402f9" dependencies = [ "base64ct", "blake2", @@ -204,7 +204,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -237,9 +237,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b74f44609f0f91493e3082d3734d98497e094777144380ea4db9f9905dd5b6" +checksum = "f658e2baef915ba0f26f1f7c42bfb8e12f532a01f449a090ded75ae7a07e9ba2" dependencies = [ "brotli", "flate2", @@ -251,14 +251,14 @@ dependencies = [ [[package]] name = "async-executor" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" dependencies = [ "async-lock", "async-task", "concurrent-queue", - "fastrand 1.9.0", + "fastrand 2.0.1", "futures-lite", "slab", ] @@ -292,7 +292,7 @@ dependencies = [ "log", "parking", "polling", - "rustix 0.37.23", + "rustix 0.37.25", "slab", "socket2 0.4.9", "waker-fn", @@ -313,7 +313,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "beec3f8fb8f710b7be84ccd1716e17f38f2868168355cab5f2f168ae988e767e" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bytes", "http", "rand 0.8.5", @@ -321,20 +321,20 @@ dependencies = [ "serde", "serde-aux", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "thiserror", "url", ] [[package]] name = "async-recursion" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" +checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -378,7 +378,7 @@ dependencies = [ "serde", "serde_json", "serde_qs 0.9.2", - "sha2 0.10.7", + "sha2 0.10.8", "smart-default", "smol_str", "thiserror", @@ -388,30 +388,19 @@ dependencies = [ [[package]] name = "async-task" -version = "4.4.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" - -[[package]] -name = "async-timer" -version = "0.7.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5fa6ed76cb2aa820707b4eb9ec46f42da9ce70b0eafab5e5e34942b38a44d5" -dependencies = [ - "libc", - "wasm-bindgen", - "winapi", -] +checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921" [[package]] name = "async-trait" -version = "0.1.73" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -440,9 +429,9 @@ dependencies = [ [[package]] name = "atomic-waker" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" @@ -529,9 +518,9 @@ checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" [[package]] name = "base64" -version = "0.21.3" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64-simd" @@ -582,6 +571,19 @@ dependencies = [ "num-traits", ] +[[package]] +name = "bigdecimal" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c06619be423ea5bb86c95f087d5707942791a08a85530df0db2209a3ecfb8bc9" +dependencies = [ + "autocfg", + "libm", + "num-bigint", + "num-integer", + "num-traits", +] + [[package]] name = "bincode" version = "1.3.3" @@ -604,23 +606,23 @@ dependencies = [ "lazycell", "log", "peeking_take_while", - "prettyplease 0.2.12", + "prettyplease 0.2.15", "proc-macro2", "quote", "regex", "rustc-hash", "shlex", - "syn 2.0.29", + "syn 2.0.38", "which", ] [[package]] name = "bindgen" -version = "0.66.1" +version = "0.68.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cexpr", "clang-sys", "lazy_static", @@ -631,7 +633,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -657,9 +659,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" dependencies = [ "serde", ] @@ -722,17 +724,18 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "blocking" -version = "1.3.1" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65" +checksum = "8c36a4d0d48574b3dd360b4b7d95cc651d2b6557b6402848a27d4b228a473e2a" dependencies = [ "async-channel", "async-lock", "async-task", - "atomic-waker", - "fastrand 1.9.0", + "fastrand 2.0.1", + "futures-io", "futures-lite", - "log", + "piper", + "tracing", ] [[package]] @@ -782,9 +785,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -793,9 +796,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "da74e2b81409b1b743f8f0c62cc6254afefb8b8e50bbfe3735550f7aeefa3448" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -824,9 +827,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "bytecheck" @@ -852,15 +855,15 @@ dependencies = [ [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bzip2" @@ -889,9 +892,9 @@ version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e11c675378efb449ed3ce8de78d75d0d80542fc98487c26aba28eb3b82feac72" dependencies = [ - "semver 1.0.18", + "semver 1.0.20", "serde", - "toml 0.7.6", + "toml 0.7.8", "url", ] @@ -922,18 +925,17 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.26" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "serde", - "time 0.1.45", "wasm-bindgen", - "winapi", + "windows-targets", ] [[package]] @@ -980,20 +982,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.4.0" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d5f1946157a96594eb2d2c10eb7ad9a2b27518cb3000209dec700c35df9197d" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.4.0" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78116e32a042dd73c2901f0dc30790d20ff3447f3e3472fad359e8c3d282bcd6" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", @@ -1003,14 +1004,14 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9fd1a5729c4548118d7d70ff234a44868d00489a4b6597b0b020918a0e91a1a" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1050,9 +1051,9 @@ dependencies = [ [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" dependencies = [ "crossbeam-utils", ] @@ -1075,9 +1076,9 @@ checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" [[package]] name = "const_format" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c990efc7a285731f9a4378d81aff2f0e85a2c8781a05ef0f8baa8dac54d0ff48" +checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673" dependencies = [ "const_format_proc_macros", "konst", @@ -1085,9 +1086,9 @@ dependencies = [ [[package]] name = "const_format_proc_macros" -version = "0.2.31" +version = "0.2.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e026b6ce194a874cb9cf32cd5772d1ef9767cc8fcb5765948d74f37a9d8b2bf6" +checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500" dependencies = [ "proc-macro2", "quote", @@ -1116,7 +1117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7efb37c3e1ccb1ff97164ad95ac1606e8ccd35b3fa0a7d99a304c7f4a428cc24" dependencies = [ "percent-encoding", - "time 0.3.28", + "time", "version_check", ] @@ -1317,7 +1318,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1339,17 +1340,17 @@ checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" dependencies = [ "darling_core 0.20.3", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "dashmap" -version = "5.5.1" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edd72493923899c6f10c641bdbdeddc7183d6396641d99c1a0d1597f37f92e28" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.0", + "hashbrown 0.14.1", "lock_api", "once_cell", "parking_lot_core", @@ -1397,7 +1398,7 @@ checksum = "3c65c2ffdafc1564565200967edc4851c7b55422d3913466688907efd05ea26f" dependencies = [ "deno-proc-macro-rules-macros", "proc-macro2", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1409,7 +1410,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1529,7 +1530,7 @@ dependencies = [ "strum", "strum_macros", "syn 1.0.109", - "syn 2.0.29", + "syn 2.0.38", "thiserror", ] @@ -1610,10 +1611,11 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3" dependencies = [ + "powerfmt", "serde", ] @@ -1750,9 +1752,9 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" +checksum = "23d2f3407d9a573d666de4b5bdf10569d73ca9478087346697dcbae6244bfbcd" [[package]] name = "dyn-iter" @@ -1795,25 +1797,14 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.2" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ - "errno-dragonfly", "libc", "windows-sys", ] -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", -] - [[package]] name = "etcetera" version = "0.8.0" @@ -1848,9 +1839,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "filetime" @@ -1864,6 +1855,12 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "finl_unicode" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fcfdc7a0362c9f4444381a9e697c79d435fe65b52a37466fc2c1184cee9edc6" + [[package]] name = "fixedbitset" version = "0.4.2" @@ -1872,9 +1869,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "libz-ng-sys", @@ -1884,13 +1881,12 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.14" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" +checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" dependencies = [ "futures-core", "futures-sink", - "pin-project", "spin 0.9.8", ] @@ -1933,7 +1929,7 @@ dependencies = [ "pmutil", "proc-macro2", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1961,7 +1957,7 @@ checksum = "b0fa992f1656e1707946bbba340ad244f0814009ef8c0118eb7b658395f19a2e" dependencies = [ "frunk_proc_macro_helpers", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1973,7 +1969,7 @@ dependencies = [ "frunk_core", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -1985,7 +1981,7 @@ dependencies = [ "frunk_core", "frunk_proc_macro_helpers", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -2086,7 +2082,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -2126,17 +2122,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d3b20d3058763d26d88e6e7a49998841e5296735b00dbfb064ff7cb142933dd" dependencies = [ "async-trait", - "base64 0.21.3", + "base64 0.21.4", "dirs-next", "hyper", "hyper-rustls", - "ring", + "ring 0.16.20", "rustls", "rustls-pemfile", "serde", "serde_json", "thiserror", - "time 0.3.28", + "time", "tokio", "tracing", "tracing-futures", @@ -2258,9 +2254,9 @@ dependencies = [ [[package]] name = "gosyn" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70b93546d5d444f37319802767121681f21309d5a16854513ba50ad8d761f362" +checksum = "2c003b8c167a1abb8b170baacf075dcdac2aaf5732bc94fead3d6ce429df7aa8" dependencies = [ "anyhow", "strum", @@ -2307,9 +2303,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" dependencies = [ "ahash 0.8.3", "allocator-api2", @@ -2317,21 +2313,20 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312f66718a2d7789ffef4f4b7b213138ed9f1eb3aa1d0d82fc99f88fb3ffd26f" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] name = "headers" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3e372db8e5c0d213e0cd0b9be18be2aca3d44cf2fe30a9d46a65581cd454584" +checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.4", "bytes", "headers-core", "http", @@ -2360,9 +2355,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" [[package]] name = "hex" @@ -2512,16 +2507,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows", + "windows-core", ] [[package]] @@ -2568,12 +2563,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.1", ] [[package]] @@ -2618,7 +2613,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -2628,7 +2623,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi", - "rustix 0.38.9", + "rustix 0.38.19", "windows-sys", ] @@ -2658,9 +2653,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -2680,9 +2675,9 @@ version = "8.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6971da4d9c3aa03c3d8f3ff0f4155b534aad021292003895a469716b2a230378" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "pem 1.1.1", - "ring", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -2856,9 +2851,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.147" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libgit2-sys" @@ -2884,9 +2879,9 @@ dependencies = [ [[package]] name = "libm" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libsqlite3-sys" @@ -2940,9 +2935,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" [[package]] name = "linux-raw-sys" -version = "0.4.5" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -3011,18 +3006,18 @@ dependencies = [ [[package]] name = "mail-builder" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "765969f4385f88a62738e8ed63e2fa630571d7ed6fd96ca6932d699513dd8c28" +checksum = "ef70f53409852d2612f2249810cbbe0c9931ca25b739b734bafc7f61d88051d4" dependencies = [ "gethostname", ] [[package]] name = "mail-send" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d2b8d0cb56f199d36f527ff96453cf3b1cdfdacb5e4d154ac1d8fcd89873c2" +checksum = "4cbc58a799366b3b2956a2c5ae7e2892ea34b3016343cbbdc5deb844aa6c0973" dependencies = [ "base64 0.20.0", "gethostname", @@ -3031,7 +3026,7 @@ dependencies = [ "smtp-proto", "tokio", "tokio-rustls", - "webpki-roots 0.23.1", + "webpki-roots 0.25.2", ] [[package]] @@ -3051,9 +3046,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "matchit" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed1202b2a6f884ae56f04cff409ab315c5ce26b5e58d7412e484f01fd52f52ef" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "md-5" @@ -3068,18 +3063,19 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest 0.10.7", ] [[package]] name = "memchr" -version = "2.5.0" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memoffset" @@ -3146,7 +3142,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "termcolor", "thiserror", ] @@ -3175,7 +3171,7 @@ dependencies = [ "priority-queue", "serde", "serde_json", - "socket2 0.5.3", + "socket2 0.5.4", "thiserror", "tokio", "tokio-native-tls", @@ -3190,10 +3186,10 @@ version = "0.30.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57349d5a326b437989b6ee4dc8f2f34b0cc131202748414712a8e7d98952fc8c" dependencies = [ - "base64 0.21.3", - "bigdecimal", - "bindgen 0.66.1", - "bitflags 2.4.0", + "base64 0.21.4", + "bigdecimal 0.3.1", + "bindgen 0.68.1", + "bitflags 2.4.1", "bitvec", "byteorder", "bytes", @@ -3214,11 +3210,11 @@ dependencies = [ "serde", "serde_json", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "subprocess", "thiserror", - "time 0.3.28", + "time", "uuid 1.4.1", ] @@ -3246,6 +3242,17 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" +[[package]] +name = "nix" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +dependencies = [ + "bitflags 2.4.1", + "cfg-if", + "libc", +] + [[package]] name = "nom" version = "7.1.3" @@ -3329,9 +3336,9 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", "libm", @@ -3349,9 +3356,9 @@ dependencies = [ [[package]] name = "object" -version = "0.32.0" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] @@ -3385,7 +3392,7 @@ version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "cfg-if", "foreign-types", "libc", @@ -3402,7 +3409,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3413,9 +3420,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.92" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7e971c2c2bba161b2d2fdf37080177eff520b3bc044787c7f1f5f9e78d869b" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", @@ -3437,9 +3444,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "parking" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067" [[package]] name = "parking_lot" @@ -3517,7 +3524,7 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "serde", ] @@ -3527,7 +3534,7 @@ version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "serde", ] @@ -3557,10 +3564,11 @@ checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pest" -version = "2.7.2" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a" +checksum = "c022f1e7b65d6a24c0dbbd5fb344c66881bc01f3e5ae74a1c8100f2f985d98a4" dependencies = [ + "memchr", "thiserror", "ucd-trie", ] @@ -3572,7 +3580,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.0.2", ] [[package]] @@ -3660,7 +3668,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3698,7 +3706,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3713,6 +3721,17 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "piper" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4" +dependencies = [ + "atomic-waker", + "fastrand 2.0.1", + "futures-io", +] + [[package]] name = "pkcs1" version = "0.4.1" @@ -3770,7 +3789,7 @@ checksum = "52a40bc70c2c58040d2d8b167ba9a5ff59fc9dab7ad44771cfde3dcfde7a09c6" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3822,15 +3841,15 @@ version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "byteorder", "bytes", "fallible-iterator", "hmac", - "md-5 0.10.5", + "md-5 0.10.6", "memchr", "rand 0.8.5", - "sha2 0.10.7", + "sha2 0.10.8", "stringprep", ] @@ -3850,6 +3869,12 @@ dependencies = [ "uuid 1.4.1", ] +[[package]] +name = "powerfmt" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -3874,12 +3899,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -3943,9 +3968,9 @@ checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" [[package]] name = "proc-macro2" -version = "1.0.66" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ "unicode-ident", ] @@ -3999,7 +4024,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "syn 2.0.29", + "syn 2.0.38", "thiserror", "typify", "unicode-ident", @@ -4019,7 +4044,7 @@ dependencies = [ "serde_json", "serde_tokenstream", "serde_yaml", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -4081,6 +4106,18 @@ dependencies = [ "serde", ] +[[package]] +name = "quick_cache" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f69f8d22fa3f34f3083d9a4375c038732c7a7e964de1beb81c544da92dfc40b8" +dependencies = [ + "ahash 0.8.3", + "equivalent", + "hashbrown 0.14.1", + "parking_lot", +] + [[package]] name = "quote" version = "1.0.33" @@ -4175,9 +4212,9 @@ dependencies = [ [[package]] name = "redis" -version = "0.23.2" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffd6543a7bc6428396845f6854ccf3d1ae8823816592e2cbe74f20f50f209d02" +checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba" dependencies = [ "async-std", "async-trait", @@ -4226,14 +4263,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.9.4" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12de2eff854e5fa4b1295edd650e227e9d8fb0c9e90b12e7f36d6a6811791a29" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.3.7", - "regex-syntax 0.7.5", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", ] [[package]] @@ -4247,13 +4284,13 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.3.7" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49530408a136e16e5b486e883fbb6ba058e8e4e8ae6621a77b048b314336e629" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.7.5", + "regex-syntax 0.8.2", ] [[package]] @@ -4264,9 +4301,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regex-syntax" -version = "0.7.5" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "regress" @@ -4280,21 +4317,21 @@ dependencies = [ [[package]] name = "rend" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab" +checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd" dependencies = [ "bytecheck", ] [[package]] name = "reqwest" -version = "0.11.20" +version = "0.11.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" dependencies = [ - "async-compression 0.4.1", - "base64 0.21.3", + "async-compression 0.4.4", + "base64 0.21.4", "bytes", "encoding_rs", "futures-core", @@ -4318,6 +4355,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", + "system-configuration", "tokio", "tokio-native-tls", "tokio-rustls", @@ -4333,18 +4371,6 @@ dependencies = [ "winreg", ] -[[package]] -name = "retainer" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df8c01a8276c14d0f8d51ebcf8a48f0748f9f73f5f6b29e688126e6a52bcb145" -dependencies = [ - "async-lock", - "async-timer", - "log", - "rand 0.8.5", -] - [[package]] name = "ring" version = "0.16.20" @@ -4355,11 +4381,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fce3045ffa7c981a6ee93f640b538952e155f1ae3a1a02b84547fc7a56b7059a" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys", +] + [[package]] name = "rkyv" version = "0.7.42" @@ -4466,7 +4506,7 @@ dependencies = [ "proc-macro2", "quote", "rust-embed-utils", - "syn 2.0.29", + "syn 2.0.38", "walkdir", ] @@ -4476,7 +4516,7 @@ version = "7.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d38ff6bf570dc3bb7100fce9f7b60c33fa71d80e88da3f2580df4ff2bdded74" dependencies = [ - "sha2 0.10.7", + "sha2 0.10.8", "walkdir", ] @@ -4524,7 +4564,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.20", ] [[package]] @@ -4542,9 +4582,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" +version = "0.37.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" +checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" dependencies = [ "bitflags 1.3.2", "errno", @@ -4556,26 +4596,26 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.9" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "errno", "libc", - "linux-raw-sys 0.4.5", + "linux-raw-sys 0.4.10", "windows-sys", ] [[package]] name = "rustls" -version = "0.21.6" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1feddffcfcc0b33f5c6ce9a29e341e4cd59c3f78e7ee45f4a40c038b1d6cbb" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", - "rustls-webpki 0.101.4", + "ring 0.16.20", + "rustls-webpki", "sct", ] @@ -4597,27 +4637,17 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", ] [[package]] name = "rustls-webpki" -version = "0.100.2" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98ff011474fa39949b7e5c0428f9b4937eda7da7848bbb947786b7be0b27dab" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d93931baf2d282fff8d3a532bbfd7653f734643161b87e3e01e59a04439bf0d" -dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4692,7 +4722,7 @@ version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7af1a6bbd2d98a207abf060c0734b0b9eb8a2a679008bf7bb5296c8876e27958" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "bindgen 0.65.1", "chrono", "data-encoding", @@ -4739,9 +4769,9 @@ dependencies = [ [[package]] name = "schemars" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f" +checksum = "1f7b0ce13155372a76ee2e1c5ffba1fe61ede73fbea5630d61eee6fac4929c0c" dependencies = [ "chrono", "dyn-clone", @@ -4753,9 +4783,9 @@ dependencies = [ [[package]] name = "schemars_derive" -version = "0.8.12" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c" +checksum = "e85e2a16b12bdb763244c69ab79363d71db2b4b918a2def53f80b02e0574b13c" dependencies = [ "proc-macro2", "quote", @@ -4781,8 +4811,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4834,9 +4864,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090" dependencies = [ "serde", ] @@ -4858,9 +4888,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] @@ -4898,13 +4928,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -4920,11 +4950,11 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -4980,7 +5010,7 @@ dependencies = [ "proc-macro2", "quote", "serde", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5017,7 +5047,7 @@ version = "0.9.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "itoa", "ryu", "serde", @@ -5037,9 +5067,9 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", @@ -5067,9 +5097,9 @@ dependencies = [ [[package]] name = "sha2" -version = "0.10.7" +version = "0.10.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", @@ -5078,18 +5108,18 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] [[package]] name = "shlex" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "signal-hook-registry" @@ -5135,7 +5165,7 @@ dependencies = [ "num-bigint", "num-traits", "thiserror", - "time 0.3.28", + "time", ] [[package]] @@ -5155,9 +5185,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smart-default" @@ -5208,9 +5238,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", "windows-sys", @@ -5279,20 +5309,20 @@ dependencies = [ [[package]] name = "sqlformat" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e" +checksum = "6b7b278788e7be4d0d29c0f39497a0eef3fba6bbc8e70d8bf7fde46edeaa9e85" dependencies = [ - "itertools 0.10.5", + "itertools 0.11.0", "nom", "unicode_categories", ] [[package]] name = "sqlx" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e58421b6bc416714d5115a2ca953718f6c621a51b68e4f4922aea5a4391a721" +checksum = "0e50c216e3624ec8e7ecd14c6a6a6370aad6ee5d8cfc3ab30b5162eeeef2ed33" dependencies = [ "sqlx-core", "sqlx-macros", @@ -5303,12 +5333,13 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4cef4251aabbae751a3710927945901ee1d97ee96d757f6880ebb9a79bfd53" +checksum = "8d6753e460c998bbd4cd8c6f0ed9a64346fcca0723d6e75e52fdc351c5d2169d" dependencies = [ "ahash 0.8.3", "atoi", + "bigdecimal 0.3.1", "byteorder", "bytes", "chrono", @@ -5324,7 +5355,7 @@ dependencies = [ "futures-util", "hashlink", "hex", - "indexmap 2.0.0", + "indexmap 2.0.2", "log", "memchr", "once_cell", @@ -5334,7 +5365,7 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlformat", "thiserror", @@ -5348,9 +5379,9 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "208e3165167afd7f3881b16c1ef3f2af69fa75980897aac8874a0696516d12c2" +checksum = "9a793bb3ba331ec8359c1853bd39eed32cdd7baaf22c35ccf5c92a7e8d1189ec" dependencies = [ "proc-macro2", "quote", @@ -5361,9 +5392,9 @@ dependencies = [ [[package]] name = "sqlx-macros-core" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a4a8336d278c62231d87f24e8a7a74898156e34c1c18942857be2acb29c7dfc" +checksum = "0a4ee1e104e00dedb6aa5ffdd1343107b0a4702e862a84320ee7cc74782d96fc" dependencies = [ "dotenvy", "either", @@ -5374,7 +5405,7 @@ dependencies = [ "quote", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sqlx-core", "sqlx-mysql", "sqlx-postgres", @@ -5387,13 +5418,14 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca69bf415b93b60b80dc8fda3cb4ef52b2336614d8da2de5456cc942a110482" +checksum = "864b869fdf56263f4c95c45483191ea0af340f9f3e3e7b4d57a61c7c87a970db" dependencies = [ "atoi", - "base64 0.21.3", - "bitflags 2.4.0", + "base64 0.21.4", + "bigdecimal 0.3.1", + "bitflags 2.4.1", "byteorder", "bytes", "chrono", @@ -5411,7 +5443,7 @@ dependencies = [ "hmac", "itoa", "log", - "md-5 0.10.5", + "md-5 0.10.6", "memchr", "once_cell", "percent-encoding", @@ -5419,7 +5451,7 @@ dependencies = [ "rsa 0.9.2", "serde", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -5431,13 +5463,14 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0db2df1b8731c3651e204629dd55e52adbae0462fa1bdcbed56a2302c18181e" +checksum = "eb7ae0e6a97fb3ba33b23ac2671a5ce6e3cabe003f451abd5a56e7951d975624" dependencies = [ "atoi", - "base64 0.21.3", - "bitflags 2.4.0", + "base64 0.21.4", + "bigdecimal 0.3.1", + "bitflags 2.4.1", "byteorder", "chrono", "crc", @@ -5453,14 +5486,15 @@ dependencies = [ "home", "itoa", "log", - "md-5 0.10.5", + "md-5 0.10.6", "memchr", + "num-bigint", "once_cell", "rand 0.8.5", "serde", "serde_json", "sha1", - "sha2 0.10.7", + "sha2 0.10.8", "smallvec", "sqlx-core", "stringprep", @@ -5472,9 +5506,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.1" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be4c21bf34c7cae5b283efb3ac1bcc7670df7561124dc2f8bdc0b59be40f79a2" +checksum = "d59dc83cf45d89c555a577694534fcd1b55c545a816c816ce51f20bbe56a4f3f" dependencies = [ "atoi", "chrono", @@ -5555,15 +5589,16 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "stringprep" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3737bde7edce97102e0e2b15365bf7a20bfdb5f60f4f9e8d7004258a51a8da" +checksum = "bb41d74e231a107a1b4ee36bd1214b11285b77768d2e3824aedafa988fd36ee6" dependencies = [ + "finl_unicode", "unicode-bidi", "unicode-normalization", ] @@ -5585,15 +5620,15 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5675,7 +5710,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5684,7 +5719,7 @@ version = "0.107.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7191c8c57af059b75a2aadc927a2608c3962d19e4d09ce8f9c3f03739ddf833" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "is-macro", "num-bigint", "scoped-tls", @@ -5724,7 +5759,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5767,7 +5802,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8d8ca5dd849cea79e6a9792d725f4082ad3ade7a9541fba960c42d55ae778f2" dependencies = [ "better_scoped_tls", - "bitflags 2.4.0", + "bitflags 2.4.1", "indexmap 1.9.3", "once_cell", "phf 0.10.1", @@ -5807,7 +5842,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5911,7 +5946,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5923,7 +5958,7 @@ dependencies = [ "pmutil", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5947,7 +5982,7 @@ dependencies = [ "proc-macro2", "quote", "swc_macros_common", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -5963,9 +5998,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.29" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ "proc-macro2", "quote", @@ -5978,6 +6013,27 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tap" version = "1.0.1" @@ -5991,9 +6047,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if", - "fastrand 2.0.0", + "fastrand 2.0.1", "redox_syscall 0.3.5", - "rustix 0.38.9", + "rustix 0.38.19", "windows-sys", ] @@ -6010,9 +6066,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -6028,22 +6084,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.47" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -6069,23 +6125,13 @@ dependencies = [ [[package]] name = "time" -version = "0.1.45" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" -dependencies = [ - "libc", - "wasi 0.10.0+wasi-snapshot-preview1", - "winapi", -] - -[[package]] -name = "time" -version = "0.3.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -6093,15 +6139,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20" dependencies = [ "time-core", ] @@ -6144,7 +6190,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.3", + "socket2 0.5.4", "tokio-macros", "tracing", "windows-sys", @@ -6158,7 +6204,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] @@ -6202,7 +6248,7 @@ dependencies = [ "postgres-protocol", "postgres-types", "rand 0.8.5", - "socket2 0.5.3", + "socket2 0.5.4", "tokio", "tokio-util", "whoami", @@ -6258,9 +6304,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ "bytes", "futures-core", @@ -6281,9 +6327,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.7.6" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542" +checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257" dependencies = [ "serde", "serde_spanned", @@ -6302,11 +6348,11 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.19.14" +version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.0.2", "serde", "serde_spanned", "toml_datetime", @@ -6361,11 +6407,11 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ae70283aba8d2a8b411c695c437fe25b8b5e44e23e780662002fc72fb47a82" +checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.1", "bytes", "futures-core", "futures-util", @@ -6392,11 +6438,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" +checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ - "cfg-if", "log", "pin-project-lite", "tracing-attributes", @@ -6405,25 +6450,36 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", ] [[package]] name = "tracing-core" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", ] +[[package]] +name = "tracing-flame" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bae117ee14789185e129aaee5d93750abe67fdc5a9a62650452bfe4e122a3a9" +dependencies = [ + "lazy_static", + "tracing", + "tracing-subscriber", +] + [[package]] name = "tracing-futures" version = "0.2.5" @@ -6511,9 +6567,9 @@ checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "typify" @@ -6538,7 +6594,7 @@ dependencies = [ "regress", "schemars", "serde_json", - "syn 2.0.29", + "syn 2.0.38", "thiserror", "unicode-ident", ] @@ -6555,7 +6611,7 @@ dependencies = [ "serde", "serde_json", "serde_tokenstream", - "syn 2.0.29", + "syn 2.0.38", "typify-impl", ] @@ -6567,9 +6623,9 @@ checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" [[package]] name = "ulid" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13a3aaa69b04e5b66cc27309710a569ea23593612387d67daaf102e73aa974fd" +checksum = "7e37c4b6cbcc59a8dcd09a6429fbc7890286bcbb79215cea7b38a3c4c0921d93" dependencies = [ "rand 0.8.5", "uuid 1.4.1", @@ -6656,15 +6712,15 @@ checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-id" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" +checksum = "b1b6def86329695390197b82c1e244a54a131ceb66c996f2088a3876e2ae083f" [[package]] name = "unicode-ident" -version = "1.0.11" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" @@ -6683,9 +6739,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -6718,10 +6774,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] -name = "url" -version = "2.4.0" +name = "untrusted" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + +[[package]] +name = "url" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", "idna", @@ -6817,15 +6879,15 @@ checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" [[package]] name = "waker-fn" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" [[package]] name = "walkdir" -version = "2.3.3" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" dependencies = [ "same-file", "winapi-util", @@ -6846,12 +6908,6 @@ version = "0.9.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" -[[package]] -name = "wasi" -version = "0.10.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -6879,7 +6935,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-shared", ] @@ -6913,7 +6969,7 @@ checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.29", + "syn 2.0.38", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -6973,12 +7029,12 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.4", + "untrusted 0.9.0", ] [[package]] @@ -6990,22 +7046,13 @@ dependencies = [ "webpki", ] -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.2", -] - [[package]] name = "webpki-roots" version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki 0.101.4", + "rustls-webpki", ] [[package]] @@ -7016,13 +7063,14 @@ checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "which" -version = "4.4.0" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269" +checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7" dependencies = [ "either", - "libc", + "home", "once_cell", + "rustix 0.38.19", ] [[package]] @@ -7053,9 +7101,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -7068,11 +7116,11 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windmill" -version = "1.160.0" +version = "1.184.0" dependencies = [ "anyhow", "axum", - "base64 0.21.3", + "base64 0.21.4", "chrono", "dotenv", "futures", @@ -7083,11 +7131,10 @@ dependencies = [ "prometheus", "rand 0.8.5", "reqwest", - "rsa 0.7.2", "rsmq_async", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sqlx", "tokio", "tokio-metrics", @@ -7103,7 +7150,7 @@ dependencies = [ [[package]] name = "windmill-api" -version = "1.160.0" +version = "1.184.0" dependencies = [ "anyhow", "argon2", @@ -7112,7 +7159,7 @@ dependencies = [ "async-stripe", "async_zip", "axum", - "base64 0.21.3", + "base64 0.21.4", "bytes", "chrono", "chrono-tz", @@ -7129,21 +7176,22 @@ dependencies = [ "mail-send", "mime_guess", "prometheus", + "quick_cache", "rand 0.8.5", "regex", "reqwest", - "retainer", + "rsa 0.7.2", "rsmq_async", "rust-embed", "samael", "serde", "serde_json", "serde_urlencoded", - "sha2 0.10.7", + "sha2 0.10.8", "sql-builder", "sqlx", "tempfile", - "time 0.3.28", + "time", "tokio", "tokio-tar", "tokio-util", @@ -7153,6 +7201,7 @@ dependencies = [ "tracing", "tracing-subscriber", "urlencoding", + "uuid 1.4.1", "windmill-audit", "windmill-common", "windmill-parser", @@ -7162,10 +7211,11 @@ dependencies = [ [[package]] name = "windmill-api-client" -version = "1.160.0" +version = "1.184.0" dependencies = [ - "base64 0.21.3", + "base64 0.21.4", "chrono", + "openapiv3", "prettyplease 0.1.25", "progenitor", "progenitor-client", @@ -7179,7 +7229,7 @@ dependencies = [ [[package]] name = "windmill-audit" -version = "1.160.0" +version = "1.184.0" dependencies = [ "chrono", "serde", @@ -7192,7 +7242,7 @@ dependencies = [ [[package]] name = "windmill-common" -version = "1.160.0" +version = "1.184.0" dependencies = [ "anyhow", "axum", @@ -7200,24 +7250,27 @@ dependencies = [ "hex", "hmac", "hyper", + "itertools 0.11.0", "lazy_static", "prometheus", "rand 0.8.5", + "regex", "reqwest", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sqlx", "thiserror", "tokio", "tracing", + "tracing-flame", "tracing-subscriber", "uuid 1.4.1", ] [[package]] name = "windmill-parser" -version = "1.160.0" +version = "1.184.0" dependencies = [ "serde", "serde_json", @@ -7225,7 +7278,7 @@ dependencies = [ [[package]] name = "windmill-parser-bash" -version = "1.160.0" +version = "1.184.0" dependencies = [ "anyhow", "lazy_static", @@ -7236,17 +7289,19 @@ dependencies = [ [[package]] name = "windmill-parser-go" -version = "1.160.0" +version = "1.184.0" dependencies = [ "anyhow", "gosyn", "itertools 0.11.0", + "lazy_static", + "regex", "windmill-parser", ] [[package]] name = "windmill-parser-graphql" -version = "1.160.0" +version = "1.184.0" dependencies = [ "anyhow", "lazy_static", @@ -7257,7 +7312,7 @@ dependencies = [ [[package]] name = "windmill-parser-py" -version = "1.160.0" +version = "1.184.0" dependencies = [ "anyhow", "itertools 0.11.0", @@ -7268,7 +7323,7 @@ dependencies = [ [[package]] name = "windmill-parser-py-imports" -version = "1.160.0" +version = "1.184.0" dependencies = [ "anyhow", "async-recursion", @@ -7285,7 +7340,7 @@ dependencies = [ [[package]] name = "windmill-parser-sql" -version = "1.160.0" +version = "1.184.0" dependencies = [ "anyhow", "lazy_static", @@ -7296,7 +7351,7 @@ dependencies = [ [[package]] name = "windmill-parser-ts" -version = "1.160.0" +version = "1.184.0" dependencies = [ "anyhow", "convert_case 0.6.0", @@ -7313,7 +7368,7 @@ dependencies = [ [[package]] name = "windmill-parser-wasm" -version = "1.160.0" +version = "1.184.0" dependencies = [ "anyhow", "getrandom 0.2.10", @@ -7331,10 +7386,12 @@ dependencies = [ [[package]] name = "windmill-queue" -version = "1.160.0" +version = "1.184.0" dependencies = [ "anyhow", "async-recursion", + "axum", + "bigdecimal 0.4.2", "chrono", "chrono-tz", "cron", @@ -7360,11 +7417,12 @@ dependencies = [ [[package]] name = "windmill-worker" -version = "1.160.0" +version = "1.184.0" dependencies = [ "anyhow", "async-recursion", - "base64 0.21.3", + "base64 0.21.4", + "bytes", "chrono", "const_format", "deno_ast", @@ -7384,24 +7442,25 @@ dependencies = [ "lazy_static", "mysql_async", "native-tls", + "nix", "once_cell", "pem 3.0.2", "postgres-native-tls", "prometheus", "rand 0.8.5", "regex", + "reqwest", "rsmq_async", "rust_decimal", "serde", "serde_json", - "sha2 0.10.7", + "sha2 0.10.8", "sqlx", "tokio", "tokio-postgres", "tracing", "urlencoding", "uuid 1.4.1", - "windmill-api-client", "windmill-audit", "windmill-common", "windmill-parser", @@ -7416,10 +7475,10 @@ dependencies = [ ] [[package]] -name = "windows" -version = "0.48.0" +name = "windows-core" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ "windows-targets", ] @@ -7492,9 +7551,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" dependencies = [ "memchr", ] @@ -7563,11 +7622,10 @@ dependencies = [ [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/pkgs/servers/windmill/default.nix b/pkgs/servers/windmill/default.nix index f3d58aaa8922..ad561c2488e0 100644 --- a/pkgs/servers/windmill/default.nix +++ b/pkgs/servers/windmill/default.nix @@ -24,13 +24,13 @@ let pname = "windmill"; - version = "1.160.0"; + version = "1.184.0"; fullSrc = fetchFromGitHub { owner = "windmill-labs"; repo = "windmill"; rev = "v${version}"; - hash = "sha256-WsIYGqBBcLq5CE/zcgqPVCYtxM3GfSxSqF2JeW6C0ss="; + hash = "sha256-K7nF2B52dEzvdZxj21i89uJveh3/cM7uq7y/EE45ooY"; }; pythonEnv = python3.withPackages (ps: [ ps.pip-tools ]); @@ -43,7 +43,11 @@ let sourceRoot = "${fullSrc.name}/frontend"; - npmDepsHash = "sha256-GUrOfN3SyxkvQllgHXDao8JFl5zY4DBxftelsX0Rkqo="; + npmDepsHash = "sha256-pGTJfVXo7nPIzwVIVxOm1pTd+7CbnKCnaQMYC+GkSAI="; + + # without these you get a + # FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory + env.NODE_OPTIONS="--max-old-space-size=8192"; preBuild = '' npm run generate-backend-client @@ -101,7 +105,7 @@ rustPlatform.buildRustPackage { ]; postPatch = '' - substituteInPlace windmill-worker/src/worker.rs \ + substituteInPlace windmill-worker/src/bash_executor.rs \ --replace '"/bin/bash"' '"${bash}/bin/bash"' substituteInPlace windmill-api/src/lib.rs \ From 0f7f84dc1b2dc1aa4a330422a2a0ed5568b376dd Mon Sep 17 00:00:00 2001 From: happysalada Date: Wed, 18 Oct 2023 16:02:17 +0100 Subject: [PATCH 59/65] windmill: add happysalada as maintainer --- pkgs/servers/windmill/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/windmill/default.nix b/pkgs/servers/windmill/default.nix index ad561c2488e0..70998153c29c 100644 --- a/pkgs/servers/windmill/default.nix +++ b/pkgs/servers/windmill/default.nix @@ -158,7 +158,7 @@ rustPlatform.buildRustPackage { description = "Open-source developer platform to turn scripts into workflows and UIs"; homepage = "https://windmill.dev"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ dit7ya ]; + maintainers = with lib.maintainers; [ dit7ya happysalada ]; mainProgram = "windmill"; # limited by librusty_v8 platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ]; From f203901b4f1dd85920efdfeda801b54778186f0f Mon Sep 17 00:00:00 2001 From: Juergen Fitschen Date: Wed, 18 Oct 2023 23:23:59 +0200 Subject: [PATCH 60/65] horizon-eda: clarify package license Source: https://github.com/horizon-eda/horizon/blob/v2.5.0/org.horizon_eda.HorizonEDA.metainfo.xml#L6 --- pkgs/applications/science/electronics/horizon-eda/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index c4c1e798dd51..486b3924d9a8 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { description = "A free EDA software to develop printed circuit boards"; homepage = "https://horizon-eda.org"; maintainers = with maintainers; [ guserav ]; - license = licenses.gpl3; + license = licenses.gpl3Plus; platforms = platforms.linux; }; } From 14c9544e25d4e2bf8f16741d27a5819a08acf364 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 18 Oct 2023 23:24:09 +0200 Subject: [PATCH 61/65] qt6.qtwebengine: fix platform detection on darwin --- pkgs/development/libraries/qt-6/modules/qtwebengine.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index 5d9aa71e8537..9614dc2831b4 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -166,7 +166,7 @@ qtModule { src/3rdparty/chromium/gpu/config/gpu_info_collector_linux.cc '' + lib.optionalString stdenv.isDarwin '' - substituteInPlace configure.cmake \ + substituteInPlace configure.cmake src/gn/CMakeLists.txt \ --replace "AppleClang" "Clang" substituteInPlace cmake/Functions.cmake \ --replace "/usr/bin/xcrun" "${xcbuild}/bin/xcrun" From 115b7994b0fa8c75de738ffdf564785e0f03c606 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Thu, 13 Jul 2023 23:21:10 +0800 Subject: [PATCH 62/65] pythonPackages: fix input argument typos disable -> disabled --- pkgs/applications/networking/onionshare/default.nix | 4 ++-- pkgs/development/python-modules/aiohttp-basicauth/default.nix | 2 +- pkgs/development/python-modules/aioprometheus/default.nix | 2 +- pkgs/development/python-modules/beautiful-date/default.nix | 2 +- pkgs/development/python-modules/checksumdir/default.nix | 2 +- pkgs/development/python-modules/dataprep-ml/default.nix | 2 +- pkgs/development/python-modules/dtw-python/default.nix | 2 +- pkgs/development/python-modules/flask-openid/default.nix | 2 +- pkgs/development/python-modules/furo/default.nix | 2 +- pkgs/development/python-modules/gcsa/default.nix | 2 +- .../python-modules/graphql-server-core/default.nix | 2 +- pkgs/development/python-modules/greynoise/default.nix | 2 +- pkgs/development/python-modules/kotsu/default.nix | 2 +- pkgs/development/python-modules/mindsdb-evaluator/default.nix | 2 +- pkgs/development/python-modules/mrsqm/default.nix | 2 +- pkgs/development/python-modules/pmdarima/default.nix | 2 +- pkgs/development/python-modules/py-partiql-parser/default.nix | 2 +- pkgs/development/python-modules/pyre-extensions/default.nix | 2 +- pkgs/development/python-modules/pytest-reverse/default.nix | 2 +- pkgs/development/python-modules/schemainspect/default.nix | 2 +- pkgs/development/python-modules/seasonal/default.nix | 2 +- pkgs/development/python-modules/sphinx-basic-ng/default.nix | 2 +- pkgs/development/python-modules/tsfresh/default.nix | 2 +- pkgs/development/python-modules/txtai/default.nix | 2 +- pkgs/development/python-modules/type-infer/default.nix | 2 +- pkgs/development/python-modules/xformers/default.nix | 2 +- 26 files changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 369cd7e33850..695dfba72f59 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -75,7 +75,7 @@ rec { inherit (tor) geoip; }) ]; - disable = !isPy3k; + disabled = !isPy3k; propagatedBuildInputs = [ colorama flask @@ -127,7 +127,7 @@ rec { ./fix-qrcode-gui.patch ]; - disable = !isPy3k; + disabled = !isPy3k; propagatedBuildInputs = [ onionshare pyqt5 diff --git a/pkgs/development/python-modules/aiohttp-basicauth/default.nix b/pkgs/development/python-modules/aiohttp-basicauth/default.nix index 9855971564bc..b7ce89c13476 100644 --- a/pkgs/development/python-modules/aiohttp-basicauth/default.nix +++ b/pkgs/development/python-modules/aiohttp-basicauth/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "1.0.0"; format = "setuptools"; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "romis2012"; diff --git a/pkgs/development/python-modules/aioprometheus/default.nix b/pkgs/development/python-modules/aioprometheus/default.nix index 5c875ea70087..273d35fe13d9 100644 --- a/pkgs/development/python-modules/aioprometheus/default.nix +++ b/pkgs/development/python-modules/aioprometheus/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { version = "unstable-2023-03-14"; format = "setuptools"; - disable = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "claws"; diff --git a/pkgs/development/python-modules/beautiful-date/default.nix b/pkgs/development/python-modules/beautiful-date/default.nix index 22f69a728539..05ebf87f2a05 100644 --- a/pkgs/development/python-modules/beautiful-date/default.nix +++ b/pkgs/development/python-modules/beautiful-date/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "2.3.0"; format = "setuptools"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "kuzmoyev"; diff --git a/pkgs/development/python-modules/checksumdir/default.nix b/pkgs/development/python-modules/checksumdir/default.nix index 7492d168d8d9..78a24bb2950a 100644 --- a/pkgs/development/python-modules/checksumdir/default.nix +++ b/pkgs/development/python-modules/checksumdir/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { version = "1.2.0"; pyproject = true; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "to-mc"; diff --git a/pkgs/development/python-modules/dataprep-ml/default.nix b/pkgs/development/python-modules/dataprep-ml/default.nix index f7d5a9cec94e..3eeac2e85b9b 100644 --- a/pkgs/development/python-modules/dataprep-ml/default.nix +++ b/pkgs/development/python-modules/dataprep-ml/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { version = "0.0.18"; pyproject = true; - disable = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; # using PyPI as github repo does not contain tags or release branches src = fetchPypi { diff --git a/pkgs/development/python-modules/dtw-python/default.nix b/pkgs/development/python-modules/dtw-python/default.nix index f50102fe6210..6af3dd1186b1 100644 --- a/pkgs/development/python-modules/dtw-python/default.nix +++ b/pkgs/development/python-modules/dtw-python/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { version = "1.3.0"; format = "pyproject"; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "DynamicTimeWarping"; diff --git a/pkgs/development/python-modules/flask-openid/default.nix b/pkgs/development/python-modules/flask-openid/default.nix index c8d212368958..a68ad000ecb9 100644 --- a/pkgs/development/python-modules/flask-openid/default.nix +++ b/pkgs/development/python-modules/flask-openid/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "flask-openid"; version = "1.3.0"; - disable = !isPy3k; + disabled = !isPy3k; src = fetchPypi { pname = "Flask-OpenID"; diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 8d73aa1c5e20..5aa3fbcc165b 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { version = "2023.7.26"; format = "wheel"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version format; diff --git a/pkgs/development/python-modules/gcsa/default.nix b/pkgs/development/python-modules/gcsa/default.nix index 9dd8b51fd31d..c4ffcabeb94d 100644 --- a/pkgs/development/python-modules/gcsa/default.nix +++ b/pkgs/development/python-modules/gcsa/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "gcsa"; version = "2.1.0"; format = "setuptools"; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kuzmoyev"; diff --git a/pkgs/development/python-modules/graphql-server-core/default.nix b/pkgs/development/python-modules/graphql-server-core/default.nix index 37c2893908c8..16217cd23a51 100644 --- a/pkgs/development/python-modules/graphql-server-core/default.nix +++ b/pkgs/development/python-modules/graphql-server-core/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "graphql-server-core"; version = "2.0.0"; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "graphql-python"; diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix index 98247e8903ff..ada5f4096216 100644 --- a/pkgs/development/python-modules/greynoise/default.nix +++ b/pkgs/development/python-modules/greynoise/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { version = "2.0.1"; format = "setuptools"; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "GreyNoise-Intelligence"; diff --git a/pkgs/development/python-modules/kotsu/default.nix b/pkgs/development/python-modules/kotsu/default.nix index 47d78c8b916f..f1f9389daf5b 100644 --- a/pkgs/development/python-modules/kotsu/default.nix +++ b/pkgs/development/python-modules/kotsu/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { version = "0.3.3"; format = "setuptools"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "datavaluepeople"; diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix index a6d2c883fc88..7e18975095b0 100644 --- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix +++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "0.0.11"; pyproject = true; - disable = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; # using PyPI as git repository does not have release tags or branches src = fetchPypi { diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix index aa02f713d962..d9748df70785 100644 --- a/pkgs/development/python-modules/mrsqm/default.nix +++ b/pkgs/development/python-modules/mrsqm/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { version = "0.0.6"; format = "setuptools"; - disable = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pmdarima/default.nix b/pkgs/development/python-modules/pmdarima/default.nix index 17bde3ddf3c7..428511bdca3a 100644 --- a/pkgs/development/python-modules/pmdarima/default.nix +++ b/pkgs/development/python-modules/pmdarima/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { version = "2.0.3"; format = "setuptools"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "alkaline-ml"; diff --git a/pkgs/development/python-modules/py-partiql-parser/default.nix b/pkgs/development/python-modules/py-partiql-parser/default.nix index 555268a26c08..07855f6b3288 100644 --- a/pkgs/development/python-modules/py-partiql-parser/default.nix +++ b/pkgs/development/python-modules/py-partiql-parser/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "0.3.8"; pyproject = true; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "getmoto"; diff --git a/pkgs/development/python-modules/pyre-extensions/default.nix b/pkgs/development/python-modules/pyre-extensions/default.nix index dd9868d2078d..24bc9312de86 100644 --- a/pkgs/development/python-modules/pyre-extensions/default.nix +++ b/pkgs/development/python-modules/pyre-extensions/default.nix @@ -14,7 +14,7 @@ buildPythonPackage { inherit pname version; format = "setuptools"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/pytest-reverse/default.nix b/pkgs/development/python-modules/pytest-reverse/default.nix index bd413c4d7050..567b5b13683b 100644 --- a/pkgs/development/python-modules/pytest-reverse/default.nix +++ b/pkgs/development/python-modules/pytest-reverse/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { version = "1.7.0"; format = "pyproject"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "adamchainz"; diff --git a/pkgs/development/python-modules/schemainspect/default.nix b/pkgs/development/python-modules/schemainspect/default.nix index 1703853f3c92..e2c375b11b92 100644 --- a/pkgs/development/python-modules/schemainspect/default.nix +++ b/pkgs/development/python-modules/schemainspect/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "schemainspect"; version = "3.1.1663587362"; format = "pyproject"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "djrobstep"; diff --git a/pkgs/development/python-modules/seasonal/default.nix b/pkgs/development/python-modules/seasonal/default.nix index 6e527407fc2e..d38559ff2eed 100644 --- a/pkgs/development/python-modules/seasonal/default.nix +++ b/pkgs/development/python-modules/seasonal/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { version = "0.3.1"; pyproject = true; - disable = pythonOlder "3.6"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "welch"; diff --git a/pkgs/development/python-modules/sphinx-basic-ng/default.nix b/pkgs/development/python-modules/sphinx-basic-ng/default.nix index 69a34dd2c619..a3da400d1070 100644 --- a/pkgs/development/python-modules/sphinx-basic-ng/default.nix +++ b/pkgs/development/python-modules/sphinx-basic-ng/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "sphinx-basic-ng"; version = "1.0.0.beta2"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pradyunsg"; diff --git a/pkgs/development/python-modules/tsfresh/default.nix b/pkgs/development/python-modules/tsfresh/default.nix index 7678152a23fe..36a93a540051 100644 --- a/pkgs/development/python-modules/tsfresh/default.nix +++ b/pkgs/development/python-modules/tsfresh/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { version = "0.20.1"; pyproject = true; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "blue-yonder"; diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index c4214fdc3c61..75b83aaaa090 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -99,7 +99,7 @@ buildPythonPackage { inherit version; format = "setuptools"; - disable = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "neuml"; diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix index 7adbd97059c5..55fe29e972a8 100644 --- a/pkgs/development/python-modules/type-infer/default.nix +++ b/pkgs/development/python-modules/type-infer/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { version = "0.0.15"; format = "pyproject"; - disable = pythonOlder "3.8"; + disabled = pythonOlder "3.8"; # using PyPI because the repo does not have tags or release branches src = fetchPypi { diff --git a/pkgs/development/python-modules/xformers/default.nix b/pkgs/development/python-modules/xformers/default.nix index 1dc11e5f01a4..fd2e2e3567c4 100644 --- a/pkgs/development/python-modules/xformers/default.nix +++ b/pkgs/development/python-modules/xformers/default.nix @@ -34,7 +34,7 @@ buildPythonPackage { inherit version; format = "setuptools"; - disable = pythonOlder "3.7"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "facebookresearch"; From 52482b26fcfe985f90585784be16ab698c53bfd5 Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Fri, 14 Jul 2023 02:24:22 +0000 Subject: [PATCH 63/65] onionshare: drop disabled = !isPy3k after Python2 EOL --- pkgs/applications/networking/onionshare/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix index 695dfba72f59..b9c88bf3bdc1 100644 --- a/pkgs/applications/networking/onionshare/default.nix +++ b/pkgs/applications/networking/onionshare/default.nix @@ -75,7 +75,6 @@ rec { inherit (tor) geoip; }) ]; - disabled = !isPy3k; propagatedBuildInputs = [ colorama flask @@ -127,7 +126,6 @@ rec { ./fix-qrcode-gui.patch ]; - disabled = !isPy3k; propagatedBuildInputs = [ onionshare pyqt5 From 8a4fa377e32fc9af319c8deb4a4cca5d8fcdf5bb Mon Sep 17 00:00:00 2001 From: Yueh-Shun Li Date: Tue, 18 Jul 2023 09:47:55 +0000 Subject: [PATCH 64/65] python3Packages.flask-openid: drop disabled = !isPy3k after Python 2 EOL --- pkgs/development/python-modules/flask-openid/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/flask-openid/default.nix b/pkgs/development/python-modules/flask-openid/default.nix index a68ad000ecb9..748e2fbe2bd9 100644 --- a/pkgs/development/python-modules/flask-openid/default.nix +++ b/pkgs/development/python-modules/flask-openid/default.nix @@ -9,7 +9,6 @@ buildPythonPackage rec { pname = "flask-openid"; version = "1.3.0"; - disabled = !isPy3k; src = fetchPypi { pname = "Flask-OpenID"; From 4c620881013665ce47bcc9d33573453726b035e0 Mon Sep 17 00:00:00 2001 From: Juergen Fitschen Date: Sat, 7 Oct 2023 23:06:56 +0200 Subject: [PATCH 65/65] python311Packages.horizon-eda: init at 2.5.0 --- .../science/electronics/horizon-eda/base.nix | 58 ++++++++++++++++++ .../electronics/horizon-eda/default.nix | 59 ++++--------------- .../python-modules/horizon-eda/default.nix | 46 +++++++++++++++ pkgs/top-level/python-packages.nix | 4 ++ 4 files changed, 119 insertions(+), 48 deletions(-) create mode 100644 pkgs/applications/science/electronics/horizon-eda/base.nix create mode 100644 pkgs/development/python-modules/horizon-eda/default.nix diff --git a/pkgs/applications/science/electronics/horizon-eda/base.nix b/pkgs/applications/science/electronics/horizon-eda/base.nix new file mode 100644 index 000000000000..8ce75a6ce241 --- /dev/null +++ b/pkgs/applications/science/electronics/horizon-eda/base.nix @@ -0,0 +1,58 @@ +{ lib +, cppzmq +, curl +, fetchFromGitHub +, glm +, gtkmm3 +, libarchive +, libepoxy +, libgit2 +, librsvg +, libuuid +, opencascade-occt +, pkg-config +, podofo +, sqlite +}: + +# This base is used in horizon-eda and python3Packages.horizon-eda +rec { + pname = "horizon-eda"; + version = "2.5.0"; + + src = fetchFromGitHub { + owner = "horizon-eda"; + repo = "horizon"; + rev = "v${version}"; + hash = "sha256-UcjbDJR6shyETpanNkRoH8LF8r6gFjsyNHVSCMHKqS8="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + cppzmq + curl + glm + gtkmm3 + libarchive + libepoxy + libgit2 + librsvg + libuuid + opencascade-occt + podofo + sqlite + ]; + + CASROOT = opencascade-occt; + + meta = with lib; { + description = "A free EDA software to develop printed circuit boards"; + homepage = "https://horizon-eda.org"; + maintainers = with maintainers; [ guserav jue89 ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index 486b3924d9a8..1fbc92f06115 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -1,62 +1,33 @@ { stdenv , boost +, callPackage , coreutils -, cppzmq -, curl -, libepoxy -, fetchFromGitHub -, glm -, gtkmm3 -, lib -, libarchive -, libgit2 -, librsvg , libspnav -, libuuid -, opencascade-occt -, pkg-config -, podofo , python3 -, sqlite , wrapGAppsHook }: +let + base = callPackage ./base.nix { }; +in stdenv.mkDerivation rec { - pname = "horizon-eda"; - version = "2.5.0"; + inherit (base) pname version src meta CASROOT; - src = fetchFromGitHub { - owner = "horizon-eda"; - repo = "horizon"; - rev = "v${version}"; - sha256 = "sha256-UcjbDJR6shyETpanNkRoH8LF8r6gFjsyNHVSCMHKqS8="; + # provide base for python module + passthru = { + inherit base; }; - buildInputs = [ - cppzmq - curl - libepoxy - glm - gtkmm3 - libarchive - libgit2 - librsvg + buildInputs = base.buildInputs ++ [ libspnav - libuuid - opencascade-occt - podofo - python3 - sqlite ]; - nativeBuildInputs = [ + nativeBuildInputs = base.nativeBuildInputs ++ [ boost.dev - pkg-config wrapGAppsHook + python3 ]; - CASROOT = opencascade-occt; - installFlags = [ "INSTALL=${coreutils}/bin/install" "DESTDIR=$(out)" @@ -64,12 +35,4 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - - meta = with lib; { - description = "A free EDA software to develop printed circuit boards"; - homepage = "https://horizon-eda.org"; - maintainers = with maintainers; [ guserav ]; - license = licenses.gpl3Plus; - platforms = platforms.linux; - }; } diff --git a/pkgs/development/python-modules/horizon-eda/default.nix b/pkgs/development/python-modules/horizon-eda/default.nix new file mode 100644 index 000000000000..d2385e190e77 --- /dev/null +++ b/pkgs/development/python-modules/horizon-eda/default.nix @@ -0,0 +1,46 @@ +{ lib +, stdenv +, buildPythonPackage +, callPackage +, horizon-eda +, mesa +, pycairo +, python +, pythonOlder +}: + +let + base = horizon-eda.passthru.base; +in +buildPythonPackage { + inherit (base) pname version src meta CASROOT; + + pyproject = false; + + disabled = pythonOlder "3.9"; + + buildInputs = base.buildInputs ++ [ + mesa + mesa.osmesa + python + ]; + + propagatedBuildInputs = [ + pycairo + ]; + + nativeBuildInputs = base.nativeBuildInputs; + + buildFlags = ["pymodule"]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/${python.sitePackages} + cp build/horizon.so $out/${python.sitePackages} + + runHook postInstall + ''; + + enableParallelBuilding = true; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7c6c4a501771..5348fa00e646 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4993,6 +4993,10 @@ self: super: with self; { hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; + horizon-eda = callPackage ../development/python-modules/horizon-eda { + inherit (pkgs) horizon-eda mesa; + }; + howdoi = callPackage ../development/python-modules/howdoi { }; hpack = callPackage ../development/python-modules/hpack { };