diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/misc')
192 files changed, 1305 insertions, 1118 deletions
diff --git a/nixpkgs/pkgs/tools/misc/aescrypt/default.nix b/nixpkgs/pkgs/tools/misc/aescrypt/default.nix index 0ced53804643..11052cb59350 100644 --- a/nixpkgs/pkgs/tools/misc/aescrypt/default.nix +++ b/nixpkgs/pkgs/tools/misc/aescrypt/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Encrypt files with Advanced Encryption Standard (AES)"; homepage = "https://www.aescrypt.com/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ lovek323 qknight ]; platforms = lib.platforms.all; hydraPlatforms = with platforms; unix; diff --git a/nixpkgs/pkgs/tools/misc/aichat/default.nix b/nixpkgs/pkgs/tools/misc/aichat/default.nix index 9b97546a2c47..a3b7307290ee 100644 --- a/nixpkgs/pkgs/tools/misc/aichat/default.nix +++ b/nixpkgs/pkgs/tools/misc/aichat/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "aichat"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "sigoden"; repo = "aichat"; rev = "v${version}"; - hash = "sha256-XNNiIjJfPsfoyG3RbxlcoUxsOUkWZ+3H3SlYenuNOIQ="; + hash = "sha256-muRUBBmhXtIbKvMzBISjoHFSOtYci6x9nQI/bUiEHrs="; }; - cargoHash = "sha256-JOkcqqmfat+PAn7mRHq+iQCF60weDOBWP2+0DL0s3X0="; + cargoHash = "sha256-RKyZOfjweSE83hAjBIve38CT9R2DomwW3qA8ezw6dCI="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix b/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix index 525d65dd7e08..85feb80700e6 100644 --- a/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/nixpkgs/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -4,7 +4,7 @@ , fetchpatch , cmake , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gst_all_1 , libnotify , libayatana-appindicator @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/apparix/default.nix b/nixpkgs/pkgs/tools/misc/apparix/default.nix index a75a9f03f300..7b80c2a5d9bd 100644 --- a/nixpkgs/pkgs/tools/misc/apparix/default.nix +++ b/nixpkgs/pkgs/tools/misc/apparix/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { homepage = "http://micans.org/apparix"; description = "Add directory bookmarks, distant listing, and distant editing to the command line"; maintainers = with maintainers; [ ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; mainProgram = "apparix"; }; diff --git a/nixpkgs/pkgs/tools/misc/archi/default.nix b/nixpkgs/pkgs/tools/misc/archi/default.nix index 23c5372e5eef..e933edf3642b 100644 --- a/nixpkgs/pkgs/tools/misc/archi/default.nix +++ b/nixpkgs/pkgs/tools/misc/archi/default.nix @@ -5,27 +5,27 @@ , jdk , libsecret , webkitgtk -, wrapGAppsHook +, wrapGAppsHook3 , _7zz , nixosTests }: stdenv.mkDerivation rec { pname = "Archi"; - version = "5.2.0"; + version = "5.3.0"; src = { "x86_64-linux" = fetchurl { - url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Linux64-${version}.tgz"; - hash = "sha256-uGW4Wl3E71ZCgWzPHkmXv/PluegDF8C64FUQ7C5/SDA="; + url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Linux64-${version}.tgz"; + hash = "sha256-ngO3YFCChsnefxdxtR00Dy736K2GYnTEYI4vKWLnPsw="; }; "x86_64-darwin" = fetchurl { - url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Mac-${version}.dmg"; - hash = "sha256-GI9aIAYwu60RdjN0Y3O94sVMzJR1+nX4txVcvqn1r58="; + url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-${version}.dmg"; + hash = "sha256-dL1c7IrbDMY/WbijQh1dCmCrRQQhj4fjGN+6m19OjO0="; }; "aarch64-darwin" = fetchurl { - url = "https://www.archimatetool.com/downloads/archi_5.php?/${version}/Archi-Mac-Silicon-${version}.dmg"; - hash = "sha256-Jg+tl902OWSm4GHxF7QXbRU5nxX4/5q6LTGubHWQ08E="; + url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-Silicon-${version}.dmg"; + hash = "sha256-iczIUm1LCAjYKOyHXbFCgb+zoUxxATSOVkB8Ldk7pxQ="; }; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ _7zz ] ++ lib.optionals stdenv.hostPlatform.isLinux [ @@ -55,6 +55,7 @@ stdenv.mkDerivation rec { install -D -m755 Archi $out/libexec/Archi makeWrapper $out/libexec/Archi $out/bin/Archi \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk ])} \ + --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \ --prefix PATH : ${jdk}/bin '' else diff --git a/nixpkgs/pkgs/tools/misc/bfr/default.nix b/nixpkgs/pkgs/tools/misc/bfr/default.nix index 5308d2098d5e..60905d95e57d 100644 --- a/nixpkgs/pkgs/tools/misc/bfr/default.nix +++ b/nixpkgs/pkgs/tools/misc/bfr/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A general-purpose command-line pipe buffer"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = with maintainers; [ pSub ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix b/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix index 2e5ebd1e56a2..ba73de533af9 100644 --- a/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix +++ b/nixpkgs/pkgs/tools/misc/bibtex2html/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A collection of tools for translating from BibTeX to HTML"; homepage = "https://www.lri.fr/~filliatr/bibtex2html/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = ocaml.meta.platforms or []; maintainers = [ maintainers.scolobb ]; }; diff --git a/nixpkgs/pkgs/tools/misc/bibtool/default.nix b/nixpkgs/pkgs/tools/misc/bibtool/default.nix index f9de299c87b2..46c798f12c6d 100644 --- a/nixpkgs/pkgs/tools/misc/bibtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/bibtool/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tool for manipulating BibTeX bibliographies"; homepage = "http://www.gerd-neugebauer.de/software/TeX/BibTool/index.en.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.rycee ]; mainProgram = "bibtool"; diff --git a/nixpkgs/pkgs/tools/misc/bibutils/default.nix b/nixpkgs/pkgs/tools/misc/bibutils/default.nix index c454e8cfa1d8..ea5360549b20 100644 --- a/nixpkgs/pkgs/tools/misc/bibutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/bibutils/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { description = "Bibliography format interconversion"; longDescription = "The bibutils program set interconverts between various bibliography formats using a common MODS-format XML intermediate. For example, one can convert RIS-format files to Bibtex by doing two transformations: RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N programs are required and not N²-N. These programs operate on the command line and are styled after standard UNIX-like filters."; homepage = "https://sourceforge.net/p/bibutils/home/Bibutils/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.garrison ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/misc/birdfont/default.nix b/nixpkgs/pkgs/tools/misc/birdfont/default.nix index aa8e9ac6a9e8..731eeb051335 100644 --- a/nixpkgs/pkgs/tools/misc/birdfont/default.nix +++ b/nixpkgs/pkgs/tools/misc/birdfont/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, python3, xmlbird, cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala, -gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook, autoPatchelfHook }: +gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook3, autoPatchelfHook }: stdenv.mkDerivation rec { pname = "birdfont"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-NNw7203BtHhNyyQezb3/EP98cTsu7ABDFBnM5Ms2ePY="; }; - nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook autoPatchelfHook ]; + nativeBuildInputs = [ python3 pkg-config vala gobject-introspection wrapGAppsHook3 autoPatchelfHook ]; buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ]; postPatch = '' diff --git a/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix b/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix index 4bf170ccbc7d..2f36c452fcb1 100644 --- a/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/bmap-tools/default.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "bmap-related tools"; homepage = "https://github.com/intel/bmap-tools"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; mainProgram = "bmaptool"; diff --git a/nixpkgs/pkgs/tools/misc/bogofilter/default.nix b/nixpkgs/pkgs/tools/misc/bogofilter/default.nix index df78108e43e2..f5fcbc831c89 100644 --- a/nixpkgs/pkgs/tools/misc/bogofilter/default.nix +++ b/nixpkgs/pkgs/tools/misc/bogofilter/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { classifications and corrections. It is based on a Bayesian filter. ''; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/misc/broot/default.nix b/nixpkgs/pkgs/tools/misc/broot/default.nix index b136dcb6ad93..fc1d076c1ad6 100644 --- a/nixpkgs/pkgs/tools/misc/broot/default.nix +++ b/nixpkgs/pkgs/tools/misc/broot/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "1.37.0"; + version = "1.38.0"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - hash = "sha256-IJSXP4B07/0ZHzuAmPBXn/n0O7LOYNTB812sKz+mGuc="; + hash = "sha256-eKvJyORTb8gFgyeWW7C6PngQ+bKE9Oln2lpd646YbMU="; }; - cargoHash = "sha256-jsy7FtTX/iG3TPdbYemG+6jbguQN4LoYMgscMffik7g="; + cargoHash = "sha256-uX0pQMt6WLUsXaUmbMojyScykdFe8DqpyGrK0QC66eE="; nativeBuildInputs = [ installShellFiles diff --git a/nixpkgs/pkgs/tools/misc/ccze/default.nix b/nixpkgs/pkgs/tools/misc/ccze/default.nix index 4946fd64d89d..2c028485ccd3 100644 --- a/nixpkgs/pkgs/tools/misc/ccze/default.nix +++ b/nixpkgs/pkgs/tools/misc/ccze/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { for the Perl colorize tool. Includes plugins for a variety of log formats (Apache, Postfix, Procmail, etc.). ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ malyn ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix b/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix index 5ec67c40f1d8..42ac51995531 100644 --- a/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix +++ b/nixpkgs/pkgs/tools/misc/cf-terraforming/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cf-terraforming"; - version = "0.19.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cf-terraforming"; rev = "v${version}"; - sha256 = "sha256-eGfPk3qptNf6QfVKDT4MwJav7z+ri+eEiB7KHGRxzOE="; + sha256 = "sha256-r5iRXhbjmFNlzoOe9s6vheROl/XKbeIfGD+ACl0hmro="; }; - vendorHash = "sha256-cWFCEC20D2nhVeW7P/w5YSt1tQbWTPDWF/eaxEvWoLo="; + vendorHash = "sha256-FinthjJeXwfjyNORdgmgArjRk+2zUlVV67P52V/lK+A="; ldflags = [ "-X github.com/cloudflare/cf-terraforming/internal/app/cf-terraforming/cmd.versionString=${version}" ]; # The test suite insists on downloading a binary release of Terraform from diff --git a/nixpkgs/pkgs/tools/misc/cht.sh/default.nix b/nixpkgs/pkgs/tools/misc/cht.sh/default.nix index b34b1ee4d517..f61defdbdeda 100644 --- a/nixpkgs/pkgs/tools/misc/cht.sh/default.nix +++ b/nixpkgs/pkgs/tools/misc/cht.sh/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { pname = "cht.sh"; - version = "unstable-2022-04-18"; + version = "0-unstable-2022-04-18"; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/ckb-next/default.nix b/nixpkgs/pkgs/tools/misc/ckb-next/default.nix index 959493d3e4bd..6b7fc82e0d01 100644 --- a/nixpkgs/pkgs/tools/misc/ckb-next/default.nix +++ b/nixpkgs/pkgs/tools/misc/ckb-next/default.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Driver and configuration tool for Corsair keyboards and mice"; homepage = "https://github.com/ckb-next/ckb-next"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; mainProgram = "ckb-next"; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/tools/misc/clipster/default.nix b/nixpkgs/pkgs/tools/misc/clipster/default.nix index cad2c4506374..5c9c2cd1054c 100644 --- a/nixpkgs/pkgs/tools/misc/clipster/default.nix +++ b/nixpkgs/pkgs/tools/misc/clipster/default.nix @@ -1,5 +1,5 @@ {fetchFromGitHub , lib, stdenv, python3, gtk3, libwnck, - gobject-introspection, wrapGAppsHook }: + gobject-introspection, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "clipster"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pythonEnv = python3.withPackages(ps: with ps; [ pygobject3 ]); nativeBuildInputs = [ gobject-introspection ]; - buildInputs = [ pythonEnv gtk3 libwnck wrapGAppsHook ]; + buildInputs = [ pythonEnv gtk3 libwnck wrapGAppsHook3 ]; installPhase = '' sed -i 's/python/python3/g' clipster diff --git a/nixpkgs/pkgs/tools/misc/cloc/default.nix b/nixpkgs/pkgs/tools/misc/cloc/default.nix index 14c7b2133c71..4cb21ea5c99e 100644 --- a/nixpkgs/pkgs/tools/misc/cloc/default.nix +++ b/nixpkgs/pkgs/tools/misc/cloc/default.nix @@ -53,7 +53,7 @@ in stdenv.mkDerivation { meta = { description = "A program that counts lines of source code"; homepage = "https://github.com/AlDanial/cloc"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ rycee ]; mainProgram = "cloc"; diff --git a/nixpkgs/pkgs/tools/misc/contacts/default.nix b/nixpkgs/pkgs/tools/misc/contacts/default.nix index 175b7a9ed247..1c789ca1d11d 100644 --- a/nixpkgs/pkgs/tools/misc/contacts/default.nix +++ b/nixpkgs/pkgs/tools/misc/contacts/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Access contacts from the Mac address book from command-line"; homepage = "http://www.gnufoo.org/contacts/contacts.html"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ jwiegley ]; platforms = platforms.darwin; hydraPlatforms = platforms.darwin; diff --git a/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/nixpkgs/pkgs/tools/misc/coreutils/default.nix index efcdce15bf02..2e2f2f160124 100644 --- a/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -54,6 +54,9 @@ stdenv.mkDerivation rec { sed '2i echo Skipping rm deep-2 test && exit 77' -i ./tests/rm/deep-2.sh sed '2i echo Skipping du long-from-unreadable test && exit 77' -i ./tests/du/long-from-unreadable.sh + # The test tends to fail on cephfs + sed '2i echo Skipping df total-verify test && exit 77' -i ./tests/df/total-verify.sh + # Some target platforms, especially when building inside a container have # issues with the inotify test. sed '2i echo Skipping tail inotify dir recreate test && exit 77' -i ./tests/tail/inotify-dir-recreate.sh diff --git a/nixpkgs/pkgs/tools/misc/cpulimit/default.nix b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix index 75c3ba733b14..4788bc57befe 100644 --- a/nixpkgs/pkgs/tools/misc/cpulimit/default.nix +++ b/nixpkgs/pkgs/tools/misc/cpulimit/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/opsengine/cpulimit"; description = "CPU usage limiter"; platforms = platforms.unix; - license = licenses.gpl2; + license = licenses.gpl2Plus; mainProgram = "cpulimit"; maintainers = [ maintainers.jsoo1 ]; }; diff --git a/nixpkgs/pkgs/tools/misc/cpuminer/default.nix b/nixpkgs/pkgs/tools/misc/cpuminer/default.nix index 4b7c5fc7f486..8b9e07762c83 100644 --- a/nixpkgs/pkgs/tools/misc/cpuminer/default.nix +++ b/nixpkgs/pkgs/tools/misc/cpuminer/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/pooler/cpuminer"; description = "CPU miner for Litecoin and Bitcoin"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = with maintainers; [ pSub ]; mainProgram = "minerd"; diff --git a/nixpkgs/pkgs/tools/misc/csv2latex/default.nix b/nixpkgs/pkgs/tools/misc/csv2latex/default.nix index cc286c54e9ad..acfe07f26228 100644 --- a/nixpkgs/pkgs/tools/misc/csv2latex/default.nix +++ b/nixpkgs/pkgs/tools/misc/csv2latex/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Command-line CSV to LaTeX file converter"; homepage = "http://brouits.free.fr/csv2latex/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.catern ]; mainProgram = "csv2latex"; }; diff --git a/nixpkgs/pkgs/tools/misc/cyberchef/default.nix b/nixpkgs/pkgs/tools/misc/cyberchef/default.nix index ba1a609c9682..f0a20fe9687f 100644 --- a/nixpkgs/pkgs/tools/misc/cyberchef/default.nix +++ b/nixpkgs/pkgs/tools/misc/cyberchef/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "cyberchef"; - version = "10.18.3"; + version = "10.18.6"; src = fetchzip { url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; - sha256 = "sha256-HLYcKF+DCj5QA+0ZJwRpC+iTN5z/S249UnQirNJMLF4="; + sha256 = "sha256-LbauIeDUqfL1ChZTThq7CJ++yNiuKaa773jSdmxorf8="; stripRoot = false; }; diff --git a/nixpkgs/pkgs/tools/misc/dbus-map/default.nix b/nixpkgs/pkgs/tools/misc/dbus-map/default.nix index 955a248be7bb..cdd7b840a1d3 100644 --- a/nixpkgs/pkgs/tools/misc/dbus-map/default.nix +++ b/nixpkgs/pkgs/tools/misc/dbus-map/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Simple utility for enumerating D-Bus endpoints, an nmap for D-Bus"; homepage = "https://github.com/taviso/dbusmap"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ ]; mainProgram = "dbus-map"; diff --git a/nixpkgs/pkgs/tools/misc/ddcutil/default.nix b/nixpkgs/pkgs/tools/misc/ddcutil/default.nix index 28a31a16d078..baf41aac7041 100644 --- a/nixpkgs/pkgs/tools/misc/ddcutil/default.nix +++ b/nixpkgs/pkgs/tools/misc/ddcutil/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.ddcutil.com/"; description = "Query and change Linux monitor settings using DDC/CI and USB"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ rnhmjoj ]; changelog = "https://github.com/rockowitz/ddcutil/blob/v${version}/CHANGELOG.md"; diff --git a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index c5ca89f54841..7bf5b4586e0d 100644 --- a/nixpkgs/pkgs/tools/misc/diffoscope/default.nix +++ b/nixpkgs/pkgs/tools/misc/diffoscope/default.nix @@ -96,11 +96,11 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "265"; + version = "267"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-YE81R8lTOM3wmv/GIaIBqUq2O6UvnUaHjuXZ00yDU8U="; + hash = "sha256-eU5n39kwITCGKXFu7ESAs9bZM6SPxey0tmDLd86zRvE="; }; outputs = [ diff --git a/nixpkgs/pkgs/tools/misc/dtool/default.nix b/nixpkgs/pkgs/tools/misc/dtool/default.nix index 9cf22a9da39f..8fdb2f533d47 100644 --- a/nixpkgs/pkgs/tools/misc/dtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/dtool/default.nix @@ -16,11 +16,13 @@ rustPlatform.buildRustPackage rec { hash = "sha256-m4H+ANwEbK6vGW3oIVZqnqvMiAKxNJf2TLIGh/G6AU4="; }; - cargoHash = "sha256-r8r3f4yKMQgjtB3j4qE7cqQL18nIqAGPO5RsFErqh2c="; + cargoHash = "sha256-o5Xvc0tnoUgfp5k7EqVuEH9Zyo3C+A+mVqPhMtZCYKw="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; + # FIXME: remove patch when upstream version of rustc-serialize is updated + cargoPatches = [ ./rustc-serialize-fix.patch ]; checkType = "debug"; diff --git a/nixpkgs/pkgs/tools/misc/dtool/rustc-serialize-fix.patch b/nixpkgs/pkgs/tools/misc/dtool/rustc-serialize-fix.patch new file mode 100644 index 000000000000..8d0327e8a457 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/dtool/rustc-serialize-fix.patch @@ -0,0 +1,16 @@ +diff --git a/Cargo.lock b/Cargo.lock +index b1cc23695b30..ffdeb1c90618 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -996,9 +996,9 @@ dependencies = [ + + [[package]] + name = "rustc-serialize" +-version = "0.3.24" ++version = "0.3.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" ++checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" + + [[package]] + name = "rustix" diff --git a/nixpkgs/pkgs/tools/misc/duc/default.nix b/nixpkgs/pkgs/tools/misc/duc/default.nix index 0501b681aa3a..56fe697528ab 100644 --- a/nixpkgs/pkgs/tools/misc/duc/default.nix +++ b/nixpkgs/pkgs/tools/misc/duc/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://duc.zevv.nl/"; description = "Collection of tools for inspecting and visualizing disk usage"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.all; maintainers = [ ]; diff --git a/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix b/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix index 194d40e1c1cc..c80a696f8cba 100644 --- a/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix +++ b/nixpkgs/pkgs/tools/misc/dumptorrent/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Dump .torrent file information"; homepage = "https://sourceforge.net/projects/dumptorrent/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.zohl ]; platforms = platforms.all; mainProgram = "dumptorrent"; diff --git a/nixpkgs/pkgs/tools/misc/edid-decode/default.nix b/nixpkgs/pkgs/tools/misc/edid-decode/default.nix index f6bcff31a00f..24c4266424a7 100644 --- a/nixpkgs/pkgs/tools/misc/edid-decode/default.nix +++ b/nixpkgs/pkgs/tools/misc/edid-decode/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { pname = "edid-decode"; - version = "unstable-2024-04-02"; + version = "0-unstable-2024-04-02"; outputs = [ "out" diff --git a/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix b/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix index 6d72dc40ca0d..d8428e365fcd 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/dashboard.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "esphome-dashboard"; - version = "20240319.0"; + version = "20240412.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-jiEXZWw8A4RcsRbypFpWkt8O3Ib1cNcOQO1zHt96aQU="; + hash = "sha256-MT/EpZ8kDKHhJGF4njdh6Q+xe8GF4FYxaoIighSguiQ="; }; # no tests diff --git a/nixpkgs/pkgs/tools/misc/esphome/default.nix b/nixpkgs/pkgs/tools/misc/esphome/default.nix index 972ac63e83dc..2593ef5b7bb8 100644 --- a/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -19,14 +19,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2024.3.2"; + version = "2024.4.2"; pyproject = true; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-WeTajznndw01jXIEnOiSEy9psLuMeAC6j7UmHg0+Fys="; + hash = "sha256-q4SVsfd5PJjeqt6UJJG6vuyxTA/bqDDl6e5dxhWIfYM="; }; nativeBuildInputs = with python.pkgs; [ @@ -41,6 +41,12 @@ python.pkgs.buildPythonApplication rec { postPatch = '' # drop coverage testing sed -i '/--cov/d' pytest.ini + + # ensure component dependencies are available + cat requirements_optional.txt >> requirements.txt + # relax strict runtime version check + substituteInPlace esphome/components/font/__init__.py \ + --replace-fail "10.2.0" "${python.pkgs.pillow.version}" ''; # Remove esptool and platformio from requirements @@ -55,6 +61,7 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ aioesphomeapi argcomplete + cairosvg click colorama cryptography diff --git a/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix b/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix index 2dd6415324e4..58f84c9b0630 100644 --- a/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix +++ b/nixpkgs/pkgs/tools/misc/esptool-ck/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ESP8266/ESP32 build helper tool"; homepage = "https://github.com/igrr/esptool-ck"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; mainProgram = "esptool"; diff --git a/nixpkgs/pkgs/tools/misc/ethtool/default.nix b/nixpkgs/pkgs/tools/misc/ethtool/default.nix index eb1911170beb..72590420e1a1 100644 --- a/nixpkgs/pkgs/tools/misc/ethtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/ethtool/default.nix @@ -9,23 +9,13 @@ stdenv.mkDerivation rec { pname = "ethtool"; - version = "6.1"; + version = "6.7"; src = fetchurl { url = "mirror://kernel/software/network/${pname}/${pname}-${version}.tar.xz"; - sha256 = "sha256-xB/Igf+lpAQy0t2CnrRMZKSd7kgucWuqz5Jixk2qj5A="; + sha256 = "sha256-w65SawHOTY32x5SrFw3kpBBNER6o2Ns/H9fCX8uQVhk="; }; - patches = [ - # Patch that fixes build with musl libc - # NOTE remove on next release, since it is applied in upstream - (fetchpatch { - name = "Fix-build-with-musl-libc.patch"; - url = "https://git.kernel.org/pub/scm/network/ethtool/ethtool.git/patch/marvell.c?id=41be533331fc3c6b711dbe532405782d3b8be5d1"; - sha256 = "sha256-CItvt/eeNJkr1sOzaaHZhAnaybDutL9cT2O6XwQll+M="; - }) - ]; - nativeBuildInputs = [ pkg-config ]; diff --git a/nixpkgs/pkgs/tools/misc/ets/default.nix b/nixpkgs/pkgs/tools/misc/ets/default.nix index 7d9103e7b350..874c57ccaa89 100644 --- a/nixpkgs/pkgs/tools/misc/ets/default.nix +++ b/nixpkgs/pkgs/tools/misc/ets/default.nix @@ -2,22 +2,16 @@ buildGoModule rec { pname = "ets"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { - owner = "zmwangx"; - repo = pname; + owner = "gdubicki"; + repo = "ets"; rev = "v${version}"; - sha256 = "sha256-XWIDo5msTMTLr60x1R9cwsiZIDG6G+uHWx8idt4F2iA="; + hash = "sha256-PowJ3ig8TfGx9P/PJPVBL8GsMh+gGZVt9l4Rf7Mqk00="; }; - # https://github.com/zmwangx/ets/pull/18/ - patches = [ (fetchpatch { - url = "https://github.com/zmwangx/ets/commit/600ec17a9c86ca63cd022d00439cdc4978e2afa9.patch"; - sha256 = "sha256-SGCISHkWNFubgKkQYx8Vf5/fknNDfPNYkSuw1mMhZaE="; - }) ]; - - vendorHash = "sha256-+8dXfqOu8XTw2uEx3GAynQSHtzifejZtddr1CdxrupA="; + vendorHash = "sha256-XHgdiXdp9aNEAc/Apvb64ExnpywjddWOw1scNKy+ico="; ldflags = [ "-s" "-w" "-X main.version=v${version}-nixpkgs" ]; @@ -35,7 +29,7 @@ buildGoModule rec { meta = with lib; { description = "Command output timestamper"; - homepage = "https://github.com/zmwangx/ets/"; + homepage = "https://github.com/gdubicki/ets/"; license = licenses.mit; maintainers = with maintainers; [ cameronfyfe ]; mainProgram = "ets"; diff --git a/nixpkgs/pkgs/tools/misc/fd/default.nix b/nixpkgs/pkgs/tools/misc/fd/default.nix index eddcb4b7784d..f203e4881616 100644 --- a/nixpkgs/pkgs/tools/misc/fd/default.nix +++ b/nixpkgs/pkgs/tools/misc/fd/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "fd"; - version = "9.0.0"; + version = "10.1.0"; src = fetchFromGitHub { owner = "sharkdp"; repo = "fd"; rev = "v${version}"; - hash = "sha256-xcrvAWbSvUUtbFXyENy3eQimxt5aXzFrHnL6VptyydA="; + hash = "sha256-9fL2XV3Vre2uo8Co3tlHYIvpNHNOh5TuvZggkWOxm5A="; }; - cargoHash = "sha256-z4PV8k6avaLwo58yJq47WEUJGw3JCW1GZGviBaPTs+8="; + cargoHash = "sha256-3TbsPfAn/GcGASc0RCcyAeUiD4RUtvTATdTYhKdBxvo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/fend/default.nix b/nixpkgs/pkgs/tools/misc/fend/default.nix index 9b977f6d0d47..2e7c22672330 100644 --- a/nixpkgs/pkgs/tools/misc/fend/default.nix +++ b/nixpkgs/pkgs/tools/misc/fend/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "fend"; - version = "1.4.6"; + version = "1.4.8"; src = fetchFromGitHub { owner = "printfn"; repo = "fend"; rev = "v${version}"; - hash = "sha256-xqWAL1xMUUL2AtxnZ4oXWmNoks0pL63uqKoNc0Vvw/4="; + hash = "sha256-i4h2QYgA1XX+qHOEH07PR3G/0SSA8a413vm9T39TuYQ="; }; - cargoHash = "sha256-0ov/uzBEa8Wzw5T0mSMnnmJYucBLUe0Qlwel6pVRorc="; + cargoHash = "sha256-EhumvDwXNXB0Vp3qWkJs0y0gEwiy3Z9/3KZ92YDTlqk="; nativeBuildInputs = [ pandoc installShellFiles pkg-config copyDesktopItems ]; buildInputs = [ pkg-config openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ]; diff --git a/nixpkgs/pkgs/tools/misc/flashrom/default.nix b/nixpkgs/pkgs/tools/misc/flashrom/default.nix index b2b9583db232..190841582a4f 100644 --- a/nixpkgs/pkgs/tools/misc/flashrom/default.nix +++ b/nixpkgs/pkgs/tools/misc/flashrom/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.flashrom.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ fpletz felixsinger ]; platforms = platforms.all; mainProgram = "flashrom"; diff --git a/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix b/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix index 662193f35328..fa2004ce40ca 100644 --- a/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix +++ b/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix @@ -28,10 +28,7 @@ in appimageTools.wrapAppImage { inherit pname version; src = appimageContents; - multiArch = false; # no 32bit needed - extraPkgs = { pkgs, ... }@args: [ - pkgs.hidapi - ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; + extraPkgs = pkgs: [ pkgs.hidapi ]; extraInstallCommands = '' # Add desktop convencience stuff diff --git a/nixpkgs/pkgs/tools/misc/flowgger/default.nix b/nixpkgs/pkgs/tools/misc/flowgger/default.nix index c9517043adc9..8a37717257eb 100644 --- a/nixpkgs/pkgs/tools/misc/flowgger/default.nix +++ b/nixpkgs/pkgs/tools/misc/flowgger/default.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "flowgger"; - version = "0.3.1"; + version = "0.3.2"; src = fetchCrate { inherit pname version; - hash = "sha256-PRlcfSVfQWt+rQEJjblY7/AMrjhGYO2/G7EX60aGApA="; + hash = "sha256-eybahv1A/AIpAXGj6/md8k+b9fu9gSchU16fnAWZP2s="; }; - cargoHash = "sha256-hp2LrEVWo0gk95dPROqVcHEEG5N9fWms0mZkY9QILg0="; + cargoHash = "sha256-DZGyX3UDqCjB5NwCXcR8b9pXdq8qacd3nkqGp6vYb+U="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/tools/misc/fontfor/default.nix b/nixpkgs/pkgs/tools/misc/fontfor/default.nix deleted file mode 100644 index b973317b722e..000000000000 --- a/nixpkgs/pkgs/tools/misc/fontfor/default.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ lib -, rustPlatform -, fetchFromGitHub -, cmake -, pkg-config -, expat -, fontconfig -, freetype -}: - -rustPlatform.buildRustPackage rec { - pname = "fontfor"; - version = "0.4.1"; - - src = fetchFromGitHub { - owner = "7sDream"; - repo = "fontfor"; - rev = "v${version}"; - sha256 = "sha256-/UoZ+5X6Csoyqc+RSP0Hree7NtCDs7BjsqcpALxAazc="; - }; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = [ - expat - fontconfig - freetype - ]; - - cargoHash = "sha256-j1Qf0IKlAUEyiGAUoF7IlEbPIv2pGkn+YMCoFdF9oUE="; - - meta = with lib; { - description = "Find fonts which can show a specified character and preview them in browser"; - homepage = "https://github.com/7sDream/fontfor"; - license = with licenses; [ gpl3Plus ]; - maintainers = with maintainers; [ shamilton ]; - platforms = platforms.linux; - mainProgram = "fontfor"; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/fsearch/default.nix b/nixpkgs/pkgs/tools/misc/fsearch/default.nix index a9e3b6caa352..933daaf3df51 100644 --- a/nixpkgs/pkgs/tools/misc/fsearch/default.nix +++ b/nixpkgs/pkgs/tools/misc/fsearch/default.nix @@ -8,7 +8,7 @@ , meson , ninja , pkg-config -, wrapGAppsHook +, wrapGAppsHook3 , gettext , icu }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 gettext ]; diff --git a/nixpkgs/pkgs/tools/misc/fsmark/default.nix b/nixpkgs/pkgs/tools/misc/fsmark/default.nix index 2c2aa2c6fef8..340be1a56c2e 100644 --- a/nixpkgs/pkgs/tools/misc/fsmark/default.nix +++ b/nixpkgs/pkgs/tools/misc/fsmark/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Synchronous write workload file system benchmark"; homepage = "https://sourceforge.net/projects/fsmark/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; mainProgram = "fs_mark"; diff --git a/nixpkgs/pkgs/tools/misc/gaphor/default.nix b/nixpkgs/pkgs/tools/misc/gaphor/default.nix index 48f9fa7a7bba..a8afdef6a2bf 100644 --- a/nixpkgs/pkgs/tools/misc/gaphor/default.nix +++ b/nixpkgs/pkgs/tools/misc/gaphor/default.nix @@ -4,7 +4,7 @@ , copyDesktopItems , gobject-introspection , poetry-core -, wrapGAppsHook +, wrapGAppsHook3 , gtksourceview4 , pango , gaphas @@ -34,7 +34,7 @@ buildPythonApplication rec { copyDesktopItems gobject-introspection poetry-core - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ @@ -59,7 +59,7 @@ buildPythonApplication rec { desktopName = "Gaphor"; }; - # Disable automatic wrapGAppsHook to prevent double wrapping + # Disable automatic wrapGAppsHook3 to prevent double wrapping dontWrapGApps = true; postInstall = '' diff --git a/nixpkgs/pkgs/tools/misc/geekbench/6.nix b/nixpkgs/pkgs/tools/misc/geekbench/6.nix index 373d93dc193c..d7dd0ad7158b 100644 --- a/nixpkgs/pkgs/tools/misc/geekbench/6.nix +++ b/nixpkgs/pkgs/tools/misc/geekbench/6.nix @@ -10,15 +10,15 @@ let inherit (stdenv.hostPlatform.uname) processor; - version = "6.2.0"; + version = "6.3.0"; sources = { "x86_64-linux" = { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - hash = "sha256-QoxSw825qqx1vzhzW9TZg03BPNvgOCokBWARGUhjCGY="; + hash = "sha256-AXJ5mXGc1RWnIkB13KtIdt7vKETEXowunzQZciQDnzs="; }; "aarch64-linux" = { url = "https://cdn.geekbench.com/Geekbench-${version}-LinuxARMPreview.tar.gz"; - hash = "sha256-m2uz5Rk34rm9Bx3j5FjFigOIKaj2c4I+uXKzU4cK4D4="; + hash = "sha256-fbf01qa9wx3k9j8AEqv38fAM3F9tZOcnpH/wa/9rawQ="; }; }; geekbench_avx2 = lib.optionalString stdenv.isx86_64 "geekbench_avx2"; @@ -59,7 +59,7 @@ stdenv.mkDerivation { homepage = "https://geekbench.com/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; - maintainers = [ maintainers.michalrus ]; + maintainers = with maintainers; [ michalrus asininemonkey ]; platforms = builtins.attrNames sources; mainProgram = "geekbench6"; }; diff --git a/nixpkgs/pkgs/tools/misc/geteltorito/default.nix b/nixpkgs/pkgs/tools/misc/geteltorito/default.nix index 5fb2209ee8c1..7bbedde4dac6 100644 --- a/nixpkgs/pkgs/tools/misc/geteltorito/default.nix +++ b/nixpkgs/pkgs/tools/misc/geteltorito/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { description = "Extract the initial/default boot image from a CD image if existent"; homepage = "https://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito/"; maintainers = [ maintainers.Profpatsch ]; - license = licenses.gpl2; + license = licenses.gpl2Only; mainProgram = "geteltorito"; }; diff --git a/nixpkgs/pkgs/tools/misc/gh-markdown-preview/default.nix b/nixpkgs/pkgs/tools/misc/gh-markdown-preview/default.nix index 68f041dbbf2d..573cd607be41 100644 --- a/nixpkgs/pkgs/tools/misc/gh-markdown-preview/default.nix +++ b/nixpkgs/pkgs/tools/misc/gh-markdown-preview/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gh-markdown-preview"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "yusukebe"; repo = "gh-markdown-preview"; rev = "v${version}"; - hash = "sha256-UBveXL4/3GxxIVjqG0GuTbkGkzXFc/stew2s+dTj9BI="; + hash = "sha256-gi6Wza8v4V8PAHO75UycP0CEzvXEtm22hTEWs/dJ+LQ="; }; vendorHash = "sha256-O6Q9h5zcYAoKLjuzGu7f7UZY0Y5rL2INqFyJT2QZJ/E="; diff --git a/nixpkgs/pkgs/tools/misc/github-backup/default.nix b/nixpkgs/pkgs/tools/misc/github-backup/default.nix index 4ff25301c8c8..f555ca74d611 100644 --- a/nixpkgs/pkgs/tools/misc/github-backup/default.nix +++ b/nixpkgs/pkgs/tools/misc/github-backup/default.nix @@ -7,12 +7,12 @@ python3.pkgs.buildPythonApplication rec { pname = "github-backup"; - version = "0.45.1"; + version = "0.45.2"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-+dQVewMHSF0SnOKmgwc9pmqXAJGLjSqwS9YQHdvEmKo="; + hash = "sha256-wn2JRMLfqhhTREeYM+mcs68xlkRWKMlxKXToa83pu2g="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/nixpkgs/pkgs/tools/misc/google-cloud-bigtable-tool/default.nix b/nixpkgs/pkgs/tools/misc/google-cloud-bigtable-tool/default.nix index 3c61159bf972..6e26aac5284d 100644 --- a/nixpkgs/pkgs/tools/misc/google-cloud-bigtable-tool/default.nix +++ b/nixpkgs/pkgs/tools/misc/google-cloud-bigtable-tool/default.nix @@ -16,9 +16,9 @@ buildGoModule rec { vendorHash = "sha256-kwvEfvHs6XF84bB3Ss1307OjId0nh/0Imih1fRFdY0M="; - preCheck = '' - buildFlagsArray+="-short" - ''; + checkFlags = [ + "-short" + ]; meta = with lib; { description = "Google Cloud Bigtable Tool"; diff --git a/nixpkgs/pkgs/tools/misc/google-cloud-sql-proxy/default.nix b/nixpkgs/pkgs/tools/misc/google-cloud-sql-proxy/default.nix index 1043b4982018..3bf76cc5bf3c 100644 --- a/nixpkgs/pkgs/tools/misc/google-cloud-sql-proxy/default.nix +++ b/nixpkgs/pkgs/tools/misc/google-cloud-sql-proxy/default.nix @@ -18,9 +18,9 @@ buildGo122Module rec { vendorHash = "sha256-sAVMmDeHXEgQXb/Xi4nXYztXjuykE0TFebkeubMTZ3k="; - preCheck = '' - buildFlagsArray+="-short" - ''; + checkFlags = [ + "-short" + ]; meta = with lib; { description = "Utility for ensuring secure connections to Google Cloud SQL instances"; diff --git a/nixpkgs/pkgs/tools/misc/goose/default.nix b/nixpkgs/pkgs/tools/misc/goose/default.nix index dcb6acec4d9e..994aa5df6ec5 100644 --- a/nixpkgs/pkgs/tools/misc/goose/default.nix +++ b/nixpkgs/pkgs/tools/misc/goose/default.nix @@ -6,29 +6,31 @@ buildGoModule rec { pname = "goose"; - version = "3.19.2"; + version = "3.20.0"; src = fetchFromGitHub { owner = "pressly"; repo = pname; rev = "v${version}"; - hash = "sha256-kGa3vZSFQ8Dgndc0qRnFnQwlU2hst6j3UFUXw+tfYR0="; + hash = "sha256-DgxFczS2YAnicf8RTMf7gDzCtDyj/zqzrGfeb3YcYzg="; }; proxyVendor = true; - vendorHash = "sha256-aoBxReKRk7dkFR/fJ5uHDZrJRGutLTU2BhDWCTBN2BA="; + vendorHash = "sha256-KzIOylWrsOF5oAuuFKUKVSnSJWq3KWZ3Ot7sryNnjIY="; # skipping: end-to-end tests require a docker daemon postPatch = '' - rm -r tests/e2e rm -r tests/gomigrations - rm -r tests/vertica ''; + subPackages = [ + "cmd/goose" + ]; + ldflags = [ "-s" "-w" - "-X=main.gooseVersion=${version}" + "-X=main.version=${version}" ]; checkFlags = [ diff --git a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index 7b121ac3f9a7..1fff3856bfb6 100644 --- a/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -9,16 +9,16 @@ }: buildGoModule rec { pname = "goreleaser"; - version = "1.25.1"; + version = "1.26.1"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - hash = "sha256-WYpFSV4dMz6sYNc45iXE/oOTmyZqMqHBZlx+00NZHbU="; + hash = "sha256-ZUHXH8WBjYW5qE7iQPP8URMUNxn2eLl4UbhAxDbn3qI="; }; - vendorHash = "sha256-vI/S4QtN72tmBVZ2PPcavotJBkl+bdXO9OFqlOGw1J8="; + vendorHash = "sha256-EPrYZz6I9M+zih4gGQTtJ5LAjsQgDqvNMk7hU3PwkKQ="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; diff --git a/nixpkgs/pkgs/tools/misc/gparted/default.nix b/nixpkgs/pkgs/tools/misc/gparted/default.nix index 7c068656385d..d12babfddfaf 100644 --- a/nixpkgs/pkgs/tools/misc/gparted/default.nix +++ b/nixpkgs/pkgs/tools/misc/gparted/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, gettext, coreutils, gnused, gnome , gnugrep, parted, glib, libuuid, pkg-config, gtkmm3, libxml2 -, gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook, substituteAll +, gpart, hdparm, procps, util-linux, polkit, wrapGAppsHook3, substituteAll , mtools, dosfstools }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-doc" ]; buildInputs = [ parted glib libuuid gtkmm3 libxml2 polkit.bin gnome.adwaita-icon-theme ]; - nativeBuildInputs = [ gettext pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ gettext pkg-config wrapGAppsHook3 ]; preConfigure = '' # For ITS rules diff --git a/nixpkgs/pkgs/tools/misc/gpick/default.nix b/nixpkgs/pkgs/tools/misc/gpick/default.nix index 0d421212a3d4..c21759b00fea 100644 --- a/nixpkgs/pkgs/tools/misc/gpick/default.nix +++ b/nixpkgs/pkgs/tools/misc/gpick/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , cmake -, wrapGAppsHook +, wrapGAppsHook3 , boost , pkg-config , gtk3 @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ cmake pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ cmake pkg-config wrapGAppsHook3 ]; buildInputs = [ boost gtk3 ragel lua ]; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/misc/graylog/5.2.nix b/nixpkgs/pkgs/tools/misc/graylog/5.2.nix index e262d84f3f09..1247214e9753 100644 --- a/nixpkgs/pkgs/tools/misc/graylog/5.2.nix +++ b/nixpkgs/pkgs/tools/misc/graylog/5.2.nix @@ -2,8 +2,8 @@ let buildGraylog = callPackage ./graylog.nix {}; in buildGraylog { - version = "5.2.4"; - sha256 = "sha256-TbZMRMLpYlg6wrsC+tDEk8sLYJ1nwJum/rL30CEGQcw="; + version = "5.2.7"; + sha256 = "sha256-so9IHX0r3dmj5wLrLtQgrcXk+hu6E8/1d7wJu1XDcVA="; maintainers = [ lib.maintainers.f2k1de ]; license = lib.licenses.sspl; } diff --git a/nixpkgs/pkgs/tools/misc/grizzly/default.nix b/nixpkgs/pkgs/tools/misc/grizzly/default.nix index ffe6a4352bc0..ed5c67d95c24 100644 --- a/nixpkgs/pkgs/tools/misc/grizzly/default.nix +++ b/nixpkgs/pkgs/tools/misc/grizzly/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "grizzly"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-IM7NrykF2Fiudijo5q0I/FewvS/rs3lzSpvzc6dl5Ds="; + hash = "sha256-UOUBck1GrG3ijUpE3jPaFcC/KtlObaR38u3St8NToTk="; }; - vendorHash = "sha256-GrzMfOwNEjVQd1uCijcsfdIDO6UPzuHEDnJExupB9Jg="; + vendorHash = "sha256-lioFmaFzqaxN1wnYJaoHA54to1xGZjaLGaqAFIfTaTs="; subPackages = [ "cmd/grr" ]; diff --git a/nixpkgs/pkgs/tools/misc/grub4dos/default.nix b/nixpkgs/pkgs/tools/misc/grub4dos/default.nix index f00720af15ec..8b78c29defe7 100644 --- a/nixpkgs/pkgs/tools/misc/grub4dos/default.nix +++ b/nixpkgs/pkgs/tools/misc/grub4dos/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { description = "GRUB for DOS is the dos extension of GRUB"; maintainers = with maintainers; [ abbradar ]; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Plus; # Needs a port to modern binutils: # https://github.com/chenall/grub4dos/issues/160 broken = true; diff --git a/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix b/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix index a1c163f6784e..2b5878f7a638 100644 --- a/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix +++ b/nixpkgs/pkgs/tools/misc/gsmartcontrol/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook, pcre-cpp, gnome }: +{ fetchurl, lib, stdenv, smartmontools, autoreconfHook, gettext, gtkmm3, pkg-config, wrapGAppsHook3, pcre-cpp, gnome }: stdenv.mkDerivation rec { pname = "gsmartcontrol"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { substituteInPlace data/org.gsmartcontrol.policy --replace "/usr/sbin" $out/bin ''; - nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook gettext pkg-config wrapGAppsHook3 ]; buildInputs = [ gtkmm3 pcre-cpp gnome.adwaita-icon-theme ]; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/tools/misc/gtkterm/default.nix b/nixpkgs/pkgs/tools/misc/gtkterm/default.nix index 85636afb9d38..d761cf0644a6 100644 --- a/nixpkgs/pkgs/tools/misc/gtkterm/default.nix +++ b/nixpkgs/pkgs/tools/misc/gtkterm/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, gtk3, vte, libgudev, wrapGAppsHook, pcre2 }: +{ stdenv, lib, fetchFromGitHub, meson, ninja, pkg-config, gtk3, vte, libgudev, wrapGAppsHook3, pcre2 }: stdenv.mkDerivation rec { pname = "gtkterm"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "Jeija"; repo = "gtkterm"; rev = version; - sha256 = "sha256-4Z+8fs4VEk2+Ci1X3oUuInylTdIbQ5AiPenFqnyNXvc="; + sha256 = "sha256-KYkAHpyDl47LBKb7ZjxPCGw9XuMrqHPyejMhIvYAr68="; }; nativeBuildInputs = [ meson ninja pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/gwe/default.nix b/nixpkgs/pkgs/tools/misc/gwe/default.nix index d889230ed228..5f2c29c644d9 100644 --- a/nixpkgs/pkgs/tools/misc/gwe/default.nix +++ b/nixpkgs/pkgs/tools/misc/gwe/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , fetchFromGitLab -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config , meson , ninja @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 pkg-config meson ninja diff --git a/nixpkgs/pkgs/tools/misc/h5utils/default.nix b/nixpkgs/pkgs/tools/misc/h5utils/default.nix index f0267608d3a9..705ac56f5baf 100644 --- a/nixpkgs/pkgs/tools/misc/h5utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/h5utils/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { description = "A set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format"; homepage = "https://github.com/stevengj/h5utils"; changelog = "https://github.com/NanoComp/h5utils/releases/tag/${version}"; - license = with licenses; [ mit gpl2 ]; + license = with licenses; [ mit gpl2Plus ]; maintainers = with maintainers; [ sfrijters ]; }; diff --git a/nixpkgs/pkgs/tools/misc/hakuneko/default.nix b/nixpkgs/pkgs/tools/misc/hakuneko/default.nix index 0359da603ccb..fbc76aa1eb90 100644 --- a/nixpkgs/pkgs/tools/misc/hakuneko/default.nix +++ b/nixpkgs/pkgs/tools/misc/hakuneko/default.nix @@ -6,7 +6,7 @@ , udev , stdenv , lib -, wrapGAppsHook +, wrapGAppsHook3 , alsa-lib , nss , nspr @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { autoPatchelfHook dpkg makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/hashit/default.nix b/nixpkgs/pkgs/tools/misc/hashit/default.nix index a7bcde7ab5fc..ecd7aaf5cdcc 100644 --- a/nixpkgs/pkgs/tools/misc/hashit/default.nix +++ b/nixpkgs/pkgs/tools/misc/hashit/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, nix-update-script, meson, ninja, pkg-config, vala, pantheon, python3, libgee, gtk3, desktop-file-utils, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "hashit"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { vala pkg-config python3 - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix b/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix index 1999d9ad0d56..eb8259929e82 100644 --- a/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix +++ b/nixpkgs/pkgs/tools/misc/hdaps-gl/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "GL-based laptop model that rotates in real-time via hdaps"; homepage = "https://github.com/linux-thinkpad/hdaps-gl"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = [ maintainers.symphorien ]; mainProgram = "hdaps-gl"; diff --git a/nixpkgs/pkgs/tools/misc/heatseeker/default.nix b/nixpkgs/pkgs/tools/misc/heatseeker/default.nix index 24da793445cb..210e184e9d4a 100644 --- a/nixpkgs/pkgs/tools/misc/heatseeker/default.nix +++ b/nixpkgs/pkgs/tools/misc/heatseeker/default.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec { description = "A general-purpose fuzzy selector"; homepage = "https://github.com/rschmitt/heatseeker"; license = licenses.mit; - maintainers = [ maintainers.michaelpj ]; + maintainers = [ ]; mainProgram = "hs"; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/misc/hebcal/default.nix b/nixpkgs/pkgs/tools/misc/hebcal/default.nix index 80d52592c742..ef1686c20cb4 100644 --- a/nixpkgs/pkgs/tools/misc/hebcal/default.nix +++ b/nixpkgs/pkgs/tools/misc/hebcal/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = "https://hebcal.github.io"; description = "A perpetual Jewish Calendar"; longDescription = "Hebcal is a program which prints out the days in the Jewish calendar for a given Gregorian year. Hebcal is fairly flexible in terms of which events in the Jewish calendar it displays."; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.hhm ]; platforms = platforms.all; mainProgram = "hebcal"; diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock index 846b465bfd8c..8f50d842308e 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock +++ b/nixpkgs/pkgs/tools/misc/html-proofer/Gemfile.lock @@ -22,7 +22,7 @@ GEM html-proofer (5.0.8) addressable (~> 2.3) async (~> 2.1) - nokogiri (~> 1.13) + nokogiri (~> 1.16.0) pdf-reader (~> 2.11) rainbow (~> 3.0) typhoeus (~> 1.3) @@ -30,7 +30,7 @@ GEM zeitwerk (~> 2.5) io-event (1.2.3) mini_portile2 (2.8.4) - nokogiri (1.15.4) + nokogiri (1.16.0) mini_portile2 (~> 2.8.2) racc (~> 1.4) pdf-reader (2.11.0) diff --git a/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix index 45ad23f7ab0a..1485ab4e5062 100644 --- a/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix +++ b/nixpkgs/pkgs/tools/misc/html-proofer/gemset.nix @@ -140,10 +140,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k9w2z0953mnjrsji74cshqqp08q7m1r6zhadw1w0g34xzjh3a74"; + sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl"; type = "gem"; }; - version = "1.15.4"; + version = "1.16.0"; }; pdf-reader = { dependencies = ["Ascii85" "afm" "hashery" "ruby-rc4" "ttfunk"]; diff --git a/nixpkgs/pkgs/tools/misc/hueadm/default.nix b/nixpkgs/pkgs/tools/misc/hueadm/default.nix index 6afa6607129f..30cbaa591cc5 100644 --- a/nixpkgs/pkgs/tools/misc/hueadm/default.nix +++ b/nixpkgs/pkgs/tools/misc/hueadm/default.nix @@ -22,7 +22,7 @@ buildNpmPackage rec { description = "Command line management interface to Philips Hue"; homepage = "https://github.com/bahamas10/hueadm"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sigmanificient ]; mainProgram = "hueadm"; }; } diff --git a/nixpkgs/pkgs/tools/misc/hunt/default.nix b/nixpkgs/pkgs/tools/misc/hunt/default.nix index 2c135e028513..6163e8cf3b0d 100644 --- a/nixpkgs/pkgs/tools/misc/hunt/default.nix +++ b/nixpkgs/pkgs/tools/misc/hunt/default.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Simplified Find command made with Rust"; - homepage = "https://github.com/LyonSyonII/hunt"; + homepage = "https://github.com/LyonSyonII/hunt-rs"; license = licenses.mit; maintainers = with maintainers; [ dit7ya ]; mainProgram = "hunt"; diff --git a/nixpkgs/pkgs/tools/misc/hwatch/default.nix b/nixpkgs/pkgs/tools/misc/hwatch/default.nix index 6ba928a29d08..afa75fca0cd2 100644 --- a/nixpkgs/pkgs/tools/misc/hwatch/default.nix +++ b/nixpkgs/pkgs/tools/misc/hwatch/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "hwatch"; - version = "0.3.12"; + version = "0.3.13"; src = fetchFromGitHub { owner = "blacknon"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Klv1VIJv4/R7HvvB6H+WxTeJxQYFqAFU3HC6oafD/90="; + sha256 = "sha256-3RFiVDXjPFBMK+f/9s9t3cdIH+R/88Fp5uKbo5p2X+g="; }; - cargoHash = "sha256-Aos/QP8tLiKFmAZss19jn5h/murZR2jgTYRYalUONHw="; + cargoHash = "sha256-MC0Ch9ai4XmhhRz/9nFYEA3A7kgBv2x9q4yc5IJ7CZ8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/infracost/default.nix b/nixpkgs/pkgs/tools/misc/infracost/default.nix index ddec6c3c5d89..51316f969ec1 100644 --- a/nixpkgs/pkgs/tools/misc/infracost/default.nix +++ b/nixpkgs/pkgs/tools/misc/infracost/default.nix @@ -24,15 +24,14 @@ buildGoModule rec { # want but also limits the tests unset subPackages - # checkFlags aren't correctly passed through via buildGoModule so we use buildFlagsArray - # -short only runs the unit-tests tagged short - # move to checkFlags after https://github.com/NixOS/nixpkgs/pull/173702 - buildFlagsArray+="-short" - # remove tests that require networking rm cmd/infracost/{breakdown,diff,hcl,run}_test.go ''; + checkFlags = [ + "-short" + ]; + postInstall = '' export INFRACOST_SKIP_UPDATE_CHECK=true installShellCompletion --cmd infracost \ diff --git a/nixpkgs/pkgs/tools/misc/ink/default.nix b/nixpkgs/pkgs/tools/misc/ink/default.nix index 30df6e9691fa..6932d04c8d6c 100644 --- a/nixpkgs/pkgs/tools/misc/ink/default.nix +++ b/nixpkgs/pkgs/tools/misc/ink/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { Ink is a command line tool for checking the ink level of your locally connected printer on a system which runs Linux or FreeBSD. Canon BJNP network printers are supported too. ''; homepage = "https://ink.sourceforge.net/"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux ++ platforms.freebsd; maintainers = with maintainers; [ samb96 ]; mainProgram = "ink"; diff --git a/nixpkgs/pkgs/tools/misc/ipxe/default.nix b/nixpkgs/pkgs/tools/misc/ipxe/default.nix index 293c32b3e6ff..7ad4b0d809f1 100644 --- a/nixpkgs/pkgs/tools/misc/ipxe/default.nix +++ b/nixpkgs/pkgs/tools/misc/ipxe/default.nix @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { pname = "ipxe"; - version = "unstable-2024-02-08"; + version = "1.21.1-unstable-2024-04-17"; nativeBuildInputs = [ gnu-efi mtools openssl perl xorriso xz ] ++ lib.optional stdenv.hostPlatform.isx86 syslinux; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "ipxe"; repo = "ipxe"; - rev = "a846c4ccfc7db212dff792e081991df17268b4d5"; - hash = "sha256-4BvAwZ09EZJXBkdkZHLw0qjOqasNaN6RF4wmTfPVTWc="; + rev = "d7e58c5a812988c341ec4ad19f79faf067388d58"; + hash = "sha256-OIisRd2o2zrTqH1Xv3FDhQWDqhKNeGhPkHWyYZzbtTU="; }; postPatch = lib.optionalString stdenv.hostPlatform.isAarch64 '' @@ -101,7 +101,9 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.updateScript = unstableGitUpdater {}; + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + }; meta = with lib; { description = "Network boot firmware"; diff --git a/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix b/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix index cc778b6f6692..ac6696bbb7fe 100644 --- a/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/jfrog-cli/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "jfrog-cli"; - version = "2.56.0"; + version = "2.56.1"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-a7zCPyKV9kZ34XxVBYotcMvXUVrieunFpKGBK1Jhvo4="; + hash = "sha256-oUICnpVHRNCauWEplz7xH6AdP6CbbYX/Uy/QUPjwGHc="; }; - vendorHash = "sha256-q0PXbLTS5Po3xTK+CkU7BtZ6tk1PfH3zVAVK1IbmitY="; + vendorHash = "sha256-zQjOOUlqL0Mj2DKHiG9rOfu41SKMO7C99JBJDycXAs4="; # Upgrade the Go version during the vendoring FOD build because it fails otherwise. overrideModAttrs = _: { diff --git a/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix b/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix index 64b91a68d948..ee2f4cbfc7e5 100644 --- a/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix +++ b/nixpkgs/pkgs/tools/misc/jugglinglab/default.nix @@ -3,7 +3,7 @@ , maven , fetchFromGitHub , makeWrapper -, wrapGAppsHook +, wrapGAppsHook3 , jre }: @@ -38,7 +38,7 @@ maven.buildMavenPackage rec { nativeBuildInputs = [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 ]; dontWrapGApps = true; diff --git a/nixpkgs/pkgs/tools/misc/keychain/default.nix b/nixpkgs/pkgs/tools/misc/keychain/default.nix index edb0bc34e776..bd993c34bd2c 100644 --- a/nixpkgs/pkgs/tools/misc/keychain/default.nix +++ b/nixpkgs/pkgs/tools/misc/keychain/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { process, allowing your scripts to take advantage of key-based logins. ''; homepage = "https://www.funtoo.org/Keychain"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ sigma ]; mainProgram = "keychain"; diff --git a/nixpkgs/pkgs/tools/misc/kodi-cli/default.nix b/nixpkgs/pkgs/tools/misc/kodi-cli/default.nix index 10b9cea73d76..fc2aa1400758 100644 --- a/nixpkgs/pkgs/tools/misc/kodi-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/kodi-cli/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/nawar/kodi-cli"; description = "Kodi/XBMC bash script to send Kodi commands using JSON RPC. It also allows sending YouTube videos to Kodi"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; maintainers = [ maintainers.pstn ]; }; diff --git a/nixpkgs/pkgs/tools/misc/kronometer/default.nix b/nixpkgs/pkgs/tools/misc/kronometer/default.nix index 06fafedf42ef..6e303ddfc983 100644 --- a/nixpkgs/pkgs/tools/misc/kronometer/default.nix +++ b/nixpkgs/pkgs/tools/misc/kronometer/default.nix @@ -16,7 +16,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://kde.org/applications/utilities/kronometer/"; description = "A stopwatch application"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; mainProgram = "kronometer"; }; diff --git a/nixpkgs/pkgs/tools/misc/latex2html/default.nix b/nixpkgs/pkgs/tools/misc/latex2html/default.nix index f3cca8872b23..9f0aed7fb424 100644 --- a/nixpkgs/pkgs/tools/misc/latex2html/default.nix +++ b/nixpkgs/pkgs/tools/misc/latex2html/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { homepage = "https://www.ctan.org/pkg/latex2html"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = with platforms; linux ++ darwin; maintainers = with maintainers; [ yurrriq ]; }; diff --git a/nixpkgs/pkgs/tools/misc/lbdb/default.nix b/nixpkgs/pkgs/tools/misc/lbdb/default.nix index 43dab4772d5f..44f0149cbb7c 100644 --- a/nixpkgs/pkgs/tools/misc/lbdb/default.nix +++ b/nixpkgs/pkgs/tools/misc/lbdb/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.spinnaker.de/lbdb/"; description = "The Little Brother's Database"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ kaiha bfortz ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/tools/misc/lcdf-typetools/default.nix b/nixpkgs/pkgs/tools/misc/lcdf-typetools/default.nix index eaa2ce01347b..feb2563735b4 100644 --- a/nixpkgs/pkgs/tools/misc/lcdf-typetools/default.nix +++ b/nixpkgs/pkgs/tools/misc/lcdf-typetools/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utilities for manipulating OpenType, PostScript Type 1, and Multiple Master fonts"; homepage = "https://www.lcdf.org/type"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ dtzWill ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/ldapvi/default.nix b/nixpkgs/pkgs/tools/misc/ldapvi/default.nix index 4be3b9e9024c..03a01da3e5ef 100644 --- a/nixpkgs/pkgs/tools/misc/ldapvi/default.nix +++ b/nixpkgs/pkgs/tools/misc/ldapvi/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { can update LDAP entries with a text editor. ''; homepage = "http://www.lichteblau.com/ldapvi/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; platforms = lib.platforms.linux; mainProgram = "ldapvi"; diff --git a/nixpkgs/pkgs/tools/misc/lektor/default.nix b/nixpkgs/pkgs/tools/misc/lektor/default.nix index aef55ffb9b1f..129e5e41851c 100644 --- a/nixpkgs/pkgs/tools/misc/lektor/default.nix +++ b/nixpkgs/pkgs/tools/misc/lektor/default.nix @@ -23,19 +23,23 @@ let in python.pkgs.buildPythonApplication rec { pname = "lektor"; - version = "3.4.0b8"; + version = "3.4.0b12"; format = "pyproject"; src = fetchFromGitHub { owner = "lektor"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-FtmRW4AS11zAX2jvGY8XTsPrN3mhHkIWoFY7sXmqG/U="; + # fix for case-insensitive filesystems + postFetch = '' + rm -f $out/tests/demo-project/content/icc-profile-test/{LICENSE,license}.txt + ''; + hash = "sha256-y0/fYuiIB/O5tsYKjzOPnCafOIZCn4Z5OITPMcnHd/M="; }; npmDeps = fetchNpmDeps { - src = "${src}/frontend"; - hash = "sha256-Z7LP9rrVSzKoLITUarsnRbrhIw7W7TZSZUgV/OT+m0M="; + src = "${src}/${npmRoot}"; + hash = "sha256-LXe5/u4nAGig8RSu6r8Qsr3p3Od8eoMxukW8Z4HkJ44="; }; npmRoot = "frontend"; @@ -50,8 +54,6 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ babel click - exifread - filetype flask inifile jinja2 @@ -71,11 +73,6 @@ python.pkgs.buildPythonApplication rec { pytest-click pytest-mock pytestCheckHook - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - "werkzeug" ]; postInstall = '' @@ -90,16 +87,18 @@ python.pkgs.buildPythonApplication rec { # Tests require network access "test_path_installed_plugin_is_none" "test_VirtualEnv_run_pip_install" - # expects FHS paths - "test_VirtualEnv_executable" ]; - meta = with lib; { + postCheck = '' + make test-js + ''; + + meta = { description = "A static content management system"; homepage = "https://www.getlektor.com/"; changelog = "https://github.com/lektor/lektor/blob/v${version}/CHANGES.md"; - license = licenses.bsd0; + license = lib.licenses.bsd3; mainProgram = "lektor"; - maintainers = with maintainers; [ ]; + maintainers = [ ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/lesspipe/default.nix b/nixpkgs/pkgs/tools/misc/lesspipe/default.nix index 5bc3f97c3c78..9922573d3e93 100644 --- a/nixpkgs/pkgs/tools/misc/lesspipe/default.nix +++ b/nixpkgs/pkgs/tools/misc/lesspipe/default.nix @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/wofr06/lesspipe"; platforms = platforms.all; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.martijnvermaat ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/limitcpu/default.nix b/nixpkgs/pkgs/tools/misc/limitcpu/default.nix index 830eed9d94ae..168abdd56ba8 100644 --- a/nixpkgs/pkgs/tools/misc/limitcpu/default.nix +++ b/nixpkgs/pkgs/tools/misc/limitcpu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "limitcpu"; - version = "3.0"; + version = "3.1"; src = fetchurl { url = "mirror://sourceforge/limitcpu/cpulimit-${version}.tar.gz"; - sha256 = "sha256-rS9BXrK72j6DqKLZGO9ekPUuvMb+5h6Uv5F7PoTrtJw="; + sha256 = "sha256-lGmU7GDznwMJW4m9dOZguJwUyCq6dUVmk5jjArx7I0w="; }; buildFlags = with stdenv; [ ( @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { homepage = "https://limitcpu.sourceforge.net/"; description = "A tool to throttle the CPU usage of programs"; platforms = with platforms; linux ++ freebsd; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [maintainers.rycee]; mainProgram = "cpulimit"; }; diff --git a/nixpkgs/pkgs/tools/misc/linuxquota/default.nix b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix index b5fc42be82dc..65e5646e6a7d 100644 --- a/nixpkgs/pkgs/tools/misc/linuxquota/default.nix +++ b/nixpkgs/pkgs/tools/misc/linuxquota/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Tools to manage kernel-level quotas in Linux"; homepage = "https://sourceforge.net/projects/linuxquota/"; - license = licenses.gpl2; # With some files being BSD as an exception + license = licenses.gpl2Plus; # With some files being BSD as an exception platforms = platforms.linux; maintainers = [ maintainers.dezgeg ]; }; diff --git a/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix b/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix index f919facf21b4..b07b62624f0a 100644 --- a/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix +++ b/nixpkgs/pkgs/tools/misc/loadlibrary/default.nix @@ -26,7 +26,7 @@ stdenv_32bit.mkDerivation rec { description = "Porting Windows Dynamic Link Libraries to Linux"; platforms = platforms.linux; maintainers = [ maintainers.eleanor ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; mainProgram = "mpclient"; }; } diff --git a/nixpkgs/pkgs/tools/misc/lrzsz/default.nix b/nixpkgs/pkgs/tools/misc/lrzsz/default.nix index 867e492b33e2..137d27ae1bd0 100644 --- a/nixpkgs/pkgs/tools/misc/lrzsz/default.nix +++ b/nixpkgs/pkgs/tools/misc/lrzsz/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://ohse.de/uwe/software/lrzsz.html"; description = "Communication package providing the XMODEM, YMODEM ZMODEM file transfer protocols"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/makebootfat/default.nix b/nixpkgs/pkgs/tools/misc/makebootfat/default.nix index b2e93bb140ad..7fcd15c53284 100644 --- a/nixpkgs/pkgs/tools/misc/makebootfat/default.nix +++ b/nixpkgs/pkgs/tools/misc/makebootfat/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create bootable USB disks using the FAT filesystem and syslinux"; homepage = "http://advancemame.sourceforge.net/boot-readme.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = [ maintainers.ehmry ]; platforms = platforms.linux; mainProgram = "makebootfat"; diff --git a/nixpkgs/pkgs/tools/misc/maker-panel/default.nix b/nixpkgs/pkgs/tools/misc/maker-panel/default.nix index 12a5d46547a2..7fc5ec9f3c77 100644 --- a/nixpkgs/pkgs/tools/misc/maker-panel/default.nix +++ b/nixpkgs/pkgs/tools/misc/maker-panel/default.nix @@ -16,7 +16,9 @@ rustPlatform.buildRustPackage rec { sha256 = "0dlsy0c46781sb652kp80pvga7pzx6xla64axir92fcgg8k803bi"; }; - cargoSha256 = "1ar62dn0khlbm47chakrsrxd1y76gpq0sql4g9j7dqqrvkavgd7w"; + cargoHash = "sha256-Ygya/9keRyIQyjrO6medtcXww9LMG3ne6I/8q35lJPo="; + + cargoPatches = [ ./update-gerber-types-to-0.3.patch ]; nativeBuildInputs = [ go-md2man installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/maker-panel/update-gerber-types-to-0.3.patch b/nixpkgs/pkgs/tools/misc/maker-panel/update-gerber-types-to-0.3.patch new file mode 100644 index 000000000000..60b22d7d69e1 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/maker-panel/update-gerber-types-to-0.3.patch @@ -0,0 +1,109 @@ +From e616648213b75f60703bd68e028f0af78199a565 Mon Sep 17 00:00:00 2001 +From: Leah Amelia Chen <hi@pluie.me> +Date: Mon, 6 May 2024 10:43:56 +0200 +Subject: [PATCH] Update gerber-types to 0.3.0 + +Required to update num-bigint to ^0.3.3, in order to compile on modern +Rust versions with a native `div_ceil` on unsigned integers. +--- + Cargo.lock | 26 ++++++++++++++++---------- + Cargo.toml | 2 +- + 2 files changed, 17 insertions(+), 11 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 1b15393..41cd500 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -387,7 +387,7 @@ dependencies = [ + "log", + "memmap2", + "ttf-parser", +- "uuid", ++ "uuid 0.8.2", + ] + + [[package]] +@@ -471,15 +471,15 @@ dependencies = [ + + [[package]] + name = "gerber-types" +-version = "0.2.0" ++version = "0.3.0" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "c7badd25c55b207eb6607600b73293d9627587b2dc0608031aa8de50e63810d3" ++checksum = "aecf78a269d7b4f73953f30174b18f52c1bb44f7d58f4d830a76c0ea023ad8bc" + dependencies = [ + "chrono", + "conv", + "num-rational", + "thiserror", +- "uuid", ++ "uuid 1.8.0", + ] + + [[package]] +@@ -780,9 +780,9 @@ dependencies = [ + + [[package]] + name = "num-bigint" +-version = "0.3.2" ++version = "0.4.4" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7d0a3d5e207573f948a9e5376662aa743a2ea13f7c50a554d7af443a73fbfeba" ++checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" + dependencies = [ + "autocfg", + "num-integer", +@@ -801,9 +801,9 @@ dependencies = [ + + [[package]] + name = "num-rational" +-version = "0.3.2" ++version = "0.4.1" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" ++checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" + dependencies = [ + "autocfg", + "num-bigint", +@@ -813,9 +813,9 @@ dependencies = [ + + [[package]] + name = "num-traits" +-version = "0.2.14" ++version = "0.2.19" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" + dependencies = [ + "autocfg", + ] +@@ -1379,6 +1379,12 @@ dependencies = [ + "getrandom 0.2.2", + ] + ++[[package]] ++name = "uuid" ++version = "1.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" ++ + [[package]] + name = "vec_map" + version = "0.8.2" +diff --git a/Cargo.toml b/Cargo.toml +index 2f9e8ea..09f0410 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -13,7 +13,7 @@ geo-booleanop = "0.3.2" + geo = "0.16" + usvg = { version = "0.12", default-features = false } + resvg = { version = "0.12", default-features = false } +-gerber-types = "0.2" ++gerber-types = "0.3" + #{ git = "https://github.com/twitchyliquid64/gerber-types-rs", rev = "e927ed2ff68d9e8629dbc36d5f1e5626da472376" } + structopt = "0.3" + zip = { version = "0.5", default-features = false } +-- +2.44.0 + diff --git a/nixpkgs/pkgs/tools/misc/man-db/default.nix b/nixpkgs/pkgs/tools/misc/man-db/default.nix index 8e2365f475d2..59450f5c360e 100644 --- a/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://man-db.nongnu.org"; description = "An implementation of the standard Unix documentation system accessed using the man command"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = lib.platforms.unix; mainProgram = "man"; }; diff --git a/nixpkgs/pkgs/tools/misc/massren/default.nix b/nixpkgs/pkgs/tools/misc/massren/default.nix index 763c3a2ae370..a1f1e7027028 100644 --- a/nixpkgs/pkgs/tools/misc/massren/default.nix +++ b/nixpkgs/pkgs/tools/misc/massren/default.nix @@ -23,7 +23,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" ]; - preCheck = + checkFlags = let skippedTests = [ # Possible error about github.com/mattn/go-sqlite3 @@ -31,9 +31,7 @@ buildGoModule rec { "Test_processFileActions" ]; in - '' - buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") - ''; + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; meta = with lib; { description = "Easily rename multiple files using your text editor"; diff --git a/nixpkgs/pkgs/tools/misc/mcfly/default.nix b/nixpkgs/pkgs/tools/misc/mcfly/default.nix index 675639a03294..17fea7b5fb17 100644 --- a/nixpkgs/pkgs/tools/misc/mcfly/default.nix +++ b/nixpkgs/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.8.4"; + version = "0.8.6"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - hash = "sha256-beoXLTy3XikdZBS0Lh3cugHflNJ51PbqsCE3xtCHpj0="; + hash = "sha256-OoDfQze4t03PaLyoB0/0HtcsPK6Jy74OythuJG6Vy60="; }; postPatch = '' @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { substituteInPlace mcfly.fish --replace '(command which mcfly)' '${placeholder "out"}/bin/mcfly' ''; - cargoHash = "sha256-wWYpDU6oXT+sDCzX8VWJ6GfNPOi7T02LK0JKcWHFGi8="; + cargoHash = "sha256-Y1W9QetWZAgcZdfJNH9Hg3i4NZoCpf7FIPOlaRJzBrQ="; meta = with lib; { homepage = "https://github.com/cantino/mcfly"; diff --git a/nixpkgs/pkgs/tools/misc/mdbtools/default.nix b/nixpkgs/pkgs/tools/misc/mdbtools/default.nix index 327b58d8d78b..05299e60845a 100644 --- a/nixpkgs/pkgs/tools/misc/mdbtools/default.nix +++ b/nixpkgs/pkgs/tools/misc/mdbtools/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = ".mdb (MS Access) format tools"; - license = with licenses; [ gpl2 lgpl2 ]; + license = with licenses; [ gpl2Plus lgpl2 ]; maintainers = with maintainers; [ ]; platforms = platforms.unix; inherit (src.meta) homepage; diff --git a/nixpkgs/pkgs/tools/misc/memtest86+/default.nix b/nixpkgs/pkgs/tools/misc/memtest86+/default.nix index 297ef5dff041..520b0a98c201 100644 --- a/nixpkgs/pkgs/tools/misc/memtest86+/default.nix +++ b/nixpkgs/pkgs/tools/misc/memtest86+/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.memtest.org/"; description = "A tool to detect memory errors"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = [ lib.maintainers.LunNova ]; }; diff --git a/nixpkgs/pkgs/tools/misc/minicom/default.nix b/nixpkgs/pkgs/tools/misc/minicom/default.nix index 361909ebddf2..50043a132b14 100644 --- a/nixpkgs/pkgs/tools/misc/minicom/default.nix +++ b/nixpkgs/pkgs/tools/misc/minicom/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Modem control and terminal emulation program"; homepage = "https://salsa.debian.org/minicom-team/minicom"; - license = licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Minicom is a menu driven communications program. It emulates ANSI and VT102 terminals. It has a dialing directory and auto zmodem diff --git a/nixpkgs/pkgs/tools/misc/minipro/default.nix b/nixpkgs/pkgs/tools/misc/minipro/default.nix index 870c4706f882..13bb93cb4fbe 100644 --- a/nixpkgs/pkgs/tools/misc/minipro/default.nix +++ b/nixpkgs/pkgs/tools/misc/minipro/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "minipro"; - version = "0.6"; + version = "0.7"; src = fetchFromGitLab { owner = "DavidGriffith"; repo = "minipro"; rev = version; - sha256 = "sha256-6i4PYzSm6lcO/Nb6n3holrNe4TtAnG2o81ZIMAIGqOE="; + hash = "sha256-suMGR1vgM2tXsPHInZ6HEDKhDSPlC1ss+wCgbION/rE="; }; nativeBuildInputs = [ pkg-config ]; @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.bmwalters ]; mainProgram = "minipro"; + platforms = platforms.unix; }; } diff --git a/nixpkgs/pkgs/tools/misc/mise/default.nix b/nixpkgs/pkgs/tools/misc/mise/default.nix index 280b7adde970..5c24e8314ce1 100644 --- a/nixpkgs/pkgs/tools/misc/mise/default.nix +++ b/nixpkgs/pkgs/tools/misc/mise/default.nix @@ -17,13 +17,13 @@ rustPlatform.buildRustPackage rec { pname = "mise"; - version = "2024.4.8"; + version = "2024.5.9"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; rev = "v${version}"; - hash = "sha256-bIw7j7KPHlgIucV/onvp92k0OlNgaxqiVq/Cnj0kIuQ="; + hash = "sha256-vmY+uI/NqMCLJwJaQU+aDppmn5OSLPUIbeqCSlN8Xb0="; # registry is not needed for compilation nor for tests. # contains files with the same name but different case, which cause problems with hash on darwin @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoHash = "sha256-yMpU39SU4Ut7vUQdzkBjhf8p8yCU350HMYKGm5CCado="; + cargoHash = "sha256-7kcs1vOM68uKjMrRn8jGI6mgXd90TeMUeYWnAGl8sgE="; nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; diff --git a/nixpkgs/pkgs/tools/misc/mlocate/default.nix b/nixpkgs/pkgs/tools/misc/mlocate/default.nix index c9253be930af..bf8899b4003e 100644 --- a/nixpkgs/pkgs/tools/misc/mlocate/default.nix +++ b/nixpkgs/pkgs/tools/misc/mlocate/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Merging locate is an utility to index and quickly search for files"; homepage = "https://pagure.io/mlocate"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ ]; }; diff --git a/nixpkgs/pkgs/tools/misc/moar/default.nix b/nixpkgs/pkgs/tools/misc/moar/default.nix index c99c394f100a..4140308c4967 100644 --- a/nixpkgs/pkgs/tools/misc/moar/default.nix +++ b/nixpkgs/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.23.11"; + version = "1.23.15"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - hash = "sha256-dKsDvtFs1/WToqpfW84dxDAHRN13TUnZKKk26h3pQ18="; + hash = "sha256-tRjKBHsNJL66oz+0gZTrL8xFHQEyHLG+W35LHUYQKwU="; }; vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE="; diff --git a/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix index e0c1097d183f..c89018cf03a4 100644 --- a/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix +++ b/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix @@ -28,12 +28,12 @@ nss, pango, stdenv, systemd, -wrapGAppsHook, +wrapGAppsHook3, xorg, }: let - version = "1.42.5"; + version = "1.43.0"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-46JQXC2Ydq37TomtQdnvk8DwSs8aCfozxqUaEO6hmxo="; + sha256 = "sha256-hzPhF0NGwv+Lm+q5SoS8qv10UmuKf4RarGMkEeCxp9w="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; @@ -95,7 +95,7 @@ in stdenv.mkDerivation { inherit src; - buildInputs = [ dpkg wrapGAppsHook gtk3 ]; + buildInputs = [ dpkg wrapGAppsHook3 gtk3 ]; dontUnpack = true; buildCommand = '' diff --git a/nixpkgs/pkgs/tools/misc/most/default.nix b/nixpkgs/pkgs/tools/misc/most/default.nix index 87280b9f295e..dd94f1fed45f 100644 --- a/nixpkgs/pkgs/tools/misc/most/default.nix +++ b/nixpkgs/pkgs/tools/misc/most/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { windows and can scroll left and right. Why settle for less? ''; homepage = "https://www.jedsoft.org/most/index.html"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; mainProgram = "most"; }; diff --git a/nixpkgs/pkgs/tools/misc/mstflint/default.nix b/nixpkgs/pkgs/tools/misc/mstflint/default.nix index c4c99da85e18..16b46002a301 100644 --- a/nixpkgs/pkgs/tools/misc/mstflint/default.nix +++ b/nixpkgs/pkgs/tools/misc/mstflint/default.nix @@ -26,22 +26,13 @@ stdenv.mkDerivation rec { pname = "mstflint"; - version = "4.26.0-1"; + version = "4.28.0-1"; src = fetchurl { url = "https://github.com/Mellanox/mstflint/releases/download/v${version}/mstflint-${version}.tar.gz"; - hash = "sha256-P8XACcz6d8UTOhFFeTijfFOthBqnUghGlDj9K145sZ8="; + hash = "sha256-zvCDc/9wAqT3XBI9A5kOprnnm52Ek8oGe2Je3dKHti0="; }; - patches = [ - # needed to introduce this with GCC 13. Remove, when https://github.com/Mellanox/mstflint/pull/916 is upstream. - (fetchpatch { - name = "elf.patch"; - url = "https://patch-diff.githubusercontent.com/raw/Mellanox/mstflint/pull/916.patch"; - hash = "sha256-quBdmiuzwThu4MkAaT74eJDlZwIcUZMrLZa8OIcO96w="; - }) - ]; - nativeBuildInputs = [ autoconf automake @@ -121,7 +112,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Open source version of Mellanox Firmware Tools (MFT)"; homepage = "https://github.com/Mellanox/mstflint"; - license = with licenses; [ gpl2 bsd2 ]; + license = with licenses; [ gpl2Only bsd2 ]; maintainers = with maintainers; [ thillux ]; platforms = platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/nagstamon/default.nix b/nixpkgs/pkgs/tools/misc/nagstamon/default.nix index e9f76dbf22d9..eb80c03bec91 100644 --- a/nixpkgs/pkgs/tools/misc/nagstamon/default.nix +++ b/nixpkgs/pkgs/tools/misc/nagstamon/default.nix @@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec { meta = with lib; { description = "A status monitor for the desktop"; homepage = "https://nagstamon.ifw-dresden.de/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ pSub ]; # fails to install with: # TypeError: cannot unpack non-iterable bool object diff --git a/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix index b200731ab8f2..45716202878f 100644 --- a/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix +++ b/nixpkgs/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -9,7 +9,7 @@ , gsettings-desktop-schemas , gtk3 , python3 -, wrapGAppsHook +, wrapGAppsHook3 }: python3.pkgs.buildPythonPackage rec { @@ -30,7 +30,7 @@ python3.pkgs.buildPythonPackage rec { glib gobject-introspection pkg-config - wrapGAppsHook + wrapGAppsHook3 python3.pkgs.setuptools ]; diff --git a/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix b/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix index 0265e5dd8974..e1118022edff 100644 --- a/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix +++ b/nixpkgs/pkgs/tools/misc/notify-desktop/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { It also does not use any external dependencies (except from libdbus of course). ''; homepage = "https://github.com/nowrep/notify-desktop"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ ylwghst ]; mainProgram = "notify-desktop"; diff --git a/nixpkgs/pkgs/tools/misc/ntfy-sh/default.nix b/nixpkgs/pkgs/tools/misc/ntfy-sh/default.nix index cf429da9cad0..439707e5b014 100644 --- a/nixpkgs/pkgs/tools/misc/ntfy-sh/default.nix +++ b/nixpkgs/pkgs/tools/misc/ntfy-sh/default.nix @@ -5,21 +5,21 @@ buildGoModule rec { pname = "ntfy-sh"; - version = "2.10.0"; + version = "2.11.0"; src = fetchFromGitHub { owner = "binwiederhier"; repo = "ntfy"; rev = "v${version}"; - hash = "sha256-Ns73kZ7XJKj93fhTDQ3L5hk4NZVEcKysJVEZk6jX7KE="; + hash = "sha256-lSj4LfS4nBC1xtTE/ee2Nhx9TmlU+138miwC0nEfVRY="; }; - vendorHash = "sha256-c7fOSI+BPF3lwAJEftZHk9o/97T9kntgSsXoko3AYtQ="; + vendorHash = "sha256-V8LgbprUsr+8Ub4xeTPrE4Bp9qOP/R35/qPj0Udgod0="; ui = buildNpmPackage { inherit src version; pname = "ntfy-sh-ui"; - npmDepsHash = "sha256-nU5atvqyt5U7z8XB0+25uF+7tWPW2yYnkV/124fKoPE="; + npmDepsHash = "sha256-PCkRULHfC3ktShO+3wIQFLG24l5LBSB1niWcIrCT9Bo="; prePatch = '' cd web/ diff --git a/nixpkgs/pkgs/tools/misc/octosql/default.nix b/nixpkgs/pkgs/tools/misc/octosql/default.nix index a42f80d95ff9..675375cb0941 100644 --- a/nixpkgs/pkgs/tools/misc/octosql/default.nix +++ b/nixpkgs/pkgs/tools/misc/octosql/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "octosql"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "cube2222"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jf40w5QkSTAgGu0JA4NeqsasN2TUf9vnKVw5zlZr8Mw="; + sha256 = "sha256-kzbIts5d2KmFfaAnOdpIXI1fiqBYXe5t981g4Uyk/cc="; }; vendorHash = "sha256-p/2UsvxxywQKtk/9wDa5fjS0z6xLLzDONuQ5AtnUonk="; diff --git a/nixpkgs/pkgs/tools/misc/opencorsairlink/default.nix b/nixpkgs/pkgs/tools/misc/opencorsairlink/default.nix index 40b747f20305..4d455977d6d9 100644 --- a/nixpkgs/pkgs/tools/misc/opencorsairlink/default.nix +++ b/nixpkgs/pkgs/tools/misc/opencorsairlink/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux and Mac OS support for the CorsairLink Devices "; homepage = "https://github.com/audiohacked/OpenCorsairLink"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ lib.maintainers.expipiplus1 ]; mainProgram = "OpenCorsairLink.elf"; diff --git a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix index 6a0fafc7815c..ea52a0e00b3c 100644 --- a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix +++ b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/contrib.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "opentelemetry-collector-contrib"; - version = "0.98.0"; + version = "0.100.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector-contrib"; rev = "v${version}"; - sha256 = "sha256-YdaAP/o8WhiGOggF2Xo66TzE7PCJDkvbiCFPLVG4SHQ="; + sha256 = "sha256-QmWl3XhCmOxJPn/haBsWVCPI970sTQpmVpJwCCpBbH4="; }; # proxy vendor to avoid hash missmatches between linux and macOS proxyVendor = true; - vendorHash = "sha256-4hQcHUX/UgeG/ojljq4eJCqZIYp1unNsngprr/3C9q0="; + vendorHash = "sha256-62G+wQeZK/7iO10ZgXXY3gT8LwUnqDY9Pr8HkAqkVik="; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcontribcol"; diff --git a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix index 421f59f75009..b855202633db 100644 --- a/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/nixpkgs/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -8,17 +8,17 @@ buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.99.0"; + version = "0.100.0"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - hash = "sha256-O0I6G8Wa2GTv/lR6ijo9XglAdciJj2yuupJP9/uYySM="; + hash = "sha256-GDRxOfuAlztJhuYXZKmDpQ6M4ZW3+bNevMjqCHRuyVY="; }; # there is a nested go.mod sourceRoot = "${src.name}/cmd/otelcorecol"; - vendorHash = "sha256-JaquTJ3xl2NvipKF8her5m7tbYbLVQjYprGXEcrzv4s="; + vendorHash = "sha256-wVJyu4+dYXLSkopfSLkKPkwnUCGyUeagQtOjuvNxF6A="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/os-prober/default.nix b/nixpkgs/pkgs/tools/misc/os-prober/default.nix index 5d15b7077385..f48aae8e6df5 100644 --- a/nixpkgs/pkgs/tools/misc/os-prober/default.nix +++ b/nixpkgs/pkgs/tools/misc/os-prober/default.nix @@ -68,6 +68,8 @@ stdenv.mkDerivation rec { description = "Utility to detect other OSs on a set of drives"; homepage = "http://packages.debian.org/source/sid/os-prober"; license = licenses.gpl2Plus; + mainProgram = "os-prober"; maintainers = with maintainers; [ symphorien ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/tools/misc/ostree/default.nix b/nixpkgs/pkgs/tools/misc/ostree/default.nix index caccfbec9b69..cab9aba3d90c 100644 --- a/nixpkgs/pkgs/tools/misc/ostree/default.nix +++ b/nixpkgs/pkgs/tools/misc/ostree/default.nix @@ -8,6 +8,7 @@ , gobject-introspection , gjs , nixosTests +, pkgsCross , curl , glib , systemd @@ -140,6 +141,7 @@ in stdenv.mkDerivation rec { passthru = { tests = { + musl = pkgsCross.musl64.ostree; installedTests = nixosTests.installed-tests.ostree; }; }; diff --git a/nixpkgs/pkgs/tools/misc/pal/default.nix b/nixpkgs/pkgs/tools/misc/pal/default.nix index 5456ffdf061c..c3778ba3bccf 100644 --- a/nixpkgs/pkgs/tools/misc/pal/default.nix +++ b/nixpkgs/pkgs/tools/misc/pal/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://palcal.sourceforge.net/"; description = "Command-line calendar program that can keep track of events"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [viric]; platforms = with lib.platforms; linux; }; diff --git a/nixpkgs/pkgs/tools/misc/panoply/default.nix b/nixpkgs/pkgs/tools/misc/panoply/default.nix index b79d6b7d8e35..b5df3adc7b3d 100644 --- a/nixpkgs/pkgs/tools/misc/panoply/default.nix +++ b/nixpkgs/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.3.4"; + version = "5.4.0"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-v7ieTtm2W8Sc/zhQ7QPh8rkMUgaqgfGYYXc6Ly+9iMg="; + sha256 = "sha256-mWk0wuTxkITVU3SwWYPHrX8Y9NceXeRMwyvpwEDWIiA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/tools/misc/parallel/default.nix b/nixpkgs/pkgs/tools/misc/parallel/default.nix index 7dff66bc1003..ec1603640a8e 100644 --- a/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "parallel"; - version = "20240322"; + version = "20240422"; src = fetchurl { url = "mirror://gnu/parallel/${pname}-${version}.tar.bz2"; - hash = "sha256-CxcCmiA9q/e6bKflLC05EP/0ayl5R24SqREJILeeapU="; + hash = "sha256-eDiIID7eK5LO0x6z6AnKOp2J9FCP3LEYML+zV1SIJGc="; }; outputs = [ "out" "man" "doc" ]; diff --git a/nixpkgs/pkgs/tools/misc/parallel/wrapper.nix b/nixpkgs/pkgs/tools/misc/parallel/wrapper.nix index 0240f1ac9e9e..b798a1acea22 100644 --- a/nixpkgs/pkgs/tools/misc/parallel/wrapper.nix +++ b/nixpkgs/pkgs/tools/misc/parallel/wrapper.nix @@ -1,10 +1,18 @@ -{ lib, runCommand, makeWrapper, parallel, perlPackages +{ lib, symlinkJoin, makeWrapper, parallel, perlPackages , extraPerlPackages ? with perlPackages; [ DBI DBDPg DBDSQLite DBDCSV TextCSV ] , willCite ? false }: -runCommand "parallel-full" { nativeBuildInputs = [ makeWrapper ]; } '' - mkdir -p $out/bin - makeWrapper ${parallel}/bin/parallel $out/bin/parallel \ - --set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}" \ - ${lib.optionalString willCite "--add-flags --will-cite"} -'' +symlinkJoin { + name = "parallel-full-${parallel.version}"; + inherit (parallel) pname version meta outputs; + nativeBuildInputs = [ makeWrapper ]; + paths = [ parallel ]; + postBuild = '' + ${lib.concatMapStringsSep "\n" (output: "ln -s --no-target-directory ${parallel.${output}} \$${output}") (lib.remove "out" parallel.outputs)} + + rm $out/bin/parallel + makeWrapper ${parallel}/bin/parallel $out/bin/parallel \ + --set PERL5LIB "${perlPackages.makeFullPerlPath extraPerlPackages}" \ + ${lib.optionalString willCite "--add-flags --will-cite"} + ''; +} diff --git a/nixpkgs/pkgs/tools/misc/parcellite/default.nix b/nixpkgs/pkgs/tools/misc/parcellite/default.nix index d39115fcecc9..3c53be706641 100644 --- a/nixpkgs/pkgs/tools/misc/parcellite/default.nix +++ b/nixpkgs/pkgs/tools/misc/parcellite/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook , gtk2, hicolor-icon-theme, intltool, pkg-config -, which, wrapGAppsHook, xdotool, libappindicator-gtk2 }: +, which, wrapGAppsHook3, xdotool, libappindicator-gtk2 }: stdenv.mkDerivation rec { pname = "parcellite"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "19q4x6x984s6gxk1wpzaxawgvly5vnihivrhmja2kcxhzqrnfhiy"; }; - nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook intltool pkg-config wrapGAppsHook3 ]; buildInputs = [ gtk2 hicolor-icon-theme libappindicator-gtk2 ]; NIX_LDFLAGS = "-lgio-2.0"; diff --git a/nixpkgs/pkgs/tools/misc/pastebinit/default.nix b/nixpkgs/pkgs/tools/misc/pastebinit/default.nix index ba597934ebbe..21beecc443c0 100644 --- a/nixpkgs/pkgs/tools/misc/pastebinit/default.nix +++ b/nixpkgs/pkgs/tools/misc/pastebinit/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { homepage = "https://stgraber.org/category/pastebinit/"; description = "A software that lets you send anything you want directly to a pastebin from the command line"; maintainers = with maintainers; [ raboof samuel-martineau ]; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux ++ lib.platforms.darwin; }; } diff --git a/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix b/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix index 70b08aa96a92..fc00c5936b06 100644 --- a/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix +++ b/nixpkgs/pkgs/tools/misc/phrase-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "phrase-cli"; - version = "2.25.0"; + version = "2.27.0"; src = fetchFromGitHub { owner = "phrase"; repo = "phrase-cli"; rev = version; - sha256 = "sha256-JVelz5I6HWgoqqkfNzb0DlAA4DsydBzdcxEIdKs24i4="; + sha256 = "sha256-PStbkJbSGCN92eAk4TZaIzbkG1C25PKI6R6LJgaQuxQ="; }; - vendorHash = "sha256-8lqiseOJ8eDvY4J/MimKVvh5euHfOgQLjhKf7sPS6AE="; + vendorHash = "sha256-5EgttRimT+TTL9QhT36AO9rx2DdZBmnQrllBfRpdhg0="; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; diff --git a/nixpkgs/pkgs/tools/misc/pipelight/default.nix b/nixpkgs/pkgs/tools/misc/pipelight/default.nix index 90c1e8d1e86a..e565bf554fff 100644 --- a/nixpkgs/pkgs/tools/misc/pipelight/default.nix +++ b/nixpkgs/pkgs/tools/misc/pipelight/default.nix @@ -59,7 +59,7 @@ in stdenv.mkDerivation rec { meta = { homepage = "http://pipelight.net/"; - license = with lib.licenses; [ mpl11 gpl2 lgpl21 ]; + license = with lib.licenses; [ mpl11 gpl2Only lgpl21 ]; description = "A wrapper for using Windows plugins in Linux browsers"; maintainers = with lib.maintainers; [ ]; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/nixpkgs/pkgs/tools/misc/pkgdiff/default.nix b/nixpkgs/pkgs/tools/misc/pkgdiff/default.nix index 45ec2df2beaf..77ba84c1df0f 100644 --- a/nixpkgs/pkgs/tools/misc/pkgdiff/default.nix +++ b/nixpkgs/pkgs/tools/misc/pkgdiff/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A tool for visualizing changes in Linux software packages"; homepage = "https://lvc.github.io/pkgdiff/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ sweber ]; platforms = platforms.unix; mainProgram = "pkgdiff"; diff --git a/nixpkgs/pkgs/tools/misc/plotinus/default.nix b/nixpkgs/pkgs/tools/misc/plotinus/default.nix index 112010c80082..10c86b10c3da 100644 --- a/nixpkgs/pkgs/tools/misc/plotinus/default.nix +++ b/nixpkgs/pkgs/tools/misc/plotinus/default.nix @@ -7,7 +7,7 @@ , cmake , ninja , vala -, wrapGAppsHook }: +, wrapGAppsHook3 }: stdenv.mkDerivation rec { pname = "plotinus"; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 vala cmake ninja diff --git a/nixpkgs/pkgs/tools/misc/popsicle/default.nix b/nixpkgs/pkgs/tools/misc/popsicle/default.nix index c5a9e5edc738..2a62a0aa922d 100644 --- a/nixpkgs/pkgs/tools/misc/popsicle/default.nix +++ b/nixpkgs/pkgs/tools/misc/popsicle/default.nix @@ -6,7 +6,7 @@ , glib , pkg-config , rustc -, wrapGAppsHook +, wrapGAppsHook3 , gdk-pixbuf , gtk3 }: @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { rustPlatform.bindgenHook rustPlatform.cargoSetupHook rustc - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/pre-commit/default.nix b/nixpkgs/pkgs/tools/misc/pre-commit/default.nix index 535ce1a8c4da..122226486bd4 100644 --- a/nixpkgs/pkgs/tools/misc/pre-commit/default.nix +++ b/nixpkgs/pkgs/tools/misc/pre-commit/default.nix @@ -18,7 +18,7 @@ with python3Packages; buildPythonApplication rec { pname = "pre-commit"; - version = "3.7.0"; + version = "3.7.1"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonApplication rec { owner = "pre-commit"; repo = "pre-commit"; rev = "refs/tags/v${version}"; - hash = "sha256-k9pC/GCtqLlK9PhZmx4EKWT1HDyl+KQubDFDQOZdKUQ="; + hash = "sha256-+9NNXM4i6saxktF1pl93dmkrqjsErqMB6kEK3IPQTNQ="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/misc/pspg/default.nix b/nixpkgs/pkgs/tools/misc/pspg/default.nix index 9d0adb051af0..1ceefdd82edf 100644 --- a/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.8.5"; + version = "5.8.6"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-Lri675TEIVWp8iEQI1oeSd9xNCVtzlUcK2AEJHmWNjs="; + sha256 = "sha256-UgJHsniDbfAcohnrYYUUJ4OhL2Fr65kGu26dsw9vYyM="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/qflipper/default.nix b/nixpkgs/pkgs/tools/misc/qflipper/default.nix index 5c139d017c86..171c5d7b3877 100644 --- a/nixpkgs/pkgs/tools/misc/qflipper/default.nix +++ b/nixpkgs/pkgs/tools/misc/qflipper/default.nix @@ -6,7 +6,7 @@ , libusb1 , libGL , qmake -, wrapGAppsHook +, wrapGAppsHook3 , wrapQtAppsHook , mkDerivation @@ -45,7 +45,7 @@ mkDerivation { pkg-config qmake qttools - wrapGAppsHook + wrapGAppsHook3 wrapQtAppsHook ]; diff --git a/nixpkgs/pkgs/tools/misc/qjoypad/default.nix b/nixpkgs/pkgs/tools/misc/qjoypad/default.nix index a602e7b7fad6..260c8f498e6b 100644 --- a/nixpkgs/pkgs/tools/misc/qjoypad/default.nix +++ b/nixpkgs/pkgs/tools/misc/qjoypad/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { experience just a little bit nicer. ''; homepage = "https://github.com/panzi/qjoypad/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = with maintainers; [ astsmtl ]; platforms = with platforms; linux; mainProgram = "qjoypad"; diff --git a/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix b/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix index db05aeda96a3..998241f5cc39 100644 --- a/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix +++ b/nixpkgs/pkgs/tools/misc/recoverjpeg/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://rfc1149.net/devel/recoverjpeg.html"; description = "Recover lost JPEGs and MOV files on a bogus memory card or disk"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ dotlambda ]; platforms = with platforms; linux; }; diff --git a/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix b/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix index 9ce23873aa27..f0acc5cc04b0 100644 --- a/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix +++ b/nixpkgs/pkgs/tools/misc/riemann-c-client/default.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "riemann-c-client"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitea { domain = "git.madhouse-project.org"; owner = "algernon"; repo = "riemann-c-client"; rev = "riemann-c-client-${version}"; - hash = "sha256-FIhTT57g2uZBaH3EPNxNUNJn9n+0ZOhI6WMyF+xIr/Q="; + hash = "sha256-GAinZtEetRAl04CjxNCTCkGbvdhSZei7gon3KxEqiIY="; }; outputs = [ "bin" "dev" "out" ]; diff --git a/nixpkgs/pkgs/tools/misc/rig/default.nix b/nixpkgs/pkgs/tools/misc/rig/default.nix index b9a3e0951e3c..45304f3e56f4 100644 --- a/nixpkgs/pkgs/tools/misc/rig/default.nix +++ b/nixpkgs/pkgs/tools/misc/rig/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { if the Web site/BBS/person you are giving the information to tries to cross-check the city, state, zip, or area code, it will check out. ''; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ tomberek ]; platforms = with lib.platforms; all; mainProgram = "rig"; diff --git a/nixpkgs/pkgs/tools/misc/rmlint/default.nix b/nixpkgs/pkgs/tools/misc/rmlint/default.nix index 2c11cbf195bd..08a0a0c5e146 100644 --- a/nixpkgs/pkgs/tools/misc/rmlint/default.nix +++ b/nixpkgs/pkgs/tools/misc/rmlint/default.nix @@ -14,7 +14,7 @@ , scons , sphinx , util-linux -, wrapGAppsHook +, wrapGAppsHook3 , withGui ? false }: assert withGui -> !stdenv.isDarwin; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { scons ] ++ lib.optionals withGui [ makeWrapper - wrapGAppsHook + wrapGAppsHook3 gobject-introspection ]; diff --git a/nixpkgs/pkgs/tools/misc/rrdtool/default.nix b/nixpkgs/pkgs/tools/misc/rrdtool/default.nix index e852374e2a88..3ce10f131605 100644 --- a/nixpkgs/pkgs/tools/misc/rrdtool/default.nix +++ b/nixpkgs/pkgs/tools/misc/rrdtool/default.nix @@ -41,7 +41,7 @@ perl.pkgs.toPerlModule (stdenv.mkDerivation rec { meta = with lib; { homepage = "https://oss.oetiker.ch/rrdtool/"; description = "High performance logging in Round Robin Databases"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ pSub ]; }; diff --git a/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix b/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix index 67cf3b6895e0..329c572967a9 100644 --- a/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix +++ b/nixpkgs/pkgs/tools/misc/rshim-user-space/default.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { target and provides a way to access the internal rshim registers. ''; homepage = "https://github.com/Mellanox/rshim-user-space"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; maintainers = with maintainers; [ nikstur ]; }; diff --git a/nixpkgs/pkgs/tools/misc/scanmem/default.nix b/nixpkgs/pkgs/tools/misc/scanmem/default.nix index 817e713b229f..15d8f1c02f1e 100644 --- a/nixpkgs/pkgs/tools/misc/scanmem/default.nix +++ b/nixpkgs/pkgs/tools/misc/scanmem/default.nix @@ -4,7 +4,7 @@ , autoreconfHook , gobject-introspection , intltool -, wrapGAppsHook +, wrapGAppsHook3 , procps , python3 , readline @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { sha256 = "17p8sh0rj8yqz36ria5bp48c8523zzw3y9g8sbm2jwq7sc27i7s9"; }; - nativeBuildInputs = [ autoreconfHook gobject-introspection intltool wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook gobject-introspection intltool wrapGAppsHook3 ]; buildInputs = [ readline python3 ]; configureFlags = ["--enable-gui"]; diff --git a/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix b/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix index 238b9f400b89..f75629d96f12 100644 --- a/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix +++ b/nixpkgs/pkgs/tools/misc/sensible-utils/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://salsa.debian.org/debian/sensible-utils"; changelog = "https://salsa.debian.org/debian/sensible-utils/-/tags"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ pbek ]; platforms = platforms.unix; }; diff --git a/nixpkgs/pkgs/tools/misc/sixpair/default.nix b/nixpkgs/pkgs/tools/misc/sixpair/default.nix index fa444a86a0ac..92f7e81c0ccd 100644 --- a/nixpkgs/pkgs/tools/misc/sixpair/default.nix +++ b/nixpkgs/pkgs/tools/misc/sixpair/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { This command-line utility searches USB buses for SIXAXIS controllers and tells them to connect to a new Bluetooth master. ''; homepage = "http://www.pabr.org/sixlinux/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.tomsmeets ]; platforms = lib.platforms.linux; mainProgram = "sixpair"; diff --git a/nixpkgs/pkgs/tools/misc/slsnif/default.nix b/nixpkgs/pkgs/tools/misc/slsnif/default.nix index 04bc462350f1..7ac1a846484f 100644 --- a/nixpkgs/pkgs/tools/misc/slsnif/default.nix +++ b/nixpkgs/pkgs/tools/misc/slsnif/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Serial line sniffer"; homepage = "http://slsnif.sourceforge.net/"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; mainProgram = "slsnif"; }; diff --git a/nixpkgs/pkgs/tools/misc/sonota/default.nix b/nixpkgs/pkgs/tools/misc/sonota/default.nix index 5f341bbc98ee..efc7ab22b468 100644 --- a/nixpkgs/pkgs/tools/misc/sonota/default.nix +++ b/nixpkgs/pkgs/tools/misc/sonota/default.nix @@ -48,7 +48,7 @@ in buildPythonApplication rec { meta = with lib; { description = "Flash Itead Sonoff devices with custom firmware via original OTA mechanism"; homepage = src.meta.homepage; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ peterhoeg ]; mainProgram = "sonota"; }; diff --git a/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix index 8d93736ffdac..289de7d02264 100644 --- a/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix +++ b/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -9,7 +9,7 @@ python3Packages.buildPythonApplication rec { pname = "sqlite3-to-mysql"; - version = "2.1.9"; + version = "2.1.10"; format = "pyproject"; disabled = python3Packages.pythonOlder "3.8"; @@ -18,7 +18,7 @@ python3Packages.buildPythonApplication rec { owner = "techouse"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-TnqNPW/d1dcVuS5sg9NOXH5ns7AzcbyailY2pYcpUEU="; + hash = "sha256-E8cKgKT6Tmz5rR/E2eXDVEVdOr7kk+VbkpF+Yc7IZrw="; }; nativeBuildInputs = with python3Packages; [ diff --git a/nixpkgs/pkgs/tools/misc/starship/default.nix b/nixpkgs/pkgs/tools/misc/starship/default.nix index d040534cf300..ce82cb7745c7 100644 --- a/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "1.18.2"; + version = "1.19.0"; src = fetchFromGitHub { owner = "starship"; repo = "starship"; rev = "v${version}"; - hash = "sha256-84FyKhSP2EZZkQJRhNPTYs2BYppylk50GiIck8pN3l4="; + hash = "sha256-3IO9hHuhzJsCHU/6BA5ylEKQI2ik6ZiRul/iO/vzii4="; }; nativeBuildInputs = [ installShellFiles cmake ]; @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec { cp docs/public/presets/toml/*.toml $presetdir ''; - cargoHash = "sha256-Fu8KfWHCQUPSiT1aMSS0Il/S02YXdEqKMA2nsliUu8E="; + cargoHash = "sha256-zX04gX40dFYsK+R6gafHNtDevzrWiGufMwrGfhqYVG0="; nativeCheckInputs = [ git ]; diff --git a/nixpkgs/pkgs/tools/misc/staruml/default.nix b/nixpkgs/pkgs/tools/misc/staruml/default.nix index a6497a62f59b..036f47965b8f 100644 --- a/nixpkgs/pkgs/tools/misc/staruml/default.nix +++ b/nixpkgs/pkgs/tools/misc/staruml/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl -, dpkg, wrapGAppsHook +, dpkg, wrapGAppsHook3 , hicolor-icon-theme , gtk3, glib, systemd , xorg, nss, nspr @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-ULdrAQCiQlTN+aRhETj+ASMKkKctFgC2AfvUHGc6stU="; }; - nativeBuildInputs = [ wrapGAppsHook dpkg ]; + nativeBuildInputs = [ wrapGAppsHook3 dpkg ]; buildInputs = [ glib hicolor-icon-theme ]; unpackPhase = '' diff --git a/nixpkgs/pkgs/tools/misc/statserial/default.nix b/nixpkgs/pkgs/tools/misc/statserial/default.nix index 526729dcd31c..2bcd9e9bdb77 100644 --- a/nixpkgs/pkgs/tools/misc/statserial/default.nix +++ b/nixpkgs/pkgs/tools/misc/statserial/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://sites.google.com/site/tranter/software"; description = "Display serial port modem status lines"; - license = licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Statserial displays a table of the signals on a standard 9-pin or diff --git a/nixpkgs/pkgs/tools/misc/subberthehut/default.nix b/nixpkgs/pkgs/tools/misc/subberthehut/default.nix index 913bc49a5116..66e4442ad460 100644 --- a/nixpkgs/pkgs/tools/misc/subberthehut/default.nix +++ b/nixpkgs/pkgs/tools/misc/subberthehut/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/mus65/subberthehut"; description = "An OpenSubtitles.org downloader"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ jqueiroz ]; mainProgram = "subberthehut"; diff --git a/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix b/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix index cafc35790193..907ca3432aea 100644 --- a/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix +++ b/nixpkgs/pkgs/tools/misc/system-config-printer/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, udev, pkg-config, glib, xmlto, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, udev, pkg-config, glib, xmlto, wrapGAppsHook3 , docbook_xml_dtd_412, docbook_xsl , libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify , gobject-introspection, libsecret, packagekit @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { pkg-config gettext libtool autoconf-archive xmlto libxml2 docbook_xml_dtd_412 docbook_xsl desktop-file-utils python3Packages.wrapPython - wrapGAppsHook autoreconfHook gobject-introspection + wrapGAppsHook3 autoreconfHook gobject-introspection ]; pythonPath = with python3Packages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 pycairo pysmbc ]; @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/openprinting/system-config-printer"; platforms = lib.platforms.linux; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; }; } diff --git a/nixpkgs/pkgs/tools/misc/szyszka/default.nix b/nixpkgs/pkgs/tools/misc/szyszka/default.nix index 7bcce4158faf..8be3e0caf8b6 100644 --- a/nixpkgs/pkgs/tools/misc/szyszka/default.nix +++ b/nixpkgs/pkgs/tools/misc/szyszka/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , rustPlatform , fetchFromGitHub , pkg-config @@ -9,6 +10,7 @@ , gdk-pixbuf , gtk4 , wrapGAppsHook4 +, darwin }: rustPlatform.buildRustPackage rec { @@ -36,7 +38,9 @@ rustPlatform.buildRustPackage rec { atk gdk-pixbuf gtk4 - ]; + ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ + Foundation + ]); meta = with lib; { description = "A simple but powerful and fast bulk file renamer"; diff --git a/nixpkgs/pkgs/tools/misc/tbls/default.nix b/nixpkgs/pkgs/tools/misc/tbls/default.nix index c930d2038149..0a3b341cc482 100644 --- a/nixpkgs/pkgs/tools/misc/tbls/default.nix +++ b/nixpkgs/pkgs/tools/misc/tbls/default.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.74.1"; + version = "1.75.0"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-QuusOxXcTp7c6zkj6L//jOXWwLUgrsUFtsUtrNZrkOk="; + hash = "sha256-8bfDahJw+ZUSNqMiKDqqyX2jVPd6Wg3JsD/ATAW/oF4="; }; - vendorHash = "sha256-mDZOBwm3k3L4QqQA+1C3jRz46R7+4wwJg9BVNWB0F0A="; + vendorHash = "sha256-NafHcWP9xJX2hy8i1TKtBi54cXDKgoxbgwLQjYRBcjU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/tewisay/default.nix b/nixpkgs/pkgs/tools/misc/tewisay/default.nix index f4ae05711285..bcf77c2db2cf 100644 --- a/nixpkgs/pkgs/tools/misc/tewisay/default.nix +++ b/nixpkgs/pkgs/tools/misc/tewisay/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { pname = "tewisay"; - version = "unstable-2022-11-04"; + version = "0-unstable-2022-11-04"; # lucy deleted the old repo, this is a fork/mirror src = fetchFromGitHub { diff --git a/nixpkgs/pkgs/tools/misc/timidity/default.nix b/nixpkgs/pkgs/tools/misc/timidity/default.nix index 65d154476f02..1cb62fec2e02 100644 --- a/nixpkgs/pkgs/tools/misc/timidity/default.nix +++ b/nixpkgs/pkgs/tools/misc/timidity/default.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://sourceforge.net/projects/timidity/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; description = "A software MIDI renderer"; maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix b/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix index 873b7c0f6f0a..1c545b280dd1 100644 --- a/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix +++ b/nixpkgs/pkgs/tools/misc/tmpwatch/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://pagure.io/tmpwatch"; description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ vlstill ]; platforms = platforms.unix; mainProgram = "tmpwatch"; diff --git a/nixpkgs/pkgs/tools/misc/topicctl/default.nix b/nixpkgs/pkgs/tools/misc/topicctl/default.nix index 86debbf38800..c3252987c4ce 100644 --- a/nixpkgs/pkgs/tools/misc/topicctl/default.nix +++ b/nixpkgs/pkgs/tools/misc/topicctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "topicctl"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "segmentio"; repo = "topicctl"; rev = "v${version}"; - sha256 = "sha256-Gx/ld651Se2mLlUG/CkHawfVBN2BsxV8w6vrnKFLHuE="; + sha256 = "sha256-S1i2Nv7FQzqCTTjkS5slEI0vdt3kXhVWdtaYyng1GsQ="; }; vendorHash = "sha256-+mnnvdna1g6JE29weOJZmdO3jFp2a75dV9wK2XcWJ9s="; diff --git a/nixpkgs/pkgs/tools/misc/toybox/default.nix b/nixpkgs/pkgs/tools/misc/toybox/default.nix index 07ad33645849..4ef5279ef476 100644 --- a/nixpkgs/pkgs/tools/misc/toybox/default.nix +++ b/nixpkgs/pkgs/tools/misc/toybox/default.nix @@ -12,13 +12,13 @@ in stdenv.mkDerivation rec { pname = "toybox"; - version = "0.8.10"; + version = "0.8.11"; src = fetchFromGitHub { owner = "landley"; repo = pname; rev = version; - sha256 = "sha256-MMkNLhQP3ztWoRYhCU/cNXE/M+/ny41OK1SA9oM/lZg="; + sha256 = "sha256-7izs2C5/czec0Dt3apL8s7luARAlw4PfUFy9Xsxb0zw="; }; depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ]; diff --git a/nixpkgs/pkgs/tools/misc/trackma/default.nix b/nixpkgs/pkgs/tools/misc/trackma/default.nix index 86834e337d8c..c57d5ac1d757 100644 --- a/nixpkgs/pkgs/tools/misc/trackma/default.nix +++ b/nixpkgs/pkgs/tools/misc/trackma/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchFromGitHub , python3 -, wrapGAppsHook +, wrapGAppsHook3 , gobject-introspection , glib , gtk3 @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication rec { }; nativeBuildInputs = [ copyDesktopItems python3.pkgs.poetry-core ] - ++ lib.optionals withGTK [ wrapGAppsHook gobject-introspection ] + ++ lib.optionals withGTK [ wrapGAppsHook3 gobject-introspection ] ++ lib.optionals withQT [ qt5.wrapQtAppsHook ]; buildInputs = lib.optionals withGTK [ glib gtk3 ]; diff --git a/nixpkgs/pkgs/tools/misc/ttylog/default.nix b/nixpkgs/pkgs/tools/misc/ttylog/default.nix index ca90481ba9e6..ff07ba976175 100644 --- a/nixpkgs/pkgs/tools/misc/ttylog/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttylog/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { A serial port logger which can be used to print everything to stdout that comes from a serial device. ''; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.linux; mainProgram = "ttylog"; }; diff --git a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix index fc53f0b8997a..64b9b7cddfab 100644 --- a/nixpkgs/pkgs/tools/misc/ttyplot/default.nix +++ b/nixpkgs/pkgs/tools/misc/ttyplot/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ttyplot"; - version = "1.6.2"; + version = "1.6.4"; src = fetchFromGitHub { owner = "tenox7"; repo = "ttyplot"; rev = version; - hash = "sha256-HBJvTDhp1CA96gRU2Q+lMxcFaZ+txXcmNb8Cg1BFiH4="; + hash = "sha256-yxAFqi3TgiKiZYgR891ahkwUqZLk/JDsjujOYmBjUtk="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/txt2man/default.nix b/nixpkgs/pkgs/tools/misc/txt2man/default.nix index a6ebcb288216..57ec9ccb8e53 100644 --- a/nixpkgs/pkgs/tools/misc/txt2man/default.nix +++ b/nixpkgs/pkgs/tools/misc/txt2man/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Convert flat ASCII text to man page format"; homepage = "http://mvertes.free.fr/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; diff --git a/nixpkgs/pkgs/tools/misc/ugs/default.nix b/nixpkgs/pkgs/tools/misc/ugs/default.nix index 2a3eea73c07f..cb1033123df1 100644 --- a/nixpkgs/pkgs/tools/misc/ugs/default.nix +++ b/nixpkgs/pkgs/tools/misc/ugs/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "ugs"; - version = "2.1.6"; + version = "2.1.7"; src = fetchzip { url = "https://github.com/winder/Universal-G-Code-Sender/releases/download/v${version}/UniversalGcodeSender.zip"; - hash = "sha256-6L/4s/QmlTnYnhwLgPf7z8UVkBUYXi3Wb3doa5JCViE="; + hash = "sha256-HxaFGa7UG7dWtVKTLDRbhY7UCWeA6E50txz45bjb5uE="; }; dontUnpack = true; diff --git a/nixpkgs/pkgs/tools/misc/uhubctl/default.nix b/nixpkgs/pkgs/tools/misc/uhubctl/default.nix index e148e03f820e..4ee7ea3a00e1 100644 --- a/nixpkgs/pkgs/tools/misc/uhubctl/default.nix +++ b/nixpkgs/pkgs/tools/misc/uhubctl/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/mvp/uhubctl"; description = "Utility to control USB power per-port on smart USB hubs"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ prusnak ]; platforms = with platforms; linux ++ darwin; mainProgram = "uhubctl"; diff --git a/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix b/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix index 990547291f61..547d0a86f957 100644 --- a/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix +++ b/nixpkgs/pkgs/tools/misc/ultrastar-creator/default.nix @@ -39,7 +39,7 @@ mkDerivation { meta = with lib; { description = "Ultrastar karaoke song creation tool"; homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Creator"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix b/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix index d5dd47e0f669..4921c1de397e 100644 --- a/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix +++ b/nixpkgs/pkgs/tools/misc/ultrastar-manager/default.nix @@ -116,7 +116,7 @@ in mkDerivation { meta = with lib; { description = "Ultrastar karaoke song manager"; homepage = "https://github.com/UltraStar-Deluxe/UltraStar-Manager"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ Profpatsch ]; }; } diff --git a/nixpkgs/pkgs/tools/misc/undocker/default.nix b/nixpkgs/pkgs/tools/misc/undocker/default.nix index a2ce7dfb7aa1..0b6fb57f710e 100644 --- a/nixpkgs/pkgs/tools/misc/undocker/default.nix +++ b/nixpkgs/pkgs/tools/misc/undocker/default.nix @@ -1,25 +1,36 @@ { lib , buildGoModule -, fetchFromSourcehut +, fetchFromGitea +, gnumake }: -buildGoModule rec { - pname = "undocker"; - version = "1.0.4"; - - src = fetchFromSourcehut { - owner = "~motiejus"; - repo = pname; +let + version = "1.2.2"; + hash = "sha256-kBqNopcHpldU5oD6zoVjPjP84t12QFcbWBSNNgwImKg="; + src = fetchFromGitea { + domain = "git.jakstys.lt"; + owner = "motiejus"; + repo = "undocker"; rev = "v${version}"; - hash = "sha256-I+pTbr1lKELyYlyHrx2gB+aeZ3/PmcePQfXu1ckhKAk="; + hash = hash; }; +in +buildGoModule { + pname = "undocker"; + inherit version src; + + nativeBuildInputs = [ gnumake ]; + + buildPhase = "make VSN=v${version} VSNHASH=${hash} undocker"; + + installPhase = "install -D undocker $out/bin/undocker"; vendorHash = null; meta = with lib; { - homepage = "https://git.sr.ht/~motiejus/undocker"; + homepage = "https://git.jakstys.lt/motiejus/undocker"; description = "A CLI tool to convert a Docker image to a flattened rootfs tarball"; license = licenses.asl20; - maintainers = with maintainers; [ jordanisaacs ]; + maintainers = with maintainers; [ jordanisaacs motiejus ]; mainProgram = "undocker"; }; } diff --git a/nixpkgs/pkgs/tools/misc/url-parser/default.nix b/nixpkgs/pkgs/tools/misc/url-parser/default.nix index 39ae506c2524..cb9f058c0d9d 100644 --- a/nixpkgs/pkgs/tools/misc/url-parser/default.nix +++ b/nixpkgs/pkgs/tools/misc/url-parser/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "url-parser"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "thegeeklab"; repo = "url-parser"; rev = "refs/tags/v${version}"; - hash = "sha256-pu6U6YIA7+K1ZSt97Nn0IDaQFVIwMq3m7d8JidK1vJk="; + hash = "sha256-zCtCLhIWQQWKD2RM+p7HxZSPHnmo7SIZFYGT4nBCWLY="; }; - vendorHash = "sha256-QqhjS0uL2Fm2OeFkuAB8VeS7HpoS9dOhgHk/J4j9++M="; + vendorHash = "sha256-bUQNZQT13VZuglFW0zdSOBzBLDjH5PiMkKHmkSZJupw="; ldflags = [ "-s" diff --git a/nixpkgs/pkgs/tools/misc/urn-timer/default.nix b/nixpkgs/pkgs/tools/misc/urn-timer/default.nix index df45524a8a06..ad0c271fda66 100644 --- a/nixpkgs/pkgs/tools/misc/urn-timer/default.nix +++ b/nixpkgs/pkgs/tools/misc/urn-timer/default.nix @@ -4,7 +4,7 @@ , xxd , pkg-config , imagemagick -, wrapGAppsHook +, wrapGAppsHook3 , gtk3 , jansson , nixosTests @@ -12,7 +12,7 @@ stdenv.mkDerivation { pname = "urn-timer"; - version = "unstable-2024-03-05"; + version = "0-unstable-2024-03-05"; src = fetchFromGitHub { owner = "paoloose"; @@ -25,7 +25,7 @@ stdenv.mkDerivation { xxd pkg-config imagemagick - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/usbimager/default.nix b/nixpkgs/pkgs/tools/misc/usbimager/default.nix index 57d9855231c7..a872fb9a74c4 100644 --- a/nixpkgs/pkgs/tools/misc/usbimager/default.nix +++ b/nixpkgs/pkgs/tools/misc/usbimager/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitLab, pkg-config, wrapGAppsHook +{ lib, stdenv, fetchFromGitLab, pkg-config, wrapGAppsHook3 , withLibui ? true, gtk3 , withUdisks ? stdenv.isLinux, udisks, glib , libX11 }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sourceRoot = "${src.name}/src"; - nativeBuildInputs = [ pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; buildInputs = lib.optionals withUdisks [ udisks glib ] ++ lib.optional (!withLibui) libX11 ++ lib.optional withLibui gtk3; diff --git a/nixpkgs/pkgs/tools/misc/uucp/default.nix b/nixpkgs/pkgs/tools/misc/uucp/default.nix index 28f7a6572c18..325ad135558c 100644 --- a/nixpkgs/pkgs/tools/misc/uucp/default.nix +++ b/nixpkgs/pkgs/tools/misc/uucp/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, autoreconfHook, testers }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "uucp"; version = "1.07"; src = fetchurl { - url = "mirror://gnu/uucp/uucp-${version}.tar.gz"; + url = "mirror://gnu/uucp/uucp-${finalAttrs.version}.tar.gz"; sha256 = "0b5nhl9vvif1w3wdipjsk8ckw49jj1w85xw1mmqi3zbcpazia306"; }; @@ -13,15 +13,28 @@ stdenv.mkDerivation rec { prePatch = '' # do not set sticky bit in nix store - substituteInPlace Makefile.in \ - --replace 4555 0555 - sed -i '/chown $(OWNER)/d' Makefile.in + substituteInPlace Makefile.am \ + --replace-fail 4555 0555 + sed -i '/chown $(OWNER)/d' Makefile.am + + # don't reply on implicitly defined `exit` function in `HAVE_VOID` test: + substituteInPlace configure.in \ + --replace-fail '(void) exit (0)' '(void) (0)' ''; + # Regenerate `configure`; the checked in version was generated in 2002 and + # contains snippets like `main(){return(0);}` that modern compilers dislike. + nativeBuildInputs = [ autoreconfHook ]; + makeFlags = [ "AR:=$(AR)" ]; + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + meta = { description = "Unix-unix cp over serial line, also includes cu program"; + mainProgram = "uucp"; longDescription = '' Taylor UUCP is a free implementation of UUCP and is the standard @@ -37,4 +50,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/nixpkgs/pkgs/tools/misc/vector/Cargo.lock b/nixpkgs/pkgs/tools/misc/vector/Cargo.lock index d24feb253f2e..4362aedcf615 100644 --- a/nixpkgs/pkgs/tools/misc/vector/Cargo.lock +++ b/nixpkgs/pkgs/tools/misc/vector/Cargo.lock @@ -66,19 +66,19 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.14", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.6" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom 0.2.12", + "getrandom 0.2.14", "once_cell", "version_check", "zerocopy", @@ -179,9 +179,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.7" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd2405b3ac1faab2990b74d728624cd9fd115651fcecc7c2d8daf01376275ba" +checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb" dependencies = [ "anstyle", "anstyle-parse", @@ -193,9 +193,9 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.4" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" [[package]] name = "anstyle-parse" @@ -227,9 +227,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.81" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247" +checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519" [[package]] name = "apache-avro" @@ -274,9 +274,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b3d0060af21e8d11a926981cc00c6c1541aa91dd64b9f881985c3da1094425f" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "arr_macro" @@ -296,7 +296,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c6368f9ae5c6ec403ca910327ae0c9437b0a85255b6950c90d497e6177f6e5e" dependencies = [ "proc-macro-hack", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] @@ -359,9 +359,9 @@ dependencies = [ [[package]] name = "async-compression" -version = "0.4.6" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a116f46a969224200a0a97f29cfd4c50e7534e4b4826bd23ea2c3c533039c82c" +checksum = "4e9eabd7a98fe442131a17c316bd9349c43695e49e730c3c8e12cfb5f4da2693" dependencies = [ "flate2", "futures-core", @@ -436,12 +436,12 @@ dependencies = [ "async-stream", "async-trait", "base64 0.21.7", - "bytes 1.5.0", + "bytes 1.6.0", "chrono", "fnv", "futures-util", "http 1.0.0", - "indexmap 2.2.5", + "indexmap 2.2.6", "mime", "multer", "num-traits", @@ -465,10 +465,10 @@ dependencies = [ "async-graphql-parser", "darling 0.20.8", "proc-macro-crate 1.3.1", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "strum 0.26.1", - "syn 2.0.53", + "syn 2.0.60", "thiserror", ] @@ -490,8 +490,8 @@ version = "7.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68e40849c29a39012d38bff87bfed431f1ed6c53fbec493294c1045d61a7ae75" dependencies = [ - "bytes 1.5.0", - "indexmap 2.2.5", + "bytes 1.6.0", + "indexmap 2.2.6", "serde", "serde_json", ] @@ -576,7 +576,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbc1f1a75fd07f0f517322d103211f12d757658e91676def9a2e688774656c60" dependencies = [ "base64 0.21.7", - "bytes 1.5.0", + "bytes 1.6.0", "futures 0.3.30", "http 0.2.9", "memchr", @@ -586,7 +586,7 @@ dependencies = [ "rand 0.8.5", "regex", "ring", - "rustls 0.21.8", + "rustls 0.21.11", "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.3", "rustls-webpki 0.101.7", @@ -645,13 +645,13 @@ dependencies = [ [[package]] name = "async-recursion" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -689,9 +689,9 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -702,13 +702,13 @@ checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" [[package]] name = "async-trait" -version = "0.1.78" +version = "0.1.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "461abc97219de0eaaf81fe3ef974a540158f3d079c2ab200f891f1a2ef201e85" +checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -757,7 +757,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.5.0", + "bytes 1.6.0", "fastrand 2.0.1", "http 0.2.9", "hyper 0.14.28", @@ -768,9 +768,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.1.8" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa8587ae17c8e967e4b05a62d495be2fb7701bec52a97f7acfe8a29f938384c8" +checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -787,7 +787,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.5.0", + "bytes 1.6.0", "http 0.2.9", "http-body 0.4.5", "pin-project-lite", @@ -855,7 +855,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.5.0", + "bytes 1.6.0", "fastrand 2.0.1", "http 0.2.9", "regex", @@ -878,7 +878,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.5.0", + "bytes 1.6.0", "http 0.2.9", "regex", "tracing 0.1.40", @@ -900,7 +900,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.5.0", + "bytes 1.6.0", "http 0.2.9", "regex", "tracing 0.1.40", @@ -922,7 +922,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.5.0", + "bytes 1.6.0", "http 0.2.9", "regex", "tracing 0.1.40", @@ -948,7 +948,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes 1.5.0", + "bytes 1.6.0", "http 0.2.9", "http-body 0.4.5", "once_cell", @@ -959,6 +959,29 @@ dependencies = [ ] [[package]] +name = "aws-sdk-secretsmanager" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "faea24d86bcabc65048014abd3ee5763a5e8877f678d9cd688a12e086ebe2dbd" +dependencies = [ + "aws-credential-types", + "aws-http", + "aws-runtime", + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-types", + "bytes 1.6.0", + "fastrand 2.0.1", + "http 0.2.9", + "regex", + "tracing 0.1.40", +] + +[[package]] name = "aws-sdk-sns" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -997,7 +1020,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes 1.5.0", + "bytes 1.6.0", "http 0.2.9", "regex", "tracing 0.1.40", @@ -1028,16 +1051,16 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11d6f29688a4be9895c0ba8bef861ad0c0dac5c15e9618b9b7a6c233990fc263" +checksum = "58b56f1cbe6fd4d0c2573df72868f20ab1c125ca9c9dbce17927a463433a2e57" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.5.0", + "bytes 1.6.0", "form_urlencoded", "hex", "hmac", @@ -1052,9 +1075,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "1.1.8" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26ea8fa03025b2face2b3038a63525a10891e3d8829901d502e5384a0d8cd46" +checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" dependencies = [ "futures-util", "pin-project-lite", @@ -1069,7 +1092,7 @@ checksum = "c5a373ec01aede3dd066ec018c1bc4e8f5dd11b2c11c59c8eef1a5c68101f397" dependencies = [ "aws-smithy-http", "aws-smithy-types", - "bytes 1.5.0", + "bytes 1.6.0", "crc32c", "crc32fast", "hex", @@ -1089,20 +1112,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" dependencies = [ "aws-smithy-types", - "bytes 1.5.0", + "bytes 1.6.0", "crc32fast", ] [[package]] name = "aws-smithy-http" -version = "0.60.7" +version = "0.60.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f10fa66956f01540051b0aa7ad54574640f748f9839e843442d99b970d3aff9" +checksum = "4a7de001a1b9a25601016d8057ea16e31a45fdca3751304c8edf4ad72e706c08" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.5.0", + "bytes 1.6.0", "bytes-utils", "futures-core", "http 0.2.9", @@ -1135,38 +1158,39 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.1.8" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec81002d883e5a7fd2bb063d6fb51c4999eb55d404f4fff3dd878bf4733b9f01" +checksum = "1cf64e73ef8d4dac6c933230d56d136b75b252edcf82ed36e37d603090cd7348" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-runtime-api", "aws-smithy-types", - "bytes 1.5.0", + "bytes 1.6.0", "fastrand 2.0.1", "h2 0.3.26", "http 0.2.9", "http-body 0.4.5", + "http-body 1.0.0", "hyper 0.14.28", "hyper-rustls 0.24.2", "once_cell", "pin-project-lite", "pin-utils", - "rustls 0.21.8", + "rustls 0.21.11", "tokio", "tracing 0.1.40", ] [[package]] name = "aws-smithy-runtime-api" -version = "1.2.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9acb931e0adaf5132de878f1398d83f8677f90ba70f01f65ff87f6d7244be1c5" +checksum = "8c19fdae6e3d5ac9cd01f2d6e6c359c5f5a3e028c2d148a8f5b90bf3399a18a7" dependencies = [ "aws-smithy-async", "aws-smithy-types", - "bytes 1.5.0", + "bytes 1.6.0", "http 0.2.9", "http 1.0.0", "pin-project-lite", @@ -1182,10 +1206,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abe14dceea1e70101d38fbf2a99e6a34159477c0fb95e68e05c66bd7ae4c3729" dependencies = [ "base64-simd", - "bytes 1.5.0", + "bytes 1.6.0", "bytes-utils", "http 0.2.9", + "http 1.0.0", "http-body 0.4.5", + "http-body 1.0.0", + "http-body-util", "itoa", "num-integer", "pin-project-lite", @@ -1206,9 +1233,9 @@ dependencies = [ [[package]] name = "aws-types" -version = "1.1.8" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dbf2f3da841a8930f159163175cf6a3d16ddde517c1b0fba7aa776822800f40" +checksum = "5a43b56df2c529fe44cb4d92bd64d0479883fb9608ff62daede4df5405381814" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -1228,7 +1255,7 @@ dependencies = [ "async-trait", "axum-core", "bitflags 1.3.2", - "bytes 1.5.0", + "bytes 1.6.0", "futures-util", "http 0.2.9", "http-body 0.4.5", @@ -1255,7 +1282,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" dependencies = [ "async-trait", - "bytes 1.5.0", + "bytes 1.6.0", "futures-util", "http 0.2.9", "http-body 0.4.5", @@ -1273,10 +1300,10 @@ checksum = "4ccd63c07d1fbfb3d4543d7ea800941bf5a30db1911b9b9e4db3b2c4210a434f" dependencies = [ "async-trait", "base64 0.21.7", - "bytes 1.5.0", + "bytes 1.6.0", "dyn-clone", "futures 0.3.30", - "getrandom 0.2.12", + "getrandom 0.2.14", "http-types", "log", "paste", @@ -1322,7 +1349,7 @@ dependencies = [ "RustyXML", "async-trait", "azure_core", - "bytes 1.5.0", + "bytes 1.6.0", "futures 0.3.30", "hmac", "log", @@ -1344,7 +1371,7 @@ dependencies = [ "RustyXML", "azure_core", "azure_storage", - "bytes 1.5.0", + "bytes 1.6.0", "futures 0.3.30", "log", "serde", @@ -1361,7 +1388,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.14", "instant", "rand 0.8.5", ] @@ -1406,6 +1433,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] +name = "base62" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f879ef8fc74665ed7f0e6127cb106315888fc2744f68e14b74f83edbb2a08992" + +[[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1425,9 +1458,9 @@ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "base64-simd" @@ -1478,8 +1511,8 @@ version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9990737a6d5740ff51cdbbc0f0503015cb30c390f6623968281eb214a520cfc0" dependencies = [ - "quote 1.0.35", - "syn 2.0.53", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -1539,13 +1572,13 @@ dependencies = [ [[package]] name = "bollard" -version = "0.16.0" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83545367eb6428eb35c29cdec3a1f350fa8d6d9085d59a7d7bcb637f2e38db5a" +checksum = "0aed08d3adb6ebe0eff737115056652670ae290f177759aac19c30456135f94c" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "bollard-stubs", - "bytes 1.5.0", + "bytes 1.6.0", "chrono", "futures-core", "futures-util", @@ -1560,7 +1593,7 @@ dependencies = [ "hyperlocal-next", "log", "pin-project-lite", - "rustls 0.22.2", + "rustls 0.22.4", "rustls-native-certs 0.7.0", "rustls-pemfile 2.1.0", "rustls-pki-types", @@ -1586,7 +1619,7 @@ dependencies = [ "chrono", "serde", "serde_repr", - "serde_with 3.7.0", + "serde_with 3.8.1", ] [[package]] @@ -1607,9 +1640,9 @@ checksum = "f404657a7ea7b5249e36808dff544bc88a28f26e0ac40009f674b7a009d14be3" dependencies = [ "once_cell", "proc-macro-crate 2.0.0", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", "syn_derive", ] @@ -1619,7 +1652,7 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61570f4de0cc9c03b481c96057b3ae7c6ff7b5b35da8b0832c44f0131987a718" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "base64 0.13.1", "bitvec", "hex", @@ -1679,12 +1712,18 @@ version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", ] [[package]] +name = "bytemuck" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15" + +[[package]] name = "byteorder" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1702,9 +1741,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" dependencies = [ "serde", ] @@ -1715,7 +1754,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e47d3a8076e283f3acd27400535992edb3ba4b5bb72f8891ad8fbe7932a7d4b9" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "either", ] @@ -1727,14 +1766,14 @@ checksum = "a3e368af43e418a04d52505cf3dbc23dda4e3407ae2fa99fd0e4f308ce546acc" [[package]] name = "cached" -version = "0.49.2" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f251fd1e72720ca07bf5d8e310f54a193fd053479a1f6342c6663ee4fa01cf96" +checksum = "10a7d38ed2761b8a13ce42bc44b09d5a052b88da2f9fead624c779f31ac0729a" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "cached_proc_macro", "cached_proc_macro_types", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "instant", "once_cell", "thiserror", @@ -1742,14 +1781,14 @@ dependencies = [ [[package]] name = "cached_proc_macro" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9f16c0d84de31a2ab7fdf5f7783c14631f7075cf464eb3bb43119f61c9cb2a" +checksum = "771aa57f3b17da6c8bcacb187bb9ec9bc81c8160e72342e67c329e0e1651a669" dependencies = [ - "darling 0.14.4", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 1.0.109", + "darling 0.20.8", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -1760,9 +1799,9 @@ checksum = "ade8366b8bd5ba243f0a58f036cc0ca8a2f069cff1a2351ef1cac6b083e16fc0" [[package]] name = "cargo_toml" -version = "0.19.2" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a98356df42a2eb1bd8f1793ae4ee4de48e384dd974ce5eac8eee802edb7492be" +checksum = "c8cb1d556b8b8f36e5ca74938008be3ac102f5dcb5b68a0477e4249ae2291cd3" dependencies = [ "serde", "toml", @@ -1871,9 +1910,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "8a0d04d43504c61aa6c7531f1871dd0d418d91130162063b789da00fd7057a5e" dependencies = [ "android-tzdata", "iana-time-zone", @@ -1886,9 +1925,9 @@ dependencies = [ [[package]] name = "chrono-tz" -version = "0.8.6" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59ae0466b83e838b81a54256c39d5d7c20b9d7daa10510a242d9b75abd5936e" +checksum = "93698b29de5e97ad0ae26447b344c482a7284c737d9ddc5f9e52b74a336671bb" dependencies = [ "chrono", "chrono-tz-build", @@ -1898,9 +1937,9 @@ dependencies = [ [[package]] name = "chrono-tz-build" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433e39f13c9a060046954e0592a8d0a4bcb1040125cbf91cb8ee58964cfb350f" +checksum = "0c088aee841df9c3041febbb73934cfc39708749bf96dc827e3359cd39ef11b1" dependencies = [ "parse-zoneinfo", "phf", @@ -1992,9 +2031,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.3" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "949626d00e063efc93b6dca932419ceb5432f99769911c0b995f7e884c778813" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", "clap_derive", @@ -2006,7 +2045,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb9b20c0dd58e4c2e991c8d203bbeb76c11304d1011659686b5b644bc29aa478" dependencies = [ - "clap 4.5.3", + "clap 4.5.4", "log", ] @@ -2025,23 +2064,23 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "885e4d7d5af40bfb99ae6f9433e292feac98d452dcb3ec3d25dfe7552b77da8c" +checksum = "dd79504325bf38b10165b02e89b4347300f855f273c4cb30c4a3209e6583275e" dependencies = [ - "clap 4.5.3", + "clap 4.5.4", ] [[package]] name = "clap_derive" -version = "4.5.3" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90239a040c80f5e14809ca132ddc4176ab33d5e17e49691793296e3fcb34d72f" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ "heck 0.5.0", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -2073,7 +2112,7 @@ name = "codecs" version = "0.1.0" dependencies = [ "apache-avro", - "bytes 1.5.0", + "bytes 1.6.0", "chrono", "csv-core", "derivative", @@ -2083,7 +2122,7 @@ dependencies = [ "memchr", "once_cell", "ordered-float 4.2.0", - "prost 0.12.3", + "prost 0.12.4", "prost-reflect", "regex", "rstest", @@ -2151,7 +2190,7 @@ version = "4.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "futures-core", "memchr", "pin-project-lite", @@ -2227,8 +2266,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787" dependencies = [ "futures-core", - "prost 0.12.3", - "prost-types 0.12.3", + "prost 0.12.4", + "prost-types 0.12.4", "tonic", "tracing-core 0.1.32", ] @@ -2245,7 +2284,7 @@ dependencies = [ "futures-task", "hdrhistogram", "humantime", - "prost-types 0.12.3", + "prost-types 0.12.4", "serde", "serde_json", "thread_local", @@ -2326,18 +2365,18 @@ dependencies = [ [[package]] name = "crc" -version = "3.0.1" +version = "3.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" +checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" dependencies = [ "crc-catalog", ] [[package]] name = "crc-catalog" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4939f9ed1444bd8c896d37f3090012fa6e7834fe84ef8c9daa166109515732f9" +checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" [[package]] name = "crc32c" @@ -2366,7 +2405,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.3", + "clap 4.5.4", "criterion-plot", "futures 0.3.30", "is-terminal", @@ -2567,9 +2606,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -2584,16 +2623,6 @@ dependencies = [ [[package]] name = "darling" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" -dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", -] - -[[package]] -name = "darling" version = "0.20.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54e36fcd13ed84ffdfda6f5be89b31287cbb80c439841fe69e04841435464391" @@ -2610,22 +2639,8 @@ checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.79", - "quote 1.0.35", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "strsim 0.10.0", "syn 1.0.109", ] @@ -2638,10 +2653,10 @@ checksum = "9c2cf1c23a687a1feeb728783b993c4e1ad83d99f351801977dd809b48d0a70f" dependencies = [ "fnv", "ident_case", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "strsim 0.10.0", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -2651,18 +2666,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" dependencies = [ "darling_core 0.13.4", - "quote 1.0.35", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core 0.14.4", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] @@ -2673,8 +2677,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f" dependencies = [ "darling_core 0.20.8", - "quote 1.0.35", - "syn 2.0.53", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -2690,7 +2694,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", "parking_lot_core", @@ -2698,9 +2702,9 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "data-url" @@ -2709,6 +2713,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c297a1c74b71ae29df00c3e22dd9534821d60eb9af5a0192823fa2acea70c2a" [[package]] +name = "databend-client" +version = "0.17.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "123d9b08aefcdce56e2379487198c1fb8c439cedf6c31d16c3974f0f9d3e282f" +dependencies = [ + "async-trait", + "log", + "once_cell", + "percent-encoding", + "reqwest", + "serde", + "serde_json", + "tokio", + "tokio-retry", + "tokio-stream", + "tokio-util", + "url", + "uuid", +] + +[[package]] name = "db-key" version = "0.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2766,8 +2791,8 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", ] @@ -2777,9 +2802,9 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -2789,8 +2814,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" dependencies = [ "convert_case 0.4.0", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "rustc_version 0.4.0", "syn 1.0.109", ] @@ -2869,7 +2894,7 @@ checksum = "e5766087c2235fec47fafa4cfecc81e494ee679d0fd4a59887ea0919bfb0e4fc" dependencies = [ "cfg-if", "libc", - "socket2 0.5.6", + "socket2 0.5.7", "windows-sys 0.48.0", ] @@ -3046,8 +3071,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", ] @@ -3058,21 +3083,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] name = "enum_dispatch" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +checksum = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" dependencies = [ "once_cell", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -3090,9 +3115,9 @@ version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -3102,6 +3127,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62a61b2faff777e62dbccd7f82541d873f96264d050c5dd7e95194f79fc4de29" [[package]] +name = "env_filter" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea" +dependencies = [ + "log", + "regex", +] + +[[package]] name = "env_logger" version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3113,15 +3148,15 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.10.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" +checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9" dependencies = [ + "anstream", + "anstyle", + "env_filter", "humantime", - "is-terminal", "log", - "regex", - "termcolor", ] [[package]] @@ -3217,9 +3252,9 @@ dependencies = [ [[package]] name = "fakedata_generator" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "302a45f60d105c247c9d3131107392da80df844f9215260b7f8ccfa301a6a6f4" +checksum = "57b82fba4b485b819fde74012109688a9d2bd4ce7b22583ac12c9fa239f74a02" dependencies = [ "passt", "rand 0.8.5", @@ -3269,7 +3304,7 @@ name = "file-source" version = "0.1.0" dependencies = [ "bstr 1.9.1", - "bytes 1.5.0", + "bytes 1.6.0", "chrono", "crc", "criterion", @@ -3277,7 +3312,7 @@ dependencies = [ "flate2", "futures 0.3.30", "glob", - "indexmap 2.2.5", + "indexmap 2.2.6", "libc", "quickcheck", "scan_fmt", @@ -3325,9 +3360,9 @@ checksum = "d52a7e408202050813e6f1d9addadcaafef3dca7530c7ddfb005d4081cce6779" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -3345,9 +3380,6 @@ version = "0.10.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" dependencies = [ - "futures-core", - "futures-sink", - "pin-project", "spin 0.9.8", ] @@ -3492,9 +3524,9 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -3559,9 +3591,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c" dependencies = [ "cfg-if", "js-sys", @@ -3616,9 +3648,9 @@ dependencies = [ [[package]] name = "governor" -version = "0.6.0" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "821239e5672ff23e2a7060901fa622950bbd80b649cdaadd78d1c1767ed14eb4" +checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" dependencies = [ "cfg-if", "dashmap", @@ -3627,8 +3659,10 @@ dependencies = [ "no-std-compat", "nonzero_ext", "parking_lot", + "portable-atomic", "rand 0.8.5", "smallvec", + "spinning_top", ] [[package]] @@ -3652,9 +3686,9 @@ dependencies = [ [[package]] name = "graphql_client" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cdf7b487d864c2939b23902291a5041bc4a84418268f25fda1c8d4e15ad8fa" +checksum = "a50cfdc7f34b7f01909d55c2dcb71d4c13cbcbb4a1605d6c8bd760d654c1144b" dependencies = [ "graphql_query_derive", "serde", @@ -3663,16 +3697,16 @@ dependencies = [ [[package]] name = "graphql_client_codegen" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a40f793251171991c4eb75bd84bc640afa8b68ff6907bc89d3b712a22f700506" +checksum = "5e27ed0c2cf0c0cc52c6bcf3b45c907f433015e580879d14005386251842fb0a" dependencies = [ "graphql-introspection-query", "graphql-parser", "heck 0.4.1", "lazy_static", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "serde", "serde_json", "syn 1.0.109", @@ -3680,12 +3714,12 @@ dependencies = [ [[package]] name = "graphql_query_derive" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00bda454f3d313f909298f626115092d348bc231025699f557b27e248475f48c" +checksum = "83febfa838f898cfa73dfaa7a8eb69ff3409021ac06ee94cfb3d622f6eeb1a97" dependencies = [ "graphql_client_codegen", - "proc-macro2 1.0.79", + "proc-macro2 1.0.81", "syn 1.0.109", ] @@ -3694,7 +3728,7 @@ name = "greptime-proto" version = "0.1.0" source = "git+https://github.com/GreptimeTeam/greptime-proto.git?tag=v0.4.1#4306ab645ee55b3f7f2ad3fb7acc5820f967c1aa" dependencies = [ - "prost 0.12.3", + "prost 0.12.4", "serde", "serde_json", "strum 0.25.0", @@ -3714,7 +3748,7 @@ dependencies = [ "futures-util", "greptime-proto", "parking_lot", - "prost 0.12.3", + "prost 0.12.4", "rand 0.8.5", "snafu 0.7.5", "tokio", @@ -3751,13 +3785,13 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "fnv", "futures-core", "futures-sink", "futures-util", "http 0.2.9", - "indexmap 2.2.5", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -3770,13 +3804,13 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "816ec7294445779408f36fe57bc5b7fc1cf59664059096c65f905c1c61f58069" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "fnv", "futures-core", "futures-sink", "futures-util", "http 1.0.0", - "indexmap 2.2.5", + "indexmap 2.2.6", "slab", "tokio", "tokio-util", @@ -3810,16 +3844,16 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ff8ae62cd3a9102e5637afc8452c55acf3844001bd5374e0b0bd7b6616c038" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", ] [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "allocator-api2", ] @@ -3844,7 +3878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06683b93020a07e3dbcf5f8c0f6d40080d725bea7936fc01ad345c01b97dc270" dependencies = [ "base64 0.21.7", - "bytes 1.5.0", + "bytes 1.6.0", "headers-core", "http 0.2.9", "httpdate", @@ -4029,9 +4063,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] name = "hickory-proto" -version = "0.24.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091a6fbccf4860009355e3efc52ff4acf37a63489aad7435372d44ceeb6fbbcf" +checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512" dependencies = [ "async-trait", "cfg-if", @@ -4090,12 +4124,23 @@ dependencies = [ ] [[package]] +name = "hostname" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" +dependencies = [ + "cfg-if", + "libc", + "windows", +] + +[[package]] name = "http" version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "fnv", "itoa", ] @@ -4106,7 +4151,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b32afd38673a8016f7c9ae69e5af41a58f81b1d31689040f2f1959594ce194ea" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "fnv", "itoa", ] @@ -4117,7 +4162,7 @@ version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "http 0.2.9", "pin-project-lite", ] @@ -4128,7 +4173,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "http 1.0.0", ] @@ -4138,7 +4183,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cb79eb393015dadd30fc252023adb0b2400a0caee0fa2a077e6e21a551e840" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "futures-util", "http 1.0.0", "http-body 1.0.0", @@ -4206,7 +4251,7 @@ version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "futures-channel", "futures-core", "futures-util", @@ -4217,7 +4262,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.10", + "socket2 0.5.7", "tokio", "tower-service", "tracing 0.1.40", @@ -4230,7 +4275,7 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "186548d73ac615b32a73aafe38fb4f56c0d340e110e5a200bcadbaf2e199263a" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "futures-channel", "futures-util", "http 1.0.0", @@ -4282,7 +4327,7 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca815a891b24fdfb243fa3239c86154392b0953ee584aa1a2a1f66d20cbe75cc" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "futures 0.3.30", "headers", "http 0.2.9", @@ -4303,7 +4348,7 @@ dependencies = [ "http 0.2.9", "hyper 0.14.28", "log", - "rustls 0.21.8", + "rustls 0.21.11", "rustls-native-certs 0.6.3", "tokio", "tokio-rustls 0.24.1", @@ -4320,7 +4365,7 @@ dependencies = [ "hyper 1.2.0", "hyper-util", "log", - "rustls 0.22.2", + "rustls 0.22.4", "rustls-native-certs 0.7.0", "rustls-pki-types", "tokio", @@ -4346,7 +4391,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "hyper 0.14.28", "native-tls", "tokio", @@ -4359,14 +4404,14 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca38ef113da30126bbff9cd1705f9273e15d45498615d138b0c20279ac7a76aa" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "futures-channel", "futures-util", "http 1.0.0", "http-body 1.0.0", "hyper 1.2.0", "pin-project-lite", - "socket2 0.5.6", + "socket2 0.5.7", "tokio", "tower", "tower-service", @@ -4461,12 +4506,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "serde", ] @@ -4486,9 +4531,9 @@ dependencies = [ [[package]] name = "indoc" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" [[package]] name = "infer" @@ -4573,7 +4618,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f" dependencies = [ - "socket2 0.5.6", + "socket2 0.5.7", "widestring 1.0.2", "windows-sys 0.48.0", "winreg", @@ -4714,7 +4759,7 @@ dependencies = [ name = "k8s-e2e-tests" version = "0.1.0" dependencies = [ - "env_logger 0.10.2", + "env_logger 0.11.3", "futures 0.3.30", "indoc", "k8s-openapi 0.16.0", @@ -4734,7 +4779,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d9455388f4977de4d0934efa9f7d36296295537d774574113a20f6082de03da" dependencies = [ "base64 0.13.1", - "bytes 1.5.0", + "bytes 1.6.0", "chrono", "serde", "serde-value", @@ -4748,7 +4793,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd990069640f9db34b3b0f7a1afc62a05ffaa3be9b66aa3c313f58346df7f788" dependencies = [ "base64 0.21.7", - "bytes 1.5.0", + "bytes 1.6.0", "chrono", "http 0.2.9", "percent-encoding", @@ -4826,7 +4871,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "544339f1665488243f79080441cacb09c997746fd763342303e66eebb9d3ba13" dependencies = [ "base64 0.20.0", - "bytes 1.5.0", + "bytes 1.6.0", "chrono", "dirs-next", "either", @@ -4845,7 +4890,7 @@ dependencies = [ "secrecy", "serde", "serde_json", - "serde_yaml 0.9.33", + "serde_yaml 0.9.34+deprecated", "thiserror", "tokio", "tokio-util", @@ -4877,7 +4922,7 @@ version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "125331201e3073707ac79c294c89021faa76c84da3a566a3749a2a93d295c98a" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "async-trait", "backoff", "derivative", @@ -4926,16 +4971,16 @@ checksum = "3f35c735096c0293d313e8f2a641627472b83d01b937177fe76e5e2708d31e0d" [[package]] name = "lapin" -version = "2.3.1" +version = "2.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f3067a1fcfbc3fc46455809c023e69b8f6602463201010f4ae5a3b572adb9dc" +checksum = "fae02c316a8a5922ce7518afa6b6c00e9a099f8e59587567e3331efdd11b8ceb" dependencies = [ "amq-protocol", "async-global-executor-trait", "async-reactor-trait", "async-trait", "executor-trait", - "flume 0.10.14", + "flume 0.11.0", "futures-core", "futures-io", "parking_lot", @@ -4957,9 +5002,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.153" +version = "0.2.154" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346" [[package]] name = "libflate" @@ -5073,11 +5118,11 @@ checksum = "879777f0cc6f3646a044de60e4ab98c75617e3f9580f7a2032e6ad7ea0cd3054" name = "loki-logproto" version = "0.1.0" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "chrono", - "prost 0.12.3", - "prost-build 0.12.3", - "prost-types 0.12.3", + "prost 0.12.4", + "prost-build 0.12.4", + "prost-types 0.12.4", "snap", ] @@ -5087,7 +5132,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -5232,9 +5277,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" [[package]] name = "memmap2" @@ -5278,7 +5323,7 @@ version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5" dependencies = [ - "ahash 0.8.6", + "ahash 0.8.11", "metrics-macros", "portable-atomic", ] @@ -5289,9 +5334,9 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddece26afd34c31585c74a4db0630c376df271c285d682d1e55012197830b6df" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -5374,9 +5419,9 @@ dependencies = [ [[package]] name = "mlua" -version = "0.9.6" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "868d02cb5eb97761bbf6bd6922c1c7a88b8ea252bbf43bd8350a0bf8497a1fc0" +checksum = "6d9bed6bce296397a9d6a86f995dd10a547a4e6949825d45225906bdcbfe7367" dependencies = [ "bstr 1.9.1", "mlua-sys", @@ -5408,17 +5453,17 @@ dependencies = [ "itertools 0.12.1", "once_cell", "proc-macro-error", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "regex", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] name = "mock_instant" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9366861eb2a2c436c20b12c8dbec5f798cea6b47ad99216be0282942e2c81ea0" +checksum = "6c356644192565524790740e4075307c2cfc26d04d2543fb8e3ab9ef43a115ec" [[package]] name = "mongodb" @@ -5445,7 +5490,7 @@ dependencies = [ "percent-encoding", "rand 0.8.5", "rustc_version_runtime", - "rustls 0.21.8", + "rustls 0.21.11", "rustls-pemfile 1.0.3", "serde", "serde_bytes", @@ -5473,7 +5518,7 @@ version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a15d522be0a9c3e46fd2632e272d178f56387bdb5c9fbb3a36c649062e9b5219" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "encoding_rs", "futures-util", "http 1.0.0", @@ -5605,7 +5650,7 @@ dependencies = [ "data-encoding", "ed25519", "ed25519-dalek", - "getrandom 0.2.12", + "getrandom 0.2.14", "log", "rand 0.8.5", "signatory", @@ -5613,15 +5658,14 @@ dependencies = [ [[package]] name = "nkeys" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eafe79aeb8066a6f1f84dc44c03ae97403013e946bf0b13626468e0d5e26c6f" +checksum = "bc522a19199a0795776406619aa6aa78e1e55690fbeb3181b8db5265fd0e89ce" dependencies = [ - "byteorder", "data-encoding", "ed25519", "ed25519-dalek", - "getrandom 0.2.12", + "getrandom 0.2.14", "log", "rand 0.8.5", "signatory", @@ -5847,8 +5891,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", ] @@ -5859,9 +5903,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ "proc-macro-crate 1.3.1", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -5871,9 +5915,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ "proc-macro-crate 2.0.0", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -5899,7 +5943,7 @@ checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" dependencies = [ "base64 0.13.1", "chrono", - "getrandom 0.2.12", + "getrandom 0.2.14", "http 0.2.9", "rand 0.8.5", "reqwest", @@ -5988,11 +6032,11 @@ dependencies = [ "async-trait", "backon", "base64 0.21.7", - "bytes 1.5.0", + "bytes 1.6.0", "chrono", "flagset", "futures 0.3.30", - "getrandom 0.2.12", + "getrandom 0.2.14", "http 0.2.9", "log", "md-5", @@ -6031,7 +6075,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_plain", - "serde_with 3.7.0", + "serde_with 3.8.1", "sha2", "subtle", "thiserror", @@ -6059,9 +6103,9 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -6096,12 +6140,12 @@ dependencies = [ name = "opentelemetry-proto" version = "0.1.0" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "chrono", "hex", "ordered-float 4.2.0", - "prost 0.12.3", - "prost-build 0.12.3", + "prost 0.12.4", + "prost-build 0.12.4", "tonic", "tonic-build 0.10.2", "vector-core", @@ -6144,9 +6188,9 @@ dependencies = [ [[package]] name = "os_info" -version = "3.8.1" +version = "3.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cbb46d5d01695d7a1fb8be5f0d1968bd2b2b8ba1d1b3e7062ce2a0593e57af1" +checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092" dependencies = [ "log", "windows-sys 0.52.0", @@ -6224,9 +6268,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" dependencies = [ "lock_api", "parking_lot_core", @@ -6344,9 +6388,9 @@ checksum = "1381c29a877c6d34b8c176e734f35d7f7f5b3adaefe940cb4d1bb7af94678e2e" dependencies = [ "pest", "pest_meta", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -6367,7 +6411,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.2.5", + "indexmap 2.2.6", ] [[package]] @@ -6432,9 +6476,9 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -6582,9 +6626,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" [[package]] name = "portpicker" @@ -6614,7 +6658,7 @@ checksum = "49b6c5ef183cd3ab4ba005f1ca64c21e8bd97ce4699cfea9e8d9a2c4958ca520" dependencies = [ "base64 0.21.7", "byteorder", - "bytes 1.5.0", + "bytes 1.6.0", "fallible-iterator", "hmac", "md-5", @@ -6630,7 +6674,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d2234cdee9408b523530a9b6d2d6b373d1db34f6a8e51dc03ded1828d7fb67c" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "chrono", "fallible-iterator", "postgres-protocol", @@ -6700,7 +6744,7 @@ version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.81", "syn 1.0.109", ] @@ -6710,8 +6754,8 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ - "proc-macro2 1.0.79", - "syn 2.0.53", + "proc-macro2 1.0.81", + "syn 2.0.60", ] [[package]] @@ -6763,8 +6807,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ "proc-macro-error-attr", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", "version_check", ] @@ -6775,8 +6819,8 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "version_check", ] @@ -6803,9 +6847,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.79" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e" +checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba" dependencies = [ "unicode-ident", ] @@ -6814,12 +6858,12 @@ dependencies = [ name = "prometheus-parser" version = "0.1.0" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "nom", "num_enum 0.7.2", - "prost 0.12.3", - "prost-build 0.12.3", - "prost-types 0.12.3", + "prost 0.12.4", + "prost-build 0.12.4", + "prost-types 0.12.4", "snafu 0.7.5", "vector-common", ] @@ -6850,8 +6894,8 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", ] @@ -6861,18 +6905,18 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "prost-derive 0.11.9", ] [[package]] name = "prost" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a" +checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922" dependencies = [ - "bytes 1.5.0", - "prost-derive 0.12.3", + "bytes 1.6.0", + "prost-derive 0.12.4", ] [[package]] @@ -6881,7 +6925,7 @@ version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "heck 0.4.1", "itertools 0.10.5", "lazy_static", @@ -6899,24 +6943,23 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c55e02e35260070b6f716a2423c2ff1c3bb1642ddca6f99e1f26d06268a0e2d2" +checksum = "80b776a1b2dc779f5ee0641f8ade0125bc1298dd41a9a0c16d8bd57b42d222b1" dependencies = [ - "bytes 1.5.0", - "heck 0.4.1", - "itertools 0.11.0", + "bytes 1.6.0", + "heck 0.5.0", + "itertools 0.12.1", "log", "multimap", "once_cell", "petgraph", "prettyplease 0.2.15", - "prost 0.12.3", - "prost-types 0.12.3", + "prost 0.12.4", + "prost-types 0.12.4", "regex", - "syn 2.0.53", + "syn 2.0.60", "tempfile", - "which 4.4.2", ] [[package]] @@ -6927,34 +6970,34 @@ checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" dependencies = [ "anyhow", "itertools 0.10.5", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "prost-derive" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efb6c9a1dd1def8e2124d17e83a20af56f1570d6c2d2bd9e266ccb768df3840e" +checksum = "19de2de2a00075bf566bee3bd4db014b11587e84184d3f7a791bc17f1a8e9e48" dependencies = [ "anyhow", - "itertools 0.11.0", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "itertools 0.12.1", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] name = "prost-reflect" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae9372e3227f3685376a0836e5c248611eafc95a0be900d44bc6cdf225b700f" +checksum = "6f5eec97d5d34bdd17ad2db2219aabf46b054c6c41bd5529767c9ce55be5898f" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "once_cell", - "prost 0.12.3", - "prost-types 0.12.3", + "prost 0.12.4", + "prost-types 0.12.4", "serde", "serde-value", ] @@ -6970,11 +7013,11 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" +checksum = "3235c33eb02c1f1e212abdbe34c78b264b038fb58ca612664343271e36e55ffe" dependencies = [ - "prost 0.12.3", + "prost 0.12.4", ] [[package]] @@ -7007,8 +7050,8 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", ] @@ -7020,7 +7063,7 @@ checksum = "5d21c6a837986cf25d22ac5b951c267d95808f3c830ff009c2879fff259a0268" dependencies = [ "async-trait", "bit-vec", - "bytes 1.5.0", + "bytes 1.6.0", "chrono", "crc", "data-url", @@ -7075,9 +7118,9 @@ dependencies = [ [[package]] name = "quanta" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ca0b7bac0b97248c40bb77288fc52029cf1459c0461ea1b05ee32ccf011de2c" +checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5" dependencies = [ "crossbeam-utils", "libc", @@ -7121,8 +7164,8 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", ] @@ -7137,11 +7180,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ - "proc-macro2 1.0.79", + "proc-macro2 1.0.81", ] [[package]] @@ -7225,7 +7268,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.14", ] [[package]] @@ -7258,9 +7301,9 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.26.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcb12f8fbf6c62614b0d56eb352af54f6a22410c3b079eb53ee93c7b97dd31d8" +checksum = "a564a852040e82671dc50a37d88f3aa83bbc690dfc6844cfe7a2591620206a80" dependencies = [ "bitflags 2.4.1", "cassowary", @@ -7379,7 +7422,7 @@ checksum = "c580d9cbbe1d1b479e8d67cf9daf6a62c957e6846048408b80b43ac3f6af84cd" dependencies = [ "arc-swap", "async-trait", - "bytes 1.5.0", + "bytes 1.6.0", "combine 4.6.6", "futures 0.3.30", "futures-util", @@ -7428,16 +7471,16 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.14", "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.10.3" +version = "1.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" dependencies = [ "aho-corasick", "memchr", @@ -7511,7 +7554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78bf93c4af7a8bb7d879d51cebe797356ff10ae8516ace542b5182d9dcac10b2" dependencies = [ "base64 0.21.7", - "bytes 1.5.0", + "bytes 1.6.0", "encoding_rs", "futures-core", "futures-util", @@ -7525,11 +7568,12 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "native-tls", "once_cell", "percent-encoding", "pin-project-lite", - "rustls 0.21.8", + "rustls 0.21.11", "rustls-pemfile 1.0.3", "serde", "serde_json", @@ -7556,7 +7600,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00" dependencies = [ - "hostname", + "hostname 0.3.1", "quick-error", ] @@ -7583,7 +7627,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" dependencies = [ "cc", - "getrandom 0.2.12", + "getrandom 0.2.14", "libc", "spin 0.9.8", "untrusted", @@ -7598,7 +7642,7 @@ checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0" dependencies = [ "bitvec", "bytecheck", - "bytes 1.5.0", + "bytes 1.6.0", "hashbrown 0.12.3", "ptr_meta", "rend", @@ -7614,8 +7658,8 @@ version = "0.7.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", ] @@ -7627,9 +7671,9 @@ checksum = "3582f63211428f83597b51b2ddb88e2a91a9d52d12831f9d08f5e624e8977422" [[package]] name = "rmp" -version = "0.8.12" +version = "0.8.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9860a6cc38ed1da53456442089b4dfa35e7cedaa326df63017af88385e6b20" +checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4" dependencies = [ "byteorder", "num-traits", @@ -7638,9 +7682,9 @@ dependencies = [ [[package]] name = "rmp-serde" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bffea85eea980d8a74453e5d02a8d93028f3c34725de143085a844ebe953258a" +checksum = "52e599a477cf9840e92f2cde9a7189e67b42c57532749bf90aea6ec10facd4db" dependencies = [ "byteorder", "rmp", @@ -7649,9 +7693,9 @@ dependencies = [ [[package]] name = "rmpv" -version = "1.0.1" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0e0214a4a2b444ecce41a4025792fc31f77c7bb89c46d253953ea8c65701ec" +checksum = "58450723cd9ee93273ce44a20b6ec4efe17f8ed2e3631474387bfdecf18bb2a9" dependencies = [ "num-traits", "rmp", @@ -7661,9 +7705,13 @@ dependencies = [ [[package]] name = "roaring" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf" +checksum = "b26f4c25a604fcb3a1bcd96dd6ba37c93840de95de8198d94c0d571a74a804d1" +dependencies = [ + "bytemuck", + "byteorder", +] [[package]] name = "roxmltree" @@ -7693,9 +7741,9 @@ dependencies = [ [[package]] name = "rstest" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97eeab2f3c0a199bc4be135c36c924b6590b88c377d416494288c14f2db30199" +checksum = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330" dependencies = [ "futures 0.3.30", "futures-timer", @@ -7705,18 +7753,18 @@ dependencies = [ [[package]] name = "rstest_macros" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d428f8247852f894ee1be110b375111b586d4fa431f6c46e64ba5a0dcccbe605" +checksum = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25" dependencies = [ "cfg-if", "glob", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "regex", "relative-path", "rustc_version 0.4.0", - "syn 2.0.53", + "syn 2.0.60", "unicode-ident", ] @@ -7726,7 +7774,7 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1568e15fab2d546f940ed3a21f48bbbd1c494c90c99c4481339364a497f94a9" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "flume 0.11.0", "futures-util", "log", @@ -7746,7 +7794,7 @@ checksum = "06676aec5ccb8fc1da723cc8c0f9a46549f21ebb8753d3915c6c41db1e7f1dc4" dependencies = [ "arrayvec", "borsh", - "bytes 1.5.0", + "bytes 1.6.0", "num-traits", "rand 0.8.5", "rkyv", @@ -7823,9 +7871,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.8" +version = "0.21.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "446e14c5cda4f3f30fe71863c34ec70f5ac79d6087097ad0bb433e1be5edf04c" +checksum = "7fecbfb7b1444f477b345853b1fce097a2c6fb637b2bfb87e6bc5db0f043fae4" dependencies = [ "log", "ring", @@ -7835,9 +7883,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.22.2" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c9956bd9807afa1f77e0f7594af32566e830e088a5576d27c5b6f30f49d41" +checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" dependencies = [ "log", "ring", @@ -8064,9 +8112,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6" dependencies = [ "bitflags 1.3.2", "core-foundation", @@ -8077,9 +8125,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef" dependencies = [ "core-foundation-sys", "libc", @@ -8111,9 +8159,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "ddc6f9cc94d67c0e21aaf7eda3a010fd3af78ebf6e096aa6e2e13c79749cce4f" dependencies = [ "serde_derive", ] @@ -8159,13 +8207,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.200" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "856f046b9400cee3c8c94ed572ecdb752444c24528c035cd35882aad6f492bcb" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -8174,18 +8222,18 @@ version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330f01ce65a3a5fe59a60c82f3c9a024b573b8a6e875bd233fe5f934e71d54e3" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.116" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -8236,9 +8284,9 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -8274,19 +8322,19 @@ dependencies = [ [[package]] name = "serde_with" -version = "3.7.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee80b0e361bbf88fd2f6e242ccd19cfda072cb0faa6ae694ecee08199938569a" +checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20" dependencies = [ - "base64 0.21.7", + "base64 0.22.1", "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_derive", "serde_json", - "serde_with_macros 3.7.0", + "serde_with_macros 3.8.1", "time", ] @@ -8297,21 +8345,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" dependencies = [ "darling 0.13.4", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", ] [[package]] name = "serde_with_macros" -version = "3.7.0" +version = "3.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6561dc161a9224638a31d876ccdfefbc1df91d3f3a8342eddb35f055d48c7655" +checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2" dependencies = [ "darling 0.20.8", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -8328,11 +8376,11 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.33" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "itoa", "ryu", "serde", @@ -8576,8 +8624,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "990079665f075b699031e9c08fd3ab99be5029b96f3b78dc0709e8f77e4efebf" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", ] @@ -8588,9 +8636,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "080c44971436b1af15d6f61ddd8b543995cf63ab8e677d46b00cc06f4ef267a0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -8611,9 +8659,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -8635,6 +8683,15 @@ dependencies = [ ] [[package]] +name = "spinning_top" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300" +dependencies = [ + "lock_api", +] + +[[package]] name = "spki" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -8646,12 +8703,12 @@ dependencies = [ [[package]] name = "stability" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebd1b177894da2a2d9120208c3386066af06a488255caabc5de8ddca22dbc3ce" +checksum = "2ff9eaf853dec4c8802325d8b6d3dffa86cc707fd7a1a4cdbf416e13b061787a" dependencies = [ - "quote 1.0.35", - "syn 1.0.109", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -8747,8 +8804,8 @@ checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" dependencies = [ "heck 0.3.3", "proc-macro-error", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", ] @@ -8774,10 +8831,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "rustversion", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -8787,10 +8844,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18" dependencies = [ "heck 0.4.1", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "rustversion", - "syn 2.0.53", + "syn 2.0.60", ] [[package]] @@ -8826,19 +8883,19 @@ version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "unicode-ident", ] [[package]] name = "syn" -version = "2.0.53" +version = "2.0.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7383cd0e49fff4b6b90ca5670bfd3e9d6a733b3f90c686605aa7eec8c4996032" +checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "unicode-ident", ] @@ -8849,9 +8906,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b" dependencies = [ "proc-macro-error", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -8862,12 +8919,12 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "syslog" -version = "6.1.0" +version = "6.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7434e95bcccce1215d30f4bf84fe8c00e8de1b9be4fb736d747ca53d36e7f96f" +checksum = "dfc7e95b5b795122fafe6519e27629b5ab4232c73ebb2428f568e82b1a457ad3" dependencies = [ "error-chain", - "hostname", + "hostname 0.3.1", "libc", "log", "time", @@ -8929,9 +8986,9 @@ dependencies = [ [[package]] name = "temp-dir" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd16aa9ffe15fe021c6ee3766772132c6e98dfa395a167e16864f61a9cfb71d6" +checksum = "1f227968ec00f0e5322f9b8173c7a0cbcff6181a0a5b28e9892491c286277231" [[package]] name = "tempfile" @@ -9004,22 +9061,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297" +checksum = "f0126ad08bff79f29fc3ae6a55cc72352056dfff61e3ff8bb7129476d44b23aa" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7" +checksum = "d1cd413b5d558b4c5bf3680e324a6fa5014e7b7c067a51e69dbdf47eb7148b66" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -9120,19 +9177,19 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ "backtrace", - "bytes 1.5.0", + "bytes 1.6.0", "libc", "mio", "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.5.6", + "socket2 0.5.7", "tokio-macros", "tracing 0.1.40", "windows-sys 0.48.0", @@ -9165,9 +9222,9 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -9200,7 +9257,7 @@ checksum = "d340244b32d920260ae7448cb72b6e238bddc3d4f7603394e7dd46ed8e48f5b8" dependencies = [ "async-trait", "byteorder", - "bytes 1.5.0", + "bytes 1.6.0", "fallible-iterator", "futures-channel", "futures-util", @@ -9212,7 +9269,7 @@ dependencies = [ "postgres-protocol", "postgres-types", "rand 0.8.5", - "socket2 0.5.6", + "socket2 0.5.7", "tokio", "tokio-util", "whoami", @@ -9235,7 +9292,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.8", + "rustls 0.21.11", "tokio", ] @@ -9245,7 +9302,7 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" dependencies = [ - "rustls 0.22.2", + "rustls 0.22.4", "rustls-pki-types", "tokio", ] @@ -9269,7 +9326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2468baabc3311435b55dd935f702f42cd1b8abb7e754fb7dfb16bd36aa88f9f7" dependencies = [ "async-stream", - "bytes 1.5.0", + "bytes 1.6.0", "futures-core", "tokio", "tokio-stream", @@ -9283,9 +9340,21 @@ checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", - "rustls 0.21.8", + "rustls 0.21.11", + "tokio", + "tungstenite 0.20.1", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c83b561d025642014097b66e6c1bb422783339e0909e4429cde4749d1990bc38" +dependencies = [ + "futures-util", + "log", "tokio", - "tungstenite", + "tungstenite 0.21.0", ] [[package]] @@ -9293,7 +9362,7 @@ name = "tokio-util" version = "0.7.8" source = "git+https://github.com/vectordotdev/tokio?branch=tokio-util-0.7.8-framed-read-continue-on-error#3747655f8f0443e13fe20da3f613ea65c23347c2" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "futures-core", "futures-io", "futures-sink", @@ -9330,7 +9399,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "toml_datetime", "winnow 0.5.18", ] @@ -9341,7 +9410,7 @@ version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "toml_datetime", "winnow 0.5.18", ] @@ -9352,7 +9421,7 @@ version = "0.22.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c12219811e0c1ba077867254e5ad62ee2c9c190b0d957110750ac0cda1ae96cd" dependencies = [ - "indexmap 2.2.5", + "indexmap 2.2.6", "serde", "serde_spanned", "toml_datetime", @@ -9369,7 +9438,7 @@ dependencies = [ "async-trait", "axum", "base64 0.21.7", - "bytes 1.5.0", + "bytes 1.6.0", "flate2", "h2 0.3.26", "http 0.2.9", @@ -9378,8 +9447,8 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project", - "prost 0.12.3", - "rustls 0.21.8", + "prost 0.12.4", + "rustls 0.21.11", "rustls-native-certs 0.6.3", "rustls-pemfile 1.0.3", "tokio", @@ -9398,9 +9467,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" dependencies = [ "prettyplease 0.1.25", - "proc-macro2 1.0.79", + "proc-macro2 1.0.81", "prost-build 0.11.9", - "quote 1.0.35", + "quote 1.0.36", "syn 1.0.109", ] @@ -9411,10 +9480,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease 0.2.15", - "proc-macro2 1.0.79", - "prost-build 0.12.3", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "prost-build 0.12.4", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -9446,7 +9515,7 @@ dependencies = [ "async-compression", "base64 0.21.7", "bitflags 2.4.1", - "bytes 1.5.0", + "bytes 1.6.0", "futures-core", "futures-util", "http 0.2.9", @@ -9515,9 +9584,9 @@ version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -9701,7 +9770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", - "bytes 1.5.0", + "bytes 1.6.0", "data-encoding", "http 0.2.9", "httparse", @@ -9714,6 +9783,25 @@ dependencies = [ ] [[package]] +name = "tungstenite" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ef1a641ea34f399a848dea702823bbecfb4c486f911735368f1f137cb8257e1" +dependencies = [ + "byteorder", + "bytes 1.6.0", + "data-encoding", + "http 1.0.0", + "httparse", + "log", + "rand 0.8.5", + "sha1", + "thiserror", + "url", + "utf-8", +] + +[[package]] name = "twox-hash" version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -9729,8 +9817,8 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "syn 1.0.109", ] @@ -9749,9 +9837,9 @@ version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f03ca4cb38206e2bef0700092660bb74d696f808514dae47fa1467cbfe26e96e" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -9779,9 +9867,9 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac73887f47b9312552aa90ef477927ff014d63d1920ca8037c6c1951eab64bb1" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] @@ -9958,7 +10046,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0" dependencies = [ "atomic", - "getrandom 0.2.12", + "getrandom 0.2.14", "rand 0.8.5", "serde", "wasm-bindgen", @@ -9983,7 +10071,7 @@ dependencies = [ "anyhow", "cached", "chrono", - "clap 4.5.3", + "clap 4.5.4", "clap-verbosity-flag", "clap_complete", "confy", @@ -9991,7 +10079,7 @@ dependencies = [ "dunce", "glob", "hex", - "indexmap 2.2.5", + "indexmap 2.2.6", "indicatif", "itertools 0.12.1", "log", @@ -10003,7 +10091,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "serde_yaml 0.9.33", + "serde_yaml 0.9.34+deprecated", "sha2", "tempfile", "toml", @@ -10017,7 +10105,7 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "vector" -version = "0.37.1" +version = "0.38.0" dependencies = [ "apache-avro", "approx", @@ -10038,6 +10126,7 @@ dependencies = [ "aws-sdk-firehose", "aws-sdk-kinesis", "aws-sdk-s3", + "aws-sdk-secretsmanager", "aws-sdk-sns", "aws-sdk-sqs", "aws-sdk-sts", @@ -10053,20 +10142,21 @@ dependencies = [ "azure_identity", "azure_storage", "azure_storage_blobs", - "base64 0.22.0", + "base64 0.22.1", "bloomy", "bollard", - "bytes 1.5.0", + "bytes 1.6.0", "bytesize", "chrono", "chrono-tz", "cidr-utils 0.6.1", - "clap 4.5.3", + "clap 4.5.4", "colored", "console-subscriber", "criterion", "crossterm", "csv", + "databend-client", "derivative", "dirs-next", "dnsmsg-parser", @@ -10085,19 +10175,19 @@ dependencies = [ "grok", "h2 0.4.4", "hash_hasher", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "headers", "heim", "hex", "hickory-proto", - "hostname", + "hostname 0.4.0", "http 0.2.9", "http-body 0.4.5", "http-serde", "hyper 0.14.28", "hyper-openssl", "hyper-proxy", - "indexmap 2.2.5", + "indexmap 2.2.6", "indoc", "infer 0.15.0", "inventory", @@ -10118,7 +10208,7 @@ dependencies = [ "mlua", "mongodb", "nix 0.26.2", - "nkeys 0.4.0", + "nkeys 0.4.1", "nom", "notify", "num-format", @@ -10135,10 +10225,10 @@ dependencies = [ "portpicker", "postgres-openssl", "proptest", - "prost 0.12.3", - "prost-build 0.12.3", + "prost 0.12.4", + "prost-build 0.12.4", "prost-reflect", - "prost-types 0.12.3", + "prost-types 0.12.4", "pulsar", "quickcheck", "rand 0.8.5", @@ -10159,15 +10249,15 @@ dependencies = [ "serde-toml-merge", "serde_bytes", "serde_json", - "serde_with 3.7.0", - "serde_yaml 0.9.33", + "serde_with 3.8.1", + "serde_yaml 0.9.34+deprecated", "sha2", "similar-asserts", "smallvec", "smpl_jwt", "snafu 0.7.5", "snap", - "socket2 0.5.6", + "socket2 0.5.7", "stream-cancel", "strip-ansi-escapes", "syslog", @@ -10179,7 +10269,7 @@ dependencies = [ "tokio-postgres", "tokio-stream", "tokio-test", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "tokio-util", "toml", "tonic", @@ -10210,9 +10300,8 @@ name = "vector-api-client" version = "0.1.2" dependencies = [ "anyhow", - "async-trait", "chrono", - "clap 4.5.3", + "clap 4.5.4", "futures 0.3.30", "graphql_client", "indoc", @@ -10221,7 +10310,7 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.20.1", "url", "uuid", ] @@ -10234,8 +10323,8 @@ dependencies = [ "async-stream", "async-trait", "bytecheck", - "bytes 1.5.0", - "clap 4.5.3", + "bytes 1.6.0", + "clap 4.5.4", "crc32fast", "criterion", "crossbeam-queue", @@ -10257,7 +10346,7 @@ dependencies = [ "rand 0.8.5", "rkyv", "serde", - "serde_yaml 0.9.33", + "serde_yaml 0.9.34+deprecated", "snafu 0.7.5", "temp-dir", "tokio", @@ -10277,13 +10366,13 @@ name = "vector-common" version = "0.1.0" dependencies = [ "async-stream", - "bytes 1.5.0", + "bytes 1.6.0", "chrono", "chrono-tz", "crossbeam-utils", "derivative", "futures 0.3.30", - "indexmap 2.2.5", + "indexmap 2.2.6", "metrics", "nom", "ordered-float 4.2.0", @@ -10314,13 +10403,13 @@ dependencies = [ "chrono-tz", "encoding_rs", "http 0.2.9", - "indexmap 2.2.5", + "indexmap 2.2.6", "inventory", "no-proxy", "num-traits", "serde", "serde_json", - "serde_with 3.7.0", + "serde_with 3.8.1", "snafu 0.7.5", "toml", "tracing 0.1.40", @@ -10338,11 +10427,11 @@ dependencies = [ "convert_case 0.6.0", "darling 0.20.8", "once_cell", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "serde", "serde_json", - "syn 2.0.53", + "syn 2.0.60", "tracing 0.1.40", ] @@ -10351,11 +10440,11 @@ name = "vector-config-macros" version = "0.1.0" dependencies = [ "darling 0.20.8", - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", "serde", "serde_derive_internals", - "syn 2.0.53", + "syn 2.0.60", "vector-config", "vector-config-common", ] @@ -10366,9 +10455,9 @@ version = "0.1.0" dependencies = [ "async-graphql", "async-trait", - "base64 0.22.0", + "base64 0.22.1", "bitmask-enum", - "bytes 1.5.0", + "bytes 1.6.0", "chrono", "chrono-tz", "criterion", @@ -10384,7 +10473,7 @@ dependencies = [ "headers", "http 0.2.9", "hyper-proxy", - "indexmap 2.2.5", + "indexmap 2.2.6", "ipnet", "metrics", "metrics-tracing-context", @@ -10400,10 +10489,10 @@ dependencies = [ "parking_lot", "pin-project", "proptest", - "prost 0.12.3", - "prost-build 0.12.3", - "prost-types 0.12.3", - "quanta 0.12.2", + "prost 0.12.4", + "prost-build 0.12.4", + "prost-types 0.12.4", + "quanta 0.12.3", "quickcheck", "quickcheck_macros", "rand 0.8.5", @@ -10414,12 +10503,12 @@ dependencies = [ "security-framework", "serde", "serde_json", - "serde_with 3.7.0", - "serde_yaml 0.9.33", + "serde_with 3.8.1", + "serde_yaml 0.9.34+deprecated", "similar-asserts", "smallvec", "snafu 0.7.5", - "socket2 0.5.6", + "socket2 0.5.7", "tokio", "tokio-openssl", "tokio-stream", @@ -10495,7 +10584,7 @@ dependencies = [ name = "vector-vrl-cli" version = "0.1.0" dependencies = [ - "clap 4.5.3", + "clap 4.5.4", "vector-vrl-functions", "vrl", ] @@ -10514,7 +10603,7 @@ dependencies = [ "ansi_term", "chrono", "chrono-tz", - "clap 4.5.3", + "clap 4.5.4", "enrichment", "glob", "prettydiff", @@ -10533,7 +10622,7 @@ version = "0.1.0" dependencies = [ "cargo_toml", "enrichment", - "getrandom 0.2.12", + "getrandom 0.2.14", "gloo-utils", "serde", "serde-wasm-bindgen", @@ -10556,16 +10645,17 @@ checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] name = "vrl" -version = "0.13.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f1e48235e8db47d5010723fc32c38b09820a1a2a57eaea77b089493a375f52" +checksum = "82cfcc99d9936dc2a8645f049122a5c5d137b066d0ffc48f01203ab2f102ed62" dependencies = [ "aes", "ansi_term", "arbitrary", "base16", - "base64 0.22.0", - "bytes 1.5.0", + "base62", + "base64 0.22.1", + "bytes 1.6.0", "cbc", "cfb-mode", "cfg-if", @@ -10574,7 +10664,7 @@ dependencies = [ "chrono", "chrono-tz", "cidr-utils 0.6.1", - "clap 4.5.3", + "clap 4.5.4", "codespan-reporting", "community-id", "crypto_secretbox", @@ -10589,10 +10679,10 @@ dependencies = [ "grok", "hex", "hmac", - "hostname", + "hostname 0.4.0", "iana-time-zone", "idna 0.5.0", - "indexmap 2.2.5", + "indexmap 2.2.6", "indoc", "itertools 0.12.1", "lalrpop", @@ -10611,7 +10701,7 @@ dependencies = [ "pest_derive", "prettydiff", "prettytable-rs", - "prost 0.12.3", + "prost 0.12.4", "prost-reflect", "psl", "quickcheck", @@ -10665,8 +10755,8 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", + "proc-macro2 1.0.81", + "quote 1.0.36", ] [[package]] @@ -10705,11 +10795,11 @@ dependencies = [ [[package]] name = "warp" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e92e22e03ff1230c03a1a8ee37d2f89cd489e2e541b7550d6afad96faed169" +checksum = "4378d202ff965b011c64817db11d5829506d3404edeadb61f190d111da3f231c" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.0", "futures-channel", "futures-util", "headers", @@ -10720,14 +10810,12 @@ dependencies = [ "mime_guess", "percent-encoding", "pin-project", - "rustls-pemfile 1.0.3", "scoped-tls", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.21.0", "tokio-util", "tower-service", "tracing 0.1.40", @@ -10770,9 +10858,9 @@ dependencies = [ "bumpalo", "log", "once_cell", - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", "wasm-bindgen-shared", ] @@ -10794,7 +10882,7 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ - "quote 1.0.35", + "quote 1.0.36", "wasm-bindgen-macro-support", ] @@ -10804,9 +10892,9 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -10842,9 +10930,9 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.12" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b2391658b02c27719fc5a0a73d6e696285138e8b12fba9d4baa70451023c71" +checksum = "60b6f804e41d0852e16d2eaee61c7e4f7d3e8ffdb7b8ed85886aeb0791fe9fcd" dependencies = [ "core-foundation", "home", @@ -10943,23 +11031,33 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +dependencies = [ + "windows-core", + "windows-targets 0.52.0", +] + +[[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] name = "windows-service" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9db37ecb5b13762d95468a2fc6009d4b2c62801243223aabd44fca13ad13c8" +checksum = "d24d6bcc7f734a4091ecf8d7a64c5f7d7066f45585c1861eba06449909609c8a" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "widestring 1.0.2", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -11259,9 +11357,9 @@ version = "0.7.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a" dependencies = [ - "proc-macro2 1.0.79", - "quote 1.0.35", - "syn 2.0.53", + "proc-macro2 1.0.81", + "quote 1.0.36", + "syn 2.0.60", ] [[package]] diff --git a/nixpkgs/pkgs/tools/misc/vector/default.nix b/nixpkgs/pkgs/tools/misc/vector/default.nix index db6446ec26cf..91b755f82827 100644 --- a/nixpkgs/pkgs/tools/misc/vector/default.nix +++ b/nixpkgs/pkgs/tools/misc/vector/default.nix @@ -37,7 +37,7 @@ let pname = "vector"; - version = "0.37.1"; + version = "0.38.0"; in rustPlatform.buildRustPackage { inherit pname version; @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage { owner = "vectordotdev"; repo = pname; rev = "v${version}"; - hash = "sha256-wRXwgy+UY2z5fIWpQbDxRti54GE357WMGWXM/xKjz18="; + hash = "sha256-sJgryN6/XaM1qXxv76/5RGanUpBYxIsGYGToOCXDvwA="; }; patches = [ diff --git a/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix b/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix index e5a85049df0a..f5a2e2d1dad5 100644 --- a/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix +++ b/nixpkgs/pkgs/tools/misc/vorbisgain/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://sjeng.org/vorbisgain.html"; description = "A utility that corrects the volume of an Ogg Vorbis file to a predefined standardized loudness"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; mainProgram = "vorbisgain"; diff --git a/nixpkgs/pkgs/tools/misc/vrc-get/default.nix b/nixpkgs/pkgs/tools/misc/vrc-get/default.nix index 140fba5c11f3..7f907711e702 100644 --- a/nixpkgs/pkgs/tools/misc/vrc-get/default.nix +++ b/nixpkgs/pkgs/tools/misc/vrc-get/default.nix @@ -1,4 +1,4 @@ -{ fetchCrate, lib, rustPlatform, pkg-config, stdenv, Security, SystemConfiguration }: +{ fetchCrate, installShellFiles, lib, rustPlatform, pkg-config, stdenv, Security, SystemConfiguration, buildPackages }: rustPlatform.buildRustPackage rec { pname = "vrc-get"; @@ -9,12 +9,25 @@ rustPlatform.buildRustPackage rec { hash = "sha256-+xbHw1DpFmapjsFoUvxUqTok8TKMebMw3gYjO/rx/iU="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ installShellFiles pkg-config ]; buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; cargoHash = "sha256-iuLhDcii+wXDNUsUMo8lj4kfJve5RAz7FT5Pxs9yFPQ="; + # Execute the resulting binary to generate shell completions, using emulation if necessary when cross-compiling. + # If no emulator is available, then give up on generating shell completions + postInstall = + let + vrc-get = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/vrc-get"; + in + lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) '' + installShellCompletion --cmd vrc-get \ + --bash <(${vrc-get} completion bash) \ + --fish <(${vrc-get} completion fish) \ + --zsh <(${vrc-get} completion zsh) + ''; + meta = with lib; { description = "Command line client of VRChat Package Manager, the main feature of VRChat Creator Companion (VCC)"; homepage = "https://github.com/vrc-get/vrc-get"; diff --git a/nixpkgs/pkgs/tools/misc/vsh/default.nix b/nixpkgs/pkgs/tools/misc/vsh/default.nix index c061a14f2e30..9cfd9af7fc68 100644 --- a/nixpkgs/pkgs/tools/misc/vsh/default.nix +++ b/nixpkgs/pkgs/tools/misc/vsh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vsh"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "fishi0x01"; repo = "vsh"; rev = "v${version}"; - sha256 = "13qa9r7kij6aqhackzmsn38vyhmajgmhflnrd9rarfhhyg6ldv4z"; + sha256 = "083rqca4gx9lmzkc9rl453zqmspbpn0h2vajkrjjcwk96km7064f"; }; # vendor directory is part of repository diff --git a/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix b/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix index f10ccd698cb9..b7a0652b359c 100644 --- a/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix +++ b/nixpkgs/pkgs/tools/misc/wacomtablet/default.nix @@ -30,7 +30,7 @@ mkDerivation rec { with profile support to handle different button / pen layouts per profile. ''; homepage = "https://invent.kde.org/system/wacomtablet"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.Thra11 ]; platforms = lib.platforms.linux; }; diff --git a/nixpkgs/pkgs/tools/misc/wagyu/default.nix b/nixpkgs/pkgs/tools/misc/wagyu/default.nix index 39e1085d4c96..0eb71743f064 100644 --- a/nixpkgs/pkgs/tools/misc/wagyu/default.nix +++ b/nixpkgs/pkgs/tools/misc/wagyu/default.nix @@ -2,16 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "wagyu"; - version = "0.6.1"; + version = "0.6.3"; src = fetchFromGitHub { owner = "AleoHQ"; repo = pname; - rev = "refs/tags/v${version}"; - hash = "sha256-ltWNKB3DHtwVVzJyvRWj2I8rjsl7ru2i/RCO9yiQhpg="; + rev = "v${version}"; + hash = "sha256-5n8BmETv5jUvgu0rskAPYaBgYyNL2QU2t/iUb3hNMMw="; }; - cargoHash = "sha256-8dbeSHN6+1jLdVA9QxNAy7Y6EX7wflpQI72kqZAEVIE="; + cargoPatches = [ ./fix-rustc-serialize-version.patch ]; + + cargoHash = "sha256-vseTtok0E0ddg9ALQ1ql3NPPxirfyMPHOSWsM2qu2jU="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/nixpkgs/pkgs/tools/misc/wagyu/fix-rustc-serialize-version.patch b/nixpkgs/pkgs/tools/misc/wagyu/fix-rustc-serialize-version.patch new file mode 100644 index 000000000000..2b990909c1b4 --- /dev/null +++ b/nixpkgs/pkgs/tools/misc/wagyu/fix-rustc-serialize-version.patch @@ -0,0 +1,15 @@ +diff --git a/Cargo.lock b/Cargo.lock +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1286,9 +1286,9 @@ checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" + + [[package]] + name = "rustc-serialize" +-version = "0.3.24" ++version = "0.3.25" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" ++checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401" + + [[package]] + name = "rustc_version" diff --git a/nixpkgs/pkgs/tools/misc/wakapi/default.nix b/nixpkgs/pkgs/tools/misc/wakapi/default.nix index 372d20771f37..a8c4a28775ea 100644 --- a/nixpkgs/pkgs/tools/misc/wakapi/default.nix +++ b/nixpkgs/pkgs/tools/misc/wakapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakapi"; - version = "2.11.1"; + version = "2.11.2"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "sha256-ZdKPaHe4miMKb6qEKdRz/fRIkTWDXp2Veu7CP1gRuQw="; + sha256 = "sha256-lBjYtb64blFUH/iW/SmC4A7nX9asokvsNKu6QVYgmZ8="; }; - vendorHash = "sha256-pRj7Y2xp+Z2StaXRIzI5b2WAkIhR9y8T8DMXWrxOiy4="; + vendorHash = "sha256-Kt7RzAGZeLFhwvq+V6AK88rivqkoTE1Zep7NMh3BXXQ="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; diff --git a/nixpkgs/pkgs/tools/misc/wakatime/default.nix b/nixpkgs/pkgs/tools/misc/wakatime/default.nix deleted file mode 100644 index 2ce8df19867e..000000000000 --- a/nixpkgs/pkgs/tools/misc/wakatime/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ lib, buildGoModule, fetchFromGitHub, testers, wakatime }: - -buildGoModule rec { - pname = "wakatime"; - version = "1.73.0"; - - src = fetchFromGitHub { - owner = "wakatime"; - repo = "wakatime-cli"; - rev = "v${version}"; - hash = "sha256-EUZgYRsQRqtp0yiqNYex+ILSZwGEdO4BhciEgUVdui4="; - }; - - vendorHash = "sha256-SlYYrlRDBvhNm2BxemK9HzzsqM/RGH/sDQXpoGEY8rw="; - - ldflags = [ - "-s" - "-w" - "-X github.com/wakatime/wakatime-cli/pkg/version.Version=${version}" - ]; - - preCheck = - let - skippedTests = [ - # Tests requiring network - "TestFileExperts" - "TestSendHeartbeats" - "TestSendHeartbeats_ExtraHeartbeats" - "TestSendHeartbeats_IsUnsavedEntity" - "TestSendHeartbeats_NonExistingExtraHeartbeatsEntity" - - # Flaky tests - "TestLoadParams_ApiKey_FromVault_Err_Darwin" - ]; - in - '' - # Disable tests - buildFlagsArray+=("-run" "[^(${builtins.concatStringsSep "|" skippedTests})]") - ''; - - passthru.tests.version = testers.testVersion { - package = wakatime; - command = "HOME=$(mktemp -d) wakatime-cli --version"; - }; - - meta = with lib; { - homepage = "https://wakatime.com/"; - description = "WakaTime command line interface"; - license = licenses.bsd3; - maintainers = with maintainers; [ ]; - mainProgram = "wakatime-cli"; - }; -} diff --git a/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix b/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix index 529815b12ec4..d928b723943c 100644 --- a/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix +++ b/nixpkgs/pkgs/tools/misc/wasm-tools/default.nix @@ -5,19 +5,19 @@ rustPlatform.buildRustPackage rec { pname = "wasm-tools"; - version = "1.206.0"; + version = "1.207.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-dRCPur2EmEF5GV4PWSWAKIE+A9KfW2FbnUJVdXct3aA="; + hash = "sha256-Q2WLvAjZ0UQyIgVen4QuEtef1MJvhKLMlj8RYYoJuVQ="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-M3wtgvZWWTlB1mmyLJNHBXwVMc5b61ie/RmSGn1ow9U="; + cargoHash = "sha256-VHHtwP9LPmG0MHpv/1mf4LntTuBeDHhPA4gqz5mhlpg="; cargoBuildFlags = [ "--package" "wasm-tools" ]; cargoTestFlags = [ "--all" ]; diff --git a/nixpkgs/pkgs/tools/misc/watchexec/default.nix b/nixpkgs/pkgs/tools/misc/watchexec/default.nix index 0841a6490cc4..32ee78ff6cb0 100644 --- a/nixpkgs/pkgs/tools/misc/watchexec/default.nix +++ b/nixpkgs/pkgs/tools/misc/watchexec/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-wJt8247RKS6g+O2Ho75Fn4O4w6RoxotRm0yXBRM9d8g="; + hash = "sha256-S0c/UqdbEqhZRkxZonW1TPQLmGbZeiK14yPbW5dpI70="; }; - cargoHash = "sha256-JLDNAuYE7Pu9E82TD2cz9lnCWEC9bNQxd3MP4lXjo3k="; + cargoHash = "sha256-IuubIEu2mY3h1i9gJgQlyVoGwUYWsdp8+hKYyz0j3is="; nativeBuildInputs = [ installShellFiles ]; diff --git a/nixpkgs/pkgs/tools/misc/woeusb-ng/default.nix b/nixpkgs/pkgs/tools/misc/woeusb-ng/default.nix index 821eb73a4a89..1c3754bd95f3 100644 --- a/nixpkgs/pkgs/tools/misc/woeusb-ng/default.nix +++ b/nixpkgs/pkgs/tools/misc/woeusb-ng/default.nix @@ -1,7 +1,7 @@ { lib , python3Packages , fetchFromGitHub -, wrapGAppsHook +, wrapGAppsHook3 , p7zip , parted , grub2 @@ -27,7 +27,7 @@ buildPythonApplication rec { ''; nativeBuildInputs = [ - wrapGAppsHook + wrapGAppsHook3 ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/tools/misc/wootility/default.nix b/nixpkgs/pkgs/tools/misc/wootility/default.nix index 803ad53038e7..f8590702ecb9 100644 --- a/nixpkgs/pkgs/tools/misc/wootility/default.nix +++ b/nixpkgs/pkgs/tools/misc/wootility/default.nix @@ -8,11 +8,11 @@ appimageTools.wrapType2 rec { pname = "wootility"; - version = "4.6.15"; + version = "4.6.18"; src = fetchurl { url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-${version}.AppImage"; - sha256 = "sha256-A/cjm9rhcgp68hbyjy7OfYPBKBcccl0OdD7MTdpEdPM="; + sha256 = "sha256-oiPt1xgmYGYO1dk01rDwwaUf+yhDAbRCqTTuOivR/kI="; }; profile = '' diff --git a/nixpkgs/pkgs/tools/misc/wv/default.nix b/nixpkgs/pkgs/tools/misc/wv/default.nix index e1824c1d3709..0d2443be9f9b 100644 --- a/nixpkgs/pkgs/tools/misc/wv/default.nix +++ b/nixpkgs/pkgs/tools/misc/wv/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/AbiWord/wv"; description = "Converter from Microsoft Word formats to human-editable ones"; platforms = lib.platforms.unix; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; }; }) diff --git a/nixpkgs/pkgs/tools/misc/wyrd/default.nix b/nixpkgs/pkgs/tools/misc/wyrd/default.nix index 4010a0b42d0f..cdce7a5e347f 100644 --- a/nixpkgs/pkgs/tools/misc/wyrd/default.nix +++ b/nixpkgs/pkgs/tools/misc/wyrd/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; homepage = "http://pessimization.com/software/wyrd/"; downloadPage = "http://pessimization.com/software/wyrd/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.prikhi ]; platforms = platforms.linux; mainProgram = "wyrd"; diff --git a/nixpkgs/pkgs/tools/misc/xclip/default.nix b/nixpkgs/pkgs/tools/misc/xclip/default.nix index 721d300a19ed..e56382879d59 100644 --- a/nixpkgs/pkgs/tools/misc/xclip/default.nix +++ b/nixpkgs/pkgs/tools/misc/xclip/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to access the X clipboard from a console application"; homepage = "https://github.com/astrand/xclip"; - license = lib.licenses.gpl2; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; mainProgram = "xclip"; }; diff --git a/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix b/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix index 7201ffcbbe99..333da375d580 100644 --- a/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix +++ b/nixpkgs/pkgs/tools/misc/xdaliclock/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl , gtk3 -, wrapGAppsHook +, wrapGAppsHook3 , pkg-config }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config - wrapGAppsHook + wrapGAppsHook3 ]; buildInputs = [ gtk3 diff --git a/nixpkgs/pkgs/tools/misc/xflux/gui.nix b/nixpkgs/pkgs/tools/misc/xflux/gui.nix index a9ec5d5d0eeb..97ad6dbaaecd 100644 --- a/nixpkgs/pkgs/tools/misc/xflux/gui.nix +++ b/nixpkgs/pkgs/tools/misc/xflux/gui.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook +{ lib, fetchFromGitHub, buildPythonApplication, python3Packages, wrapGAppsHook3 , xflux, gtk3, gobject-introspection, pango, gdk-pixbuf, atk , pexpect, pygobject3, pyxdg, libappindicator-gtk3 }: @@ -24,7 +24,7 @@ buildPythonApplication rec { ]; nativeBuildInputs = [ - wrapGAppsHook gobject-introspection + wrapGAppsHook3 gobject-introspection pango gdk-pixbuf atk libappindicator-gtk3 ]; diff --git a/nixpkgs/pkgs/tools/misc/xfstests/default.nix b/nixpkgs/pkgs/tools/misc/xfstests/default.nix index 5080c8592492..aed576f7d34a 100644 --- a/nixpkgs/pkgs/tools/misc/xfstests/default.nix +++ b/nixpkgs/pkgs/tools/misc/xfstests/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Torture test suite for filesystems"; homepage = "https://git.kernel.org/pub/scm/fs/xfs/xfstests-dev.git/"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.dezgeg ]; platforms = platforms.linux; mainProgram = "xfstests-check"; diff --git a/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix b/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix index eb1e7c5b01b7..038cae8f39e6 100644 --- a/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix +++ b/nixpkgs/pkgs/tools/misc/xvfb-run/default.nix @@ -58,7 +58,7 @@ stdenvNoCC.mkDerivation rec { meta = with lib; { description = "Convenience script to run a virtualized X-Server"; platforms = platforms.linux; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = [ maintainers.artturin ]; mainProgram = "xvfb-run"; }; diff --git a/nixpkgs/pkgs/tools/misc/yad/default.nix b/nixpkgs/pkgs/tools/misc/yad/default.nix index 9bbb955f1a1b..7c2e100a33f7 100644 --- a/nixpkgs/pkgs/tools/misc/yad/default.nix +++ b/nixpkgs/pkgs/tools/misc/yad/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, autoreconfHook, wrapGAppsHook +{ lib, stdenv, fetchFromGitHub, pkg-config, intltool, autoreconfHook, wrapGAppsHook3 , gtk3, hicolor-icon-theme, netpbm }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 hicolor-icon-theme ]; - nativeBuildInputs = [ autoreconfHook pkg-config intltool wrapGAppsHook ]; + nativeBuildInputs = [ autoreconfHook pkg-config intltool wrapGAppsHook3 ]; postPatch = '' sed -i src/file.c -e '21i#include <glib/gprintf.h>' @@ -44,6 +44,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3; + mainProgram = "yad"; maintainers = with maintainers; [ smironov ]; platforms = with platforms; linux; }; |