From 6b6f3f188c1e8a070ff608fed4a711620dd96a8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 24 Feb 2023 11:46:48 +0100 Subject: [PATCH 001/244] buildMozillaMach: passthru application, extraPatches to be later used by betterbird package --- pkgs/applications/networking/browsers/firefox/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 948b32172489..99baf7cf7ce8 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -546,6 +546,7 @@ buildStdenv.mkDerivation ({ ''; passthru = { + inherit application extraPatches; inherit updateScript; inherit version; inherit alsaSupport; From 5a23a24ba275ca78d9f1e0d1dfdb7757a720707d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Mar 2023 19:18:00 +0200 Subject: [PATCH 002/244] nixos/grub-install: don't rely on shell to run commands data passed to these programs might be accidentially interpreted as shell. Discovered in https://github.com/Mic92/envfs/issues/111 --- .../modules/system/boot/loader/grub/install-grub.pl | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index aea426c7fdf2..4a8983b1bb19 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -47,10 +47,9 @@ sub writeFile { } sub runCommand { - my ($cmd) = @_; - open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n"; - my @ret = ; - close FILE; + open(my $fh, "-|", @_) or die "Failed to execute: $@_\n"; + my @ret = $fh->getlines(); + close $fh; return ($?, @ret); } @@ -200,7 +199,7 @@ sub GrubFs { $search = $types{$fsIdentifier} . ' '; # Based on the type pull in the identifier from the system - my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid -o export @{[$fs->device]}"); + my ($status, @devInfo) = runCommand("@utillinux@/bin/blkid", "-o", "export", @{[$fs->device]}); if ($status != 0) { die "Failed to get blkid info (returned $status) for @{[$fs->mount]} on @{[$fs->device]}"; } @@ -213,7 +212,7 @@ sub GrubFs { # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes if ($fs->type eq 'btrfs') { - my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs subvol show @{[$fs->mount]}"); + my ($status, @id_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "show", @{[$fs->mount]}); if ($status != 0) { die "Failed to retrieve subvolume info for @{[$fs->mount]}\n"; } @@ -221,7 +220,7 @@ sub GrubFs { if ($#ids > 0) { die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" } elsif ($#ids == 0) { - my ($status, @path_info) = runCommand("@btrfsprogs@/bin/btrfs subvol list @{[$fs->mount]}"); + my ($status, @path_info) = runCommand("@btrfsprogs@/bin/btrfs", "subvol", "list", @{[$fs->mount]}); if ($status != 0) { die "Failed to find @{[$fs->mount]} subvolume id from btrfs\n"; } From d9c92360a8454c6735b0a53e49fdedaa69862162 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 27 Mar 2023 19:19:41 +0200 Subject: [PATCH 003/244] nixos/install-grub: stop using bare file handles for readFile/WriteFile --- .../system/boot/loader/grub/install-grub.pl | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 4a8983b1bb19..2779f26aa1b6 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -34,16 +34,23 @@ sub getList { } sub readFile { - my ($fn) = @_; local $/ = undef; - open FILE, "<$fn" or return undef; my $s = ; close FILE; - local $/ = "\n"; chomp $s; return $s; + my ($fn) = @_; + # enable slurp mode: read entire file in one go + local $/ = undef; + open my $fh, "<$fn" or return undef; + my $s = <$fh>; + close $fh; + # disable slurp mode + local $/ = "\n"; + chomp $s; + return $s; } sub writeFile { my ($fn, $s) = @_; - open FILE, ">$fn" or die "cannot create $fn: $!\n"; - print FILE $s or die; - close FILE or die; + open my $fh, ">$fn" or die "cannot create $fn: $!\n"; + print $fh $s or die "cannot write to $fn: $!\n"; + close $fh or die "cannot close $fn: $!\n"; } sub runCommand { From 38f35cf7b0beb6adfefcecf0fa5414fd4f4aa628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 16 Feb 2023 01:42:09 +0100 Subject: [PATCH 004/244] firefox: remove unused rec --- pkgs/applications/networking/browsers/firefox/packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 2d821a6d1325..e7ef05c89042 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -1,6 +1,6 @@ { stdenv, lib, callPackage, fetchurl, fetchpatch, nixosTests, buildMozillaMach }: -rec { +{ firefox = buildMozillaMach rec { pname = "firefox"; version = "110.0.1"; From f382bf1d802a6622b2d6f51f782fd4f8511b2528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 18 Feb 2023 03:07:00 +0100 Subject: [PATCH 005/244] thunderbird: allow overwriting wrapped binary --- .../applications/networking/mailreaders/thunderbird/wrapper.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix b/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix index 0761232cc519..bb135568fdb5 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/wrapper.nix @@ -16,7 +16,7 @@ args: # For that to work out of the box, it requires `gnupg` on PATH and # `gpgme` in `LD_LIBRARY_PATH`; we do this below. buildCommand = old.buildCommand + '' - wrapProgram $out/bin/thunderbird \ + wrapProgram $out/bin/${browser.binaryName} \ --prefix LD_LIBRARY_PATH ':' "${lib.makeLibraryPath [ gpgme ]}" \ --prefix PATH ':' "${lib.makeBinPath [ gnupg ]}" ''; From ea750901e2c45de0e2944cb125fa8a1cb64cbc56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 28 Mar 2023 00:04:06 +0200 Subject: [PATCH 006/244] betterbird: init at 102.8.0-bb30 --- .../mailreaders/betterbird/betterbird.diff | 44 +++++++ .../mailreaders/betterbird/default.nix | 116 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 6 + 3 files changed, 166 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/betterbird/betterbird.diff create mode 100644 pkgs/applications/networking/mailreaders/betterbird/default.nix diff --git a/pkgs/applications/networking/mailreaders/betterbird/betterbird.diff b/pkgs/applications/networking/mailreaders/betterbird/betterbird.diff new file mode 100644 index 000000000000..93d12b1ccfdd --- /dev/null +++ b/pkgs/applications/networking/mailreaders/betterbird/betterbird.diff @@ -0,0 +1,44 @@ +--- a/12-feature-linux-systray-example.patch ++++ b/12-feature-linux-systray-example.patch +@@ -8,18 +8,15 @@ diff --git a/third_party/appindicator/Makefile b/third_party/appindicator/Makefi + new file mode 100644 + --- /dev/null + +++ b/third_party/appindicator/Makefile +-@@ -0,0 +1,34 @@ ++@@ -0,0 +1,31 @@ + +# Code from https://github.com/AyatanaIndicators/libayatana-appindicator + +# and related repositories. + +# See https://github.com/AyatanaIndicators/libayatana-appindicator/issues/46 for build instructions. + +# You need: sudo aptitude install libdbusmenu-gtk3-dev + + +-+CFLAGS=`pkg-config --cflags gtk+-3.0 glib-2.0` \ +-+ -I/usr/include/libdbusmenu-glib-0.4/ \ +-+ -I/usr/include/libdbusmenu-gtk3-0.4/ \ +-+ -I/usr/include/glib-2.0 +++CFLAGS=`pkg-config --cflags gtk+-3.0 glib-2.0 dbusmenu-gtk3-0.4` \ + + +-+LDFLAGS=`pkg-config --libs gtk+-3.0 glib-2.0` -ldbusmenu-glib -ldbusmenu-gtk3 +++LDFLAGS=`pkg-config --libs dbusmenu-gtk3-0.4` + + + +OBJECTS=betterbird-systray-icon.o \ + + app-indicator.o \ +--- a/1790619-send-progress-width.patch ++++ b/1790619-send-progress-width.patch +@@ -31,6 +21,7 @@ + scrolling="false"> + + &sendDialog.title; ++ + + + + - +--- a/1777788-fix-dialog-size.patch ++++ b/1777788-fix-dialog-size.patch +@@ -22,6 +22,7 @@ diff --git a/mailnews/compose/content/sendProgress.xhtml b/mailnews/compose/cont + scrolling="false"> + + &sendDialog.title; ++ + + + diff --git a/pkgs/applications/networking/mailreaders/betterbird/default.nix b/pkgs/applications/networking/mailreaders/betterbird/default.nix new file mode 100644 index 000000000000..1112bb39f74c --- /dev/null +++ b/pkgs/applications/networking/mailreaders/betterbird/default.nix @@ -0,0 +1,116 @@ +{ lib +, buildMozillaMach +, cacert +, fetchFromGitHub +, fetchurl +, git +, libdbusmenu-gtk3 +, runtimeShell +, thunderbird-unwrapped +}: + +((buildMozillaMach rec { + pname = "betterbird"; + version = "102.8.0"; + + applicationName = "Betterbird"; + binaryName = "betterbird"; + inherit (thunderbird-unwrapped) application extraPatches; + + src = fetchurl { + # https://download.cdn.mozilla.net/pub/mozilla.org/thunderbird/releases/ + url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; + sha512 = "2431eb8799184b261609c96bed3c9368bec9035a831aa5f744fa89e48aedb130385b268dd90f03bbddfec449dc3e5fad1b5f8727fe9e11e1d1f123a81b97ddf8"; + }; + + extraPostPatch = let + majVer = lib.versions.major version; + betterbird = fetchFromGitHub { + owner = "Betterbird"; + repo = "thunderbird-patches"; + rev = "${version}-bb30"; + postFetch = '' + echo "Retrieving external patches" + + echo "#!${runtimeShell}" > external.sh + grep " # " $out/${majVer}/series-M-C >> external.sh + grep " # " $out/${majVer}/series >> external.sh + sed -i -e 's/\/rev\//\/raw-rev\//' external.sh + sed -i -e 's|\(.*\) # \(.*\)|curl \2 -o $out/${majVer}/external/\1|' external.sh + chmod 700 external.sh + + mkdir $out/${majVer}/external + SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + . ./external.sh + rm external.sh + ''; + sha256 = "sha256-ouJSFz/5shNR9puVjrZRJq90DHTeSx7hAnDpuhkBsDo="; + }; + in thunderbird-unwrapped.extraPostPatch or "" + /* bash */ '' + PATH=$PATH:${lib.makeBinPath [ git ]} + patches=$(mktemp -d) + for dir in branding bugs external features misc; do + cp -r ${betterbird}/${majVer}/$dir/*.patch $patches/ + done + cp ${betterbird}/${majVer}/series* $patches/ + chmod -R +w $patches + + cd $patches + patch -p1 < ${./betterbird.diff} + substituteInPlace 12-feature-linux-systray.patch \ + --replace "/usr/include/libdbusmenu-glib-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-glib-0.4/" \ + --replace "/usr/include/libdbusmenu-gtk3-0.4/" "${lib.getDev libdbusmenu-gtk3}/include/libdbusmenu-gtk3-0.4/" + cd - + + chmod -R +w dom/base/test/gtest/ + + while read patch; do + patch="''${patch%%#*}" + patch="''${patch% }" + if [[ $patch == "" ]]; then + continue + fi + + echo Applying patch $patch. + if [[ $patch == *-m-c.patch ]]; then + git apply -p1 -v < $patches/$patch + else + cd comm + git apply -p1 -v < $patches/$patch + cd .. + fi + done < <(cat $patches/series $patches/series-M-C) + ''; + + extraBuildInputs = [ + libdbusmenu-gtk3 + ]; + + extraConfigureFlags = [ + "--enable-application=comm/mail" + "--with-branding=comm/mail/branding/betterbird" + ]; + + meta = with lib; { + description = "Betterbird is a fine-tuned version of Mozilla Thunderbird, Thunderbird on steroids, if you will"; + homepage = "https://www.betterbird.eu/"; + maintainers = with maintainers; [ SuperSandro2000 ]; + inherit (thunderbird-unwrapped.meta) platforms badPlatforms broken license; + }; +}).override { + crashreporterSupport = false; # not supported + geolocationSupport = false; + webrtcSupport = false; + + pgoSupport = false; # console.warn: feeds: "downloadFeed: network connection unavailable" +}).overrideAttrs(oldAttrs: { + postInstall = oldAttrs.postInstall or "" + '' + mv $out/lib/thunderbird/* $out/lib/betterbird + rmdir $out/lib/thunderbird/ + rm $out/bin/thunderbird + ln -srf $out/lib/betterbird/betterbird $out/bin/betterbird + ''; + + doInstallCheck = false; + requiredSystemFeatures = []; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 930a9c58276d..67f745e5db67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33604,6 +33604,12 @@ with pkgs; thonny = callPackage ../applications/editors/thonny { }; + betterbird-unwrapped = callPackage ../applications/networking/mailreaders/betterbird { }; + betterbird = wrapThunderbird betterbird-unwrapped { + desktopName = "Betterbird"; + pname = "betterbird"; + }; + thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix { callPackage = newScope { inherit (rustPackages) cargo rustc; From baf549a9a19d2d080402e73093844f0aa35493bb Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Mon, 27 Feb 2023 01:53:38 +0000 Subject: [PATCH 007/244] mysql-shell: 8.0.32 -> 8.0.33 --- pkgs/development/tools/mysql-shell/default.nix | 14 ++++---------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/mysql-shell/default.nix b/pkgs/development/tools/mysql-shell/default.nix index c16cab26b7bc..208c95714806 100644 --- a/pkgs/development/tools/mysql-shell/default.nix +++ b/pkgs/development/tools/mysql-shell/default.nix @@ -27,7 +27,6 @@ , re2 , ncurses , libfido2 -, v8 , python3 , cyrus_sasl , openldap @@ -39,16 +38,16 @@ let in stdenv.mkDerivation rec { pname = "mysql-shell"; - version = "8.0.32"; + version = "8.0.33"; srcs = [ (fetchurl { url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${version}-src.tar.gz"; - hash = "sha256-GUkeZ856/olOssiqkb3qc8ddnianVGXwrcW6hrIG3wE="; + hash = "sha256-ElcAOvyQjXNns35p4J+jnGu8orZR81Itz/fxYh7Usbs="; }) (fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor version}/mysql-${version}.tar.gz"; - hash = "sha256-Hw2SojeJgkRxbdWB95k1bgc8LaY8Oy5KAeEDLL7VDig="; + hash = "sha256-liAC9dkG9C9AsnejnS25OTEkjB8H/49DEsKI5jgD3RI="; }) ]; @@ -83,7 +82,6 @@ stdenv.mkDerivation rec { libfido2 cyrus_sasl openldap - v8 python3 antlr.runtime.cpp ] ++ pythonDeps @@ -108,14 +106,10 @@ stdenv.mkDerivation rec { "-DWITH_LZ4=system" "-DWITH_ZLIB=system" "-DWITH_PROTOBUF=${protobuf}" - "-DHAVE_V8=1" - "-DV8_INCLUDE_DIR=${v8}/include" - "-DV8_LIB_DIR=${v8}/lib" + "-DHAVE_V8=0" # V8 10.x required. "-DHAVE_PYTHON=1" ]; - CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ]; - postFixup = '' wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${lib.makeSearchPath python3.sitePackages pythonDeps}" ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23ce67e0f276..be9ece70f867 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -881,7 +881,6 @@ with pkgs; boost = boost177; # Configure checks for specific version. protobuf = protobuf3_19; icu = icu69; - v8 = v8_8_x; }; broadlink-cli = callPackage ../tools/misc/broadlink-cli { }; From f311f47d63e23b683f819d516cfd12b4d874061a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 19 Apr 2023 19:24:57 +0000 Subject: [PATCH 008/244] python310Packages.pyxattr: 0.8.0 -> 0.8.1 --- pkgs/development/python-modules/pyxattr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyxattr/default.nix b/pkgs/development/python-modules/pyxattr/default.nix index 0fe64d2bf901..7e1676dafa63 100644 --- a/pkgs/development/python-modules/pyxattr/default.nix +++ b/pkgs/development/python-modules/pyxattr/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pyxattr"; - version = "0.8.0"; + version = "0.8.1"; src = fetchPypi { inherit pname version; - hash = "sha256-e/QM7FrpPdZWEocX29Joz8Ozso2VU214hndslPomeFU="; + hash = "sha256-SMV47PjqC9Q1GxdSRw4wGpCjdhx8IfAPlT3PbW+m7lo="; }; # IOError: [Errno 95] Operation not supported (expected) From 3d2b0f145e831fa6aa4f437bd45452788b0fb718 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Fri, 24 Mar 2023 22:55:56 +0100 Subject: [PATCH 009/244] maintainers: add zumorica --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 201ba0545980..1f8bfc383fdf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -17380,6 +17380,12 @@ githubId = 393108; name = "Damien Diederen"; }; + zumorica = { + name = "Vera Aguilera Puerto"; + email = "gradientvera+nix@outlook.com"; + github = "Zumorica"; + githubId = 6766154; + }; zupo = { name = "Nejc Zupan"; email = "nejczupan+nix@gmail.com"; From c768d8ff7292e770b29bc57b7e1bb71070e03691 Mon Sep 17 00:00:00 2001 From: Vera Aguilera Puerto Date: Fri, 24 Mar 2023 22:57:20 +0100 Subject: [PATCH 010/244] space-station-14-launcher: init at 0.20.5 --- .../space-station-14-launcher/default.nix | 40 +++++ pkgs/games/space-station-14-launcher/deps.nix | 169 ++++++++++++++++++ .../space-station-14-launcher.nix | 143 +++++++++++++++ .../games/space-station-14-launcher/update.sh | 18 ++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 372 insertions(+) create mode 100644 pkgs/games/space-station-14-launcher/default.nix create mode 100644 pkgs/games/space-station-14-launcher/deps.nix create mode 100644 pkgs/games/space-station-14-launcher/space-station-14-launcher.nix create mode 100755 pkgs/games/space-station-14-launcher/update.sh diff --git a/pkgs/games/space-station-14-launcher/default.nix b/pkgs/games/space-station-14-launcher/default.nix new file mode 100644 index 000000000000..606f0659c788 --- /dev/null +++ b/pkgs/games/space-station-14-launcher/default.nix @@ -0,0 +1,40 @@ +{ soundfont-fluid +, buildFHSEnv +, runCommand +, callPackage +}: + +let + space-station-14-launcher = callPackage ./space-station-14-launcher.nix { }; + + # Workaround for hardcoded soundfont paths in downloaded engine assemblies. + soundfont-fluid-fixed = runCommand "soundfont-fluid-fixed" { } '' + mkdir -p "$out/share/soundfonts" + ln -sf ${soundfont-fluid}/share/soundfonts/FluidR3_GM2-2.sf2 $out/share/soundfonts/FluidR3_GM.sf2 + ''; +in +buildFHSEnv rec { + name = "space-station-14-launcher-wrapped"; + + targetPkgs = pkgs: [ + space-station-14-launcher + soundfont-fluid-fixed + ]; + + runScript = "SS14.Launcher"; + + extraInstallCommands = '' + mkdir -p $out/share/applications + ln -s ${space-station-14-launcher}/share/icons $out/share + cp ${space-station-14-launcher}/share/applications/space-station-14-launcher.desktop "$out/share/applications" + substituteInPlace "$out/share/applications/space-station-14-launcher.desktop" \ + --replace ${space-station-14-launcher.meta.mainProgram} ${meta.mainProgram} + ''; + + passthru = space-station-14-launcher.passthru // { + unwrapped = space-station-14-launcher; + }; + meta = space-station-14-launcher.meta // { + mainProgram = name; + }; +} diff --git a/pkgs/games/space-station-14-launcher/deps.nix b/pkgs/games/space-station-14-launcher/deps.nix new file mode 100644 index 000000000000..0028f0dadd59 --- /dev/null +++ b/pkgs/games/space-station-14-launcher/deps.nix @@ -0,0 +1,169 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + +{ fetchNuGet }: [ + (fetchNuGet { pname = "Avalonia"; version = "0.10.13"; sha256 = "1df46dvjyax8jjdcvdavpzq5bwxacrw71j557mcm1401vv3r1vn3"; }) + (fetchNuGet { pname = "Avalonia.Angle.Windows.Natives"; version = "2.1.0.2020091801"; sha256 = "04jm83cz7vkhhr6n2c9hya2k8i2462xbf6np4bidk55as0jdq43a"; }) + (fetchNuGet { pname = "Avalonia.Controls.DataGrid"; version = "0.10.13"; sha256 = "1yl402l5cwbv6gwy3p8r702ypp3p8w5wi8im25c2bjnv31889l8r"; }) + (fetchNuGet { pname = "Avalonia.Desktop"; version = "0.10.13"; sha256 = "1y206hrfwyg8023z0m7dik1hlir1r18h8q0f0zqz3sabyy5k276w"; }) + (fetchNuGet { pname = "Avalonia.Diagnostics"; version = "0.10.13"; sha256 = "11khr3w7gwlm1bajfh5zhrsfcfd9kbw5mbgwnbjq7i5lq9glriid"; }) + (fetchNuGet { pname = "Avalonia.FreeDesktop"; version = "0.10.13"; sha256 = "18gygzg12facawvzmfgpja4rsagy670dv1dcrx4shfl7w8l998jp"; }) + (fetchNuGet { pname = "Avalonia.Native"; version = "0.10.13"; sha256 = "18b2pykfcgw9pyjmdqq7i1n8j330n7xrwyldl9bpkvahswinvhza"; }) + (fetchNuGet { pname = "Avalonia.ReactiveUI"; version = "0.10.13"; sha256 = "1y93xh9mgaa8nzsmp6la8jkw0bqia4i1cx7vmwzy7c5j7pd81aq4"; }) + (fetchNuGet { pname = "Avalonia.Remote.Protocol"; version = "0.10.13"; sha256 = "0j0kdh6dbii59v972azhwq69rmak63lp5f5jqz3pi94mifx4bayy"; }) + (fetchNuGet { pname = "Avalonia.Skia"; version = "0.10.13"; sha256 = "0k5y0w164m03q278m4wr7zzf3vfq9nb0am9vmmprivpn1xwwa7ml"; }) + (fetchNuGet { pname = "Avalonia.Win32"; version = "0.10.13"; sha256 = "0jyl1rrn1n07dnqn76ijwhxgkc45dmsfh2d811n4695ndaz85nkl"; }) + (fetchNuGet { pname = "Avalonia.X11"; version = "0.10.13"; sha256 = "1y8x9hjdlxg4q8q958i364cbak8xjh4nldp38cnxwjir814p0xwh"; }) + (fetchNuGet { pname = "CodeHollow.FeedReader"; version = "1.2.1"; sha256 = "050ni2952n2xmbq0vyk37wpxhgcfsffm8w0wh27km75nim6l3jnj"; }) + (fetchNuGet { pname = "Dapper"; version = "2.0.123"; sha256 = "15hxrchfgiqnmgf8fqhrf4pb4c8l9igg5qnkw9yk3rkagcqfkk91"; }) + (fetchNuGet { pname = "DynamicData"; version = "7.4.9"; sha256 = "0ssgh42fi5m6xyw36f4km04ls9nq4w8cpbck8gh7g8n3ixz05rrw"; }) + (fetchNuGet { pname = "Fody"; version = "6.6.0"; sha256 = "0cx708ah61cxmvpaq040mhqwrv937rvlmskwihg1w118729k9yv0"; }) + (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2-preview.178"; sha256 = "1p5nwzl7jpypsd6df7hgcf47r977anjlyv21wacmalsj6lvdgnvn"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2-preview.178"; sha256 = "1402ylkxbgcnagcarqlfvg4gppy2pqs3bmin4n5mphva1g7bqb2p"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.macOS"; version = "2.8.2-preview.178"; sha256 = "0p8miaclnbfpacc1jaqxwfg0yfx9byagi4j4k91d9621vd19i8b2"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.WebAssembly"; version = "2.8.2-preview.178"; sha256 = "1n9jay9sji04xly6n8bzz4591fgy8i65p21a8mv5ip9lsyj1c320"; }) + (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2-preview.178"; sha256 = "1r5syii96wv8q558cvsqw3lr10cdw6677lyiy82p6i3if51v3mr7"; }) + (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) + (fetchNuGet { pname = "libsodium"; version = "1.0.18"; sha256 = "15qzl5k31yaaapqlijr336lh4lzz1qqxlimgxy8fdyig8jdmgszn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.16"; sha256 = "1v02j1i139a8x32hgi1yhcpp754xi0sg5b7iqzmslvinfg3b7dwn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.16"; sha256 = "1xdhn8v8y947kw29npck1h9qaw8rj81q7a0qwawpc2200ds96n40"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite"; version = "6.0.1"; sha256 = "04kzr5mi899fd1fmd56wkh14whcvyibb484dfirdsd0kgrkcb0x6"; }) + (fetchNuGet { pname = "Microsoft.Data.Sqlite.Core"; version = "6.0.1"; sha256 = "0gzn3rynp9k6mx4h4dhq124b7ra8m11rkjh40r2r8z4gkr0shjv1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.16"; sha256 = "1pv9arqbmxlh86rnx6nss2cl91hi22j83p66m4ahds34caykf32l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.16"; sha256 = "1w89n5grnxdis0wclfimi9ij8g046yrw76rhmcp8l57xm8nl21yj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.16"; sha256 = "1fjrc1l7ihal93ybxqzlxrs7vdqb9jhkabh2acwrmlh7q5197vn2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.Toolkit.Mvvm"; version = "7.1.2"; sha256 = "0hrlgjr41hlpp3hb697i0513x2cm4ysbl0wj4bj67md604cmkv14"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.5.0"; sha256 = "0fnkv3ky12227zqg4zshx4kw2mvysq2ppxjibfw02cc3iprv4njq"; }) + (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) + (fetchNuGet { pname = "NSec.Cryptography"; version = "20.2.0"; sha256 = "19slji51v8s8i4836nqqg7qb3i3p4ahqahz0fbb3gwpp67pn6izx"; }) + (fetchNuGet { pname = "ReactiveUI"; version = "17.1.9"; sha256 = "0z4jjvrb56hjbgb1kiq1spj6jw7yai1cwg69pbwfj89wknr9alvg"; }) + (fetchNuGet { pname = "ReactiveUI.Fody"; version = "17.1.9"; sha256 = "1chzyccmckyym6svxh8qj34vy4vn51ixrxgwcvwq0bnr6pxlxkx7"; }) + (fetchNuGet { pname = "Robust.Natives"; version = "0.1.1"; sha256 = "1spfaxk8nsx368zncdcj0b3kg7gj7h14mjji19xrraf8ij0dnczw"; }) + (fetchNuGet { pname = "Robust.Natives.Angle"; version = "0.1.1-chromium4758"; sha256 = "0awydljd6psr0w661p9q73pg2aa29lfb4i0arkpszl0ra33mhrah"; }) + (fetchNuGet { pname = "Robust.Natives.Fluidsynth"; version = "0.1.0"; sha256 = "00nkww5sjixs1dmn979niq0hrhplcpabrp18bmpm240wl53ay72x"; }) + (fetchNuGet { pname = "Robust.Natives.Freetype"; version = "0.1.0"; sha256 = "0skrj5bj5vlxvmp8wg8ar8n393w1vv1bs64hwas7svxf2adwgrw2"; }) + (fetchNuGet { pname = "Robust.Natives.Glfw"; version = "0.1.0"; sha256 = "0xfak1d76jmr4ajfzclarna0x1c19xf4c3zfzhjn4vqmkk1znck0"; }) + (fetchNuGet { pname = "Robust.Natives.OpenAL"; version = "0.1.0"; sha256 = "06waksj5rmc50xas4a2nmlj8v01kpwh5k367pcq2yjn0ld22klnx"; }) + (fetchNuGet { pname = "Robust.Natives.Swnfd"; version = "0.1.0"; sha256 = "1ssnl6zasf2cdaffib4pzyfd1w962y1zmcsivyalgpsh6p4g9as1"; }) + (fetchNuGet { pname = "Robust.Shared.AuthLib"; version = "0.1.2"; sha256 = "1vn19d81n8jdyy75ryrlajyxr0kp7pwjdlbyqcn8gcid5plrzmh0"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "3.1.1"; sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "4.1.0"; sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; }) + (fetchNuGet { pname = "SharpZstd.Interop"; version = "1.5.2-beta1"; sha256 = "0yvk5g9jjmr7hg695zb0wid44dqjjngycjdng2xs6awqbx9kydcw"; }) + (fetchNuGet { pname = "SharpZstd.Interop"; version = "1.5.2-beta2"; sha256 = "1145jlprsgll8ixwib0i8phc6jsv6nm4yki4wi1bkxx2bgf9yjay"; }) + (fetchNuGet { pname = "SkiaSharp"; version = "2.88.0-preview.178"; sha256 = "062g14s6b2bixanpwihj3asm3jwvfw15mhvzqv6901afrlgzx4nk"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Linux"; version = "2.88.0-preview.178"; sha256 = "07kga1j51l3l302nvf537zg5clf6rflinjy0xd6i06cmhpkf3ksw"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.macOS"; version = "2.88.0-preview.178"; sha256 = "14p95nxccs6yq4rn2h9zbb60k0232k6349zdpy31jcfr6gc99cgi"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.0-preview.178"; sha256 = "09jmcg5k1vpsal8jfs90mwv0isf2y5wq3h4hd77rv6vffn5ic4sm"; }) + (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0-preview.178"; sha256 = "0ficil702lv3fvwpngbqh5l85i05l5jafzyh4jprzshr2qbnd8nl"; }) + (fetchNuGet { pname = "SpaceWizards.Sodium"; version = "0.2.0"; sha256 = "1w4c555krimgkvz7nir2z63vav05125cwgsqvs65lq8qfmfh2h50"; }) + (fetchNuGet { pname = "SpaceWizards.Sodium.Interop"; version = "1.0.18-beta3"; sha256 = "1lxbgccqzpyyf70rbn0lc22ib4fjyi95ajl392rlk6hq1cl3wgpj"; }) + (fetchNuGet { pname = "Splat"; version = "14.1.1"; sha256 = "0j79ph1mgmwn4kmvnwi5vs7pskiavwz01l8lgax5z36nri0mwpxj"; }) + (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.0.6"; sha256 = "1ip0a653dx5cqybxg27zyz5ps31f2yz50g3jvz3vx39isx79gax3"; }) + (fetchNuGet { pname = "SQLitePCLRaw.core"; version = "2.0.6"; sha256 = "1w4iyg0v1v1z2m7akq7rv8lsgixp2m08732vr14vgpqs918bsy1i"; }) + (fetchNuGet { pname = "SQLitePCLRaw.lib.e_sqlite3"; version = "2.0.6"; sha256 = "16378rh1lcqxynf5qj0kh8mrsb0jp37qqwg4285kqc5pknvh1bx3"; }) + (fetchNuGet { pname = "SQLitePCLRaw.provider.e_sqlite3"; version = "2.0.6"; sha256 = "0chgrqyycb1kqnaxnhhfg0850b94blhzni8zn79c7ggb3pd2ykyz"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) + (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "4.5.0"; sha256 = "0knqa0zsm91nfr34br8gx5kjqq4v81zdhqkacvs2hzc8nqk0ddhc"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.3.0"; sha256 = "1d951hrvrpndk7insiag80qxjbf2y0y39y8h5hnq9612ws661glk"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.3.0"; sha256 = "0ky2nrcvh70rqq88m9a5yqabsl4fyd17bpr63iy2mbivjs2nyypv"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.4"; sha256 = "14gbbs22mcxwggn0fcfs1b062521azb9fbb7c113x0mq6dzq9h6y"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.5.0"; sha256 = "1kzrj37yzawf1b19jq0253rcs8hsq1l2q8g69d7ipnhzb0h97m59"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.3.0"; sha256 = "191p63zy5rpqx7dnrb3h7prvgixmk168fhvvkkvhlazncf8r3nc2"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reactive"; version = "5.0.0"; sha256 = "1lafmpnadhiwxyd543kraxa3jfdpm6ipblxrjlibym9b1ykpr5ik"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.3.0"; sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.7.0"; sha256 = "121l1z2ypwg02yz84dy6gr82phpys0njk7yask3sihgy214w43qp"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.3.0"; sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.3.0"; sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.6.0"; sha256 = "0xmzi2gpbmgyfr75p24rqqsba3cmrqgmcv45lsqp5amgrdwd0f0m"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.7.0"; sha256 = "16r6sn4czfjk8qhnz7bnqlyiaaszr0ihinb7mq9zzr1wba257r54"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) + (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) + (fetchNuGet { pname = "TerraFX.Interop.Windows"; version = "10.0.20348"; sha256 = "1ns39bkb0i6d92z3mk0hf72cli7k8x99c412329ngrivxivxxap8"; }) + (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) + (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.2.1"; sha256 = "1fkqvmq3b4lla6cyaacxpjjqxzcxb5wmz1zb8834pzc7mdjcx5jz"; }) + (fetchNuGet { pname = "YamlDotNet"; version = "11.2.1"; sha256 = "0acd7k97nqzisyqql71m6l0b0lvkr612zaav42hw0y1qnp06jdi4"; }) +] diff --git a/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix new file mode 100644 index 000000000000..0ebfad0586ba --- /dev/null +++ b/pkgs/games/space-station-14-launcher/space-station-14-launcher.nix @@ -0,0 +1,143 @@ +{ lib +, buildDotnetModule +, dotnetCorePackages +, fetchFromGitHub +, wrapGAppsHook +, iconConvTools +, copyDesktopItems +, makeDesktopItem +, libX11 +, libICE +, libSM +, libXi +, libXcursor +, libXext +, libXrandr +, fontconfig +, glew +, SDL2 +, glfw +, glibc +, libGL +, freetype +, openal +, fluidsynth +, gtk3 +, pango +, atk +, cairo +, zlib +, glib +, gdk-pixbuf +}: +let + version = "0.20.5"; + pname = "space-station-14-launcher"; +in +buildDotnetModule rec { + inherit pname; + + # Workaround to prevent buildDotnetModule from overriding assembly versions. + name = "${pname}-${version}"; + + src = fetchFromGitHub { + owner = "space-wizards"; + repo = "SS14.Launcher"; + rev = "v${version}"; + hash = "sha256-uonndoqDOgPtnSk5v0KyyR8BQ9neAH1ploEY/kKD0IQ="; + fetchSubmodules = true; + }; + + buildType = "Release"; + selfContainedBuild = false; + + projectFile = [ + "SS14.Loader/SS14.Loader.csproj" + "SS14.Launcher/SS14.Launcher.csproj" + ]; + + nugetDeps = ./deps.nix; + + passthru = { + inherit version; # Workaround so update script works. + updateScript = ./update.sh; + }; + + dotnet-sdk = dotnetCorePackages.sdk_7_0; + dotnet-runtime = dotnetCorePackages.runtime_7_0; + + dotnetFlags = [ + "-p:FullRelease=true" + "-p:RobustILLink=true" + "-nologo" + ]; + + nativeBuildInputs = [ wrapGAppsHook iconConvTools copyDesktopItems ]; + + runtimeDeps = [ + # Required by the game. + glfw + SDL2 + glibc + libGL + openal + freetype + fluidsynth + + # Needed for file dialogs. + gtk3 + pango + cairo + atk + zlib + glib + gdk-pixbuf + + # Avalonia UI dependencies. + libX11 + libICE + libSM + libXi + libXcursor + libXext + libXrandr + fontconfig + glew + ]; + + executables = [ "SS14.Launcher" ]; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = meta.mainProgram; + icon = pname; + desktopName = "Space Station 14 Launcher"; + comment = meta.description; + categories = [ "Game" ]; + startupWMClass = meta.mainProgram; + }) + ]; + + postInstall = '' + mkdir -p $out/lib/space-station-14-launcher/loader + cp -r SS14.Loader/bin/${buildType}/*/* $out/lib/space-station-14-launcher/loader/ + + icoFileToHiColorTheme SS14.Launcher/Assets/icon.ico space-station-14-launcher $out + ''; + + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "Launcher for Space Station 14, a multiplayer game about paranoia and disaster"; + homepage = "https://spacestation14.io"; + license = licenses.mit; + maintainers = [ maintainers.zumorica ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "SS14.Launcher"; + }; +} diff --git a/pkgs/games/space-station-14-launcher/update.sh b/pkgs/games/space-station-14-launcher/update.sh new file mode 100755 index 000000000000..8cfab508b0cc --- /dev/null +++ b/pkgs/games/space-station-14-launcher/update.sh @@ -0,0 +1,18 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=./. -i bash -p curl jq common-updater-scripts +set -eo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +new_version="$(curl -s "https://api.github.com/repos/space-wizards/SS14.Launcher/releases?per_page=1" | jq -r '.[0].tag_name' | sed 's/v//')" +old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./space-station-14-launcher.nix)" + +if [[ "$new_version" == "$old_version" ]]; then + echo "Already up to date!" + exit 0 +fi + +cd ../../.. +update-source-version space-station-14-launcher.unwrapped "$new_version" +$(nix-build -A space-station-14-launcher.fetch-deps --no-out-link) "$deps_file" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 186ed846f2dc..62dc1fe07ad5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36566,6 +36566,8 @@ with pkgs; # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; + space-station-14-launcher = callPackage ../games/space-station-14-launcher { }; + spring = callPackage ../games/spring { asciidoc = asciidoc-full; }; springLobby = callPackage ../games/spring/springlobby.nix { }; From 98a9103299dcf0d78eb51439c869d62eeae2ea17 Mon Sep 17 00:00:00 2001 From: rogarb Date: Mon, 24 Apr 2023 16:54:23 +0200 Subject: [PATCH 011/244] maintainers: add rogarb --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ee231ce5ae36..851cc6d9c072 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13351,6 +13351,12 @@ githubId = 710906; name = "Roel van Dijk"; }; + rogarb = { + email = "rogarb@rgarbage.fr"; + github = "rogarb"; + githubId = 69053978; + name = "rogarb"; + }; roman = { email = "open-source@roman-gonzalez.info"; github = "roman"; From be518ad70721c8b737e99901f9b310443b0e26af Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 25 Apr 2023 22:48:18 +0100 Subject: [PATCH 012/244] openvswitch-lts: 2.17.5 -> 2.17.6 --- pkgs/os-specific/linux/openvswitch/lts.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/openvswitch/lts.nix b/pkgs/os-specific/linux/openvswitch/lts.nix index d5ceae939a40..9fb9977c2017 100644 --- a/pkgs/os-specific/linux/openvswitch/lts.nix +++ b/pkgs/os-specific/linux/openvswitch/lts.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "2.17.5"; - hash = "sha256-Woye+zUikjdGWIp8pRDBC7CsUrnInfJ23byGcxFtwQY="; + version = "2.17.6"; + hash = "sha256-dNqvK+c0iuXdQBe6RbjaxlNB8Vn0+0paecVC/tQQENk="; } From 0807433107415671756c9547b802ffcec5d48a5b Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Tue, 25 Apr 2023 22:48:34 +0100 Subject: [PATCH 013/244] openvswitch: 3.0.3 -> 3.1.1 --- pkgs/os-specific/linux/openvswitch/default.nix | 4 ++-- pkgs/os-specific/linux/openvswitch/generic.nix | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 3fc597beaab3..664adfdc164c 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,4 +1,4 @@ import ./generic.nix { - version = "3.0.3"; - hash = "sha256-9QZlCnbx8s7737WD80NBIQLxcKvFXG/4dWd5Jrm9lGM="; + version = "3.1.1"; + hash = "sha256-YEiRg6RNO5WlUiQHIhfF9tN6oRvhKnV2JRDO25Ok4gQ="; } diff --git a/pkgs/os-specific/linux/openvswitch/generic.nix b/pkgs/os-specific/linux/openvswitch/generic.nix index ff0238e51aba..be4bc90fe428 100644 --- a/pkgs/os-specific/linux/openvswitch/generic.nix +++ b/pkgs/os-specific/linux/openvswitch/generic.nix @@ -93,6 +93,9 @@ in stdenv.mkDerivation rec { ''; doCheck = true; + preCheck = '' + patchShebangs tests/ + ''; nativeCheckInputs = [ iproute2 From e30c0604880a9eb353b620f193b01dae77a3d3c5 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Wed, 26 Apr 2023 14:32:16 -0400 Subject: [PATCH 014/244] inspec: init at 5.21.29 --- pkgs/tools/misc/inspec/Gemfile | 4 + pkgs/tools/misc/inspec/Gemfile.lock | 643 ++++++++ pkgs/tools/misc/inspec/default.nix | 19 + pkgs/tools/misc/inspec/gemset.nix | 2230 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 2898 insertions(+) create mode 100644 pkgs/tools/misc/inspec/Gemfile create mode 100644 pkgs/tools/misc/inspec/Gemfile.lock create mode 100644 pkgs/tools/misc/inspec/default.nix create mode 100644 pkgs/tools/misc/inspec/gemset.nix diff --git a/pkgs/tools/misc/inspec/Gemfile b/pkgs/tools/misc/inspec/Gemfile new file mode 100644 index 000000000000..35994813924f --- /dev/null +++ b/pkgs/tools/misc/inspec/Gemfile @@ -0,0 +1,4 @@ +source 'https://rubygems.org' do + gem "inspec" + gem "inspec-bin" +end diff --git a/pkgs/tools/misc/inspec/Gemfile.lock b/pkgs/tools/misc/inspec/Gemfile.lock new file mode 100644 index 000000000000..503207134db0 --- /dev/null +++ b/pkgs/tools/misc/inspec/Gemfile.lock @@ -0,0 +1,643 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (7.0.4.3) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 1.6, < 2) + minitest (>= 5.1) + tzinfo (~> 2.0) + addressable (2.8.4) + public_suffix (>= 2.0.2, < 6.0) + ast (2.4.2) + aws-eventstream (1.2.0) + aws-partitions (1.749.0) + aws-sdk-alexaforbusiness (1.58.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-amplify (1.32.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-apigateway (1.81.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-apigatewayv2 (1.44.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-applicationautoscaling (1.51.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-athena (1.64.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-autoscaling (1.63.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-batch (1.47.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-budgets (1.52.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudformation (1.77.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudfront (1.76.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudhsm (1.41.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudhsmv2 (1.44.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudtrail (1.58.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudwatch (1.72.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudwatchevents (1.46.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-cloudwatchlogs (1.62.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-codecommit (1.53.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-codedeploy (1.52.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-codepipeline (1.55.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-cognitoidentity (1.31.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-cognitoidentityprovider (1.53.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-configservice (1.89.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-core (3.171.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-costandusagereportservice (1.43.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-databasemigrationservice (1.53.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-dynamodb (1.84.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-ec2 (1.375.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-ecr (1.58.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-ecrpublic (1.16.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-ecs (1.114.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-efs (1.59.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-eks (1.83.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-elasticache (1.84.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-elasticbeanstalk (1.54.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-elasticloadbalancing (1.42.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-elasticloadbalancingv2 (1.84.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-elasticsearchservice (1.69.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-emr (1.53.0) + aws-sdk-core (~> 3, >= 3.121.2) + aws-sigv4 (~> 1.1) + aws-sdk-eventbridge (1.24.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-firehose (1.51.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-glue (1.88.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-guardduty (1.67.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-iam (1.77.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-kafka (1.54.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-kinesis (1.45.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-kms (1.63.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-lambda (1.95.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-mq (1.40.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-networkfirewall (1.26.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-networkmanager (1.30.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-organizations (1.59.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ram (1.26.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-rds (1.176.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-redshift (1.91.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53 (1.71.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53domains (1.43.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-route53resolver (1.40.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.120.1) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sdk-s3control (1.43.0) + aws-sdk-core (~> 3, >= 3.122.0) + aws-sigv4 (~> 1.1) + aws-sdk-secretsmanager (1.46.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-securityhub (1.79.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-servicecatalog (1.60.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-ses (1.41.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-shield (1.51.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-signer (1.32.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv4 (~> 1.1) + aws-sdk-simpledb (1.29.0) + aws-sdk-core (~> 3, >= 3.120.0) + aws-sigv2 (~> 1.0) + aws-sdk-sms (1.43.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-sns (1.60.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-sqs (1.53.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-ssm (1.150.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-states (1.39.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-synthetics (1.19.0) + aws-sdk-core (~> 3, >= 3.121.2) + aws-sigv4 (~> 1.1) + aws-sdk-transfer (1.34.0) + aws-sdk-core (~> 3, >= 3.112.0) + aws-sigv4 (~> 1.1) + aws-sdk-waf (1.43.0) + aws-sdk-core (~> 3, >= 3.122.0) + aws-sigv4 (~> 1.1) + aws-sigv2 (1.1.0) + aws-sigv4 (1.5.2) + aws-eventstream (~> 1, >= 1.0.2) + azure_graph_rbac (0.17.2) + ms_rest_azure (~> 0.12.0) + azure_mgmt_key_vault (0.17.7) + ms_rest_azure (~> 0.12.0) + azure_mgmt_resources (0.18.2) + ms_rest_azure (~> 0.12.0) + azure_mgmt_security (0.19.0) + ms_rest_azure (~> 0.12.0) + azure_mgmt_storage (0.23.0) + ms_rest_azure (~> 0.12.0) + bson (4.15.0) + builder (3.2.4) + chef-config (18.2.7) + addressable + chef-utils (= 18.2.7) + fuzzyurl + mixlib-config (>= 2.2.12, < 4.0) + mixlib-shellout (>= 2.0, < 4.0) + tomlrb (~> 1.2) + chef-telemetry (1.1.1) + chef-config + concurrent-ruby (~> 1.0) + chef-utils (18.2.7) + concurrent-ruby + coderay (1.1.3) + concurrent-ruby (1.2.2) + cookstyle (7.32.2) + rubocop (= 1.25.1) + declarative (0.0.20) + diff-lcs (1.5.0) + docker-api (2.2.0) + excon (>= 0.47.0) + multi_json + domain_name (0.5.20190701) + unf (>= 0.0.5, < 1.0.0) + erubi (1.12.0) + excon (0.99.0) + faraday (1.10.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-follow_redirects (0.3.0) + faraday (>= 1, < 3) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.0.0) + faraday (~> 1.0) + ffi (1.15.5) + fuzzyurl (0.9.0) + google-api-client (0.52.0) + addressable (~> 2.5, >= 2.5.1) + googleauth (~> 0.9) + httpclient (>= 2.8.1, < 3.0) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.0) + rexml + signet (~> 0.12) + googleauth (0.14.0) + faraday (>= 0.17.3, < 2.0) + jwt (>= 1.4, < 3.0) + memoist (~> 0.16) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (~> 0.14) + gssapi (1.3.1) + ffi (>= 1.0.1) + gyoku (1.4.0) + builder (>= 2.1.2) + rexml (~> 3.0) + hashie (4.1.0) + highline (2.1.0) + http-cookie (1.0.5) + domain_name (~> 0.5) + httpclient (2.8.3) + i18n (1.12.0) + concurrent-ruby (~> 1.0) + inifile (3.0.0) + inspec (5.21.29) + cookstyle + faraday_middleware (>= 0.12.2, < 1.1) + inspec-core (= 5.21.29) + mongo (= 2.13.2) + progress_bar (~> 1.3.3) + rake + train (~> 3.10) + train-aws (~> 0.2) + train-habitat (~> 0.1) + train-winrm (~> 0.2) + inspec-bin (5.21.29) + inspec (= 5.21.29) + inspec-core (5.21.29) + addressable (~> 2.4) + chef-telemetry (~> 1.0, >= 1.0.8) + faraday (>= 1, < 3) + faraday-follow_redirects (~> 0.3) + hashie (>= 3.4, < 5.0) + license-acceptance (>= 0.2.13, < 3.0) + method_source (>= 0.8, < 2.0) + mixlib-log (~> 3.0) + multipart-post (~> 2.0) + parallel (~> 1.9) + parslet (>= 1.5, < 2.0) + pry (~> 0.13) + rspec (>= 3.9, <= 3.11) + rspec-its (~> 1.2) + rubyzip (>= 1.2.2, < 3.0) + semverse (~> 3.0) + sslshake (~> 1.2) + thor (>= 0.20, < 2.0) + tomlrb (>= 1.2, < 2.1) + train-core (~> 3.10) + tty-prompt (~> 0.17) + tty-table (~> 0.10) + jmespath (1.6.2) + json (2.6.3) + jwt (2.7.0) + license-acceptance (2.1.13) + pastel (~> 0.7) + tomlrb (>= 1.2, < 3.0) + tty-box (~> 0.6) + tty-prompt (~> 0.20) + little-plugger (1.1.4) + logging (2.3.1) + little-plugger (~> 1.1) + multi_json (~> 1.14) + memoist (0.16.2) + method_source (1.0.0) + mini_mime (1.1.2) + minitest (5.18.0) + mixlib-config (3.0.27) + tomlrb + mixlib-log (3.0.9) + mixlib-shellout (3.2.7) + chef-utils + mongo (2.13.2) + bson (>= 4.8.2, < 5.0.0) + ms_rest (0.7.6) + concurrent-ruby (~> 1.0) + faraday (>= 0.9, < 2.0.0) + timeliness (~> 0.3.10) + ms_rest_azure (0.12.0) + concurrent-ruby (~> 1.0) + faraday (>= 0.9, < 2.0.0) + faraday-cookie_jar (~> 0.0.6) + ms_rest (~> 0.7.6) + multi_json (1.15.0) + multipart-post (2.3.0) + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-ssh (7.1.0) + nori (2.6.0) + options (2.3.2) + os (1.1.4) + parallel (1.23.0) + parser (3.2.2.0) + ast (~> 2.4.1) + parslet (1.8.2) + pastel (0.8.0) + tty-color (~> 0.5) + progress_bar (1.3.3) + highline (>= 1.6, < 3) + options (~> 2.3.0) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + public_suffix (5.0.1) + rainbow (3.1.1) + rake (13.0.6) + regexp_parser (2.8.0) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.2.5) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.11.0) + rspec-its (1.3.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (3.11.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.11.0) + rspec-support (3.11.1) + rubocop (1.25.1) + parallel (~> 1.10) + parser (>= 3.1.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.15.1, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.28.0) + parser (>= 3.2.1.0) + ruby-progressbar (1.13.0) + ruby2_keywords (0.0.5) + rubyntlm (0.6.3) + rubyzip (2.3.2) + semverse (3.0.2) + signet (0.17.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + sslshake (1.3.1) + strings (0.2.1) + strings-ansi (~> 0.2) + unicode-display_width (>= 1.5, < 3.0) + unicode_utils (~> 1.4) + strings-ansi (0.2.0) + thor (1.2.1) + timeliness (0.3.10) + tomlrb (1.3.0) + trailblazer-option (0.1.2) + train (3.10.7) + activesupport (>= 6.0.3.1) + azure_graph_rbac (~> 0.16) + azure_mgmt_key_vault (~> 0.17) + azure_mgmt_resources (~> 0.15) + azure_mgmt_security (~> 0.18) + azure_mgmt_storage (~> 0.18) + docker-api (>= 1.26, < 3.0) + google-api-client (>= 0.23.9, <= 0.52.0) + googleauth (>= 0.6.6, <= 0.14.0) + inifile (~> 3.0) + train-core (= 3.10.7) + train-winrm (~> 0.2) + train-aws (0.2.24) + aws-sdk-alexaforbusiness (~> 1.0) + aws-sdk-amplify (~> 1.32.0) + aws-sdk-apigateway (~> 1.0) + aws-sdk-apigatewayv2 (~> 1.0) + aws-sdk-applicationautoscaling (>= 1.46, < 1.52) + aws-sdk-athena (~> 1.0) + aws-sdk-autoscaling (>= 1.22, < 1.64) + aws-sdk-batch (>= 1.36, < 1.48) + aws-sdk-budgets (~> 1.0) + aws-sdk-cloudformation (~> 1.0) + aws-sdk-cloudfront (~> 1.0) + aws-sdk-cloudhsm (~> 1.0) + aws-sdk-cloudhsmv2 (~> 1.0) + aws-sdk-cloudtrail (~> 1.8) + aws-sdk-cloudwatch (~> 1.13) + aws-sdk-cloudwatchevents (>= 1.36, < 1.47) + aws-sdk-cloudwatchlogs (~> 1.13) + aws-sdk-codecommit (~> 1.0) + aws-sdk-codedeploy (~> 1.0) + aws-sdk-codepipeline (~> 1.0) + aws-sdk-cognitoidentity (>= 1.26, < 1.32) + aws-sdk-cognitoidentityprovider (>= 1.46, < 1.54) + aws-sdk-configservice (~> 1.21) + aws-sdk-core (~> 3.0) + aws-sdk-costandusagereportservice (~> 1.6) + aws-sdk-databasemigrationservice (>= 1.42, < 1.54) + aws-sdk-dynamodb (~> 1.31) + aws-sdk-ec2 (~> 1.70) + aws-sdk-ecr (~> 1.18) + aws-sdk-ecrpublic (~> 1.3) + aws-sdk-ecs (~> 1.30) + aws-sdk-efs (~> 1.0) + aws-sdk-eks (~> 1.9) + aws-sdk-elasticache (~> 1.0) + aws-sdk-elasticbeanstalk (~> 1.0) + aws-sdk-elasticloadbalancing (~> 1.8) + aws-sdk-elasticloadbalancingv2 (~> 1.0) + aws-sdk-elasticsearchservice (~> 1.0) + aws-sdk-emr (~> 1.53.0) + aws-sdk-eventbridge (~> 1.24.0) + aws-sdk-firehose (~> 1.0) + aws-sdk-glue (>= 1.71, < 1.89) + aws-sdk-guardduty (~> 1.31) + aws-sdk-iam (~> 1.13) + aws-sdk-kafka (~> 1.0) + aws-sdk-kinesis (~> 1.0) + aws-sdk-kms (~> 1.13) + aws-sdk-lambda (~> 1.0) + aws-sdk-mq (~> 1.40.0) + aws-sdk-networkfirewall (>= 1.6.0) + aws-sdk-networkmanager (>= 1.13.0) + aws-sdk-organizations (>= 1.17, < 1.60) + aws-sdk-ram (>= 1.21, < 1.27) + aws-sdk-rds (~> 1.43) + aws-sdk-redshift (~> 1.0) + aws-sdk-route53 (~> 1.0) + aws-sdk-route53domains (~> 1.0) + aws-sdk-route53resolver (~> 1.0) + aws-sdk-s3 (~> 1.30) + aws-sdk-s3control (~> 1.43.0) + aws-sdk-secretsmanager (>= 1.42, < 1.47) + aws-sdk-securityhub (~> 1.0) + aws-sdk-servicecatalog (>= 1.48, < 1.61) + aws-sdk-ses (~> 1.41.0) + aws-sdk-shield (~> 1.30) + aws-sdk-signer (~> 1.32.0) + aws-sdk-simpledb (~> 1.29.0) + aws-sdk-sms (~> 1.0) + aws-sdk-sns (~> 1.9) + aws-sdk-sqs (~> 1.10) + aws-sdk-ssm (~> 1.0) + aws-sdk-states (>= 1.35, < 1.40) + aws-sdk-synthetics (~> 1.19.0) + aws-sdk-transfer (>= 1.26, < 1.35) + aws-sdk-waf (~> 1.43.0) + train-core (3.10.7) + addressable (~> 2.5) + ffi (!= 1.13.0) + json (>= 1.8, < 3.0) + mixlib-shellout (>= 2.0, < 4.0) + net-scp (>= 1.2, < 5.0) + net-ssh (>= 2.9, < 8.0) + train-habitat (0.2.22) + train-winrm (0.2.13) + winrm (>= 2.3.6, < 3.0) + winrm-elevated (~> 1.2.2) + winrm-fs (~> 1.0) + tty-box (0.7.0) + pastel (~> 0.8) + strings (~> 0.2.0) + tty-cursor (~> 0.7) + tty-color (0.6.0) + tty-cursor (0.7.1) + tty-prompt (0.23.1) + pastel (~> 0.8) + tty-reader (~> 0.8) + tty-reader (0.9.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.8) + wisper (~> 2.0) + tty-screen (0.8.1) + tty-table (0.12.0) + pastel (~> 0.8) + strings (~> 0.2.0) + tty-screen (~> 0.8) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + uber (0.1.0) + unf (0.1.4) + unf_ext + unf_ext (0.0.8.2) + unicode-display_width (2.4.2) + unicode_utils (1.4.0) + winrm (2.3.6) + builder (>= 2.1.2) + erubi (~> 1.8) + gssapi (~> 1.2) + gyoku (~> 1.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (~> 2.0) + rubyntlm (~> 0.6.0, >= 0.6.3) + winrm-elevated (1.2.3) + erubi (~> 1.8) + winrm (~> 2.0) + winrm-fs (~> 1.0) + winrm-fs (1.3.5) + erubi (~> 1.8) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 2.0) + winrm (~> 2.0) + wisper (2.0.1) + +PLATFORMS + ruby + +DEPENDENCIES + inspec! + inspec-bin! + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/tools/misc/inspec/default.nix b/pkgs/tools/misc/inspec/default.nix new file mode 100644 index 000000000000..f9108c7af6bd --- /dev/null +++ b/pkgs/tools/misc/inspec/default.nix @@ -0,0 +1,19 @@ +{ lib, ruby, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "inspec"; + gemdir = ./.; + + inherit ruby; + + exes = ["inspec"]; + + passthru.updateScript = bundlerUpdateScript "inspec"; + + meta = with lib; { + description = "Inspec is an open-source testing framework for infrastructure with a human- and machine-readable language for specifying compliance, security and policy requirements"; + homepage = "https://inspec.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ dylanmtaylor ]; + }; +} diff --git a/pkgs/tools/misc/inspec/gemset.nix b/pkgs/tools/misc/inspec/gemset.nix new file mode 100644 index 000000000000..ac2a8914427f --- /dev/null +++ b/pkgs/tools/misc/inspec/gemset.nix @@ -0,0 +1,2230 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15m0b1im6i401ab51vzr7f8nk8kys1qa0snnl741y3sir3xd07jp"; + type = "gem"; + }; + version = "7.0.4.3"; + }; + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + type = "gem"; + }; + version = "2.8.4"; + }; + ast = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y"; + type = "gem"; + }; + version = "2.4.2"; + }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12n41py8jfxf9p3gy62ikw8n7wd0cmczk3i2fzxb4ms2xvkxv7b0"; + type = "gem"; + }; + version = "1.749.0"; + }; + aws-sdk-alexaforbusiness = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hbb2fpmxb77bp4mm3z24k8vhcc8y9ngjz9jarb54v4lbs8cmlq6"; + type = "gem"; + }; + version = "1.58.0"; + }; + aws-sdk-amplify = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fv4w1npqglxm9sl6939akjw3y1ivhpl55i75azvbzx0f7abh3b8"; + type = "gem"; + }; + version = "1.32.0"; + }; + aws-sdk-apigateway = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1m3vxlx20hjd14hc90k4lvqvhblh4c9m14pbnqp3k271zpaljnzx"; + type = "gem"; + }; + version = "1.81.0"; + }; + aws-sdk-apigatewayv2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lq2qzxk396kbmbxcsx8ic61758zl3ynxymwia1wzdxwkpsxks71"; + type = "gem"; + }; + version = "1.44.0"; + }; + aws-sdk-applicationautoscaling = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lp008dcyiqcz90fkck5dgx23ycgk04rhd0n1ywz14rg45844nfn"; + type = "gem"; + }; + version = "1.51.0"; + }; + aws-sdk-athena = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qzdnv42x0q2f53zsvj7i56b49n82zbx3qikcf9mp2bgxsbddvg8"; + type = "gem"; + }; + version = "1.64.0"; + }; + aws-sdk-autoscaling = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wr9dkf88h46s9n173imvbm6233a8d3cmcnvbm2s3bz0glzp0k4c"; + type = "gem"; + }; + version = "1.63.0"; + }; + aws-sdk-batch = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xd8yvvxdmha951h8b1qjijx3l21c9pwjr6nifaxjylpx5897fc0"; + type = "gem"; + }; + version = "1.47.0"; + }; + aws-sdk-budgets = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qmlqplc5l72p3mgpin3wjcdny4fbnq9lwcn55vphp8kgdzvv74p"; + type = "gem"; + }; + version = "1.52.0"; + }; + aws-sdk-cloudformation = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1634skrhc9nj46smvclx3767qvj02ydqjw15rkww1pigqvh46mcz"; + type = "gem"; + }; + version = "1.77.0"; + }; + aws-sdk-cloudfront = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jfrqwrvp9iv7sf24w0bbw094nz87w1gvrbq1725b0d0bry66ydy"; + type = "gem"; + }; + version = "1.76.0"; + }; + aws-sdk-cloudhsm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gis7ggljdsygb64knxfg6vxn8rbk5zfgcxqrjhvf4812hqzv4sp"; + type = "gem"; + }; + version = "1.41.0"; + }; + aws-sdk-cloudhsmv2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10fcy73lvivjdywklkqhp70jik2fscp0cz54qdzjpdhwvvpvgnfk"; + type = "gem"; + }; + version = "1.44.0"; + }; + aws-sdk-cloudtrail = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zfppjsasqbdhv9vvvjqif3b4mxgchw0i66hyxpc2gswk2a5803j"; + type = "gem"; + }; + version = "1.58.0"; + }; + aws-sdk-cloudwatch = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vls66mnkmxd05wqadgh7hfknj7yhnsfdms43cy607jv057lcqn4"; + type = "gem"; + }; + version = "1.72.0"; + }; + aws-sdk-cloudwatchevents = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xfyviddwll6n4lxl3g57x86gic9ycppnmpnl90jsbgy2dp12632"; + type = "gem"; + }; + version = "1.46.0"; + }; + aws-sdk-cloudwatchlogs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1paqyv0m55ag25liwmgqdj1vwi3yd231hvn419i0y1wg5ffcsg7j"; + type = "gem"; + }; + version = "1.62.0"; + }; + aws-sdk-codecommit = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vzpfsnnvwp21d9rsdaaml8fsigbwj344ghqw9834m4y3g7xax80"; + type = "gem"; + }; + version = "1.53.0"; + }; + aws-sdk-codedeploy = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1g8lp4ci1b40rx754hf2vfpzl4v9zi5vjakzmc1r9fg58x0v9wyv"; + type = "gem"; + }; + version = "1.52.0"; + }; + aws-sdk-codepipeline = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kvzsssfas7m2sxmfirnl0bp49m079bgj8lg5rlj2gri3wdgkx3f"; + type = "gem"; + }; + version = "1.55.0"; + }; + aws-sdk-cognitoidentity = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k7d4riiczkkxi4l3nh8nd2sn449j73s9cwcbk6b37lnkvq81kq2"; + type = "gem"; + }; + version = "1.31.0"; + }; + aws-sdk-cognitoidentityprovider = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j2v3m0d5d756nm98xgf10kz4cz68a8m9xlwzlqh86smqcml6v25"; + type = "gem"; + }; + version = "1.53.0"; + }; + aws-sdk-configservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lky7k2fqzqs8lpm3wqa5vw1b7np8g82hi39m6fsk1wvahx6kiwa"; + type = "gem"; + }; + version = "1.89.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0732vv8zi67z25fss1sdvqx0vv1ap3w6hz1avxzwznkjp002vj39"; + type = "gem"; + }; + version = "3.171.0"; + }; + aws-sdk-costandusagereportservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l9df1dji0m1sj6w5gjmxd0bjv7q858pnhwjhfkr0mfdk1dnsjbj"; + type = "gem"; + }; + version = "1.43.0"; + }; + aws-sdk-databasemigrationservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kppbmbd26bmbwy1f803symy36kbigf5mdgd91jh5r2l63418m46"; + type = "gem"; + }; + version = "1.53.0"; + }; + aws-sdk-dynamodb = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h7sl8236mgq0q6mzbznrq3wksr3jd4m8lwj6bkz678z6mxa0fal"; + type = "gem"; + }; + version = "1.84.0"; + }; + aws-sdk-ec2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj67jzg81nr3da2mwh27b22ps2waz41fhvc2f2khdfjazi7knqv"; + type = "gem"; + }; + version = "1.375.0"; + }; + aws-sdk-ecr = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cyscy0v5xsk8x946r125bidrzx7y4fam09ra8pl8xjp5a0706ig"; + type = "gem"; + }; + version = "1.58.0"; + }; + aws-sdk-ecrpublic = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15iz3wnc2z3n0f9lnbfgqyyi0bg6l65dyn5wc09p8wilg6jlib5c"; + type = "gem"; + }; + version = "1.16.0"; + }; + aws-sdk-ecs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pkz2fy63wr6wfzmwyscfzsjn4443cp7y4kzvirg1gcyq1cpyxgy"; + type = "gem"; + }; + version = "1.114.0"; + }; + aws-sdk-efs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r16nqsqhlc429p9hd1j226fkd9xq6x4ybm01sj482vjg4wsq4qg"; + type = "gem"; + }; + version = "1.59.0"; + }; + aws-sdk-eks = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12k9i7syfmxlk5dracwvin03bjhy8abyd58180z4zmq77al0dn24"; + type = "gem"; + }; + version = "1.83.0"; + }; + aws-sdk-elasticache = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wydzznzk4zhy3bh4ra8b2dsdhhib4ahnppni72zhr3dvda0pxfg"; + type = "gem"; + }; + version = "1.84.0"; + }; + aws-sdk-elasticbeanstalk = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13haliasq2k74xhk0sl2rb9x14vk980rnp2rzm5d0jls42mkkzsm"; + type = "gem"; + }; + version = "1.54.0"; + }; + aws-sdk-elasticloadbalancing = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jf2mcb1lqqm5dpmrhrlszmf9hb98kj6i7yw118lqn5dkb1mjjy1"; + type = "gem"; + }; + version = "1.42.0"; + }; + aws-sdk-elasticloadbalancingv2 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yzyk4q2g3hx74fhr7y37n8zp349g71micwzix5gwbjhfpjizy72"; + type = "gem"; + }; + version = "1.84.0"; + }; + aws-sdk-elasticsearchservice = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rz8hs78cd1lxcha29y751hxrv6yhcw6q9rvpcg24bgf81d4n4ag"; + type = "gem"; + }; + version = "1.69.0"; + }; + aws-sdk-emr = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wybb0aadsk8x3whwlid58g40613c9rrl48g43ikgpqz9f3b44ac"; + type = "gem"; + }; + version = "1.53.0"; + }; + aws-sdk-eventbridge = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cj1pwvhwal1qvmaiwi42lhsak7mb61bmm7j1g4gmscxg36l3bj2"; + type = "gem"; + }; + version = "1.24.0"; + }; + aws-sdk-firehose = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z0dvga01xg6pahy5p4bfc8s73n3ycjr0h3cxvhy8kcymynswn1k"; + type = "gem"; + }; + version = "1.51.0"; + }; + aws-sdk-glue = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1608aiav3iz6jcxdlprcax5984gq5m20dyg8w8caqjkgrrgkyd3f"; + type = "gem"; + }; + version = "1.88.0"; + }; + aws-sdk-guardduty = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12wvpgzqw7lswxchsbwmn0csp5lj521a1fx6f0dv8s26swnmhdsk"; + type = "gem"; + }; + version = "1.67.0"; + }; + aws-sdk-iam = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0crb3m1apj6kszp9aqmc2lqw99i1xkxbp5fl1s5748718kld4s8v"; + type = "gem"; + }; + version = "1.77.0"; + }; + aws-sdk-kafka = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pxzjmdb5bqrqnivmw7li2qliam0dm6v56idv50slds96q6jck61"; + type = "gem"; + }; + version = "1.54.0"; + }; + aws-sdk-kinesis = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k14773dyzwcjcb9a1pqbh0vqzjlb19cwf0ydw7pch5g8x5fs5g2"; + type = "gem"; + }; + version = "1.45.0"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v87zi28dfmrv7bv91yfldccnpd63n295siirbz7wqv1rajn8n02"; + type = "gem"; + }; + version = "1.63.0"; + }; + aws-sdk-lambda = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1a0l6yxmvc1hxlmhg4lcsh6yljmsav8p1rprlnnjvhgszhp3gcv3"; + type = "gem"; + }; + version = "1.95.0"; + }; + aws-sdk-mq = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pr2v6lf2rcnfsdbs5s5ig5mlvnfm1xwy2y8jcyp9w4s933ps9fg"; + type = "gem"; + }; + version = "1.40.0"; + }; + aws-sdk-networkfirewall = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ai74sc8q0vvnkicl4dyq1xikclpmdd0rbzlqpww64wd5q2i6myp"; + type = "gem"; + }; + version = "1.26.0"; + }; + aws-sdk-networkmanager = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ldlvhcvbs5r2dzfa2wglacywnqgijbr9iqalq0jhbv4aknmgfjy"; + type = "gem"; + }; + version = "1.30.0"; + }; + aws-sdk-organizations = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1b5zy7hc67k5pmmnv90p5skd12a61gk1swqlq4a5vn3kjlmg57al"; + type = "gem"; + }; + version = "1.59.0"; + }; + aws-sdk-ram = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rm6sr5kvdy9q1xjg00c80648l8j3cpc6l5fakfxiqhp256bf2ac"; + type = "gem"; + }; + version = "1.26.0"; + }; + aws-sdk-rds = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15jril7gd5ax0pabbj6gxfnh30x2c9ffw4dv31vb8k7rpdrzkzj8"; + type = "gem"; + }; + version = "1.176.0"; + }; + aws-sdk-redshift = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1smv2621gzrhk0wbnmyb2kdqcjp8z8wldy1vfypdcpgvlj9m2wvk"; + type = "gem"; + }; + version = "1.91.0"; + }; + aws-sdk-route53 = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xcg7rl6lllm4syxgw496976dnsmfwvxw4131klaycfx9dixz1kc"; + type = "gem"; + }; + version = "1.71.0"; + }; + aws-sdk-route53domains = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12in1rcjnni4xza6mdmp3avrb4hgkfk8dzsiqp97yvpywd1dbara"; + type = "gem"; + }; + version = "1.43.0"; + }; + aws-sdk-route53resolver = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vcwh47pgr745wyl0zwjjhr29yynjgl9w8d0qpnqn1i8ywbnxn9b"; + type = "gem"; + }; + version = "1.40.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mapdzm97rv22pca1hvvshwsafa12gd2yv2fcy63dfjn5vjjq893"; + type = "gem"; + }; + version = "1.120.1"; + }; + aws-sdk-s3control = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kf3i430b6lwzf7dmm506jvm7xy0rj4zhc9kywcg4rc1fp0bmzh3"; + type = "gem"; + }; + version = "1.43.0"; + }; + aws-sdk-secretsmanager = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xkx39yi2mlwyh3lyg6h39nzj5n059nc6idaqlnsjlrkkrh3i13i"; + type = "gem"; + }; + version = "1.46.0"; + }; + aws-sdk-securityhub = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0vp8hkmwl0p7xasbzhgnsk3ikj6l34vgyd3g9yg5nfsr4098almv"; + type = "gem"; + }; + version = "1.79.0"; + }; + aws-sdk-servicecatalog = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zjxbpr5jj3znrsynazcjznaqcqbfpy646nzvl3c83gcwrsqj8s7"; + type = "gem"; + }; + version = "1.60.0"; + }; + aws-sdk-ses = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xii4i4dia1w6hizfxvni8jawpikv9g26ixiw349x33l09f12cbw"; + type = "gem"; + }; + version = "1.41.0"; + }; + aws-sdk-shield = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xd1baasgazrfc1b2pr196jycj14rb6kdkxjkqa0rnd0ml9xwiwj"; + type = "gem"; + }; + version = "1.51.0"; + }; + aws-sdk-signer = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ysspl6n2rw5hr3bz38k46k04nkbri0c54fc109kgw57fxfwq3fk"; + type = "gem"; + }; + version = "1.32.0"; + }; + aws-sdk-simpledb = { + dependencies = ["aws-sdk-core" "aws-sigv2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15vrakmbxz7pg9vf2gi8ssb6jg4k5jwrsik6x0hkjf3n4g3vfgqs"; + type = "gem"; + }; + version = "1.29.0"; + }; + aws-sdk-sms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1z40zf3v3isqsc6ipmv8v6f28a0bsrba2rivgya98hk1wyivxn4w"; + type = "gem"; + }; + version = "1.43.0"; + }; + aws-sdk-sns = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10kn9nsh7jn0ikmxybhxh3wgczlpp3pcanqvmc3cjh1sahy8sb1n"; + type = "gem"; + }; + version = "1.60.0"; + }; + aws-sdk-sqs = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rp62fmz4lc32qj2phqmrdic4j4la34xp2a6vlg4v6lqz2y2fjhs"; + type = "gem"; + }; + version = "1.53.0"; + }; + aws-sdk-ssm = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16p7l4mgzs6al3rpb35318gc06vp757vjb99brbkx8ppyg78cdir"; + type = "gem"; + }; + version = "1.150.0"; + }; + aws-sdk-states = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00ja9hkx4rdgd0242l8vmbfmb1qgvys3xs2ryap3ms3qaa76sach"; + type = "gem"; + }; + version = "1.39.0"; + }; + aws-sdk-synthetics = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "10zh51r45pzbnx8fxjz8pppwlgbzpbvs4kaji1mi53cwpfprlhsz"; + type = "gem"; + }; + version = "1.19.0"; + }; + aws-sdk-transfer = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "017zpcqssv138y7nqzwqpvcnsbq2jws6g22996n64kcr2azj28gn"; + type = "gem"; + }; + version = "1.34.0"; + }; + aws-sdk-waf = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "036655pbqkvzwd05svimvn2v96srz370zmhczg1jzsca0249hxfr"; + type = "gem"; + }; + version = "1.43.0"; + }; + aws-sigv2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bnsw26vd0z3gayrqxhjg94ccjdygpk00bmhdjhzagmgngmdbhrk"; + type = "gem"; + }; + version = "1.1.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m"; + type = "gem"; + }; + version = "1.5.2"; + }; + azure_graph_rbac = { + dependencies = ["ms_rest_azure"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mmx8jp85xa13j3asa9xnfi6wa8a9wwlp0hz0nj70fi3ydmcpdag"; + type = "gem"; + }; + version = "0.17.2"; + }; + azure_mgmt_key_vault = { + dependencies = ["ms_rest_azure"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0f4fai5l3453yirrwajds0jgah60gvawffx53a0jyv3b93ag88mz"; + type = "gem"; + }; + version = "0.17.7"; + }; + azure_mgmt_resources = { + dependencies = ["ms_rest_azure"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p4hsa7xha8ifml58hmkxdkp7vyhm7sw624xam1mrq0hvzawvkm3"; + type = "gem"; + }; + version = "0.18.2"; + }; + azure_mgmt_security = { + dependencies = ["ms_rest_azure"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11h2dyz4awzidvfj41h7k2q7mcqqcgzvm95fxpfxz609pbvck0g2"; + type = "gem"; + }; + version = "0.19.0"; + }; + azure_mgmt_storage = { + dependencies = ["ms_rest_azure"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ik06knz7fxn9q2x874d7q1v2fb00askwh36wbl75fnsi2m5m6rq"; + type = "gem"; + }; + version = "0.23.0"; + }; + bson = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19vgs9rzzyvd7jfrzynjnc6518q0ffpfciyicfywbp77zl8nc9hk"; + type = "gem"; + }; + version = "4.15.0"; + }; + builder = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; + chef-config = { + dependencies = ["addressable" "chef-utils" "fuzzyurl" "mixlib-config" "mixlib-shellout" "tomlrb"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13581xgpdvdyd0zvdankharj9aahs99vmihcknm66v03a37q7y6x"; + type = "gem"; + }; + version = "18.2.7"; + }; + chef-telemetry = { + dependencies = ["chef-config" "concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l9icc3nfdj28mip85vf31v5l60qsfqq3a5dscv7jryh1k94y05x"; + type = "gem"; + }; + version = "1.1.1"; + }; + chef-utils = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q5by0q1i443lds626cyq78jhzkwb6b1f8vcbv82q790q06vg1w9"; + type = "gem"; + }; + version = "18.2.7"; + }; + coderay = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; + type = "gem"; + }; + version = "1.1.3"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + type = "gem"; + }; + version = "1.2.2"; + }; + cookstyle = { + dependencies = ["rubocop"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0np0y94x1rgn13bwkd4hc5ysimn9ax57ihrpz5rl4fwrn3lybm1s"; + type = "gem"; + }; + version = "7.32.2"; + }; + declarative = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yczgnqrbls7shrg63y88g7wand2yp9h6sf56c9bdcksn5nds8c0"; + type = "gem"; + }; + version = "0.0.20"; + }; + diff-lcs = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + type = "gem"; + }; + version = "1.5.0"; + }; + docker-api = { + dependencies = ["excon" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0g7dbniz15b3l2sy6xh0j0998dr5jypf3xg3bsygp0108vv7waxy"; + type = "gem"; + }; + version = "2.2.0"; + }; + domain_name = { + dependencies = ["unf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; + type = "gem"; + }; + version = "0.5.20190701"; + }; + erubi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + type = "gem"; + }; + version = "1.12.0"; + }; + excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09"; + type = "gem"; + }; + version = "0.99.0"; + }; + faraday = { + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c760q0ks4vj4wmaa7nh1dgvgqiwaw0mjr7v8cymy7i3ffgjxx90"; + type = "gem"; + }; + version = "1.10.3"; + }; + faraday-cookie_jar = { + dependencies = ["faraday" "http-cookie"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00hligx26w9wdnpgsrf0qdnqld4rdccy8ym6027h5m735mpvxjzk"; + type = "gem"; + }; + version = "0.0.7"; + }; + faraday-em_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday-follow_redirects = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr"; + type = "gem"; + }; + version = "0.3.0"; + }; + faraday-httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fyk0jd3ks7fdn8nv3spnwjpzx2lmxmg2gh4inz3by1zjzqg33sc"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-multipart = { + dependencies = ["multipart-post"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; + type = "gem"; + }; + version = "1.0.4"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http_persistent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; + type = "gem"; + }; + version = "1.2.0"; + }; + faraday-patron = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19wgsgfq0xkski1g7m96snv39la3zxz6x7nbdgiwhg5v82rxfb6w"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1h184g4vqql5jv9s9im6igy00jp6mrah2h14py6mpf9bkabfqq7g"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-retry = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "153i967yrwnswqgvnnajgwp981k9p50ys1h80yz3q94rygs59ldd"; + type = "gem"; + }; + version = "1.0.3"; + }; + faraday_middleware = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jik2kgfinwnfi6fpp512vlvs0mlggign3gkbpkg5fw1jr9his0r"; + type = "gem"; + }; + version = "1.0.0"; + }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + type = "gem"; + }; + version = "1.15.5"; + }; + fuzzyurl = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03qchs33vfwbsv5awxg3acfmlcrf5xbhnbrc83fdpamwya0glbjl"; + type = "gem"; + }; + version = "0.9.0"; + }; + google-api-client = { + dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "signet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q1lsyyyfvff7727sr01j8qx6b30qpx6h0bna5s0bfz853fhl33b"; + type = "gem"; + }; + version = "0.52.0"; + }; + googleauth = { + dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cm60nbmwzf83fzy06f3iyn5a6sw91siw8x9bdvpwwmjsmivana6"; + type = "gem"; + }; + version = "0.14.0"; + }; + gssapi = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765"; + type = "gem"; + }; + version = "1.3.1"; + }; + gyoku = { + dependencies = ["builder" "rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kd2q59xpm39hpvmmvyi6g3f1fr05xjbnxwkrdqz4xy7hirqi79q"; + type = "gem"; + }; + version = "1.4.0"; + }; + hashie = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q"; + type = "gem"; + }; + version = "4.1.0"; + }; + highline = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f8cr014j7mdqpdb9q17fp5vb5b8n1pswqaif91s3ylg5x3pygfn"; + type = "gem"; + }; + version = "2.1.0"; + }; + http-cookie = { + dependencies = ["domain_name"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; + type = "gem"; + }; + version = "1.0.5"; + }; + httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; + type = "gem"; + }; + version = "1.12.0"; + }; + inifile = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c5zmk7ia63yw5l2k14qhfdydxwi1sah1ppjdiicr4zcalvfn0xi"; + type = "gem"; + }; + version = "3.0.0"; + }; + inspec = { + dependencies = ["cookstyle" "faraday_middleware" "inspec-core" "mongo" "progress_bar" "rake" "train" "train-aws" "train-habitat" "train-winrm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1y2p1dm8b648gw6sabgq45mj0wvc683xq4jvh286vmfhkld8ibgh"; + type = "gem"; + }; + version = "5.21.29"; + }; + inspec-bin = { + dependencies = ["inspec"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02lq4qnmxdc3vn5wwrb5m526js14jvj5c3wczln2skmqg5yr6pbh"; + type = "gem"; + }; + version = "5.21.29"; + }; + inspec-core = { + dependencies = ["addressable" "chef-telemetry" "faraday" "faraday-follow_redirects" "hashie" "license-acceptance" "method_source" "mixlib-log" "multipart-post" "parallel" "parslet" "pry" "rspec" "rspec-its" "rubyzip" "semverse" "sslshake" "thor" "tomlrb" "train-core" "tty-prompt" "tty-table"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1irzd4nms4fpv5llkqsx8mlgyhgsibkzk293w31yixarg3jbnvd7"; + type = "gem"; + }; + version = "5.21.29"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; + type = "gem"; + }; + version = "1.6.2"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; + type = "gem"; + }; + version = "2.6.3"; + }; + jwt = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "09yj3z5snhaawh2z1w45yyihzmh57m6m7dp8ra8gxavhj5kbiq5p"; + type = "gem"; + }; + version = "2.7.0"; + }; + license-acceptance = { + dependencies = ["pastel" "tomlrb" "tty-box" "tty-prompt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12h5a3j57h50xkfpdz9gr42k0v8g1qxn2pnj5hbbzbmdhydjbjzf"; + type = "gem"; + }; + version = "2.1.13"; + }; + little-plugger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + logging = { + dependencies = ["little-plugger" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02"; + type = "gem"; + }; + version = "2.3.1"; + }; + memoist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i9wpzix3sjhf6d9zw60dm4371iq8kyz7ckh2qapan2vyaim6b55"; + type = "gem"; + }; + version = "0.16.2"; + }; + method_source = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; + type = "gem"; + }; + version = "1.0.0"; + }; + mini_mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lbim375gw2dk6383qirz13hgdmxlan0vc5da2l072j3qw6fqjm5"; + type = "gem"; + }; + version = "1.1.2"; + }; + minitest = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ic7i5z88zcaqnpzprf7saimq2f6sad57g5mkkqsrqrcd6h3mx06"; + type = "gem"; + }; + version = "5.18.0"; + }; + mixlib-config = { + dependencies = ["tomlrb"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j0122lv2qgccl61njqi0pj6sp6nb85y07gcmw16bwg4k0c8nx6p"; + type = "gem"; + }; + version = "3.0.27"; + }; + mixlib-log = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n5dm5iz90ijvjn59jfm8gb8hgsvbj0f1kpzbl38b02z0z4a4v7x"; + type = "gem"; + }; + version = "3.0.9"; + }; + mixlib-shellout = { + dependencies = ["chef-utils"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zkwg76y96nkh1mv0k92ybq46cr06v1wmic16129ls3yqzwx3xj6"; + type = "gem"; + }; + version = "3.2.7"; + }; + mongo = { + dependencies = ["bson"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mkksik7mffwm29dz0pxjfz87rmm578nqzg8bc4kp076xqjwn2xp"; + type = "gem"; + }; + version = "2.13.2"; + }; + ms_rest = { + dependencies = ["concurrent-ruby" "faraday" "timeliness"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1jiha1bda5knpjqjymwik6i41n69gb0phcrgvmgc5icl4mcisai7"; + type = "gem"; + }; + version = "0.7.6"; + }; + ms_rest_azure = { + dependencies = ["concurrent-ruby" "faraday" "faraday-cookie_jar" "ms_rest"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06i37b84r2q206kfm5vsi9s1qiiy09091vhvc5pzb7320h0hc1ih"; + type = "gem"; + }; + version = "0.12.0"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + multipart-post = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lgyysrpl50wgcb9ahg29i4p01z0irb3p9lirygma0kkfr5dgk9x"; + type = "gem"; + }; + version = "2.3.0"; + }; + net-scp = { + dependencies = ["net-ssh"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; + type = "gem"; + }; + version = "4.0.0"; + }; + net-ssh = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687"; + type = "gem"; + }; + version = "7.1.0"; + }; + nori = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + type = "gem"; + }; + version = "2.6.0"; + }; + options = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1s650nwnabx66w584m1cyw82icyym6hv5kzfsbp38cinkr5klh9j"; + type = "gem"; + }; + version = "2.3.2"; + }; + os = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gwd20smyhxbm687vdikfh1gpi96h8qb1x28s2pdcysf6dm6v0ap"; + type = "gem"; + }; + version = "1.1.4"; + }; + parallel = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; + type = "gem"; + }; + version = "1.23.0"; + }; + parser = { + dependencies = ["ast"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s5afi89p76k8vpwiqvh343pm5l23ijqlpszhz65afym3zpkxhzx"; + type = "gem"; + }; + version = "3.2.2.0"; + }; + parslet = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88"; + type = "gem"; + }; + version = "1.8.2"; + }; + pastel = { + dependencies = ["tty-color"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; + type = "gem"; + }; + version = "0.8.0"; + }; + progress_bar = { + dependencies = ["highline" "options"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04kv6h5mdjd9zf8mcf2dplxls06n2jf72281s74k6b2ar731hc47"; + type = "gem"; + }; + version = "1.3.3"; + }; + pry = { + dependencies = ["coderay" "method_source"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; + type = "gem"; + }; + version = "0.14.2"; + }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + type = "gem"; + }; + version = "5.0.1"; + }; + rainbow = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503"; + type = "gem"; + }; + version = "3.1.1"; + }; + rake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; + type = "gem"; + }; + version = "13.0.6"; + }; + regexp_parser = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17xizkw5ryw8hhq64iqxmzdrrdxpc5lhkqc1fgm1aj0zsk1r2950"; + type = "gem"; + }; + version = "2.8.0"; + }; + representable = { + dependencies = ["declarative" "trailblazer-option" "uber"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kms3r6w6pnryysnaqqa9fsn0v73zx1ilds9d1c565n3xdzbyafc"; + type = "gem"; + }; + version = "3.2.0"; + }; + retriable = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1q48hqws2dy1vws9schc0kmina40gy7sn5qsndpsfqdslh65snha"; + type = "gem"; + }; + version = "3.1.2"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19dyb6rcvgi9j2mksd29wfdhfdyzqk7yjhy1ai77559hbhpg61w9"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l1bzk6a68i1b2qix83vs40r0pbjawv67hixiq2qxsja19bbq3bc"; + type = "gem"; + }; + version = "3.11.1"; + }; + rspec-its = { + dependencies = ["rspec-core" "rspec-expectations"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad"; + type = "gem"; + }; + version = "1.3.0"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vsqp9dij2rj9aapcn3sz7qzw0d8ln7x9p46h9rzd3jzb7his9kk"; + type = "gem"; + }; + version = "3.11.2"; + }; + rspec-support = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c01iicvrjk6vv744jgh0y4kk9d0kg2rd2ihdyzvg5p06xm2fpzq"; + type = "gem"; + }; + version = "3.11.1"; + }; + rubocop = { + dependencies = ["parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l3q96il8zx5zl041lxvmfrndxxpk08fksza1gqshhjjzms7c2rk"; + type = "gem"; + }; + version = "1.25.1"; + }; + rubocop-ast = { + dependencies = ["parser"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n2gsafg6p7nr1z8i1hkvp2qqkkbg842ba183dnl0h08xd9ms6q5"; + type = "gem"; + }; + version = "1.28.0"; + }; + ruby-progressbar = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cwvyb7j47m7wihpfaq7rc47zwwx9k4v7iqd9s1xch5nm53rrz40"; + type = "gem"; + }; + version = "1.13.0"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; + rubyntlm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + type = "gem"; + }; + version = "0.6.3"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + semverse = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vrh6p0756n3gjnk6am1cc4kmw6wzzd02hcajj27rlsqg3p6lwn9"; + type = "gem"; + }; + version = "3.0.2"; + }; + signet = { + dependencies = ["addressable" "faraday" "jwt" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0100rclkhagf032rg3r0gf3f4znrvvvqrimy6hpa73f21n9k2a0x"; + type = "gem"; + }; + version = "0.17.0"; + }; + sslshake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r3ifksx8a05yqhv7nc4cwan8bwmxgq5kyv7q7hy2h9lv5zcjs8h"; + type = "gem"; + }; + version = "1.3.1"; + }; + strings = { + dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yynb0qhhhplmpzavfrrlwdnd1rh7rkwzcs4xf0mpy2wr6rr6clk"; + type = "gem"; + }; + version = "0.2.1"; + }; + strings-ansi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; + type = "gem"; + }; + version = "0.2.0"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + type = "gem"; + }; + version = "1.2.1"; + }; + timeliness = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gvp9b7yn4pykn794cibylc9ys1lw7fzv7djx1433icxw4y26my3"; + type = "gem"; + }; + version = "0.3.10"; + }; + tomlrb = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8"; + type = "gem"; + }; + version = "1.3.0"; + }; + trailblazer-option = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18s48fndi2kfvrfzmq6rxvjfwad347548yby0341ixz1lhpg3r10"; + type = "gem"; + }; + version = "0.1.2"; + }; + train = { + dependencies = ["activesupport" "azure_graph_rbac" "azure_mgmt_key_vault" "azure_mgmt_resources" "azure_mgmt_security" "azure_mgmt_storage" "docker-api" "google-api-client" "googleauth" "inifile" "train-core" "train-winrm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04ixvxhpv33h8wcirplzgp5pix2xipx5hfxxlrjp579hrcs38sjy"; + type = "gem"; + }; + version = "3.10.7"; + }; + train-aws = { + dependencies = ["aws-sdk-alexaforbusiness" "aws-sdk-amplify" "aws-sdk-apigateway" "aws-sdk-apigatewayv2" "aws-sdk-applicationautoscaling" "aws-sdk-athena" "aws-sdk-autoscaling" "aws-sdk-batch" "aws-sdk-budgets" "aws-sdk-cloudformation" "aws-sdk-cloudfront" "aws-sdk-cloudhsm" "aws-sdk-cloudhsmv2" "aws-sdk-cloudtrail" "aws-sdk-cloudwatch" "aws-sdk-cloudwatchevents" "aws-sdk-cloudwatchlogs" "aws-sdk-codecommit" "aws-sdk-codedeploy" "aws-sdk-codepipeline" "aws-sdk-cognitoidentity" "aws-sdk-cognitoidentityprovider" "aws-sdk-configservice" "aws-sdk-core" "aws-sdk-costandusagereportservice" "aws-sdk-databasemigrationservice" "aws-sdk-dynamodb" "aws-sdk-ec2" "aws-sdk-ecr" "aws-sdk-ecrpublic" "aws-sdk-ecs" "aws-sdk-efs" "aws-sdk-eks" "aws-sdk-elasticache" "aws-sdk-elasticbeanstalk" "aws-sdk-elasticloadbalancing" "aws-sdk-elasticloadbalancingv2" "aws-sdk-elasticsearchservice" "aws-sdk-emr" "aws-sdk-eventbridge" "aws-sdk-firehose" "aws-sdk-glue" "aws-sdk-guardduty" "aws-sdk-iam" "aws-sdk-kafka" "aws-sdk-kinesis" "aws-sdk-kms" "aws-sdk-lambda" "aws-sdk-mq" "aws-sdk-networkfirewall" "aws-sdk-networkmanager" "aws-sdk-organizations" "aws-sdk-ram" "aws-sdk-rds" "aws-sdk-redshift" "aws-sdk-route53" "aws-sdk-route53domains" "aws-sdk-route53resolver" "aws-sdk-s3" "aws-sdk-s3control" "aws-sdk-secretsmanager" "aws-sdk-securityhub" "aws-sdk-servicecatalog" "aws-sdk-ses" "aws-sdk-shield" "aws-sdk-signer" "aws-sdk-simpledb" "aws-sdk-sms" "aws-sdk-sns" "aws-sdk-sqs" "aws-sdk-ssm" "aws-sdk-states" "aws-sdk-synthetics" "aws-sdk-transfer" "aws-sdk-waf"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vl7yfzcd6mq5lmjgagxbdhjhyv5rj2piap3w28zdwqkbyyhir8b"; + type = "gem"; + }; + version = "0.2.24"; + }; + train-core = { + dependencies = ["addressable" "ffi" "json" "mixlib-shellout" "net-scp" "net-ssh"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f0yxh5mpr7rdn3660jf5iwc3rhv4l82dd9mhcrm6v85901rvj9c"; + type = "gem"; + }; + version = "3.10.7"; + }; + train-habitat = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0qdi2q5djzfl6x3fv2vrvybjdvrnx53nfh4vzrcl2h7nrf801n6v"; + type = "gem"; + }; + version = "0.2.22"; + }; + train-winrm = { + dependencies = ["winrm" "winrm-elevated" "winrm-fs"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07haiwh7jcg00mmiarj5g7k9kclq40yqd4j4r3c01qn2cq1sw2xb"; + type = "gem"; + }; + version = "0.2.13"; + }; + tty-box = { + dependencies = ["pastel" "strings" "tty-cursor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12yzhl3s165fl8pkfln6mi6mfy3vg7p63r3dvcgqfhyzq6h57x0p"; + type = "gem"; + }; + version = "0.7.0"; + }; + tty-color = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g"; + type = "gem"; + }; + version = "0.6.0"; + }; + tty-cursor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; + type = "gem"; + }; + version = "0.7.1"; + }; + tty-prompt = { + dependencies = ["pastel" "tty-reader"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j4y8ik82azjxshgd4i1v4wwhsv3g9cngpygxqkkz69qaa8cxnzw"; + type = "gem"; + }; + version = "0.23.1"; + }; + tty-reader = { + dependencies = ["tty-cursor" "tty-screen" "wisper"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cf2k7w7d84hshg4kzrjvk9pkyc2g1m3nx2n1rpmdcf0hp4p4af6"; + type = "gem"; + }; + version = "0.9.0"; + }; + tty-screen = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; + type = "gem"; + }; + version = "0.8.1"; + }; + tty-table = { + dependencies = ["pastel" "strings" "tty-screen"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fcrbfb0hjd9vkkazkksri93dv9wgs2hp6p1xwb1lp43a13pmhpx"; + type = "gem"; + }; + version = "0.12.0"; + }; + tzinfo = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd"; + type = "gem"; + }; + version = "2.0.6"; + }; + uber = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1p1mm7mngg40x05z52md3mbamkng0zpajbzqjjwmsyw0zw3v9vjv"; + type = "gem"; + }; + version = "0.1.0"; + }; + unf = { + dependencies = ["unf_ext"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; + type = "gem"; + }; + version = "0.1.4"; + }; + unf_ext = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; + type = "gem"; + }; + version = "0.0.8.2"; + }; + unicode-display_width = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; + type = "gem"; + }; + version = "2.4.2"; + }; + unicode_utils = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; + type = "gem"; + }; + version = "1.4.0"; + }; + winrm = { + dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; + type = "gem"; + }; + version = "2.3.6"; + }; + winrm-elevated = { + dependencies = ["erubi" "winrm" "winrm-fs"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lmlaii8qapn84wxdg5d82gbailracgk67d0qsnbdnffcg8kswzd"; + type = "gem"; + }; + version = "1.2.3"; + }; + winrm-fs = { + dependencies = ["erubi" "logging" "rubyzip" "winrm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d"; + type = "gem"; + }; + version = "1.3.5"; + }; + wisper = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rpsi0ziy78cj82sbyyywby4d0aw0a5q84v65qd28vqn79fbq5yf"; + type = "gem"; + }; + version = "2.0.1"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c936794323c8..921ec2e6a54d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -573,6 +573,8 @@ with pkgs; html5validator = python3Packages.callPackage ../applications/misc/html5validator { }; + inspec = callPackage ../tools/misc/inspec { }; + buildcatrust = with python3.pkgs; toPythonApplication buildcatrust; probe-rs-cli = callPackage ../development/tools/rust/probe-rs-cli { From 321bf53e32b244f53a0082dde053daf3014a5ae8 Mon Sep 17 00:00:00 2001 From: Dylan Taylor Date: Tue, 18 Apr 2023 14:07:48 -0400 Subject: [PATCH 015/244] chef-cli: init at 18.2.7 --- pkgs/tools/misc/chef-cli/Gemfile | 3 + pkgs/tools/misc/chef-cli/Gemfile.lock | 303 +++++++ pkgs/tools/misc/chef-cli/default.nix | 18 + pkgs/tools/misc/chef-cli/gemset.nix | 1130 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 1456 insertions(+) create mode 100644 pkgs/tools/misc/chef-cli/Gemfile create mode 100644 pkgs/tools/misc/chef-cli/Gemfile.lock create mode 100644 pkgs/tools/misc/chef-cli/default.nix create mode 100644 pkgs/tools/misc/chef-cli/gemset.nix diff --git a/pkgs/tools/misc/chef-cli/Gemfile b/pkgs/tools/misc/chef-cli/Gemfile new file mode 100644 index 000000000000..b02c6a2a9241 --- /dev/null +++ b/pkgs/tools/misc/chef-cli/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' do + gem "chef-cli" +end diff --git a/pkgs/tools/misc/chef-cli/Gemfile.lock b/pkgs/tools/misc/chef-cli/Gemfile.lock new file mode 100644 index 000000000000..95a301ec0cc2 --- /dev/null +++ b/pkgs/tools/misc/chef-cli/Gemfile.lock @@ -0,0 +1,303 @@ +GEM + remote: https://rubygems.org/ + specs: + addressable (2.8.4) + public_suffix (>= 2.0.2, < 6.0) + aws-eventstream (1.2.0) + aws-partitions (1.749.0) + aws-sdk-core (3.171.0) + aws-eventstream (~> 1, >= 1.0.2) + aws-partitions (~> 1, >= 1.651.0) + aws-sigv4 (~> 1.5) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.63.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sdk-s3 (1.120.1) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.4) + aws-sdk-secretsmanager (1.73.0) + aws-sdk-core (~> 3, >= 3.165.0) + aws-sigv4 (~> 1.1) + aws-sigv4 (1.5.2) + aws-eventstream (~> 1, >= 1.0.2) + builder (3.2.4) + chef (17.10.0) + addressable + aws-sdk-s3 (~> 1.91) + aws-sdk-secretsmanager (~> 1.46) + chef-config (= 17.10.0) + chef-utils (= 17.10.0) + chef-vault + chef-zero (>= 14.0.11) + corefoundation (~> 0.3.4) + diff-lcs (>= 1.2.4, < 1.6.0, != 1.4.0) + erubis (~> 2.7) + ffi (>= 1.5.0) + ffi-libarchive (~> 1.0, >= 1.0.3) + ffi-yajl (~> 2.2) + iniparse (~> 1.4) + inspec-core (~> 4.23) + license-acceptance (>= 1.0.5, < 3) + mixlib-archive (>= 0.4, < 2.0) + mixlib-authentication (>= 2.1, < 4) + mixlib-cli (>= 2.1.1, < 3.0) + mixlib-log (>= 2.0.3, < 4.0) + mixlib-shellout (>= 3.1.1, < 4.0) + net-sftp (>= 2.1.2, < 4.0) + ohai (~> 17.0) + plist (~> 3.2) + proxifier (~> 1.0) + syslog-logger (~> 1.6) + train-core (~> 3.2, >= 3.2.28) + train-winrm (>= 0.2.5) + uuidtools (>= 2.1.5, < 3.0) + vault (~> 0.16) + chef-cli (5.6.8) + addressable (>= 2.3.5, < 2.9) + chef (>= 16.0) + cookbook-omnifetch (~> 0.5) + diff-lcs (>= 1.0, < 1.4) + ffi-yajl (>= 1.0, < 3.0) + license-acceptance (>= 1.0.11, < 3) + minitar (~> 0.6) + mixlib-cli (>= 1.7, < 3.0) + mixlib-shellout (>= 2.0, < 4.0) + pastel (~> 0.7) + solve (> 2.0, < 5.0) + chef-config (17.10.0) + addressable + chef-utils (= 17.10.0) + fuzzyurl + mixlib-config (>= 2.2.12, < 4.0) + mixlib-shellout (>= 2.0, < 4.0) + tomlrb (~> 1.2) + chef-telemetry (1.1.1) + chef-config + concurrent-ruby (~> 1.0) + chef-utils (17.10.0) + concurrent-ruby + chef-vault (4.1.11) + chef-zero (15.0.11) + ffi-yajl (~> 2.2) + hashie (>= 2.0, < 5.0) + mixlib-log (>= 2.0, < 4.0) + rack (~> 2.0, >= 2.0.6) + uuidtools (~> 2.1) + webrick + coderay (1.1.3) + concurrent-ruby (1.2.2) + cookbook-omnifetch (0.12.2) + mixlib-archive (>= 0.4, < 2.0) + corefoundation (0.3.13) + ffi (>= 1.15.0) + diff-lcs (1.3) + erubi (1.12.0) + erubis (2.7.0) + faraday (1.4.3) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.1) + multipart-post (>= 1.2, < 3) + ruby2_keywords (>= 0.0.4) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-net_http (1.0.1) + faraday-net_http_persistent (1.2.0) + faraday_middleware (1.2.0) + faraday (~> 1.0) + ffi (1.15.5) + ffi-libarchive (1.1.3) + ffi (~> 1.0) + ffi-yajl (2.4.0) + libyajl2 (>= 1.2) + fuzzyurl (0.9.0) + gssapi (1.3.1) + ffi (>= 1.0.1) + gyoku (1.4.0) + builder (>= 2.1.2) + rexml (~> 3.0) + hashie (4.1.0) + httpclient (2.8.3) + iniparse (1.5.0) + inspec-core (4.56.20) + addressable (~> 2.4) + chef-telemetry (~> 1.0, >= 1.0.8) + faraday (>= 0.9.0, < 1.5) + faraday_middleware (~> 1.0) + hashie (>= 3.4, < 5.0) + license-acceptance (>= 0.2.13, < 3.0) + method_source (>= 0.8, < 2.0) + mixlib-log (~> 3.0) + multipart-post (~> 2.0) + parallel (~> 1.9) + parslet (>= 1.5, < 2.0) + pry (~> 0.13) + rspec (>= 3.9, <= 3.11) + rspec-its (~> 1.2) + rubyzip (>= 1.2.2, < 3.0) + semverse (~> 3.0) + sslshake (~> 1.2) + thor (>= 0.20, < 2.0) + tomlrb (>= 1.2, < 2.1) + train-core (~> 3.0) + tty-prompt (~> 0.17) + tty-table (~> 0.10) + ipaddress (0.8.3) + jmespath (1.6.2) + json (2.6.3) + libyajl2 (2.1.0) + license-acceptance (2.1.13) + pastel (~> 0.7) + tomlrb (>= 1.2, < 3.0) + tty-box (~> 0.6) + tty-prompt (~> 0.20) + little-plugger (1.1.4) + logging (2.3.1) + little-plugger (~> 1.1) + multi_json (~> 1.14) + method_source (1.0.0) + minitar (0.9) + mixlib-archive (1.1.7) + mixlib-log + mixlib-authentication (3.0.10) + mixlib-cli (2.1.8) + mixlib-config (3.0.27) + tomlrb + mixlib-log (3.0.9) + mixlib-shellout (3.2.7) + chef-utils + molinillo (0.8.0) + multi_json (1.15.0) + multipart-post (2.3.0) + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-sftp (2.1.2) + net-ssh (>= 2.6.5) + net-ssh (7.1.0) + nori (2.6.0) + ohai (17.9.1) + chef-config (>= 14.12, < 18) + chef-utils (>= 16.0, < 18) + ffi (~> 1.9) + ffi-yajl (~> 2.2) + ipaddress + mixlib-cli (>= 1.7.0) + mixlib-config (>= 2.0, < 4.0) + mixlib-log (>= 2.0.1, < 4.0) + mixlib-shellout (~> 3.2, >= 3.2.5) + plist (~> 3.1) + train-core + wmi-lite (~> 1.0) + parallel (1.23.0) + parslet (1.8.2) + pastel (0.8.0) + tty-color (~> 0.5) + plist (3.7.0) + proxifier (1.0.3) + pry (0.14.2) + coderay (~> 1.1) + method_source (~> 1.0) + public_suffix (5.0.1) + rack (2.2.6.4) + rexml (3.2.5) + rspec (3.11.0) + rspec-core (~> 3.11.0) + rspec-expectations (~> 3.11.0) + rspec-mocks (~> 3.11.0) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.1) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.11.0) + rspec-its (1.3.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (3.11.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.11.0) + rspec-support (3.11.1) + ruby2_keywords (0.0.5) + rubyntlm (0.6.3) + rubyzip (2.3.2) + semverse (3.0.2) + solve (4.0.4) + molinillo (~> 0.6) + semverse (>= 1.1, < 4.0) + sslshake (1.3.1) + strings (0.2.1) + strings-ansi (~> 0.2) + unicode-display_width (>= 1.5, < 3.0) + unicode_utils (~> 1.4) + strings-ansi (0.2.0) + syslog-logger (1.6.8) + thor (1.2.1) + tomlrb (1.3.0) + train-core (3.10.7) + addressable (~> 2.5) + ffi (!= 1.13.0) + json (>= 1.8, < 3.0) + mixlib-shellout (>= 2.0, < 4.0) + net-scp (>= 1.2, < 5.0) + net-ssh (>= 2.9, < 8.0) + train-winrm (0.2.13) + winrm (>= 2.3.6, < 3.0) + winrm-elevated (~> 1.2.2) + winrm-fs (~> 1.0) + tty-box (0.7.0) + pastel (~> 0.8) + strings (~> 0.2.0) + tty-cursor (~> 0.7) + tty-color (0.6.0) + tty-cursor (0.7.1) + tty-prompt (0.23.1) + pastel (~> 0.8) + tty-reader (~> 0.8) + tty-reader (0.9.0) + tty-cursor (~> 0.7) + tty-screen (~> 0.8) + wisper (~> 2.0) + tty-screen (0.8.1) + tty-table (0.12.0) + pastel (~> 0.8) + strings (~> 0.2.0) + tty-screen (~> 0.8) + unicode-display_width (2.4.2) + unicode_utils (1.4.0) + uuidtools (2.2.0) + vault (0.17.0) + aws-sigv4 + webrick (1.8.1) + winrm (2.3.6) + builder (>= 2.1.2) + erubi (~> 1.8) + gssapi (~> 1.2) + gyoku (~> 1.0) + httpclient (~> 2.2, >= 2.2.0.2) + logging (>= 1.6.1, < 3.0) + nori (~> 2.0) + rubyntlm (~> 0.6.0, >= 0.6.3) + winrm-elevated (1.2.3) + erubi (~> 1.8) + winrm (~> 2.0) + winrm-fs (~> 1.0) + winrm-fs (1.3.5) + erubi (~> 1.8) + logging (>= 1.6.1, < 3.0) + rubyzip (~> 2.0) + winrm (~> 2.0) + wisper (2.0.1) + wmi-lite (1.0.7) + +PLATFORMS + ruby + +DEPENDENCIES + chef-cli! + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/tools/misc/chef-cli/default.nix b/pkgs/tools/misc/chef-cli/default.nix new file mode 100644 index 000000000000..bc43592d4f28 --- /dev/null +++ b/pkgs/tools/misc/chef-cli/default.nix @@ -0,0 +1,18 @@ +{ lib, ruby, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "chef-cli"; + gemdir = ./.; + inherit ruby; + + exes = ["chef-cli"]; + + passthru.updateScript = bundlerUpdateScript "chef-cli"; + + meta = with lib; { + description = "The Chef Infra Client is a powerful agent that applies your configurations on remote Linux, macOS, Windows and cloud-based systems"; + homepage = "https://chef.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ dylanmtaylor ]; + }; +} diff --git a/pkgs/tools/misc/chef-cli/gemset.nix b/pkgs/tools/misc/chef-cli/gemset.nix new file mode 100644 index 000000000000..7a99b1851245 --- /dev/null +++ b/pkgs/tools/misc/chef-cli/gemset.nix @@ -0,0 +1,1130 @@ +{ + addressable = { + dependencies = ["public_suffix"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15s8van7r2ad3dq6i03l3z4hqnvxcq75a3h72kxvf9an53sqma20"; + type = "gem"; + }; + version = "2.8.4"; + }; + aws-eventstream = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pyis1nvnbjxk12a43xvgj2gv0mvp4cnkc1gzw0v1018r61399gz"; + type = "gem"; + }; + version = "1.2.0"; + }; + aws-partitions = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12n41py8jfxf9p3gy62ikw8n7wd0cmczk3i2fzxb4ms2xvkxv7b0"; + type = "gem"; + }; + version = "1.749.0"; + }; + aws-sdk-core = { + dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0732vv8zi67z25fss1sdvqx0vv1ap3w6hz1avxzwznkjp002vj39"; + type = "gem"; + }; + version = "3.171.0"; + }; + aws-sdk-kms = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0v87zi28dfmrv7bv91yfldccnpd63n295siirbz7wqv1rajn8n02"; + type = "gem"; + }; + version = "1.63.0"; + }; + aws-sdk-s3 = { + dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1mapdzm97rv22pca1hvvshwsafa12gd2yv2fcy63dfjn5vjjq893"; + type = "gem"; + }; + version = "1.120.1"; + }; + aws-sdk-secretsmanager = { + dependencies = ["aws-sdk-core" "aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1907wr02afyq7vaig3hc858bipz9nmgf3aqb6kpbpxzf0qirf476"; + type = "gem"; + }; + version = "1.73.0"; + }; + aws-sigv4 = { + dependencies = ["aws-eventstream"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "11hkna2av47bl0yprgp8k4ya70rc3m2ib5w10fn0piplgkkmhz7m"; + type = "gem"; + }; + version = "1.5.2"; + }; + builder = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; + chef = { + dependencies = ["addressable" "aws-sdk-s3" "aws-sdk-secretsmanager" "chef-config" "chef-utils" "chef-vault" "chef-zero" "corefoundation" "diff-lcs" "erubis" "ffi" "ffi-libarchive" "ffi-yajl" "iniparse" "inspec-core" "license-acceptance" "mixlib-archive" "mixlib-authentication" "mixlib-cli" "mixlib-log" "mixlib-shellout" "net-sftp" "ohai" "plist" "proxifier" "syslog-logger" "train-core" "train-winrm" "uuidtools" "vault"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00vh6hrmglq4vfi5qvv42d9qhygnc5dfz32hrr07v7vbyhbqw8ck"; + type = "gem"; + }; + version = "17.10.0"; + }; + chef-cli = { + dependencies = ["addressable" "chef" "cookbook-omnifetch" "diff-lcs" "ffi-yajl" "license-acceptance" "minitar" "mixlib-cli" "mixlib-shellout" "pastel" "solve"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1r6ig76j2gf9cc6hq1g9bpcyrv2dqki0x51ajsy0spyiinkfnvpx"; + type = "gem"; + }; + version = "5.6.8"; + }; + chef-config = { + dependencies = ["addressable" "chef-utils" "fuzzyurl" "mixlib-config" "mixlib-shellout" "tomlrb"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0z72pwfb9n9zwjlk5g9mcy0jlmbq5f8mx60973k7fznif5k6zyrd"; + type = "gem"; + }; + version = "17.10.0"; + }; + chef-telemetry = { + dependencies = ["chef-config" "concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l9icc3nfdj28mip85vf31v5l60qsfqq3a5dscv7jryh1k94y05x"; + type = "gem"; + }; + version = "1.1.1"; + }; + chef-utils = { + dependencies = ["concurrent-ruby"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1aq212rz8lzv3rxdsgqgmn8ryy168cz3fxminwg5gm1qw1hnjp5m"; + type = "gem"; + }; + version = "17.10.0"; + }; + chef-vault = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hnvngygbdpvpflls3png2312y1svh6k9wj7g5i084q4p72qv22i"; + type = "gem"; + }; + version = "4.1.11"; + }; + chef-zero = { + dependencies = ["ffi-yajl" "hashie" "mixlib-log" "rack" "uuidtools" "webrick"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1l20bljvh0imfraxx3mbq08sf9rwxkbl7rl9rsjzfynz53ch2sv5"; + type = "gem"; + }; + version = "15.0.11"; + }; + coderay = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jvxqxzply1lwp7ysn94zjhh57vc14mcshw1ygw14ib8lhc00lyw"; + type = "gem"; + }; + version = "1.1.3"; + }; + concurrent-ruby = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; + type = "gem"; + }; + version = "1.2.2"; + }; + cookbook-omnifetch = { + dependencies = ["mixlib-archive"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gqh66p6fxg438qpvc67s0y7ji9mvan6layyd7w9ljwva1snvy2n"; + type = "gem"; + }; + version = "0.12.2"; + }; + corefoundation = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14rgy3d636l9zy7zmw04j7pjkf3bn41vx7kb265l4zhxrik7gh19"; + type = "gem"; + }; + version = "0.3.13"; + }; + diff-lcs = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18w22bjz424gzafv6nzv98h0aqkwz3d9xhm7cbr1wfbyas8zayza"; + type = "gem"; + }; + version = "1.3"; + }; + erubi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; + type = "gem"; + }; + version = "1.12.0"; + }; + erubis = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + type = "gem"; + }; + version = "2.7.0"; + }; + faraday = { + dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-net_http" "faraday-net_http_persistent" "multipart-post" "ruby2_keywords"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zmdsl6n05khwwq8gjssmfca0ifz6q82wwghf1qyzbxxjdna5mly"; + type = "gem"; + }; + version = "1.4.3"; + }; + faraday-em_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12cnqpbak4vhikrh2cdn94assh3yxza8rq2p9w2j34bqg5q4qgbs"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-em_synchrony = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vgrbhkp83sngv6k4mii9f2s9v5lmp693hylfxp2ssfc60fas3a6"; + type = "gem"; + }; + version = "1.0.0"; + }; + faraday-excon = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h09wkb0k0bhm6dqsd47ac601qiaah8qdzjh8gvxfd376x1chmdh"; + type = "gem"; + }; + version = "1.1.0"; + }; + faraday-net_http = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1fi8sda5hc54v1w3mqfl5yz09nhx35kglyx72w7b8xxvdr0cwi9j"; + type = "gem"; + }; + version = "1.0.1"; + }; + faraday-net_http_persistent = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0dc36ih95qw3rlccffcb0vgxjhmipsvxhn6cw71l7ffs0f7vq30b"; + type = "gem"; + }; + version = "1.2.0"; + }; + faraday_middleware = { + dependencies = ["faraday"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1bw8mfh4yin2xk7138rg3fhb2p5g2dlmdma88k82psah9mbmvlfy"; + type = "gem"; + }; + version = "1.2.0"; + }; + ffi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + type = "gem"; + }; + version = "1.15.5"; + }; + ffi-libarchive = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gyxnsy5fm2pnqph0dhaivmn1pws9xwnb3wjqpx097m06lh1igj1"; + type = "gem"; + }; + version = "1.1.3"; + }; + ffi-yajl = { + dependencies = ["libyajl2"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0y2yg9ls3v9rjdq6pmdn57w43xhrf8rrg44s9pfsc2i8jdmmhizz"; + type = "gem"; + }; + version = "2.4.0"; + }; + fuzzyurl = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03qchs33vfwbsv5awxg3acfmlcrf5xbhnbrc83fdpamwya0glbjl"; + type = "gem"; + }; + version = "0.9.0"; + }; + gssapi = { + dependencies = ["ffi"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qdfhj12aq8v0y961v4xv96a1y2z80h3xhvzrs9vsfgf884g6765"; + type = "gem"; + }; + version = "1.3.1"; + }; + gyoku = { + dependencies = ["builder" "rexml"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1kd2q59xpm39hpvmmvyi6g3f1fr05xjbnxwkrdqz4xy7hirqi79q"; + type = "gem"; + }; + version = "1.4.0"; + }; + hashie = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "02bsx12ihl78x0vdm37byp78jjw2ff6035y7rrmbd90qxjwxr43q"; + type = "gem"; + }; + version = "4.1.0"; + }; + httpclient = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19mxmvghp7ki3klsxwrlwr431li7hm1lczhhj8z4qihl2acy8l99"; + type = "gem"; + }; + version = "2.8.3"; + }; + iniparse = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wb1qy4i2xrrd92dc34pi7q7ibrjpapzk9y465v0n9caiplnb89n"; + type = "gem"; + }; + version = "1.5.0"; + }; + inspec-core = { + dependencies = ["addressable" "chef-telemetry" "faraday" "faraday_middleware" "hashie" "license-acceptance" "method_source" "mixlib-log" "multipart-post" "parallel" "parslet" "pry" "rspec" "rspec-its" "rubyzip" "semverse" "sslshake" "thor" "tomlrb" "train-core" "tty-prompt" "tty-table"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0mvngxv6v080z8is3clnkdrm499l2syqdd0nhc1gbnq4lwlh6ivy"; + type = "gem"; + }; + version = "4.56.20"; + }; + ipaddress = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x86s0s11w202j6ka40jbmywkrx8fhq8xiy8mwvnkhllj57hqr45"; + type = "gem"; + }; + version = "0.8.3"; + }; + jmespath = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cdw9vw2qly7q7r41s7phnac264rbsdqgj4l0h4nqgbjb157g393"; + type = "gem"; + }; + version = "1.6.2"; + }; + json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nalhin1gda4v8ybk6lq8f407cgfrj6qzn234yra4ipkmlbfmal6"; + type = "gem"; + }; + version = "2.6.3"; + }; + libyajl2 = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vx0mv0bbcy0qh3ik08b42vrq4kw1zg51121r18c0vvp4p3zcpda"; + type = "gem"; + }; + version = "2.1.0"; + }; + license-acceptance = { + dependencies = ["pastel" "tomlrb" "tty-box" "tty-prompt"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12h5a3j57h50xkfpdz9gr42k0v8g1qxn2pnj5hbbzbmdhydjbjzf"; + type = "gem"; + }; + version = "2.1.13"; + }; + little-plugger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1frilv82dyxnlg8k1jhrvyd73l6k17mxc5vwxx080r4x1p04gwym"; + type = "gem"; + }; + version = "1.1.4"; + }; + logging = { + dependencies = ["little-plugger" "multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02"; + type = "gem"; + }; + version = "2.3.1"; + }; + method_source = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1pnyh44qycnf9mzi1j6fywd5fkskv3x7nmsqrrws0rjn5dd4ayfp"; + type = "gem"; + }; + version = "1.0.0"; + }; + minitar = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "126mq86x67d1p63acrfka4zx0cx2r0vc93884jggxnrmmnzbxh13"; + type = "gem"; + }; + version = "0.9"; + }; + mixlib-archive = { + dependencies = ["mixlib-log"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "17vw0h8ag45608hvm02g43bkfvqy8l3lwk9lqj7b5kzdw6ynvn6a"; + type = "gem"; + }; + version = "1.1.7"; + }; + mixlib-authentication = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07m6q8icjjzrv7k2vsjqmviswqv6cigc577hf48liy7b1i4l9gn5"; + type = "gem"; + }; + version = "3.0.10"; + }; + mixlib-cli = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1ydxlfgd7nnj3rp1y70k4yk96xz5cywldjii2zbnw3sq9pippwp6"; + type = "gem"; + }; + version = "2.1.8"; + }; + mixlib-config = { + dependencies = ["tomlrb"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j0122lv2qgccl61njqi0pj6sp6nb85y07gcmw16bwg4k0c8nx6p"; + type = "gem"; + }; + version = "3.0.27"; + }; + mixlib-log = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n5dm5iz90ijvjn59jfm8gb8hgsvbj0f1kpzbl38b02z0z4a4v7x"; + type = "gem"; + }; + version = "3.0.9"; + }; + mixlib-shellout = { + dependencies = ["chef-utils"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zkwg76y96nkh1mv0k92ybq46cr06v1wmic16129ls3yqzwx3xj6"; + type = "gem"; + }; + version = "3.2.7"; + }; + molinillo = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0p846facmh1j5xmbrpgzadflspvk7bzs3sykrh5s7qi4cdqz5gzg"; + type = "gem"; + }; + version = "0.8.0"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + multipart-post = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lgyysrpl50wgcb9ahg29i4p01z0irb3p9lirygma0kkfr5dgk9x"; + type = "gem"; + }; + version = "2.3.0"; + }; + net-scp = { + dependencies = ["net-ssh"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; + type = "gem"; + }; + version = "4.0.0"; + }; + net-sftp = { + dependencies = ["net-ssh"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y"; + type = "gem"; + }; + version = "2.1.2"; + }; + net-ssh = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687"; + type = "gem"; + }; + version = "7.1.0"; + }; + nori = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn"; + type = "gem"; + }; + version = "2.6.0"; + }; + ohai = { + dependencies = ["chef-config" "chef-utils" "ffi" "ffi-yajl" "ipaddress" "mixlib-cli" "mixlib-config" "mixlib-log" "mixlib-shellout" "plist" "train-core" "wmi-lite"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ff5z3nzqk8ry32qiqfrr0zgm5vyaf21sj225faz8wqmxjvklsd2"; + type = "gem"; + }; + version = "17.9.1"; + }; + parallel = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0jcc512l38c0c163ni3jgskvq1vc3mr8ly5pvjijzwvfml9lf597"; + type = "gem"; + }; + version = "1.23.0"; + }; + parslet = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12nrzfwjphjlakb9pmpj70hgjwgzvnr8i1zfzddifgyd44vspl88"; + type = "gem"; + }; + version = "1.8.2"; + }; + pastel = { + dependencies = ["tty-color"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xash2gj08dfjvq4hy6l1z22s5v30fhizwgs10d6nviggpxsj7a8"; + type = "gem"; + }; + version = "0.8.0"; + }; + plist = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0wzhnbzraz60paxhm48c50fp9xi7cqka4gfhxmiq43mhgh5ajg3h"; + type = "gem"; + }; + version = "3.7.0"; + }; + proxifier = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1abzlg39cfji1nx3i8kmb5k3anr2rd392yg2icms24wkqz9g9zj0"; + type = "gem"; + }; + version = "1.0.3"; + }; + pry = { + dependencies = ["coderay" "method_source"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4"; + type = "gem"; + }; + version = "0.14.2"; + }; + public_suffix = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0hz0bx2qs2pwb0bwazzsah03ilpf3aai8b7lk7s35jsfzwbkjq35"; + type = "gem"; + }; + version = "5.0.1"; + }; + rack = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qgwkcb8kxns8d5187cxjaxf18b7dmg9gh6cr9c1125m0bj2pnfk"; + type = "gem"; + }; + version = "2.2.6.4"; + }; + rexml = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + type = "gem"; + }; + version = "3.2.5"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19dyb6rcvgi9j2mksd29wfdhfdyzqk7yjhy1ai77559hbhpg61w9"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "118hkfw9b11hvvalr7qlylwal5h8dihagm9xg7k4gskg7587hca6"; + type = "gem"; + }; + version = "3.11.0"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0l1bzk6a68i1b2qix83vs40r0pbjawv67hixiq2qxsja19bbq3bc"; + type = "gem"; + }; + version = "3.11.1"; + }; + rspec-its = { + dependencies = ["rspec-core" "rspec-expectations"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad"; + type = "gem"; + }; + version = "1.3.0"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vsqp9dij2rj9aapcn3sz7qzw0d8ln7x9p46h9rzd3jzb7his9kk"; + type = "gem"; + }; + version = "3.11.2"; + }; + rspec-support = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1c01iicvrjk6vv744jgh0y4kk9d0kg2rd2ihdyzvg5p06xm2fpzq"; + type = "gem"; + }; + version = "3.11.1"; + }; + ruby2_keywords = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + version = "0.0.5"; + }; + rubyntlm = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b8hczk8hysv53ncsqzx4q6kma5gy5lqc7s5yx8h64x3vdb18cjv"; + type = "gem"; + }; + version = "0.6.3"; + }; + rubyzip = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0grps9197qyxakbpw02pda59v45lfgbgiyw48i0mq9f2bn9y6mrz"; + type = "gem"; + }; + version = "2.3.2"; + }; + semverse = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vrh6p0756n3gjnk6am1cc4kmw6wzzd02hcajj27rlsqg3p6lwn9"; + type = "gem"; + }; + version = "3.0.2"; + }; + solve = { + dependencies = ["molinillo" "semverse"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "059lrsf40rl5kclp1w8pb0fzz5sv8aikg073cwcvn5mndk14ayky"; + type = "gem"; + }; + version = "4.0.4"; + }; + sslshake = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0r3ifksx8a05yqhv7nc4cwan8bwmxgq5kyv7q7hy2h9lv5zcjs8h"; + type = "gem"; + }; + version = "1.3.1"; + }; + strings = { + dependencies = ["strings-ansi" "unicode-display_width" "unicode_utils"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yynb0qhhhplmpzavfrrlwdnd1rh7rkwzcs4xf0mpy2wr6rr6clk"; + type = "gem"; + }; + version = "0.2.1"; + }; + strings-ansi = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "120wa6yjc63b84lprglc52f40hx3fx920n4dmv14rad41rv2s9lh"; + type = "gem"; + }; + version = "0.2.0"; + }; + syslog-logger = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "14y20phq1khdla4z9wvf98k7j3x6n0rjgs4f7vb0xlf7h53g6hbm"; + type = "gem"; + }; + version = "1.6.8"; + }; + thor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0inl77jh4ia03jw3iqm5ipr76ghal3hyjrd6r8zqsswwvi9j2xdi"; + type = "gem"; + }; + version = "1.2.1"; + }; + tomlrb = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "00x5y9h4fbvrv4xrjk4cqlkm4vq8gv73ax4alj3ac2x77zsnnrk8"; + type = "gem"; + }; + version = "1.3.0"; + }; + train-core = { + dependencies = ["addressable" "ffi" "json" "mixlib-shellout" "net-scp" "net-ssh"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1f0yxh5mpr7rdn3660jf5iwc3rhv4l82dd9mhcrm6v85901rvj9c"; + type = "gem"; + }; + version = "3.10.7"; + }; + train-winrm = { + dependencies = ["winrm" "winrm-elevated" "winrm-fs"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "07haiwh7jcg00mmiarj5g7k9kclq40yqd4j4r3c01qn2cq1sw2xb"; + type = "gem"; + }; + version = "0.2.13"; + }; + tty-box = { + dependencies = ["pastel" "strings" "tty-cursor"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12yzhl3s165fl8pkfln6mi6mfy3vg7p63r3dvcgqfhyzq6h57x0p"; + type = "gem"; + }; + version = "0.7.0"; + }; + tty-color = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0aik4kmhwwrmkysha7qibi2nyzb4c8kp42bd5vxnf8sf7b53g73g"; + type = "gem"; + }; + version = "0.6.0"; + }; + tty-cursor = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0j5zw041jgkmn605ya1zc151bxgxl6v192v2i26qhxx7ws2l2lvr"; + type = "gem"; + }; + version = "0.7.1"; + }; + tty-prompt = { + dependencies = ["pastel" "tty-reader"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1j4y8ik82azjxshgd4i1v4wwhsv3g9cngpygxqkkz69qaa8cxnzw"; + type = "gem"; + }; + version = "0.23.1"; + }; + tty-reader = { + dependencies = ["tty-cursor" "tty-screen" "wisper"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1cf2k7w7d84hshg4kzrjvk9pkyc2g1m3nx2n1rpmdcf0hp4p4af6"; + type = "gem"; + }; + version = "0.9.0"; + }; + tty-screen = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "18jr6s1cg8yb26wzkqa6874q0z93rq0y5aw092kdqazk71y6a235"; + type = "gem"; + }; + version = "0.8.1"; + }; + tty-table = { + dependencies = ["pastel" "strings" "tty-screen"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fcrbfb0hjd9vkkazkksri93dv9wgs2hp6p1xwb1lp43a13pmhpx"; + type = "gem"; + }; + version = "0.12.0"; + }; + unicode-display_width = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1gi82k102q7bkmfi7ggn9ciypn897ylln1jk9q67kjhr39fj043a"; + type = "gem"; + }; + version = "2.4.2"; + }; + unicode_utils = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0h1a5yvrxzlf0lxxa1ya31jcizslf774arnsd89vgdhk4g7x08mr"; + type = "gem"; + }; + version = "1.4.0"; + }; + uuidtools = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0s8h35ia80p919kidb66nfp8904rhdmn41z9ghsx4ihp2ild3bn4"; + type = "gem"; + }; + version = "2.2.0"; + }; + vault = { + dependencies = ["aws-sigv4"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1aanqvdppvqwd8z7iqpx01izm65kfx9f92j1y9g1ixirzc086jxg"; + type = "gem"; + }; + version = "0.17.0"; + }; + webrick = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13qm7s0gr2pmfcl7dxrmq38asaza4w0i2n9my4yzs499j731wh8r"; + type = "gem"; + }; + version = "1.8.1"; + }; + winrm = { + dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nxf6a47d1xf1nvi7rbfbzjyyjhz0iakrnrsr2hj6y24a381sd8i"; + type = "gem"; + }; + version = "2.3.6"; + }; + winrm-elevated = { + dependencies = ["erubi" "winrm" "winrm-fs"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1lmlaii8qapn84wxdg5d82gbailracgk67d0qsnbdnffcg8kswzd"; + type = "gem"; + }; + version = "1.2.3"; + }; + winrm-fs = { + dependencies = ["erubi" "logging" "rubyzip" "winrm"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d"; + type = "gem"; + }; + version = "1.3.5"; + }; + wisper = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1rpsi0ziy78cj82sbyyywby4d0aw0a5q84v65qd28vqn79fbq5yf"; + type = "gem"; + }; + version = "2.0.1"; + }; + wmi-lite = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1nnx4xz8g40dpi3ccqk5blj1ck06ydx09f9diksn1ghd8yxzavhi"; + type = "gem"; + }; + version = "1.0.7"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73594265adf1..0b55eebf29bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -411,6 +411,8 @@ with pkgs; chatgpt-retrieval-plugin = callPackage ../servers/chatgpt-retrieval-plugin { }; + chef-cli = callPackage ../tools/misc/chef-cli { }; + checkov = callPackage ../development/tools/analysis/checkov { python3 = python311; }; From 3dbeca1c7d74542cbacf990746913c95c3173dea Mon Sep 17 00:00:00 2001 From: Dylan Taylor Date: Tue, 18 Apr 2023 13:33:16 -0400 Subject: [PATCH 016/244] serverspec: init at 2.42.2 --- pkgs/tools/misc/serverspec/Gemfile | 3 + pkgs/tools/misc/serverspec/Gemfile.lock | 45 +++++++ pkgs/tools/misc/serverspec/default.nix | 19 +++ pkgs/tools/misc/serverspec/gemset.nix | 150 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 219 insertions(+) create mode 100644 pkgs/tools/misc/serverspec/Gemfile create mode 100644 pkgs/tools/misc/serverspec/Gemfile.lock create mode 100644 pkgs/tools/misc/serverspec/default.nix create mode 100644 pkgs/tools/misc/serverspec/gemset.nix diff --git a/pkgs/tools/misc/serverspec/Gemfile b/pkgs/tools/misc/serverspec/Gemfile new file mode 100644 index 000000000000..7fa6999daf8a --- /dev/null +++ b/pkgs/tools/misc/serverspec/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' do + gem 'serverspec' +end diff --git a/pkgs/tools/misc/serverspec/Gemfile.lock b/pkgs/tools/misc/serverspec/Gemfile.lock new file mode 100644 index 000000000000..dc1fd7d44e30 --- /dev/null +++ b/pkgs/tools/misc/serverspec/Gemfile.lock @@ -0,0 +1,45 @@ +GEM + remote: https://rubygems.org/ + specs: + diff-lcs (1.5.0) + multi_json (1.15.0) + net-scp (4.0.0) + net-ssh (>= 2.6.5, < 8.0.0) + net-ssh (7.1.0) + net-telnet (0.1.1) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.1) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.2) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-its (1.3.0) + rspec-core (>= 3.0.0) + rspec-expectations (>= 3.0.0) + rspec-mocks (3.12.5) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-support (3.12.0) + serverspec (2.42.2) + multi_json + rspec (~> 3.0) + rspec-its + specinfra (~> 2.72) + sfl (2.3) + specinfra (2.85.0) + net-scp + net-ssh (>= 2.7) + net-telnet (= 0.1.1) + sfl + +PLATFORMS + ruby + +DEPENDENCIES + serverspec! + +BUNDLED WITH + 2.1.4 diff --git a/pkgs/tools/misc/serverspec/default.nix b/pkgs/tools/misc/serverspec/default.nix new file mode 100644 index 000000000000..162b9d90cc03 --- /dev/null +++ b/pkgs/tools/misc/serverspec/default.nix @@ -0,0 +1,19 @@ +{ lib, ruby, bundlerApp, bundlerUpdateScript }: + +bundlerApp { + pname = "serverspec"; + gemdir = ./.; + + inherit ruby; + + exes = ["serverspec-init"]; + + passthru.updateScript = bundlerUpdateScript "serverspec"; + + meta = with lib; { + description = "RSpec tests for your servers configured by CFEngine, Puppet, Ansible, Itamae or anything else"; + homepage = "https://serverspec.org/"; + license = licenses.mit; + maintainers = with maintainers; [ dylanmtaylor ]; + }; +} diff --git a/pkgs/tools/misc/serverspec/gemset.nix b/pkgs/tools/misc/serverspec/gemset.nix new file mode 100644 index 000000000000..353b122ec810 --- /dev/null +++ b/pkgs/tools/misc/serverspec/gemset.nix @@ -0,0 +1,150 @@ +{ + diff-lcs = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; + type = "gem"; + }; + version = "1.5.0"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; + }; + net-scp = { + dependencies = ["net-ssh"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; + type = "gem"; + }; + version = "4.0.0"; + }; + net-ssh = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687"; + type = "gem"; + }; + version = "7.1.0"; + }; + net-telnet = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "13qxznpwmc3hs51b76wqx2w29r158gzzh8719kv2gpi56844c8fx"; + type = "gem"; + }; + version = "0.1.1"; + }; + rspec = { + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; + type = "gem"; + }; + version = "3.12.0"; + }; + rspec-core = { + dependencies = ["rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f"; + type = "gem"; + }; + version = "3.12.1"; + }; + rspec-expectations = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; + type = "gem"; + }; + version = "3.12.2"; + }; + rspec-its = { + dependencies = ["rspec-core" "rspec-expectations"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad"; + type = "gem"; + }; + version = "1.3.0"; + }; + rspec-mocks = { + dependencies = ["diff-lcs" "rspec-support"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2"; + type = "gem"; + }; + version = "3.12.5"; + }; + rspec-support = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; + type = "gem"; + }; + version = "3.12.0"; + }; + serverspec = { + dependencies = ["multi_json" "rspec" "rspec-its" "specinfra"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0kqx84yspy75z517wf32mz2hr4bqmq33y46zik57rn7bq2pj39xx"; + type = "gem"; + }; + version = "2.42.2"; + }; + sfl = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1qm4hvhq9pszi9zs1cl9qgwx1n4wxq0af0hq9sbf6qihqd8rwwwr"; + type = "gem"; + }; + version = "2.3"; + }; + specinfra = { + dependencies = ["net-scp" "net-ssh" "net-telnet" "sfl"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "19kkryvxnci7qd7rq5m3nl3xazy452bcg35a709kfggpfm4c6r38"; + type = "gem"; + }; + version = "2.85.0"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73594265adf1..c06f89e0db6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1109,6 +1109,8 @@ with pkgs; closureInfo = callPackage ../build-support/closure-info.nix { }; + serverspec = callPackage ../tools/misc/serverspec { }; + setupSystemdUnits = callPackage ../build-support/setup-systemd-units.nix { }; shortenPerlShebang = makeSetupHook { From 59dc473937c2a0f478ed9384021d12fc3bf753cf Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Tue, 11 Apr 2023 22:10:07 -0400 Subject: [PATCH 017/244] ruffle: nightly-2022-12-16 -> nightly-2023-04-10 --- pkgs/applications/emulators/ruffle/Cargo.lock | 2574 +++++++++-------- .../applications/emulators/ruffle/default.nix | 19 +- .../emulators/ruffle/unify-dasp-version.patch | 172 ++ 3 files changed, 1479 insertions(+), 1286 deletions(-) create mode 100644 pkgs/applications/emulators/ruffle/unify-dasp-version.patch diff --git a/pkgs/applications/emulators/ruffle/Cargo.lock b/pkgs/applications/emulators/ruffle/Cargo.lock index 6f2cb4b45bff..047210eac2fd 100644 --- a/pkgs/applications/emulators/ruffle/Cargo.lock +++ b/pkgs/applications/emulators/ruffle/Cargo.lock @@ -8,6 +8,31 @@ version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3" +[[package]] +name = "ab_glyph" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe21446ad43aa56417a767f3e2f3d7c4ca522904de1dd640529a76e9c5c3b33c" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + [[package]] name = "adler" version = "1.0.2" @@ -31,6 +56,17 @@ dependencies = [ "version_check", ] +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "0.7.20" @@ -48,14 +84,14 @@ checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" [[package]] name = "alsa" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5915f52fe2cf65e83924d037b6c5290b7cee097c6b5c8700746e6168a343fd6b" +checksum = "8512c9117059663fb5606788fbca3619e2a91dac0e3fe516242eab1fa6be5e44" dependencies = [ "alsa-sys", - "bitflags", + "bitflags 1.3.2", "libc", - "nix 0.23.2", + "nix 0.24.3", ] [[package]] @@ -68,6 +104,30 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "android-activity" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c77a0045eda8b888c76ea473c2b0515ba6f471d318f8927c5c72240937035a6" +dependencies = [ + "android-properties", + "bitflags 1.3.2", + "cc", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -78,10 +138,50 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.66" +name = "anstream" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6" +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-wincon", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle", + "windows-sys 0.45.0", +] + +[[package]] +name = "anyhow" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" [[package]] name = "approx" @@ -114,15 +214,9 @@ dependencies = [ [[package]] name = "arrayref" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -135,9 +229,9 @@ dependencies = [ [[package]] name = "ash" -version = "0.37.1+1.3.235" +version = "0.37.2+1.3.238" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911015c962d56e2e4052f40182ca5462ba60a3d2ff04e827c365a0ab3d65726d" +checksum = "28bf19c1f0a470be5fbf7522a308a05df06610252c5bcf5143e1b23f629a9a03" dependencies = [ "libloading", ] @@ -154,10 +248,39 @@ dependencies = [ ] [[package]] -name = "atk-sys" -version = "0.15.1" +name = "async-io" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58aeb089fb698e06db8089971c7ee317ab9644bade33383f63631437b03aafb6" +checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af" +dependencies = [ + "async-lock", + "autocfg", + "cfg-if 1.0.0", + "concurrent-queue", + "futures-lite", + "log", + "parking", + "polling", + "rustix", + "slab", + "socket2", + "waker-fn", +] + +[[package]] +name = "async-lock" +version = "2.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7" +dependencies = [ + "event-listener", +] + +[[package]] +name = "atk-sys" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ad703eb64dc058024f0e57ccfa069e15a413b98dbd50a1a950e743b7f11148" dependencies = [ "glib-sys", "gobject-sys", @@ -183,10 +306,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] -name = "base-x" -version = "0.2.11" +name = "backtrace" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if 1.0.0", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] [[package]] name = "base64" @@ -196,17 +328,17 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" [[package]] name = "bindgen" -version = "0.61.0" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a022e58a142a46fea340d68012b9201c094e93ec3d033a944a24f8fd4a4f09a" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -217,7 +349,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn", + "syn 1.0.109", ] [[package]] @@ -235,12 +367,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" -[[package]] -name = "bit_field" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" - [[package]] name = "bitflags" version = "1.3.2" @@ -248,14 +374,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bitflags_serde_shim" -version = "0.2.2" +name = "bitflags" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25c3d626f0280ec39b33a6fc5c6c1067432b4c41e94aee40ded197a6649bf025" -dependencies = [ - "bitflags", - "serde", -] +checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" [[package]] name = "bitstream-io" @@ -263,18 +385,6 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d28070975aaf4ef1fd0bd1f29b739c06c2cdd9972e090617fb6dca3b2cb564e" -[[package]] -name = "bitvec" -version = "0.19.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f93d0ef3363c364d5976646a38f04cf67cfe1d4c8d160cdea02cab2c116b33" -dependencies = [ - "funty", - "radium", - "tap", - "wyz", -] - [[package]] name = "block" version = "0.1.6" @@ -283,30 +393,31 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" [[package]] name = "block-buffer" -version = "0.10.3" +version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" dependencies = [ "generic-array", ] [[package]] -name = "bstr" -version = "0.2.17" +name = "block-sys" +version = "0.1.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" dependencies = [ - "lazy_static", - "memchr", - "regex-automata", - "serde", + "objc-sys", ] [[package]] -name = "build_const" -version = "0.2.2" +name = "block2" +version = "0.2.0-alpha.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ae4235e6dac0694637c763029ecea1a2ec9e4e06ec2729bd21ba4d9c863eb7" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +dependencies = [ + "block-sys", + "objc2-encode", +] [[package]] name = "build_playerglobal" @@ -317,35 +428,37 @@ dependencies = [ "convert_case", "proc-macro2", "quote", + "regex", "serde", "serde-xml-rs", "swf", + "walkdir", ] [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bytemuck" -version = "1.12.3" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaa3a8d9a1ca92e282c96a32d6511b695d7d994d1d102ba85d279f9b2756947f" +checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.3.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fe233b960f12f8007e3db2d136e3cb1c291bfd7396e384ee76025fc1a3932b4" +checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] @@ -356,15 +469,15 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cairo-sys-rs" -version = "0.15.1" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8" +checksum = "7c48f4af05fabdcfa9658178e1326efa061853f040ce7d72e33af6885196f421" dependencies = [ "libc", "system-deps", @@ -372,9 +485,9 @@ dependencies = [ [[package]] name = "calloop" -version = "0.10.4" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19457a0da465234abd76134a5c2a910c14bd3c5558463e4396ab9a37a328e465" +checksum = "1a59225be45a478d772ce015d9743e49e92798ece9e34eda9a6aa2a6a7f40192" dependencies = [ "log", "nix 0.25.1", @@ -391,9 +504,9 @@ checksum = "a2698f953def977c68f935bb0dfa959375ad4638570e969e2f1e9f433cbf1af6" [[package]] name = "cc" -version = "1.0.77" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] @@ -410,14 +523,14 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ - "nom 7.1.1", + "nom", ] [[package]] name = "cfg-expr" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0357a6402b295ca3a86bc148e84df46c02e41f41fef186bda662557ef6328aa" +checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6" dependencies = [ "smallvec", ] @@ -442,9 +555,9 @@ checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "js-sys", @@ -456,9 +569,9 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.4.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa2e27ae6ab525c3d369ded447057bca5438d86dc3a68f6faafb8269ba82ebf3" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", @@ -467,92 +580,57 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.29" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" +checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" dependencies = [ - "bitflags", + "clap_builder", "clap_derive", - "clap_lex", - "is-terminal", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +dependencies = [ + "anstream", + "anstyle", + "bitflags 1.3.2", + "clap_lex", "strsim", - "termcolor", ] [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "clipboard-win" -version = "4.4.2" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ab1b92798304eedc095b53942963240037c0516452cb11aeba709d420b2219" +checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" dependencies = [ "error-code", "str-buf", "winapi", ] -[[package]] -name = "cmake" -version = "0.1.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db34956e100b30725f2eb215f90d4871051239535632f84fea3bc92722c66b7c" -dependencies = [ - "cc", -] - -[[package]] -name = "cocoa" -version = "0.24.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f425db7937052c684daec3bd6375c8abe2d146dca4b8b143d6db777c39138f3a" -dependencies = [ - "bitflags", - "block", - "cocoa-foundation", - "core-foundation", - "core-graphics", - "foreign-types 0.3.2", - "libc", - "objc", -] - -[[package]] -name = "cocoa-foundation" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ade49b65d560ca58c403a479bb396592b155c0185eada742ee323d1d68d6318" -dependencies = [ - "bitflags", - "block", - "core-foundation", - "core-graphics-types", - "foreign-types 0.3.2", - "libc", - "objc", -] - [[package]] name = "codespan-reporting" version = "0.11.1" @@ -580,6 +658,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + [[package]] name = "combine" version = "4.6.6" @@ -591,26 +675,40 @@ dependencies = [ ] [[package]] -name = "concurrent-queue" -version = "2.0.0" +name = "concolor-override" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7bef69dc86e3c610e4e7aed41035e2a7ed12e72dd7530f61327a6579a4390b" +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" + +[[package]] +name = "concolor-query" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +dependencies = [ + "windows-sys 0.45.0", +] + +[[package]] +name = "concurrent-queue" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c278839b831783b70278b14df4d45e1beb1aad306c07bb796637de9a0e323e8e" dependencies = [ "crossbeam-utils", ] [[package]] name = "console" -version = "0.15.2" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c050367d967ced717c04b65d8c619d863ef9292ce0c5760028655a2fb298718c" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", "lazy_static", "libc", - "terminal_size", "unicode-width", - "winapi", + "windows-sys 0.42.0", ] [[package]] @@ -623,16 +721,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "console_log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501a375961cef1a0d44767200e66e4a559283097e91d0730b1d75dfb2f8a1494" -dependencies = [ - "log", - "web-sys", -] - [[package]] name = "convert_case" version = "0.6.0" @@ -654,15 +742,21 @@ version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ - "core-foundation-sys", + "core-foundation-sys 0.8.4", "libc", ] [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b" + +[[package]] +name = "core-foundation-sys" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "core-graphics" @@ -670,10 +764,10 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "libc", ] @@ -683,85 +777,81 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a68b68b3446082644c91ac778bf50cd4104bfb002b5a6a7c44cca5a2c70788b" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", - "foreign-types 0.3.2", - "libc", -] - -[[package]] -name = "core-text" -version = "19.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99d74ada66e07c1cefa18f8abfba765b486f250de2e4a999e5727fc0dd4b4a25" -dependencies = [ - "core-foundation", - "core-graphics", - "foreign-types 0.3.2", + "foreign-types", "libc", ] [[package]] name = "coreaudio-rs" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11894b20ebfe1ff903cbdc52259693389eea03b94918a2def2c30c3bf227ad88" +checksum = "cb17e2d1795b1996419648915df94bc7103c28f7b48062d7acf4652fc371b2ff" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "core-foundation-sys 0.6.2", "coreaudio-sys", ] [[package]] name = "coreaudio-sys" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9444b94b8024feecc29e01a9706c69c1e26bfee480221c90764200cfd778fb" +checksum = "f034b2258e6c4ade2f73bf87b21047567fb913ee9550837c2316d139b0262b24" dependencies = [ "bindgen", ] [[package]] name = "cpal" -version = "0.14.2" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f342c1b63e185e9953584ff2199726bf53850d96610a310e3aca09e9405a2d0b" +checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" dependencies = [ "alsa", - "core-foundation-sys", + "core-foundation-sys 0.8.4", "coreaudio-rs", + "dasp_sample", "jni 0.19.0", "js-sys", "libc", - "mach", - "ndk 0.7.0", + "mach2", + "ndk", "ndk-context", "oboe", "once_cell", "parking_lot", - "stdweb", - "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", "web-sys", - "windows", + "windows 0.46.0", ] [[package]] name = "cpufeatures" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320" +checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" dependencies = [ "libc", ] [[package]] name = "crc" -version = "1.8.1" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d663548de7f5cca343f1e0a48d14dcfb0e9eb4e079ec58883b7251539fa10aeb" +checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" dependencies = [ - "build_const", + "crc-catalog", ] +[[package]] +name = "crc-catalog" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" + [[package]] name = "crc32fast" version = "1.3.2" @@ -773,9 +863,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -783,9 +873,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", "crossbeam-epoch", @@ -794,55 +884,26 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if 1.0.0", "crossbeam-utils", - "memoffset 0.7.1", + "memoffset 0.8.0", "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "crossfont" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21fd3add36ea31aba1520aa5288714dd63be506106753226d0eb387a93bc9c45" -dependencies = [ - "cocoa", - "core-foundation", - "core-foundation-sys", - "core-graphics", - "core-text", - "dwrote", - "foreign-types 0.5.0", - "freetype-rs", - "libc", - "log", - "objc", - "once_cell", - "pkg-config", - "servo-fontconfig", - "winapi", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - [[package]] name = "crypto-common" version = "0.1.6" @@ -855,13 +916,12 @@ dependencies = [ [[package]] name = "csv" -version = "1.1.6" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22813a6dc45b335f9bade10bf7271dc477e81113e89eb251a0bc2a8a81c536e1" +checksum = "0b015497079b9a9d69c02ad25de6c0a6edef051ea6360a327d0bd05802ef64ad" dependencies = [ - "bstr", "csv-core", - "itoa 0.4.8", + "itoa", "ryu", "serde", ] @@ -882,15 +942,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" dependencies = [ "quote", - "syn", + "syn 1.0.109", ] -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - [[package]] name = "curl" version = "0.4.44" @@ -908,9 +962,9 @@ dependencies = [ [[package]] name = "curl-sys" -version = "0.4.59+curl-7.86.0" +version = "0.4.61+curl-8.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cfce34829f448b08f55b7db6d0009e23e2e86a34e8c2b366269bf5799b4a407" +checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79" dependencies = [ "cc", "libc", @@ -924,9 +978,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.83" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdf07d07d6531bfcdbe9b8b739b104610c6508dcc4d63b410585faf338241daf" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" dependencies = [ "cc", "cxxbridge-flags", @@ -936,9 +990,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.83" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2eb5b96ecdc99f72657332953d4d9c50135af1bac34277801cc3937906ebd39" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" dependencies = [ "cc", "codespan-reporting", @@ -946,110 +1000,75 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 2.0.13", ] [[package]] name = "cxxbridge-flags" -version = "1.0.83" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac040a39517fd1674e0f32177648334b0f4074625b5588a64519804ba0553b12" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" [[package]] name = "cxxbridge-macro" -version = "1.0.83" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1362b0ddcfc4eb0a1f57b68bd77dd99f0e826958a96abd0ae9bd092e114ffed6" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] name = "d3d12" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "827914e1f53b1e0e025ecd3d967a7836b7bcb54520f90e21ef8df7b4d88a2759" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libloading", "winapi", ] [[package]] name = "darling" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" +checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" dependencies = [ - "darling_core 0.13.4", - "darling_macro 0.13.4", -] - -[[package]] -name = "darling" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0dd3cd20dc6b5a876612a6e5accfe7f3dd883db6d07acfbf14c128f61550dfa" -dependencies = [ - "darling_core 0.14.2", - "darling_macro 0.14.2", + "darling_core", + "darling_macro", ] [[package]] name = "darling_core" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" +checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_core" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a784d2ccaf7c98501746bf0be29b2022ba41fd62a2e622af997a03e9f972859f" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "darling_macro" -version = "0.13.4" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" +checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" dependencies = [ - "darling_core 0.13.4", + "darling_core", "quote", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7618812407e9402654622dd402b0a89dff9ba93badd6540781526117b92aab7e" -dependencies = [ - "darling_core 0.14.2", - "quote", - "syn", + "syn 1.0.109", ] [[package]] name = "dasp" version = "0.11.0" -source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" +source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" dependencies = [ "dasp_envelope", "dasp_frame", @@ -1066,7 +1085,7 @@ dependencies = [ [[package]] name = "dasp_envelope" version = "0.11.0" -source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" +source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" dependencies = [ "dasp_frame", "dasp_peak", @@ -1078,7 +1097,7 @@ dependencies = [ [[package]] name = "dasp_frame" version = "0.11.0" -source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" +source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" dependencies = [ "dasp_sample", ] @@ -1086,7 +1105,7 @@ dependencies = [ [[package]] name = "dasp_interpolate" version = "0.11.0" -source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" +source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" dependencies = [ "dasp_frame", "dasp_ring_buffer", @@ -1096,7 +1115,7 @@ dependencies = [ [[package]] name = "dasp_peak" version = "0.11.0" -source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" +source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" dependencies = [ "dasp_frame", "dasp_sample", @@ -1105,12 +1124,12 @@ dependencies = [ [[package]] name = "dasp_ring_buffer" version = "0.11.0" -source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" +source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" [[package]] name = "dasp_rms" version = "0.11.0" -source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" +source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" dependencies = [ "dasp_frame", "dasp_ring_buffer", @@ -1120,12 +1139,12 @@ dependencies = [ [[package]] name = "dasp_sample" version = "0.11.0" -source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" +source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" [[package]] name = "dasp_signal" version = "0.11.0" -source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" +source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" dependencies = [ "dasp_envelope", "dasp_frame", @@ -1140,7 +1159,7 @@ dependencies = [ [[package]] name = "dasp_slice" version = "0.11.0" -source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" +source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" dependencies = [ "dasp_frame", "dasp_sample", @@ -1149,11 +1168,17 @@ dependencies = [ [[package]] name = "dasp_window" version = "0.11.0" -source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" +source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" dependencies = [ "dasp_sample", ] +[[package]] +name = "data-encoding" +version = "2.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23d8666cb01533c39dde32bcbab8e227b4ed6679b2c925eba05feabea39508fb" + [[package]] name = "derive-try-from-primitive" version = "1.0.0" @@ -1162,7 +1187,7 @@ checksum = "302ccf094df1151173bb6f5a2282fcd2f45accd5eae1bdf82dcbfefbc501ad5c" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1187,7 +1212,16 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ - "dirs-sys", + "dirs-sys 0.3.7", +] + +[[package]] +name = "dirs" +version = "5.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dece029acd3353e3a58ac2e3eb3c8d6c35827a892edc6cc4138ef9c33df46ecd" +dependencies = [ + "dirs-sys 0.4.0", ] [[package]] @@ -1202,10 +1236,15 @@ dependencies = [ ] [[package]] -name = "discard" -version = "1.0.4" +name = "dirs-sys" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" +checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" +dependencies = [ + "libc", + "redox_users", + "windows-sys 0.45.0", +] [[package]] name = "dispatch" @@ -1228,35 +1267,21 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" -[[package]] -name = "dwrote" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439a1c2ba5611ad3ed731280541d36d2e9c4ac5e7fb818a27b604bdc5a6aa65b" -dependencies = [ - "lazy_static", - "libc", - "serde", - "serde_derive", - "winapi", - "wio", -] - [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "embed-resource" -version = "1.8.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e62abb876c07e4754fae5c14cafa77937841f01740637e17d78dc04352f32a5e" +checksum = "80663502655af01a2902dff3f06869330782267924bf1788410b74edcd93770a" dependencies = [ "cc", - "rustc_version 0.4.0", - "toml", + "rustc_version", + "toml 0.7.3", "vswhom", "winreg", ] @@ -1269,31 +1294,31 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "enum-map" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5a56d54c8dd9b3ad34752ed197a4eb2a6601bc010808eb097a04a58ae4c43e1" +checksum = "988f0d17a0fa38291e5f41f71ea8d46a5d5497b9054d5a759fae2cbb819f2356" dependencies = [ "enum-map-derive", ] [[package]] name = "enum-map-derive" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9045e2676cd5af83c3b167d917b0a5c90a4d8e266e2683d6631b235c457fc27" +checksum = "2a4da76b3b6116d758c7ba93f7ec6a35d2e2cf24feda76c6e38a375f4d5c59f2" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1312,10 +1337,10 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03e7b551eba279bf0fa88b83a46330168c1560a52a94f5126f892f0b364ab3e0" dependencies = [ - "darling 0.14.2", + "darling", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1333,13 +1358,13 @@ dependencies = [ [[package]] name = "errno" -version = "0.2.8" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" dependencies = [ "errno-dragonfly", "libc", - "winapi", + "windows-sys 0.45.0", ] [[package]] @@ -1364,9 +1389,9 @@ dependencies = [ [[package]] name = "euclid" -version = "0.22.7" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b52c2ef4a78da0ba68fbe1fd920627411096d2ac478f7f4c9f3a54ba6705bade" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" dependencies = [ "num-traits", ] @@ -1377,16 +1402,6 @@ version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" -[[package]] -name = "expat-sys" -version = "2.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658f19728920138342f68408b7cf7644d90d4784353d8ebc32e7e8663dbe45fa" -dependencies = [ - "cmake", - "pkg-config", -] - [[package]] name = "exporter" version = "0.1.0" @@ -1403,26 +1418,11 @@ dependencies = [ "walkdir", ] -[[package]] -name = "exr" -version = "1.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eb5f255b5980bb0c8cf676b675d1a99be40f316881444f44e0462eaf5df5ded" -dependencies = [ - "bit_field", - "flume", - "half", - "lebe", - "miniz_oxide", - "smallvec", - "threadpool", -] - [[package]] name = "fastrand" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a407cfaa3385c4ae6b23e84623d48c2798d06e3e6a1878f7f59f17b3f86499" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" dependencies = [ "instant", ] @@ -1430,12 +1430,12 @@ dependencies = [ [[package]] name = "flash-lso" version = "0.5.0" -source = "git+https://github.com/ruffle-rs/rust-flash-lso?rev=19fecd07b9888c4bdaa66771c468095783b52bed#19fecd07b9888c4bdaa66771c468095783b52bed" +source = "git+https://github.com/ruffle-rs/rust-flash-lso?rev=8376453eddddbe701031a091c0eed94068fa5649#8376453eddddbe701031a091c0eed94068fa5649" dependencies = [ "cookie-factory", "derive-try-from-primitive", "enumset", - "nom 6.1.2", + "nom", "thiserror", ] @@ -1458,19 +1458,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "flume" -version = "0.10.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577" -dependencies = [ - "futures-core", - "futures-sink", - "nanorand", - "pin-project", - "spin", -] - [[package]] name = "fnv" version = "1.0.7" @@ -1483,28 +1470,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" dependencies = [ - "foreign-types-shared 0.1.1", -] - -[[package]] -name = "foreign-types" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965" -dependencies = [ - "foreign-types-macros", - "foreign-types-shared 0.3.1", -] - -[[package]] -name = "foreign-types-macros" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8469d0d40519bc608ec6863f1cc88f3f1deee15913f2f3b3e573d81ed38cccc" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "foreign-types-shared", ] [[package]] @@ -1513,12 +1479,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" -[[package]] -name = "foreign-types-shared" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" - [[package]] name = "form_urlencoded" version = "1.1.0" @@ -1528,39 +1488,11 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "freetype-rs" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74eadec9d0a5c28c54bb9882e54787275152a4e36ce206b45d7451384e5bf5fb" -dependencies = [ - "bitflags", - "freetype-sys", - "libc", -] - -[[package]] -name = "freetype-sys" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a" -dependencies = [ - "cmake", - "libc", - "pkg-config", -] - -[[package]] -name = "funty" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" - [[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -1573,9 +1505,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -1583,15 +1515,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -1600,9 +1532,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-lite" @@ -1621,32 +1553,32 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -1672,7 +1604,7 @@ dependencies = [ [[package]] name = "gc-arena" version = "0.2.2" -source = "git+https://github.com/ruffle-rs/gc-arena#24d8aea5f0fd968756d6e3c1dac4c6c2ccb7280a" +source = "git+https://github.com/kyren/gc-arena?rev=1a6310c0d5c98836fa9efb1c4773038ecfd5a92e#1a6310c0d5c98836fa9efb1c4773038ecfd5a92e" dependencies = [ "gc-arena-derive", ] @@ -1680,19 +1612,19 @@ dependencies = [ [[package]] name = "gc-arena-derive" version = "0.2.2" -source = "git+https://github.com/ruffle-rs/gc-arena#24d8aea5f0fd968756d6e3c1dac4c6c2ccb7280a" +source = "git+https://github.com/kyren/gc-arena?rev=1a6310c0d5c98836fa9efb1c4773038ecfd5a92e#1a6310c0d5c98836fa9efb1c4773038ecfd5a92e" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "synstructure", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.15.10" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "140b2f5378256527150350a8346dbdb08fadc13453a7a2d73aecd5fab3c402a7" +checksum = "3092cf797a5f1210479ea38070d9ae8a5b8e9f8f1be9f32f4643c529c7d70016" dependencies = [ "gio-sys", "glib-sys", @@ -1703,9 +1635,9 @@ dependencies = [ [[package]] name = "gdk-sys" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e7a08c1e8f06f4177fb7e51a777b8c1689f743a7bc11ea91d44d2226073a88" +checksum = "d76354f97a913e55b984759a997b693aa7dc71068c9e98bcce51aa167a0a5c5a" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1728,10 +1660,23 @@ dependencies = [ ] [[package]] -name = "generic-array" -version = "0.14.6" +name = "generator" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" +checksum = "33a20a288a94683f5f4da0adecdbe095c94a77c295e514cc6484e9394dd8376e" +dependencies = [ + "cc", + "libc", + "log", + "rustversion", + "windows 0.44.0", +] + +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", @@ -1760,16 +1705,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "gif" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.12.0" @@ -1781,10 +1716,16 @@ dependencies = [ ] [[package]] -name = "gio-sys" -version = "0.15.10" +name = "gimli" +version = "0.27.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32157a475271e2c4a023382e9cab31c4584ee30a97da41d3c4e9fdd605abcf8d" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + +[[package]] +name = "gio-sys" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9b693b8e39d042a95547fc258a7b07349b1f0b48f4b2fa3108ba3c51c0b5229" dependencies = [ "glib-sys", "gobject-sys", @@ -1795,9 +1736,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.15.10" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef4b192f8e65e9cf76cbf4ea71fa8e3be4a0e18ffe3d68b8da6836974cc5bad4" +checksum = "c61a4f46316d06bfa33a7ac22df6f0524c8be58e3db2d9ca99ccb1f357b62a65" dependencies = [ "libc", "system-deps", @@ -1805,15 +1746,15 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "glow" -version = "0.11.2" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8bd5877156a19b8ac83a29b2306fe20537429d318f3ff0a1a2119f8d9c61919" +checksum = "4e007a07a24de5ecae94160f141029e9a347282cfe25d1d58d85d845cf3130f1" dependencies = [ "js-sys", "slotmap", @@ -1823,9 +1764,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.15.10" +version = "0.16.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d57ce44246becd17153bd035ab4d32cfee096a657fc01f2231c9278378d1e0a" +checksum = "3520bb9c07ae2a12c7f2fbb24d4efc11231c8146a86956413fb1a79bb760a0f1" dependencies = [ "glib-sys", "libc", @@ -1838,7 +1779,7 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc59e5f710e310e76e6707f86c561dd646f69a8876da9131703b2f717de818d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gpu-alloc-types", ] @@ -1848,7 +1789,20 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi", + "windows 0.44.0", ] [[package]] @@ -1857,9 +1811,9 @@ version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b0c02e1ba0bdb14e965058ca34e09c020f8e507a760df1121728e0aef68d57a" dependencies = [ - "bitflags", + "bitflags 1.3.2", "gpu-descriptor-types", - "hashbrown", + "hashbrown 0.12.3", ] [[package]] @@ -1868,14 +1822,14 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "363e3677e55ad168fef68cf9de3a4a310b53124c5e784c53a1d70e92d23f2126" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "gtk-sys" -version = "0.15.3" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5bc2f0587cba247f60246a0ca11fe25fb733eabc3de12d1965fc07efab87c84" +checksum = "89b5f8946685d5fe44497007786600c2f368ff6b1e61a16251c89f72a97520a3" dependencies = [ "atk-sys", "cairo-sys-rs", @@ -1892,9 +1846,9 @@ dependencies = [ [[package]] name = "h263-rs" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/h263-rs?rev=023e14c73e565c4c778d41f66cfbac5ece6419b2#023e14c73e565c4c778d41f66cfbac5ece6419b2" +source = "git+https://github.com/ruffle-rs/h263-rs?rev=d5d78eb251c1ce1f1da57c63db14f0fdc77a4b36#d5d78eb251c1ce1f1da57c63db14f0fdc77a4b36" dependencies = [ - "bitflags", + "bitflags 2.0.2", "lazy_static", "num-traits", "thiserror", @@ -1903,35 +1857,50 @@ dependencies = [ [[package]] name = "h263-rs-yuv" version = "0.1.0" -source = "git+https://github.com/ruffle-rs/h263-rs?rev=023e14c73e565c4c778d41f66cfbac5ece6419b2#023e14c73e565c4c778d41f66cfbac5ece6419b2" +source = "git+https://github.com/ruffle-rs/h263-rs?rev=d5d78eb251c1ce1f1da57c63db14f0fdc77a4b36#d5d78eb251c1ce1f1da57c63db14f0fdc77a4b36" dependencies = [ "bytemuck", "wide", ] -[[package]] -name = "half" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad6a9459c9c30b177b925162351f97e7d967c7ea8bab3b8352805327daf45554" -dependencies = [ - "crunchy", -] - [[package]] name = "hashbrown" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash", + "ahash 0.7.6", +] + +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash 0.8.3", +] + +[[package]] +name = "hassle-rs" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90601c6189668c7345fc53842cb3f3a3d872203d523be1b3cb44a36a3e62fb85" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading", + "thiserror", + "widestring", + "winapi", ] [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -1951,6 +1920,12 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + [[package]] name = "hexf-parse" version = "0.2.1" @@ -1959,13 +1934,13 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "http" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", - "itoa 1.0.4", + "itoa", ] [[package]] @@ -1976,16 +1951,16 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0c17cc76786e99f8d2f055c11159e7f0091c42474dcc3189fbab96072e873e6d" dependencies = [ "android_system_properties", - "core-foundation-sys", + "core-foundation-sys 0.8.4", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows 0.46.0", ] [[package]] @@ -2016,39 +1991,35 @@ dependencies = [ [[package]] name = "image" -version = "0.24.5" +version = "0.24.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69b7ea949b537b0fd0af141fff8c77690f2ce96f4f41f042ccb6c69c6c965945" +checksum = "527909aa81e20ac3a44803521443a765550f09b5130c2c2fa1ea59c2f8f50a3a" dependencies = [ "bytemuck", "byteorder", "color_quant", - "exr", - "gif 0.11.4", - "jpeg-decoder", "num-rational", "num-traits", "png", - "scoped_threadpool", "tiff", ] [[package]] name = "indexmap" -version = "1.9.2" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.12.3", "serde", ] [[package]] name = "indicatif" -version = "0.17.2" +version = "0.17.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4295cbb7573c16d310e99e713cf9e75101eb190ab31fccd35f2d2691b4352b19" +checksum = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" dependencies = [ "console", "number_prefix", @@ -2058,9 +2029,9 @@ dependencies = [ [[package]] name = "insta" -version = "1.23.0" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48b08a091dfe5b09a6a9688c468fdd5b4396e92ce09e2eb932f0884b02788a4" +checksum = "9a28d25139df397cbca21408bb742cf6837e04cdbebf1b07b760caf971d6a972" dependencies = [ "console", "lazy_static", @@ -2083,24 +2054,25 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.3" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" dependencies = [ + "hermit-abi 0.3.1", "libc", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "is-terminal" -version = "0.4.1" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" dependencies = [ - "hermit-abi 0.2.6", + "hermit-abi 0.3.1", "io-lifetimes", "rustix", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -2132,15 +2104,9 @@ dependencies = [ [[package]] name = "itoa" -version = "0.4.8" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" - -[[package]] -name = "itoa" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jni" @@ -2170,6 +2136,22 @@ dependencies = [ "walkdir", ] +[[package]] +name = "jni" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" +dependencies = [ + "cesu8", + "cfg-if 1.0.0", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", + "windows-sys 0.45.0", +] + [[package]] name = "jni-sys" version = "0.3.0" @@ -2178,9 +2160,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] @@ -2190,15 +2172,12 @@ name = "jpeg-decoder" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e" -dependencies = [ - "rayon", -] [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -2226,36 +2205,17 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" -[[package]] -name = "lebe" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8" - -[[package]] -name = "lexical-core" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" -dependencies = [ - "arrayvec 0.5.2", - "bitflags", - "cfg-if 1.0.0", - "ryu", - "static_assertions", -] - [[package]] name = "libc" -version = "0.2.138" +version = "0.2.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c" [[package]] name = "libflate" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05605ab2bce11bcfc0e9c635ff29ef8b2ea83f29be257ee7d730cac3ee373093" +checksum = "97822bf791bd4d5b403713886a5fbe8bf49520fe78e323b0dc480ca1a03e50b0" dependencies = [ "adler32", "crc32fast", @@ -2264,9 +2224,9 @@ dependencies = [ [[package]] name = "libflate_lz77" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a734c0493409afcd49deee13c006a04e3586b9761a03543c6272c9c51f2f5a" +checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" dependencies = [ "rle-decode-fast", ] @@ -2297,6 +2257,17 @@ dependencies = [ "libc", ] +[[package]] +name = "libtest-mimic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b603516767d1ab23d0de09d023e62966c3322f7148297c35cf3d97aa8b37fa" +dependencies = [ + "clap", + "termcolor", + "threadpool", +] + [[package]] name = "libz-sys" version = "1.1.8" @@ -2311,9 +2282,9 @@ dependencies = [ [[package]] name = "link-cplusplus" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9272ab7b96c9046fbc5bc56c06c117cb639fe2d509df0c421cad82d2915cf369" +checksum = "ecd207c9c713c34f95a097a5b029ac2ce6010530c7b49d7fea24d977dede04f5" dependencies = [ "cc", ] @@ -2325,10 +2296,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" [[package]] -name = "linux-raw-sys" -version = "0.1.4" +name = "linkme" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" +checksum = "af8a3edd8a2d2a8432c78a3c791c93503ec2c5f0aedab26937cafd2f4ca9f013" +dependencies = [ + "linkme-impl", +] + +[[package]] +name = "linkme-impl" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c880e0101fc5844ae1c2f3b5b50aba1fb1939e308149dc2dde33b80a0816df18" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", +] + +[[package]] +name = "linux-raw-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" [[package]] name = "lock_api" @@ -2347,7 +2338,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" dependencies = [ "cfg-if 1.0.0", - "serde", +] + +[[package]] +name = "loom" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" +dependencies = [ + "cfg-if 1.0.0", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", ] [[package]] @@ -2362,9 +2365,9 @@ dependencies = [ [[package]] name = "lyon_algorithms" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb7a1845c15729d73d25d42cb650b647f73c3494453a5c3cd3aae0df3ac5c6c" +checksum = "00a0349cd8f0270781bb93a824b63df6178e3b4a27794e7be3ce3763f5a44d6e" dependencies = [ "lyon_path", "num-traits", @@ -2376,7 +2379,7 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74df1ff0a0147282eb10699537a03baa7d31972b58984a1d44ce0624043fe8ad" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", "euclid", "num-traits", ] @@ -2393,9 +2396,9 @@ dependencies = [ [[package]] name = "lyon_tessellation" -version = "1.0.7" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66b19b1b39823ddc178d98cbb42c70ffcd3bfbcbde589f38752bedde982269c3" +checksum = "7d2124218d5428149f9e09520b9acc024334a607e671f032d06567b61008977c" dependencies = [ "float_next_after", "lyon_path", @@ -2404,19 +2407,19 @@ dependencies = [ [[package]] name = "lzma-rs" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aba8ecb0450dfabce4ad72085eed0a75dffe8f21f7ada05638564ea9db2d7fb1" +checksum = "297e814c836ae64db86b36cf2a557ba54368d03f6afcd7d947c266692f71115e" dependencies = [ "byteorder", "crc", ] [[package]] -name = "mach" -version = "0.3.2" +name = "mach2" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" dependencies = [ "libc", ] @@ -2430,6 +2433,15 @@ dependencies = [ "libc", ] +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata", +] + [[package]] name = "memchr" version = "2.5.0" @@ -2438,9 +2450,9 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ "libc", ] @@ -2456,9 +2468,9 @@ dependencies = [ [[package]] name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] @@ -2469,19 +2481,19 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" dependencies = [ - "bitflags", + "bitflags 1.3.2", "block", "core-graphics-types", - "foreign-types 0.3.2", + "foreign-types", "log", "objc", ] [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -2489,26 +2501,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "minimp3" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985438f75febf74c392071a975a29641b420dd84431135a6e6db721de4b74372" -dependencies = [ - "minimp3-sys", - "slice-deque", - "thiserror", -] - -[[package]] -name = "minimp3-sys" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e21c73734c69dc95696c9ed8926a2b393171d98b3f5f5935686a26a487ab9b90" -dependencies = [ - "cc", -] - [[package]] name = "miniz_oxide" version = "0.6.2" @@ -2520,29 +2512,30 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "naga" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "262d2840e72dbe250e8cf2f522d080988dfca624c4112c096238a4845f591707" +checksum = "5eafe22a23b797c9bc227c6c896419b26b5bb88fa903417a3adaed08778850d5" dependencies = [ "bit-set", - "bitflags", + "bitflags 1.3.2", "codespan-reporting", "hexf-parse", "indexmap", "log", "num-traits", + "pp-rs", "rustc-hash", "serde", "spirv", @@ -2555,7 +2548,7 @@ dependencies = [ name = "naga-agal" version = "0.1.0" dependencies = [ - "bitflags", + "bitflags 2.0.2", "insta", "naga", "num-derive", @@ -2563,25 +2556,21 @@ dependencies = [ ] [[package]] -name = "nanorand" -version = "0.7.0" +name = "naga_oil" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3" +checksum = "99f501e1de2b05a542e9bea75ea0f4141fb7368fe028cc8324c8c4648f1f75ff" dependencies = [ - "getrandom", -] - -[[package]] -name = "ndk" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2032c77e030ddee34a6787a64166008da93f6a352b629261d0fee232b8742dd4" -dependencies = [ - "bitflags", - "jni-sys", - "ndk-sys 0.3.0", - "num_enum", + "bit-set", + "codespan-reporting", + "data-encoding", + "naga", + "once_cell", + "regex", + "regex-syntax", + "rustc-hash", "thiserror", + "tracing", ] [[package]] @@ -2590,11 +2579,11 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" dependencies = [ - "bitflags", + "bitflags 1.3.2", "jni-sys", - "ndk-sys 0.4.1+23.1.7779620", + "ndk-sys", "num_enum", - "raw-window-handle 0.5.0", + "raw-window-handle", "thiserror", ] @@ -2604,44 +2593,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" -[[package]] -name = "ndk-glue" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0434fabdd2c15e0aab768ca31d5b7b333717f03cf02037d5a0a3ff3c278ed67f" -dependencies = [ - "libc", - "log", - "ndk 0.7.0", - "ndk-context", - "ndk-macro", - "ndk-sys 0.4.1+23.1.7779620", - "once_cell", - "parking_lot", -] - -[[package]] -name = "ndk-macro" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0df7ac00c4672f9d5aece54ee3347520b7e20f158656c7db2e6de01902eb7a6c" -dependencies = [ - "darling 0.13.4", - "proc-macro-crate", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "ndk-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e5a6ae77c8ee183dcbbba6150e2e6b9f3f4196a7666c02a715a95692ec1fa97" -dependencies = [ - "jni-sys", -] - [[package]] name = "ndk-sys" version = "0.4.1+23.1.7779620" @@ -2683,26 +2634,13 @@ dependencies = [ "nihav_core", ] -[[package]] -name = "nix" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3790c00a0150112de0f4cd161e3d7fc4b2d8a5542ffc35f099a2562aecb35c" -dependencies = [ - "bitflags", - "cc", - "cfg-if 1.0.0", - "libc", - "memoffset 0.6.5", -] - [[package]] name = "nix" version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.6.5", @@ -2715,7 +2653,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "libc", "memoffset 0.6.5", @@ -2723,27 +2661,24 @@ dependencies = [ [[package]] name = "nom" -version = "6.1.2" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7413f999671bd4745a7b624bd370a569fb6bc574b23c83a3c5ed2e453f3d5e2" -dependencies = [ - "bitvec", - "funty", - "lexical-core", - "memchr", - "version_check", -] - -[[package]] -name = "nom" -version = "7.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8903e5a29a317527874d0402f867152a3d21c908bb0b933e416c65e301d4c36" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", "minimal-lexical", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-bigint" version = "0.4.3" @@ -2757,9 +2692,9 @@ dependencies = [ [[package]] name = "num-complex" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ae39348c8bc5fbd7f40c727a9925f03517afd2ab27d46702108b6a7e5414c19" +checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d" dependencies = [ "num-traits", ] @@ -2772,7 +2707,7 @@ checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2808,33 +2743,33 @@ dependencies = [ [[package]] name = "num_cpus" -version = "1.14.0" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5" +checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi 0.2.6", "libc", ] [[package]] name = "num_enum" -version = "0.5.7" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf5395665662ef45796a4ff5486c5d41d29e0c09640af4c5f17fd94ee2c119c9" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.7" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b0498641e53dd6ac1a4f22547548caa6864cc4933784319cd1775271c5a46ce" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2864,6 +2799,32 @@ dependencies = [ "objc_id", ] +[[package]] +name = "objc-sys" +version = "0.2.0-beta.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" + +[[package]] +name = "objc2" +version = "0.3.0-beta.3.patch-leaks.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" +dependencies = [ + "block2", + "objc-sys", + "objc2-encode", +] + +[[package]] +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" +dependencies = [ + "objc-sys", +] + [[package]] name = "objc_exception" version = "0.1.2" @@ -2883,13 +2844,22 @@ dependencies = [ ] [[package]] -name = "oboe" -version = "0.4.6" +name = "object" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27f63c358b4fa0fbcfefd7c8be5cfc39c08ce2389f5325687e7762a48d30a5c1" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" dependencies = [ - "jni 0.19.0", - "ndk 0.6.0", + "memchr", +] + +[[package]] +name = "oboe" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +dependencies = [ + "jni 0.20.0", + "ndk", "ndk-context", "num-derive", "num-traits", @@ -2898,18 +2868,18 @@ dependencies = [ [[package]] name = "oboe-sys" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3370abb7372ed744232c12954d920d1a40f1c4686de9e79e800021ef492294bd" +checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" dependencies = [ "cc", ] [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "openssl-probe" @@ -2919,11 +2889,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.79" +version = "0.9.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5454462c0eced1e97f2ec09036abc8da362e66802f66fd20f86854d9d8cbcbc4" +checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -2931,16 +2900,32 @@ dependencies = [ ] [[package]] -name = "os_str_bytes" -version = "6.4.1" +name = "orbclient" +version = "0.3.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "974465c5e83cf9df05c1e4137b271d29035c902e39e5ad4c1939837e22160af8" +dependencies = [ + "cfg-if 1.0.0", + "redox_syscall 0.2.16", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "os_info" +version = "3.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" +dependencies = [ + "log", + "winapi", +] [[package]] name = "ouroboros" -version = "0.15.5" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbb50b356159620db6ac971c6d5c9ab788c9cc38a6f49619fca2a27acb062ca" +checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db" dependencies = [ "aliasable", "ouroboros_macro", @@ -2948,15 +2933,15 @@ dependencies = [ [[package]] name = "ouroboros_macro" -version = "0.15.5" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a0d9d1a6191c4f391f87219d1ea42b23f09ee84d64763cd05ee6ea88d9f384d" +checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7" dependencies = [ "Inflector", "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -2969,10 +2954,25 @@ dependencies = [ ] [[package]] -name = "pango-sys" -version = "0.15.10" +name = "overload" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a00081cde4661982ed91d80ef437c20eacaf6aa1a5962c0279ae194662c3aa" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e25e9fb15717794fae58ab55c26e044103aad13186fbb625893f9a3bbcc24228" +dependencies = [ + "ttf-parser", +] + +[[package]] +name = "pango-sys" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e134909a9a293e04d2cc31928aa95679c5e4df954d0b85483159bd20d8f047f" dependencies = [ "glib-sys", "gobject-sys", @@ -2998,15 +2998,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall", + "redox_syscall 0.2.16", "smallvec", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] @@ -3044,7 +3044,7 @@ checksum = "069bdb1e05adc7a8990dce9cc75370895fbe4e3d58b9b73bf1aee56359344a55" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -3071,7 +3071,7 @@ version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crc32fast", "flate2", "miniz_oxide", @@ -3079,23 +3079,34 @@ dependencies = [ [[package]] name = "polling" -version = "2.5.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22122d5ec4f9fe1b3916419b76be1e80bcb93f618d071d2edf841b137b2a2bd6" +checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" dependencies = [ "autocfg", + "bitflags 1.3.2", "cfg-if 1.0.0", + "concurrent-queue", "libc", "log", - "wepoll-ffi", - "windows-sys 0.42.0", + "pin-project-lite", + "windows-sys 0.45.0", ] [[package]] name = "portable-atomic" -version = "0.3.17" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef946e2f765276038550e74abfbda40c84d73278417c071e0f19f8af6ba100b" +checksum = "26f6a7b87c2e435a3241addceeeff740ff8b7e76b74c13bf9acb17fa454ea00b" + +[[package]] +name = "pp-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" +dependencies = [ + "unicode-xid", +] [[package]] name = "ppv-lite86" @@ -3126,13 +3137,12 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.2.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ "once_cell", - "thiserror", - "toml", + "toml_edit", ] [[package]] @@ -3144,7 +3154,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "version_check", ] @@ -3161,9 +3171,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "1d0dd4be24fcdcfeaa12a432d588dc59bbad6cad3510c67e74a2b6b2fc950564" dependencies = [ "unicode-ident", ] @@ -3173,30 +3183,39 @@ name = "profiling" version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74605f360ce573babfe43964cbe520294dcb081afbf8c108fc6e23036b4da2df" +dependencies = [ + "profiling-procmacros", + "tracy-client", +] + +[[package]] +name = "profiling-procmacros" +version = "1.0.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a1e2417ef905b8ad94215f8a607bd2d0f5d13d416d18dca4a530811e8a0674c" +dependencies = [ + "quote", + "syn 1.0.109", +] [[package]] name = "quick-xml" -version = "0.22.0" -source = "git+https://github.com/ruffle-rs/quick-xml?rev=8496365ec1412eb5ba5de350937b6bce352fa0ba#8496365ec1412eb5ba5de350937b6bce352fa0ba" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5c1a97b1bc42b1d550bfb48d4262153fe400a12bab1511821736f7eac76d7e2" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.21" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] -[[package]] -name = "radium" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941ba9d78d8e2f7ce474c015eea4d9c6d25b6a3327f9832ee29a4de27f91bbb8" - [[package]] name = "rand" version = "0.8.5" @@ -3229,33 +3248,21 @@ dependencies = [ [[package]] name = "range-alloc" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e935c45e09cc6dcf00d2f0b2d630a58f4095320223d47fc68918722f0538b6" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" [[package]] name = "raw-window-handle" -version = "0.4.3" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b800beb9b6e7d2df1fe337c9e3d04e3af22a124460fb4c30fcc22c9117cefb41" -dependencies = [ - "cty", -] - -[[package]] -name = "raw-window-handle" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed7e3d950b66e19e0c372f3fa3fbbcf85b1746b571f74e0c2af6042a5c93420a" -dependencies = [ - "cty", -] +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -3263,9 +3270,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -3273,13 +3280,31 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "realfft" +version = "3.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6b8e8f0c6d2234aa58048d7290c60bf92cd36fd2888cd8331c66ad4f2e1d2" +dependencies = [ + "rustfft", +] + [[package]] name = "redox_syscall" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +dependencies = [ + "bitflags 1.3.2", ] [[package]] @@ -3289,15 +3314,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ "getrandom", - "redox_syscall", + "redox_syscall 0.2.16", "thiserror", ] [[package]] name = "regex" -version = "1.7.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -3309,19 +3334,23 @@ name = "regex-automata" version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax", +] [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "regress" -version = "0.4.1" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a92ff21fe8026ce3f2627faaf43606f0b67b014dbc9ccf027181a804f75d92e" +checksum = "d995d590bd8ec096d1893f414bf3f5e8b0ee4c9eed9a5642b9766ef2c8e2e8e9" dependencies = [ + "hashbrown 0.13.2", "memchr", ] @@ -3333,26 +3362,27 @@ checksum = "f1382d1f0a252c4bf97dc20d979a2fdd05b024acd7c2ed0f7595d7817666a157" [[package]] name = "rfd" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0149778bd99b6959285b0933288206090c50e2327f47a9c463bfdbf45c8823ea" +checksum = "7cb2988ec50c9bcdb0c012b89643a6094a35a785a37897211ee62e1639342f7b" dependencies = [ + "async-io", "block", "dispatch", + "futures-util", "glib-sys", "gobject-sys", "gtk-sys", "js-sys", - "lazy_static", "log", "objc", "objc-foundation", "objc_id", - "raw-window-handle 0.5.0", + "raw-window-handle", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "windows", + "windows 0.44.0", ] [[package]] @@ -3368,7 +3398,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "300a51053b1cb55c80b7a9fde4120726ddf25ca241a1cbb926626f62fb136bff" dependencies = [ "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "serde", ] @@ -3376,12 +3406,13 @@ dependencies = [ name = "ruffle_core" version = "0.1.0" dependencies = [ - "bitflags", + "bitflags 2.0.2", "bitstream-io", "build_playerglobal", "bytemuck", "byteorder", "chrono", + "clap", "dasp", "downcast-rs", "encoding_rs", @@ -3394,28 +3425,28 @@ dependencies = [ "generational-arena", "indexmap", "instant", - "log", + "linkme", "lzma-rs", - "minimp3", "nellymoser-rs", "num-derive", "num-traits", + "once_cell", "percent-encoding", "quick-xml", "rand", + "realfft", "regress", "ruffle_macros", "ruffle_render", "ruffle_video", "ruffle_wstr", - "rustversion", "serde", "serde_json", "smallvec", - "static_assertions", "swf", "symphonia", "thiserror", + "tracing", "url", "wasm-bindgen-futures", "weak-table", @@ -3430,16 +3461,19 @@ dependencies = [ "bytemuck", "clap", "cpal", - "dirs", + "dirs 5.0.0", "embed-resource", - "env_logger", "generational-arena", "isahc", - "log", + "os_info", "rfd", "ruffle_core", + "ruffle_render", "ruffle_render_wgpu", "ruffle_video_software", + "tracing", + "tracing-subscriber", + "tracing-tracy", "url", "webbrowser", "winapi", @@ -3450,7 +3484,7 @@ dependencies = [ name = "ruffle_input_format" version = "0.1.0" dependencies = [ - "bitflags", + "bitflags 2.0.2", "serde", "serde_json", ] @@ -3460,7 +3494,7 @@ name = "ruffle_macros" version = "0.1.0" dependencies = [ "quote", - "syn", + "syn 2.0.13", ] [[package]] @@ -3468,17 +3502,22 @@ name = "ruffle_render" version = "0.1.0" dependencies = [ "approx", + "clap", "downcast-rs", + "enum-map", "flate2", "gc-arena", - "gif 0.12.0", + "gif", + "h263-rs-yuv", "jpeg-decoder", - "log", "lyon", "png", + "ruffle_wstr", + "serde", "smallvec", "swf", "thiserror", + "tracing", "wasm-bindgen", ] @@ -3528,13 +3567,16 @@ dependencies = [ "futures", "gc-arena", "image", - "log", + "naga", "naga-agal", + "naga_oil", "once_cell", "ouroboros", - "raw-window-handle 0.5.0", + "profiling", + "raw-window-handle", "ruffle_render", "swf", + "tracing", "typed-arena", "web-sys", "wgpu", @@ -3575,7 +3617,6 @@ dependencies = [ "flate2", "generational-arena", "h263-rs", - "h263-rs-yuv", "log", "nihav_codec_support", "nihav_core", @@ -3590,15 +3631,14 @@ dependencies = [ name = "ruffle_web" version = "0.1.0" dependencies = [ - "base64 0.20.0", + "base64 0.21.0", "chrono", "console_error_panic_hook", - "console_log", "generational-arena", "getrandom", "js-sys", - "log", "ruffle_core", + "ruffle_render", "ruffle_render_canvas", "ruffle_render_webgl", "ruffle_render_wgpu", @@ -3607,6 +3647,10 @@ dependencies = [ "serde", "serde-wasm-bindgen", "thiserror", + "tracing", + "tracing-log", + "tracing-subscriber", + "tracing-wasm", "url", "wasm-bindgen", "wasm-bindgen-futures", @@ -3618,7 +3662,7 @@ name = "ruffle_web_common" version = "0.1.0" dependencies = [ "js-sys", - "log", + "tracing", "wasm-bindgen", "web-sys", ] @@ -3633,9 +3677,12 @@ dependencies = [ [[package]] name = "ruffle_wstr" version = "0.1.0" -dependencies = [ - "static_assertions", -] + +[[package]] +name = "rustc-demangle" +version = "0.1.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" [[package]] name = "rustc-hash" @@ -3643,22 +3690,13 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver 0.9.0", -] - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.14", + "semver", ] [[package]] @@ -3687,38 +3725,29 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.5" +version = "0.37.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", "linux-raw-sys", - "windows-sys 0.42.0", + "windows-sys 0.45.0", ] [[package]] name = "rustversion" -version = "1.0.9" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97477e48b4cf8603ad5f7aaf897467cf42ab4218a38ef76fb14c2d6773a6d6a8" +checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06" [[package]] name = "ryu" -version = "1.0.11" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" - -[[package]] -name = "safe_arch" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ff3d6d9696af502cc3110dacce942840fb06ff4514cad92236ecc455f2ce05" -dependencies = [ - "bytemuck", -] +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "safe_arch" @@ -3740,12 +3769,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2" +checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3" dependencies = [ - "lazy_static", - "windows-sys 0.36.1", + "windows-sys 0.42.0", ] [[package]] @@ -3754,12 +3782,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - [[package]] name = "scopeguard" version = "1.1.0" @@ -3768,57 +3790,43 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.2" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8132065adcfd6e02db789d9285a0deb2f3fcb04002865ab67d5fb103533898" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "sctk-adwaita" -version = "0.4.3" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61270629cc6b4d77ec1907db1033d5c2e1a404c412743621981a871dc9c12339" +checksum = "cc56402866c717f54e48b122eb93c69f709bc5a6359c403598992fd92f017931" dependencies = [ - "crossfont", + "ab_glyph", "log", + "memmap2", "smithay-client-toolkit", "tiny-skia", ] [[package]] name = "semver" -version = "0.9.0" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.150" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e326c9ec8042f1b5da33252c8a37e9ffbd2c9bef0155215b6e6c80c790e05f91" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" dependencies = [ "serde_derive", ] [[package]] name = "serde-wasm-bindgen" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b4c031cd0d9014307d82b8abf653c0290fbdaeb4c02d00c63cf52f728628bf" +checksum = "f3b143e2833c57ab9ad3ea280d21fd34e285a42837aeb0ee301f4f41890fa00e" dependencies = [ "js-sys", "serde", @@ -3839,63 +3847,36 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.150" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42a3df25b0713732468deadad63ab9da1f1fd75a48a15024b50363f128db627e" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] name = "serde_json" -version = "1.0.89" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "020ff22c755c2ed3f8cf162dbb41a7268d934702f3ed3631656ea597e08fc3db" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ "indexmap", - "itoa 1.0.4", + "itoa", "ryu", "serde", ] [[package]] -name = "servo-fontconfig" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e3e22fe5fd73d04ebf0daa049d3efe3eae55369ce38ab16d07ddd9ac5c217c" -dependencies = [ - "libc", - "servo-fontconfig-sys", -] - -[[package]] -name = "servo-fontconfig-sys" -version = "5.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e36b879db9892dfa40f95da1c38a835d41634b825fbd8c4c418093d53c24b388" -dependencies = [ - "expat-sys", - "freetype-sys", - "pkg-config", -] - -[[package]] -name = "sha1" +name = "serde_spanned" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" dependencies = [ - "sha1_smol", + "serde", ] -[[package]] -name = "sha1_smol" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012" - [[package]] name = "sha2" version = "0.10.6" @@ -3907,6 +3888,15 @@ dependencies = [ "digest", ] +[[package]] +name = "sharded-slab" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +dependencies = [ + "lazy_static", +] + [[package]] name = "shlex" version = "1.1.0" @@ -3933,24 +3923,13 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] -[[package]] -name = "slice-deque" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31ef6ee280cdefba6d2d0b4b78a84a1c1a3f3a4cec98c2d4231c8bc225de0f25" -dependencies = [ - "libc", - "mach", - "winapi", -] - [[package]] name = "slotmap" version = "1.0.6" @@ -3983,7 +3962,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f307c47d32d2715eb2e0ece5589057820e0e5e70d07c247d1063e844e107f454" dependencies = [ - "bitflags", + "bitflags 1.3.2", "calloop", "dlib", "lazy_static", @@ -3998,30 +3977,21 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", ] -[[package]] -name = "spin" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" -dependencies = [ - "lock_api", -] - [[package]] name = "spirv" version = "0.2.0+1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" dependencies = [ - "bitflags", + "bitflags 1.3.2", "num-traits", ] @@ -4031,55 +4001,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version 0.2.3", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "str-buf" version = "1.0.6" @@ -4092,6 +4013,12 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe895eb47f22e2ddd4dabc02bce419d2e643c8e3b585c78158b349195bc24d82" +[[package]] +name = "strict-num" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9df65f20698aeed245efdde3628a6b559ea1239bbb871af1b6e3b58c413b2bd1" + [[package]] name = "strsim" version = "0.10.0" @@ -4102,7 +4029,7 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" name = "swf" version = "0.2.0" dependencies = [ - "bitflags", + "bitflags 2.0.2", "bitstream-io", "byteorder", "encoding_rs", @@ -4118,9 +4045,9 @@ dependencies = [ [[package]] name = "symphonia" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17033fe05e4f7f10a6ad602c272bafd2520b2e5cdd9feb61494d9cdce08e002f" +checksum = "3671dd6f64f4f9d5c87179525054cfc1f60de23ba1f193bd6ceab812737403f1" dependencies = [ "lazy_static", "symphonia-bundle-mp3", @@ -4130,11 +4057,11 @@ dependencies = [ [[package]] name = "symphonia-bundle-mp3" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db5d3d53535ae2b7d0e39e82f683cac5398a6c8baca25ff1183e107d13959d3e" +checksum = "55a0846e7a2c9a8081ff799fc83a975170417ad2a143f644a77ec2e3e82a2b73" dependencies = [ - "bitflags", + "bitflags 1.3.2", "lazy_static", "log", "symphonia-core", @@ -4143,12 +4070,12 @@ dependencies = [ [[package]] name = "symphonia-core" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199a6417cd4115bac79289b64b859358ea050b7add0ceb364dc991f628c5b347" +checksum = "6b9567e2d8a5f866b2f94f5d366d811e0c6826babcff6d37de9e1a6690d38869" dependencies = [ - "arrayvec 0.7.2", - "bitflags", + "arrayvec", + "bitflags 1.3.2", "bytemuck", "lazy_static", "log", @@ -4156,9 +4083,9 @@ dependencies = [ [[package]] name = "symphonia-metadata" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ed71acf6b5e6e8bee1509597b86365a06b78c1d73218df47357620a6fe5997b" +checksum = "acd35c263223ef6161000be79b124a75de3e065eea563bf3ef169b3e94c7bb2e" dependencies = [ "encoding_rs", "lazy_static", @@ -4168,9 +4095,20 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.105" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" dependencies = [ "proc-macro2", "quote", @@ -4185,81 +4123,84 @@ checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "unicode-xid", ] [[package]] name = "system-deps" -version = "6.0.3" +version = "6.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2955b1fe31e1fa2fbd1976b71cc69a606d7d4da16f6de3333d0c92d51419aeff" +checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f" dependencies = [ "cfg-expr", "heck", "pkg-config", - "toml", + "toml 0.7.3", "version-compare", ] -[[package]] -name = "tap" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" - [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] -[[package]] -name = "terminal_size" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "tests" version = "0.1.0" dependencies = [ + "anyhow", "approx", "env_logger", "futures", "image", + "libtest-mimic", + "once_cell", "pretty_assertions", "regex", "ruffle_core", "ruffle_input_format", + "ruffle_render", "ruffle_render_wgpu", + "ruffle_video_software", + "serde", + "toml 0.5.11", + "url", + "walkdir", ] [[package]] name = "thiserror" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.37" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", +] + +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", ] [[package]] @@ -4284,11 +4225,11 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ - "itoa 1.0.4", + "itoa", "serde", "time-core", "time-macros", @@ -4302,36 +4243,36 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] [[package]] name = "tiny-skia" -version = "0.7.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642680569bb895b16e4b9d181c60be1ed136fa0c9c7f11d004daf053ba89bf82" +checksum = "bfef3412c6975196fdfac41ef232f910be2bb37b9dd3313a49a1a6bc815a5bdb" dependencies = [ "arrayref", - "arrayvec 0.5.2", + "arrayvec", "bytemuck", "cfg-if 1.0.0", "png", - "safe_arch 0.5.2", "tiny-skia-path", ] [[package]] name = "tiny-skia-path" -version = "0.7.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c114d32f0c2ee43d585367cb013dfaba967ab9f62b90d9af0d696e955e70fa6c" +checksum = "a4b5edac058fc98f51c935daea4d805b695b38e2f151241cad125ade2a2ac20d" dependencies = [ "arrayref", "bytemuck", + "strict-num", ] [[package]] @@ -4345,19 +4286,53 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] +[[package]] +name = "toml" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b403acf6f2bb0859c93c7f0d967cb4a75a7ac552100f9322faf64dc047669b21" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tracing" version = "0.1.37" @@ -4379,7 +4354,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -4389,6 +4364,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" dependencies = [ "once_cell", + "valuable", ] [[package]] @@ -4401,6 +4377,77 @@ dependencies = [ "tracing", ] +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-tracy" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed3ebef1f9f0d00aaa29239537effef65b82c56040c680f540fc6cedfac7b230" +dependencies = [ + "tracing-core", + "tracing-subscriber", + "tracy-client", +] + +[[package]] +name = "tracing-wasm" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07" +dependencies = [ + "tracing", + "tracing-subscriber", + "wasm-bindgen", +] + +[[package]] +name = "tracy-client" +version = "0.14.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b3b9ab635a5b91dd66b7a1591a89f7d52423e6a9143b230bb4c503f41296c0c" +dependencies = [ + "loom", + "once_cell", + "tracy-client-sys", +] + +[[package]] +name = "tracy-client-sys" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7fcbdba03a3cfc5f757469fd5b6d795fc461484c97e47e94b0fc7db93261d9c5" +dependencies = [ + "cc", +] + [[package]] name = "transpose" version = "0.2.2" @@ -4412,10 +4459,16 @@ dependencies = [ ] [[package]] -name = "typed-arena" -version = "2.0.1" +name = "ttf-parser" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0685c84d5d54d1c26f7d3eb96cd41550adb97baed141a761cf335d3d33bcd0ae" +checksum = "0609f771ad9c6155384897e1df4d948e692667cc0588548b68eb44d052b27633" + +[[package]] +name = "typed-arena" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" [[package]] name = "typenum" @@ -4425,15 +4478,15 @@ checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -4446,9 +4499,9 @@ dependencies = [ [[package]] name = "unicode-segmentation" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fdbf052a0783de01e944a6ce7a8cb939e295b1e7be835a1112c3b9a7f047a5a" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" @@ -4473,6 +4526,18 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" @@ -4525,12 +4590,11 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -4542,9 +4606,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -4552,24 +4616,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -4579,9 +4643,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4589,22 +4653,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "wayland-client" @@ -4612,7 +4676,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" dependencies = [ - "bitflags", + "bitflags 1.3.2", "downcast-rs", "libc", "nix 0.24.3", @@ -4651,7 +4715,7 @@ version = "0.29.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" dependencies = [ - "bitflags", + "bitflags 1.3.2", "wayland-client", "wayland-commons", "wayland-scanner", @@ -4687,9 +4751,9 @@ checksum = "323f4da9523e9a669e1eaf9c6e763892769b1d38c623913647bfdc1532fe4549" [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -4697,18 +4761,19 @@ dependencies = [ [[package]] name = "webbrowser" -version = "0.8.2" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0cc7962b5aaa0dfcebaeef0161eec6edf5f4606c12e6777fd7d392f52033a5" +checksum = "579cc485bd5ce5bfa0d738e4921dd0b956eca9800be1fd2e5257ebe95bc4617e" dependencies = [ - "jni 0.20.0", + "core-foundation", + "dirs 4.0.0", + "jni 0.21.1", + "log", "ndk-context", "objc", - "raw-window-handle 0.5.0", + "raw-window-handle", "url", "web-sys", - "widestring", - "winapi", ] [[package]] @@ -4717,27 +4782,20 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" -[[package]] -name = "wepoll-ffi" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d743fdedc5c64377b5fc2bc036b01c7fd642205a0d96356034ae3404d49eb7fb" -dependencies = [ - "cc", -] - [[package]] name = "wgpu" -version = "0.14.2" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81f643110d228fd62a60c5ed2ab56c4d5b3704520bd50561174ec4ec74932937" +checksum = "d745a1b6d91d85c33defbb29f0eee0450e1d2614d987e14bf6baf26009d132d7" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", + "cfg-if 1.0.0", "js-sys", "log", "naga", "parking_lot", - "raw-window-handle 0.5.0", + "profiling", + "raw-window-handle", "serde", "smallvec", "static_assertions", @@ -4751,21 +4809,20 @@ dependencies = [ [[package]] name = "wgpu-core" -version = "0.14.2" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6000d1284ef8eec6076fd5544a73125fd7eb9b635f18dceeb829d826f41724ca" +checksum = "7131408d940e335792645a98f03639573b0480e9e2e7cddbbab74f7c6d9f3fff" dependencies = [ - "arrayvec 0.7.2", + "arrayvec", "bit-vec", - "bitflags", - "cfg_aliases", + "bitflags 1.3.2", "codespan-reporting", "fxhash", "log", "naga", "parking_lot", "profiling", - "raw-window-handle 0.5.0", + "raw-window-handle", "ron", "serde", "smallvec", @@ -4777,25 +4834,28 @@ dependencies = [ [[package]] name = "wgpu-hal" -version = "0.14.1" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc320a61acb26be4f549c9b1b53405c10a223fbfea363ec39474c32c348d12f" +checksum = "bdcf61a283adc744bb5453dd88ea91f3f86d5ca6b027661c6c73c7734ae0288b" dependencies = [ "android_system_properties", - "arrayvec 0.7.2", + "arrayvec", "ash", "bit-set", - "bitflags", + "bitflags 1.3.2", "block", "core-graphics-types", "d3d12", - "foreign-types 0.3.2", + "foreign-types", "fxhash", "glow", "gpu-alloc", + "gpu-allocator", "gpu-descriptor", + "hassle-rs", "js-sys", "khronos-egl", + "libc", "libloading", "log", "metal", @@ -4804,7 +4864,7 @@ dependencies = [ "parking_lot", "profiling", "range-alloc", - "raw-window-handle 0.5.0", + "raw-window-handle", "renderdoc-sys", "smallvec", "thiserror", @@ -4816,30 +4876,31 @@ dependencies = [ [[package]] name = "wgpu-types" -version = "0.14.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb6b28ef22cac17b9109b25b3bf8c9a103eeb293d7c5f78653979b09140375f6" +checksum = "32444e121b0bd00cb02c0de32fde457a9491bd44e03e7a5db6df9b1da2f6f110" dependencies = [ - "bitflags", - "bitflags_serde_shim", + "bitflags 1.3.2", + "js-sys", "serde", + "web-sys", ] [[package]] name = "wide" -version = "0.7.5" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae41ecad2489a1655c8ef8489444b0b113c0a0c795944a3572a0931cf7d2525c" +checksum = "b689b6c49d6549434bf944e6b0f39238cf63693cb7a147e9d887507fffa3b223" dependencies = [ "bytemuck", - "safe_arch 0.6.0", + "safe_arch", ] [[package]] name = "widestring" -version = "1.0.2" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" +checksum = "17882f045410753661207383517a6f62ec3dbeb6a4ed2acce01f0728238d1983" [[package]] name = "winapi" @@ -4883,28 +4944,20 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.37.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b543186b344cc61c85b5aab0d2e3adf4e0f99bc076eff9aa5927bcc0b8a647" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" dependencies = [ - "windows_aarch64_msvc 0.37.0", - "windows_i686_gnu 0.37.0", - "windows_i686_msvc 0.37.0", - "windows_x86_64_gnu 0.37.0", - "windows_x86_64_msvc 0.37.0", + "windows-targets", ] [[package]] -name = "windows-sys" -version = "0.36.1" +name = "windows" +version = "0.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-targets", ] [[package]] @@ -4914,124 +4967,89 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ "windows_aarch64_gnullvm", - "windows_aarch64_msvc 0.42.0", - "windows_i686_gnu 0.42.0", - "windows_i686_msvc 0.42.0", - "windows_x86_64_gnu 0.42.0", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", "windows_x86_64_gnullvm", - "windows_x86_64_msvc 0.42.0", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2623277cb2d1c216ba3b578c0f3cf9cdebeddb6e66b1b218bb33596ea7769c3a" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_i686_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - -[[package]] -name = "windows_i686_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3925fd0b0b804730d44d4b6278c50f9699703ec49bcd628020f46f4ba07d9e1" - -[[package]] -name = "windows_i686_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - -[[package]] -name = "windows_i686_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce907ac74fe331b524c1298683efbf598bb031bc84d5e274db2083696d07c57c" - -[[package]] -name = "windows_i686_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_x86_64_gnu" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2babfba0828f2e6b32457d5341427dcbb577ceef556273229959ac23a10af33d" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_msvc" -version = "0.36.1" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4dd6dc7df2d84cf7b33822ed5b86318fb1781948e9663bacd047fc9dd52259d" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "winit" -version = "0.27.5" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb796d6fbd86b2fd896c9471e6f04d39d750076ebe5680a3958f00f5ab97657c" +checksum = "4f504e8c117b9015f618774f8d58cd4781f5a479bc41079c064f974cbb253874" dependencies = [ - "bitflags", - "cocoa", + "android-activity", + "bitflags 1.3.2", + "cfg_aliases", "core-foundation", "core-graphics", "dispatch", @@ -5039,56 +5057,52 @@ dependencies = [ "libc", "log", "mio", - "ndk 0.7.0", - "ndk-glue", - "objc", + "ndk", + "objc2", "once_cell", - "parking_lot", + "orbclient", "percent-encoding", - "raw-window-handle 0.4.3", - "raw-window-handle 0.5.0", + "raw-window-handle", + "redox_syscall 0.3.5", "sctk-adwaita", "smithay-client-toolkit", "wasm-bindgen", "wayland-client", + "wayland-commons", "wayland-protocols", + "wayland-scanner", "web-sys", - "windows-sys 0.36.1", + "windows-sys 0.45.0", "x11-dl", ] +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" dependencies = [ + "cfg-if 1.0.0", "winapi", ] -[[package]] -name = "wio" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" -dependencies = [ - "winapi", -] - -[[package]] -name = "wyz" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" - [[package]] name = "x11-dl" -version = "2.20.1" +version = "2.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1536d6965a5d4e573c7ef73a2c15ebcd0b2de3347bdf526c34c297c00ac40f0" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" dependencies = [ - "lazy_static", "libc", + "once_cell", "pkg-config", ] @@ -5120,7 +5134,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "463705a63313cd4301184381c5e8042f0a7e9b4bb63653f216311d4ae74690b7" dependencies = [ - "nom 7.1.1", + "nom", ] [[package]] diff --git a/pkgs/applications/emulators/ruffle/default.nix b/pkgs/applications/emulators/ruffle/default.nix index e08529f58a81..0d8cc1474aa3 100644 --- a/pkgs/applications/emulators/ruffle/default.nix +++ b/pkgs/applications/emulators/ruffle/default.nix @@ -19,13 +19,13 @@ rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2022-12-16"; + version = "nightly-2023-04-10"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "sha256-VOaXn/dJB0AbuZ8owBbUYEPrL/H8DM73MhwhBjxq2Pg="; + sha256 = "sha256-u5Ri9KnYzE3JedUP9fGgYeG8G9uxrL6/zt3KPiKjhU0="; }; nativeBuildInputs = [ @@ -71,16 +71,23 @@ rustPlatform.buildRustPackage rec { "''${gappsWrapperArgs[@]}" ''; + cargoBuildFlags = [ "--workspace" ]; + + # Currently, buildRustPackage can't handle having both the Crates.io dasp-0.11 + # and the git dasp-0.11, as it tries to symlink both to the same place. For + # now, unify both dasp versions to the (newer) Git version. + # Related issues: #22177, #183344 + cargoPatches = [ ./unify-dasp-version.patch ]; + cargoLock = { lockFile = ./Cargo.lock; outputHashes = { "dasp-0.11.0" = "sha256-CZNgTLL4IG7EJR2xVp9X9E5yre8foY6VX2hUMRawxiI="; - "flash-lso-0.5.0" = "sha256-WQ+x0fVIdJPKECc8zA8xITS0vc58e5zxvSHc+UfsO70="; - "gc-arena-0.2.2" = "sha256-InZH9bzSKa+agqa3T9luWYNhoCwCdpg46mr4D+uWokc="; - "h263-rs-0.1.0" = "sha256-E1/bWJ/UU3nVz2IKUDaPh3cyoDBbAJ08TnIo/FcABWY="; + "flash-lso-0.5.0" = "sha256-9uH3quxRzLtmHJs5WF/GRxWkXL/KFyOl182HKcHNnuc="; + "gc-arena-0.2.2" = "sha256-/H9VcTesBD+IA7bUf208b0HQ/cIUDAz9TJBBywf6akA="; + "h263-rs-0.1.0" = "sha256-4kBg09VHyiQTvUbvcTb5g/BVcOpRFZ1fVEuRWXv5XwE="; "nellymoser-rs-0.1.2" = "sha256-GykDQc1XwySOqfxW/OcSxkKCFJyVmwSLy/CEBcwcZJs="; "nihav_codec_support-0.1.0" = "sha256-rE9AIiQr+PnHC9xfDQULndSfFHSX4sqKkCAQYVNaJcQ="; - "quick-xml-0.22.0" = "sha256-3rHOChcoBUWaUIJ+ZbJzRAJm2fpV0aa6/76qQB5ICgE="; }; }; diff --git a/pkgs/applications/emulators/ruffle/unify-dasp-version.patch b/pkgs/applications/emulators/ruffle/unify-dasp-version.patch new file mode 100644 index 000000000000..17367efcf3f6 --- /dev/null +++ b/pkgs/applications/emulators/ruffle/unify-dasp-version.patch @@ -0,0 +1,172 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 09a084648..047210eac 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -812,7 +812,7 @@ dependencies = [ + "alsa", + "core-foundation-sys 0.8.4", + "coreaudio-rs", +- "dasp_sample 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", ++ "dasp_sample", + "jni 0.19.0", + "js-sys", + "libc", +@@ -1068,7 +1068,7 @@ dependencies = [ + [[package]] + name = "dasp" + version = "0.11.0" +-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" ++source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" + dependencies = [ + "dasp_envelope", + "dasp_frame", +@@ -1076,7 +1076,7 @@ dependencies = [ + "dasp_peak", + "dasp_ring_buffer", + "dasp_rms", +- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)", ++ "dasp_sample", + "dasp_signal", + "dasp_slice", + "dasp_window", +@@ -1085,72 +1085,66 @@ dependencies = [ + [[package]] + name = "dasp_envelope" + version = "0.11.0" +-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" ++source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" + dependencies = [ + "dasp_frame", + "dasp_peak", + "dasp_ring_buffer", + "dasp_rms", +- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)", ++ "dasp_sample", + ] + + [[package]] + name = "dasp_frame" + version = "0.11.0" +-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" ++source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" + dependencies = [ +- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)", ++ "dasp_sample", + ] + + [[package]] + name = "dasp_interpolate" + version = "0.11.0" +-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" ++source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" + dependencies = [ + "dasp_frame", + "dasp_ring_buffer", +- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)", ++ "dasp_sample", + ] + + [[package]] + name = "dasp_peak" + version = "0.11.0" +-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" ++source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" + dependencies = [ + "dasp_frame", +- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)", ++ "dasp_sample", + ] + + [[package]] + name = "dasp_ring_buffer" + version = "0.11.0" +-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" ++source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" + + [[package]] + name = "dasp_rms" + version = "0.11.0" +-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" ++source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" + dependencies = [ + "dasp_frame", + "dasp_ring_buffer", +- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)", ++ "dasp_sample", + ] + + [[package]] + name = "dasp_sample" + version = "0.11.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" +- +-[[package]] +-name = "dasp_sample" +-version = "0.11.0" +-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" ++source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" + + [[package]] + name = "dasp_signal" + version = "0.11.0" +-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" ++source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" + dependencies = [ + "dasp_envelope", + "dasp_frame", +@@ -1158,25 +1152,25 @@ dependencies = [ + "dasp_peak", + "dasp_ring_buffer", + "dasp_rms", +- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)", ++ "dasp_sample", + "dasp_window", + ] + + [[package]] + name = "dasp_slice" + version = "0.11.0" +-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" ++source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" + dependencies = [ + "dasp_frame", +- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)", ++ "dasp_sample", + ] + + [[package]] + name = "dasp_window" + version = "0.11.0" +-source = "git+https://github.com/RustAudio/dasp?rev=f05a703#f05a703d247bb504d7e812b51e95f3765d9c5e94" ++source = "git+https://github.com/RustAudio/dasp?rev=f05a703d247bb504d7e812b51e95f3765d9c5e94#f05a703d247bb504d7e812b51e95f3765d9c5e94" + dependencies = [ +- "dasp_sample 0.11.0 (git+https://github.com/RustAudio/dasp?rev=f05a703)", ++ "dasp_sample", + ] + + [[package]] +diff --git a/Cargo.toml b/Cargo.toml +index c3d25e662..fba44c9e6 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -71,3 +71,6 @@ inherits = "release" + + [profile.web-wasm-extensions] + inherits = "release" ++ ++[patch.crates-io] ++dasp_sample = { git = "https://github.com/RustAudio/dasp", rev = "f05a703d247bb504d7e812b51e95f3765d9c5e94" } +diff --git a/core/Cargo.toml b/core/Cargo.toml +index ef2210484..1123911d6 100644 +--- a/core/Cargo.toml ++++ b/core/Cargo.toml +@@ -42,7 +42,7 @@ nellymoser-rs = { git = "https://github.com/ruffle-rs/nellymoser", rev = "4a3352 + regress = "0.5" + flash-lso = { git = "https://github.com/ruffle-rs/rust-flash-lso", rev = "8376453eddddbe701031a091c0eed94068fa5649" } + lzma-rs = {version = "0.3.0", optional = true } +-dasp = { git = "https://github.com/RustAudio/dasp", rev = "f05a703", features = ["interpolate", "interpolate-linear", "signal"], optional = true } ++dasp = { git = "https://github.com/RustAudio/dasp", rev = "f05a703d247bb504d7e812b51e95f3765d9c5e94", features = ["interpolate", "interpolate-linear", "signal"], optional = true } + symphonia = { version = "0.5.2", default-features = false, features = ["mp3"], optional = true } + enumset = "1.0.12" + bytemuck = "1.13.1" From a6a14f2e47c8dad93ee03dc3160d05b46448bfad Mon Sep 17 00:00:00 2001 From: SubhrajyotiSen Date: Thu, 27 Apr 2023 10:28:37 +0530 Subject: [PATCH 018/244] kotlin{-native}: 1.8.20 -> 1.8.21 --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- pkgs/development/compilers/kotlin/native.nix | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 4eb5f64b3333..39632457687e 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.8.20"; + version = "1.8.21"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "1r0ann14rjr3f1idwhkfk5s1gr6b6wnkawjmg96gvsp2qv1p9pqh"; + sha256 = "1mwggqll6117sw5ldkl1kmlp6mh9z36jhb6r0hnljryhk9bcahvf"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index da779100a664..a1f1784d6c36 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.8.20"; + version = "1.8.21"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "1lin4yd4wy56m4spkkd0glicphkwfr0gzvs66prm925fcx1hzk5y"; - "macos-x86_64" = "0ma0d0kvpbqw8cx8ixmnhk96y5xz6ljy6phbzsl8cbmfp0g817p3"; - "linux-x86_64" = "0f24ag9azzjgar3qg1fjh9q5haigj4k0yjpqxfrvjqj8khag5ls3"; + "macos-aarch64" = "06sjlwsk1854c6qpxbfqccvcyk4i8dv13jbc7s7lamgd45wrb5qa"; + "macos-x86_64" = "1mkzcwya5mjn0hjxmx8givmx9y1v4hy0cqayya20rvk10jngsfz7"; + "linux-x86_64" = "1kv81ilp2dzhxx0kbqkl0i43b44vr5dvni607k78vn6n3mj59j0g"; }.${arch}; in fetchurl { From 458c1ec2eb0897589caad0e38446f43ee889775e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Apr 2023 11:08:33 +0200 Subject: [PATCH 019/244] python310Packages.openai: 0.27.4 -> 0.27.5 Diff: https://github.com/openai/openai-python/compare/refs/tags/v0.27.4...v0.27.5 Changelog: https://github.com/openai/openai-python/releases/tag/v0.27.5 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 3929367de55b..75d2b74f1949 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.27.4"; + version = "0.27.5"; format = "setuptools"; disabled = pythonOlder "3.7.1"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-E6Y4PdxwR1V4j48bbbuV6DtgAtXRyEMa9ipA1URL2Ac="; + hash = "sha256-8C5D+zKZtKaF2Jy+9vQeNkf9YDxTo86tgn3rxTDvHjQ="; }; propagatedBuildInputs = [ From 485ce863b6384de1476365fa03616d451659a36d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Apr 2023 11:09:21 +0200 Subject: [PATCH 020/244] python310Packages.openaiauth: 0.3.2 -> 0.3.6 Changelog: https://github.com/acheong08/OpenAIAuth/releases/tag/0.3.6 --- pkgs/development/python-modules/openaiauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openaiauth/default.nix b/pkgs/development/python-modules/openaiauth/default.nix index bfe13d57dd9e..a50fd9baad87 100644 --- a/pkgs/development/python-modules/openaiauth/default.nix +++ b/pkgs/development/python-modules/openaiauth/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "openaiauth"; - version = "0.3.2"; + version = "0.3.6"; src = fetchPypi { inherit version; pname = "OpenAIAuth"; - hash = "sha256-CPcBgGvxRO677EdPI3lNtJXkCW7el6N6N2GeaDo5ApU="; + hash = "sha256-SaiTqs2HVv5ajUkrLJv24ed1+iJg5HqsCNe0IETkA00="; }; propagatedBuildInputs = [ requests ]; From 7efebca89c10c8b075790d31dad12c31beb23383 Mon Sep 17 00:00:00 2001 From: Winter Date: Sat, 28 Jan 2023 12:48:24 -0500 Subject: [PATCH 021/244] prefetch-npm-deps: fix reproducibility v1 lockfiles can contain multiple references to the same version of a package, and these references can contain different `integrity` values, such as one having SHA-1 and SHA-512, while another just has SHA-512. Given that HashMap iteration order isn't defined, this causes reproducibility issues, as a different integrity value could be chosen each time. Thanks to @lilyinstarlight for discovering this issue originally, as well as the idea for the sorting-based implementation. --- .../node/fetch-npm-deps/src/main.rs | 2 +- .../node/fetch-npm-deps/src/parse/lock.rs | 148 +++++++++++++++++- .../node/fetch-npm-deps/src/parse/mod.rs | 48 ++---- 3 files changed, 151 insertions(+), 47 deletions(-) diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index 57725a922dfd..2ce03cfd2aad 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -105,7 +105,7 @@ fn main() -> anyhow::Result<()> { eprintln!("{}", package.name); let tarball = package.tarball()?; - let integrity = package.integrity(); + let integrity = package.integrity().map(ToString::to_string); cache .put( diff --git a/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs b/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs index 99bd3020b523..572510bd82d2 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs @@ -1,7 +1,14 @@ -use anyhow::{bail, Context}; +use anyhow::{anyhow, bail, Context}; use rayon::slice::ParallelSliceMut; -use serde::Deserialize; -use std::{collections::HashMap, fmt}; +use serde::{ + de::{self, Visitor}, + Deserialize, Deserializer, +}; +use std::{ + cmp::Ordering, + collections::{HashMap, HashSet}, + fmt, +}; use url::Url; pub(super) fn packages(content: &str) -> anyhow::Result> { @@ -33,6 +40,13 @@ pub(super) fn packages(content: &str) -> anyhow::Result> { x.resolved .partial_cmp(&y.resolved) .expect("resolved should be comparable") + .then( + // v1 lockfiles can contain multiple references to the same version of a package, with + // different integrity values (e.g. a SHA-1 and a SHA-512 in one, but just a SHA-512 in another) + y.integrity + .partial_cmp(&x.integrity) + .expect("integrity should be comparable"), + ) }); packages.dedup_by(|x, y| x.resolved == y.resolved); @@ -54,7 +68,7 @@ struct OldPackage { #[serde(default)] bundled: bool, resolved: Option, - integrity: Option, + integrity: Option, dependencies: Option>, } @@ -63,7 +77,7 @@ pub(super) struct Package { #[serde(default)] pub(super) name: Option, pub(super) resolved: Option, - pub(super) integrity: Option, + pub(super) integrity: Option, } #[derive(Debug, Deserialize, PartialEq, Eq, PartialOrd, Ord)] @@ -82,6 +96,102 @@ impl fmt::Display for UrlOrString { } } +#[derive(Debug, PartialEq, Eq)] +pub(super) struct HashCollection(HashSet); + +impl HashCollection { + pub(super) fn into_best(self) -> Option { + self.0.into_iter().max() + } +} + +impl PartialOrd for HashCollection { + fn partial_cmp(&self, other: &Self) -> Option { + let lhs = self.0.iter().max()?; + let rhs = other.0.iter().max()?; + + lhs.partial_cmp(rhs) + } +} + +impl<'de> Deserialize<'de> for HashCollection { + fn deserialize(deserializer: D) -> Result + where + D: Deserializer<'de>, + { + deserializer.deserialize_string(HashCollectionVisitor) + } +} + +struct HashCollectionVisitor; + +impl<'de> Visitor<'de> for HashCollectionVisitor { + type Value = HashCollection; + + fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result { + formatter.write_str("a single SRI hash or a collection of them (separated by spaces)") + } + + fn visit_str(self, value: &str) -> Result + where + E: de::Error, + { + let hashes = value + .split_ascii_whitespace() + .map(Hash::new) + .collect::>() + .map_err(E::custom)?; + + Ok(HashCollection(hashes)) + } +} + +#[derive(Debug, Deserialize, PartialEq, Eq, Hash)] +pub struct Hash(String); + +// Hash algorithms, in ascending preference. +const ALGOS: &[&str] = &["sha1", "sha512"]; + +impl Hash { + fn new(s: impl AsRef) -> anyhow::Result { + let algo = s + .as_ref() + .split_once('-') + .ok_or_else(|| anyhow!("expected SRI hash, got {:?}", s.as_ref()))? + .0; + + if ALGOS.iter().any(|&a| algo == a) { + Ok(Hash(s.as_ref().to_string())) + } else { + Err(anyhow!("unknown hash algorithm {algo:?}")) + } + } +} + +impl fmt::Display for Hash { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + self.0.fmt(f) + } +} + +impl PartialOrd for Hash { + fn partial_cmp(&self, other: &Hash) -> Option { + let lhs = self.0.split_once('-')?.0; + let rhs = other.0.split_once('-')?.0; + + ALGOS + .iter() + .position(|&s| lhs == s)? + .partial_cmp(&ALGOS.iter().position(|&s| rhs == s)?) + } +} + +impl Ord for Hash { + fn cmp(&self, other: &Hash) -> Ordering { + self.partial_cmp(other).unwrap() + } +} + #[allow(clippy::case_sensitive_file_extension_comparisons)] fn to_new_packages( old_packages: HashMap, @@ -149,8 +259,13 @@ fn get_initial_url() -> anyhow::Result { #[cfg(test)] mod tests { - use super::{get_initial_url, to_new_packages, OldPackage, Package, UrlOrString}; - use std::collections::HashMap; + use super::{ + get_initial_url, to_new_packages, Hash, HashCollection, OldPackage, Package, UrlOrString, + }; + use std::{ + cmp::Ordering, + collections::{HashMap, HashSet}, + }; use url::Url; #[test] @@ -188,4 +303,23 @@ mod tests { Ok(()) } + + #[test] + fn hash_preference() { + assert_eq!( + Hash(String::from("sha1-foo")).partial_cmp(&Hash(String::from("sha512-foo"))), + Some(Ordering::Less) + ); + + assert_eq!( + HashCollection({ + let mut set = HashSet::new(); + set.insert(Hash(String::from("sha512-foo"))); + set.insert(Hash(String::from("sha1-bar"))); + set + }) + .into_best(), + Some(Hash(String::from("sha512-foo"))) + ); + } } diff --git a/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs index 387b3add7ec9..d96f7d878796 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs @@ -87,7 +87,7 @@ pub struct Package { #[derive(Debug)] enum Specifics { - Registry { integrity: String }, + Registry { integrity: lock::Hash }, Git { workdir: TempDir }, } @@ -134,11 +134,11 @@ impl Package { Specifics::Git { workdir } } None => Specifics::Registry { - integrity: get_ideal_hash( - &pkg.integrity - .expect("non-git dependencies should have assosciated integrity"), - )? - .to_string(), + integrity: pkg + .integrity + .expect("non-git dependencies should have assosciated integrity") + .into_best() + .expect("non-git dependencies should have non-empty assosciated integrity"), }, }; @@ -181,9 +181,9 @@ impl Package { } } - pub fn integrity(&self) -> Option { + pub fn integrity(&self) -> Option<&lock::Hash> { match &self.specifics { - Specifics::Registry { integrity } => Some(integrity.clone()), + Specifics::Registry { integrity } => Some(integrity), Specifics::Git { .. } => None, } } @@ -304,25 +304,9 @@ fn get_hosted_git_url(url: &Url) -> anyhow::Result> { } } -fn get_ideal_hash(integrity: &str) -> anyhow::Result<&str> { - let split: Vec<_> = integrity.split_ascii_whitespace().collect(); - - if split.len() == 1 { - Ok(split[0]) - } else { - for hash in ["sha512-", "sha1-"] { - if let Some(h) = split.iter().find(|s| s.starts_with(hash)) { - return Ok(h); - } - } - - Err(anyhow!("not sure which hash to select out of {split:?}")) - } -} - #[cfg(test)] mod tests { - use super::{get_hosted_git_url, get_ideal_hash}; + use super::get_hosted_git_url; use url::Url; #[test] @@ -353,18 +337,4 @@ mod tests { "GitLab URLs should be marked as invalid (lol)" ); } - - #[test] - fn ideal_hashes() { - for (input, expected) in [ - ("sha512-foo sha1-bar", Some("sha512-foo")), - ("sha1-bar md5-foo", Some("sha1-bar")), - ("sha1-bar", Some("sha1-bar")), - ("sha512-foo", Some("sha512-foo")), - ("foo-bar sha1-bar", Some("sha1-bar")), - ("foo-bar baz-foo", None), - ] { - assert_eq!(get_ideal_hash(input).ok(), expected); - } - } } From 503039f741d0b24059284a3ca4568598da9b781b Mon Sep 17 00:00:00 2001 From: Eduardo Quiros Date: Fri, 28 Apr 2023 16:20:54 -0600 Subject: [PATCH 022/244] quickemu: 4.6 -> 4.7 Diff: https://github.com/quickemu-project/quickemu/compare/4.6...4.7 --- pkgs/development/quickemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/quickemu/default.nix b/pkgs/development/quickemu/default.nix index ccfc23913fe7..2cb036e7e22d 100644 --- a/pkgs/development/quickemu/default.nix +++ b/pkgs/development/quickemu/default.nix @@ -49,13 +49,13 @@ in stdenv.mkDerivation rec { pname = "quickemu"; - version = "4.6"; + version = "4.7"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = version; - hash = "sha256-C/3zyHnxAxCu8rrR4Znka47pVPp0vvaVGyd4TVQG3qg="; + hash = "sha256-6ctO11dKUj+CnHPVdj705uTwx31zKNQp6AUb/0kCgK8="; }; postPatch = '' From ac35d7ea860d691d68f6e856202bad890478fe0b Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 30 Apr 2023 10:29:46 -0400 Subject: [PATCH 023/244] prefetch-npm-deps: look up hashes from cache when fixing up lockfiles --- .../hooks/npm-config-hook.sh | 6 + .../node/fetch-npm-deps/Cargo.lock | 30 ++ .../node/fetch-npm-deps/Cargo.toml | 1 + .../node/fetch-npm-deps/src/cacache.rs | 30 +- .../node/fetch-npm-deps/src/main.rs | 292 +++++++++++++++--- .../node/fetch-npm-deps/src/parse/lock.rs | 30 +- .../node/fetch-npm-deps/src/parse/mod.rs | 2 +- 7 files changed, 329 insertions(+), 62 deletions(-) diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh index a31118626877..c1acdc3ac3f0 100644 --- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh +++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh @@ -56,6 +56,9 @@ npmConfigHook() { exit 1 fi + export CACHE_MAP_PATH="$TMP/MEOW" + @prefetchNpmDeps@ --map-cache + @prefetchNpmDeps@ --fixup-lockfile "$srcLockfile" local cachePath @@ -109,6 +112,9 @@ npmConfigHook() { patchShebangs node_modules + rm "$CACHE_MAP_PATH" + unset CACHE_MAP_PATH + echo "Finished npmConfigHook" } diff --git a/pkgs/build-support/node/fetch-npm-deps/Cargo.lock b/pkgs/build-support/node/fetch-npm-deps/Cargo.lock index ba832d115e6e..ff636e7e5961 100644 --- a/pkgs/build-support/node/fetch-npm-deps/Cargo.lock +++ b/pkgs/build-support/node/fetch-npm-deps/Cargo.lock @@ -305,6 +305,7 @@ dependencies = [ "tempfile", "ureq", "url", + "walkdir", ] [[package]] @@ -400,6 +401,15 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09" +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "scopeguard" version = "1.1.0" @@ -583,6 +593,17 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +[[package]] +name = "walkdir" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +dependencies = [ + "same-file", + "winapi", + "winapi-util", +] + [[package]] name = "wasm-bindgen" version = "0.2.82" @@ -682,6 +703,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +[[package]] +name = "winapi-util" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +dependencies = [ + "winapi", +] + [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" diff --git a/pkgs/build-support/node/fetch-npm-deps/Cargo.toml b/pkgs/build-support/node/fetch-npm-deps/Cargo.toml index bebdaad29525..ebb631c0955a 100644 --- a/pkgs/build-support/node/fetch-npm-deps/Cargo.toml +++ b/pkgs/build-support/node/fetch-npm-deps/Cargo.toml @@ -17,3 +17,4 @@ sha2 = "0.10.6" tempfile = "3.3.0" ureq = { version = "2.5.0" } url = { version = "2.3.1", features = ["serde"] } +walkdir = "2.3.2" diff --git a/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs b/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs index 5326c3e858bb..3c49ef187021 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/cacache.rs @@ -1,5 +1,5 @@ use digest::{Digest, Update}; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use sha1::Sha1; use sha2::{Sha256, Sha512}; use std::{ @@ -9,24 +9,24 @@ use std::{ }; use url::Url; -#[derive(Serialize)] -struct Key { - key: String, - integrity: String, - time: u8, - size: usize, - metadata: Metadata, +#[derive(Serialize, Deserialize)] +pub(super) struct Key { + pub(super) key: String, + pub(super) integrity: String, + pub(super) time: u8, + pub(super) size: usize, + pub(super) metadata: Metadata, } -#[derive(Serialize)] -struct Metadata { - url: Url, - options: Options, +#[derive(Serialize, Deserialize)] +pub(super) struct Metadata { + pub(super) url: Url, + pub(super) options: Options, } -#[derive(Serialize)] -struct Options { - compress: bool, +#[derive(Serialize, Deserialize)] +pub(super) struct Options { + pub(super) compress: bool, } pub struct Cache(PathBuf); diff --git a/pkgs/build-support/node/fetch-npm-deps/src/main.rs b/pkgs/build-support/node/fetch-npm-deps/src/main.rs index 2ce03cfd2aad..e6e44fc9d92e 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/main.rs @@ -1,67 +1,176 @@ #![warn(clippy::pedantic)] -use crate::cacache::Cache; -use anyhow::anyhow; +use crate::cacache::{Cache, Key}; +use anyhow::{anyhow, bail}; use rayon::prelude::*; use serde_json::{Map, Value}; use std::{ + collections::HashMap, env, fs, - path::Path, + path::{Path, PathBuf}, process::{self, Command}, }; use tempfile::tempdir; +use url::Url; +use walkdir::WalkDir; mod cacache; mod parse; -/// `fixup_lockfile` removes the `integrity` field from Git dependencies. +fn cache_map_path() -> Option { + env::var_os("CACHE_MAP_PATH").map(PathBuf::from) +} + +/// `fixup_lockfile` rewrites `integrity` hashes to match cache and removes the `integrity` field from Git dependencies. +/// +/// Sometimes npm has multiple instances of a given `resolved` URL that have different types of `integrity` hashes (e.g. SHA-1 +/// and SHA-512) in the lockfile. Given we only cache one version of these, the `integrity` field must be normalized to the hash +/// we cache as (which is the strongest available one). /// /// Git dependencies from specific providers can be retrieved from those providers' automatic tarball features. /// When these dependencies are specified with a commit identifier, npm generates a tarball, and inserts the integrity hash of that /// tarball into the lockfile. /// /// Thus, we remove this hash, to replace it with our own determinstic copies of dependencies from hosted Git providers. -fn fixup_lockfile(mut lock: Map) -> anyhow::Result>> { - if lock +/// +/// If no fixups were performed, `None` is returned and the lockfile structure should be left as-is. If fixups were performed, the +/// `dependencies` key in v2 lockfiles designed for backwards compatibility with v1 parsers is removed because of inconsistent data. +fn fixup_lockfile( + mut lock: Map, + cache: &Option>, +) -> anyhow::Result>> { + let mut fixed = false; + + match lock .get("lockfileVersion") .ok_or_else(|| anyhow!("couldn't get lockfile version"))? .as_i64() .ok_or_else(|| anyhow!("lockfile version isn't an int"))? - < 2 { - return Ok(None); - } + 1 => fixup_v1_deps( + lock.get_mut("dependencies") + .unwrap() + .as_object_mut() + .unwrap(), + cache, + &mut fixed, + ), + 2 | 3 => { + for package in lock + .get_mut("packages") + .ok_or_else(|| anyhow!("couldn't get packages"))? + .as_object_mut() + .ok_or_else(|| anyhow!("packages isn't a map"))? + .values_mut() + { + if let Some(Value::String(resolved)) = package.get("resolved") { + if let Some(Value::String(integrity)) = package.get("integrity") { + if resolved.starts_with("git+ssh://") { + fixed = true; - let mut fixed = false; + package + .as_object_mut() + .ok_or_else(|| anyhow!("package isn't a map"))? + .remove("integrity"); + } else if let Some(cache_hashes) = cache { + let cache_hash = cache_hashes + .get(resolved) + .expect("dependency should have a hash"); - for package in lock - .get_mut("packages") - .ok_or_else(|| anyhow!("couldn't get packages"))? - .as_object_mut() - .ok_or_else(|| anyhow!("packages isn't a map"))? - .values_mut() - { - if let Some(Value::String(resolved)) = package.get("resolved") { - if resolved.starts_with("git+ssh://") && package.get("integrity").is_some() { - fixed = true; + if integrity != cache_hash { + fixed = true; - package - .as_object_mut() - .ok_or_else(|| anyhow!("package isn't a map"))? - .remove("integrity"); + *package + .as_object_mut() + .ok_or_else(|| anyhow!("package isn't a map"))? + .get_mut("integrity") + .unwrap() = Value::String(cache_hash.clone()); + } + } + } + } + } + + if fixed { + lock.remove("dependencies"); } } + v => bail!("unsupported lockfile version {v}"), } if fixed { - lock.remove("dependencies"); - Ok(Some(lock)) } else { Ok(None) } } +// Recursive helper to fixup v1 lockfile deps +fn fixup_v1_deps( + dependencies: &mut serde_json::Map, + cache: &Option>, + fixed: &mut bool, +) { + for dep in dependencies.values_mut() { + if let Some(Value::String(resolved)) = dep + .as_object() + .expect("v1 dep must be object") + .get("resolved") + { + if let Some(Value::String(integrity)) = dep + .as_object() + .expect("v1 dep must be object") + .get("integrity") + { + if resolved.starts_with("git+ssh://") { + *fixed = true; + + dep.as_object_mut() + .expect("v1 dep must be object") + .remove("integrity"); + } else if let Some(cache_hashes) = cache { + let cache_hash = cache_hashes + .get(resolved) + .expect("dependency should have a hash"); + + if integrity != cache_hash { + *fixed = true; + + *dep.as_object_mut() + .expect("v1 dep must be object") + .get_mut("integrity") + .unwrap() = Value::String(cache_hash.clone()); + } + } + } + } + + if let Some(Value::Object(more_deps)) = dep.as_object_mut().unwrap().get_mut("dependencies") + { + fixup_v1_deps(more_deps, cache, fixed); + } + } +} + +fn map_cache() -> anyhow::Result> { + let mut hashes = HashMap::new(); + + let content_path = Path::new(&env::var_os("npmDeps").unwrap()).join("_cacache/index-v5"); + + for entry in WalkDir::new(content_path) { + let entry = entry?; + + if entry.file_type().is_file() { + let content = fs::read_to_string(entry.path())?; + let key: Key = serde_json::from_str(content.split_ascii_whitespace().nth(1).unwrap())?; + + hashes.insert(key.metadata.url, key.integrity); + } + } + + Ok(hashes) +} + fn main() -> anyhow::Result<()> { let args = env::args().collect::>(); @@ -76,12 +185,25 @@ fn main() -> anyhow::Result<()> { if args[1] == "--fixup-lockfile" { let lock = serde_json::from_str(&fs::read_to_string(&args[2])?)?; - if let Some(fixed) = fixup_lockfile(lock)? { + let cache = cache_map_path() + .map(|map_path| Ok::<_, anyhow::Error>(serde_json::from_slice(&fs::read(map_path)?)?)) + .transpose()?; + + if let Some(fixed) = fixup_lockfile(lock, &cache)? { println!("Fixing lockfile"); fs::write(&args[2], serde_json::to_string(&fixed)?)?; } + return Ok(()); + } else if args[1] == "--map-cache" { + let map = map_cache()?; + + fs::write( + cache_map_path().expect("CACHE_MAP_PATH environment variable must be set"), + serde_json::to_string(&map)?, + )?; + return Ok(()); } @@ -133,6 +255,8 @@ fn main() -> anyhow::Result<()> { #[cfg(test)] mod tests { + use std::collections::HashMap; + use super::fixup_lockfile; use serde_json::json; @@ -147,12 +271,20 @@ mod tests { }, "foo": { "resolved": "https://github.com/NixOS/nixpkgs", - "integrity": "aaa" + "integrity": "sha1-aaa" }, "bar": { "resolved": "git+ssh://git@github.com/NixOS/nixpkgs.git", - "integrity": "bbb" - } + "integrity": "sha512-aaa" + }, + "foo-bad": { + "resolved": "foo", + "integrity": "sha1-foo" + }, + "foo-good": { + "resolved": "foo", + "integrity": "sha512-foo" + }, } }); @@ -165,22 +297,112 @@ mod tests { }, "foo": { "resolved": "https://github.com/NixOS/nixpkgs", - "integrity": "aaa" + "integrity": "" }, "bar": { "resolved": "git+ssh://git@github.com/NixOS/nixpkgs.git", - } + }, + "foo-bad": { + "resolved": "foo", + "integrity": "sha512-foo" + }, + "foo-good": { + "resolved": "foo", + "integrity": "sha512-foo" + }, } }); + let mut hashes = HashMap::new(); + + hashes.insert( + String::from("https://github.com/NixOS/nixpkgs"), + String::new(), + ); + + hashes.insert( + String::from("git+ssh://git@github.com/NixOS/nixpkgs.git"), + String::new(), + ); + + hashes.insert(String::from("foo"), String::from("sha512-foo")); + assert_eq!( - fixup_lockfile(input.as_object().unwrap().clone())?, + fixup_lockfile(input.as_object().unwrap().clone(), &Some(hashes))?, Some(expected.as_object().unwrap().clone()) ); + Ok(()) + } + + #[test] + fn lockfile_v1_fixup() -> anyhow::Result<()> { + let input = json!({ + "lockfileVersion": 1, + "name": "foo", + "dependencies": { + "foo": { + "resolved": "https://github.com/NixOS/nixpkgs", + "integrity": "sha512-aaa" + }, + "foo-good": { + "resolved": "foo", + "integrity": "sha512-foo" + }, + "bar": { + "resolved": "git+ssh://git@github.com/NixOS/nixpkgs.git", + "integrity": "sha512-bbb", + "dependencies": { + "foo-bad": { + "resolved": "foo", + "integrity": "sha1-foo" + }, + }, + }, + } + }); + + let expected = json!({ + "lockfileVersion": 1, + "name": "foo", + "dependencies": { + "foo": { + "resolved": "https://github.com/NixOS/nixpkgs", + "integrity": "" + }, + "foo-good": { + "resolved": "foo", + "integrity": "sha512-foo" + }, + "bar": { + "resolved": "git+ssh://git@github.com/NixOS/nixpkgs.git", + "dependencies": { + "foo-bad": { + "resolved": "foo", + "integrity": "sha512-foo" + }, + }, + }, + } + }); + + let mut hashes = HashMap::new(); + + hashes.insert( + String::from("https://github.com/NixOS/nixpkgs"), + String::new(), + ); + + hashes.insert( + String::from("git+ssh://git@github.com/NixOS/nixpkgs.git"), + String::new(), + ); + + hashes.insert(String::from("foo"), String::from("sha512-foo")); + assert_eq!( - fixup_lockfile(json!({"lockfileVersion": 1}).as_object().unwrap().clone())?, - None + fixup_lockfile(input.as_object().unwrap().clone(), &Some(hashes))?, + Some(expected.as_object().unwrap().clone()) ); Ok(()) diff --git a/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs b/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs index 572510bd82d2..f50a31651d0e 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/parse/lock.rs @@ -97,10 +97,20 @@ impl fmt::Display for UrlOrString { } #[derive(Debug, PartialEq, Eq)] -pub(super) struct HashCollection(HashSet); +pub struct HashCollection(HashSet); impl HashCollection { - pub(super) fn into_best(self) -> Option { + pub fn from_str(s: impl AsRef) -> anyhow::Result { + let hashes = s + .as_ref() + .split_ascii_whitespace() + .map(Hash::new) + .collect::>()?; + + Ok(HashCollection(hashes)) + } + + pub fn into_best(self) -> Option { self.0.into_iter().max() } } @@ -136,17 +146,11 @@ impl<'de> Visitor<'de> for HashCollectionVisitor { where E: de::Error, { - let hashes = value - .split_ascii_whitespace() - .map(Hash::new) - .collect::>() - .map_err(E::custom)?; - - Ok(HashCollection(hashes)) + HashCollection::from_str(value).map_err(E::custom) } } -#[derive(Debug, Deserialize, PartialEq, Eq, Hash)] +#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Hash)] pub struct Hash(String); // Hash algorithms, in ascending preference. @@ -166,11 +170,15 @@ impl Hash { Err(anyhow!("unknown hash algorithm {algo:?}")) } } + + pub fn as_str(&self) -> &str { + &self.0 + } } impl fmt::Display for Hash { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - self.0.fmt(f) + self.as_str().fmt(f) } } diff --git a/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs index d96f7d878796..3dd6b7da4978 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs @@ -9,7 +9,7 @@ use std::{ use tempfile::{tempdir, TempDir}; use url::Url; -mod lock; +pub mod lock; pub fn lockfile(content: &str, force_git_deps: bool) -> anyhow::Result> { let mut packages = lock::packages(content) From e2700c1bce733351feecf677216579bae48b84a4 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 16 Apr 2023 13:14:49 +0200 Subject: [PATCH 024/244] steam: add udev to non-game-sepcific deps for SteamVR SteamVR is arguably part of Steam and udev should already exist on every system anyways, so closure size increase is minimal. --- pkgs/games/steam/fhsenv.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 8d461104eaac..5bf7972a6d90 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -131,6 +131,9 @@ in buildFHSUserEnv rec { tbb zlib + # SteamVR + udev + # Other things from runtime glib gtk2 @@ -177,7 +180,6 @@ in buildFHSUserEnv rec { xorg.xkeyboardconfig xorg.libpciaccess xorg.libXScrnSaver # Dead Cells - udev # Shadow of the Tomb Raider icu # dotnet runtime, e.g. Stardew Valley # screeps dependencies From b4b7c759b63bb2e57b8f70b4b4879144fbffcc11 Mon Sep 17 00:00:00 2001 From: Atemu Date: Sun, 16 Apr 2023 13:24:42 +0200 Subject: [PATCH 025/244] steam: add xdg-user-dirs to suppress log spam --- pkgs/games/steam/fhsenv.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 5bf7972a6d90..0536bca4a7d9 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -29,6 +29,9 @@ let procps usbutils + # It tries to execute xdg-user-dir and spams the log with command not founds + xdg-user-dirs + # electron based launchers need newer versions of these libraries than what runtime provides mesa sqlite From b9ae609d63bcf1c838185167a3c74fda964067d6 Mon Sep 17 00:00:00 2001 From: bb2020 Date: Sun, 30 Apr 2023 18:35:58 +0300 Subject: [PATCH 026/244] cdrdao: 1.2.3 -> 1.2.5 --- .../cdrdao/adjust-includes-for-glibc-212.patch | 15 --------------- pkgs/tools/cd-dvd/cdrdao/default.nix | 8 ++------ 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch diff --git a/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch b/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch deleted file mode 100644 index 6d58eb6e9a56..000000000000 --- a/pkgs/tools/cd-dvd/cdrdao/adjust-includes-for-glibc-212.patch +++ /dev/null @@ -1,15 +0,0 @@ -Adjust some headers for glibc 2.12 compatibility. -Patch is a diff between the 1.2.3 release and CVS HEAD. - ---- cdrdao-1.2.3/dao/ScsiIf-linux.cc 2009-09-28 05:42:03.000000000 -0430 -+++ /home/kkallio/q/src/r/cvs/cdrdao/cdrdao/dao/ScsiIf-linux.cc 2010-08-06 07:50:46.000000000 -0430 -@@ -19,6 +19,9 @@ - - #include - -+#include -+#include -+ - #include - #include - #include diff --git a/pkgs/tools/cd-dvd/cdrdao/default.nix b/pkgs/tools/cd-dvd/cdrdao/default.nix index d3aa726afbb9..527d70e7a90d 100644 --- a/pkgs/tools/cd-dvd/cdrdao/default.nix +++ b/pkgs/tools/cd-dvd/cdrdao/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cdrdao"; - version = "1.2.3"; + version = "1.2.5"; src = fetchurl { url = "mirror://sourceforge/cdrdao/cdrdao-${version}.tar.bz2"; - sha256 = "0pmpgx91j984snrsxbq1dgf3ximks2dfh1sqqmic72lrls7wp4w1"; + hash = "sha256-0ZtnyFPF26JAavqrbNeI53817r5jTKxGeVKEd8e+AbY="; }; makeFlags = [ "RM=rm" "LN=ln" "MV=mv" ]; @@ -16,10 +16,6 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - # Adjust some headers to match glibc 2.12 ... patch is a diff between - # the cdrdao CVS head and the 1.2.3 release. - patches = [ ./adjust-includes-for-glibc-212.patch ]; - # we have glibc/include/linux as a symlink to the kernel headers, # and the magic '..' points to kernelheaders, and not back to the glibc/include postPatch = '' From 906025e445ee67878cd69896c4e0275dc92af2ed Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 1 May 2023 10:37:44 -0700 Subject: [PATCH 027/244] fishPlugins.github-copilot-cli-fish: init at 0.1.33 --- pkgs/shells/fish/plugins/default.nix | 2 ++ .../fish/plugins/github-copilot-cli-fish.nix | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/shells/fish/plugins/github-copilot-cli-fish.nix diff --git a/pkgs/shells/fish/plugins/default.nix b/pkgs/shells/fish/plugins/default.nix index e6b7db5966a8..3c3a99b35e56 100644 --- a/pkgs/shells/fish/plugins/default.nix +++ b/pkgs/shells/fish/plugins/default.nix @@ -32,6 +32,8 @@ lib.makeScope newScope (self: with self; { fzf-fish = callPackage ./fzf-fish.nix { }; + github-copilot-cli-fish = callPackage ./github-copilot-cli-fish.nix { }; + grc = callPackage ./grc.nix { }; humantime-fish = callPackage ./humantime-fish.nix { }; diff --git a/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix new file mode 100644 index 000000000000..83192ad092f5 --- /dev/null +++ b/pkgs/shells/fish/plugins/github-copilot-cli-fish.nix @@ -0,0 +1,20 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin rec { + pname = "github-copilot-cli.fish"; + version = "0.1.33"; + + src = fetchFromGitHub { + owner = "z11i"; + repo = pname; + rev = version; + hash = "sha256-dhACPlFrw1Z0dW0eA0IMnOelYJc7Fyz2D9u+rL1pyiM="; + }; + + meta = with lib; { + description = "GitHub Copilot CLI aliases for Fish Shell"; + homepage = "https://github.com/z11i/github-copilot-cli.fish"; + license = licenses.asl20; + maintainers = [ maintainers.malo ]; + }; +} From 5e53c6f7e51bd1cbc15666dcffa9e00adff762d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 2 May 2023 01:06:28 +0200 Subject: [PATCH 028/244] topgrade: 10.3.3 -> 11.0.2 Diff: https://github.com/topgrade-rs/topgrade/compare/v10.3.3...v11.0.2 Changelog: https://github.com/topgrade-rs/topgrade/releases/tag/v11.0.2 --- pkgs/tools/misc/topgrade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 72c31163dbf1..4e94957c5b12 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "10.3.3"; + version = "11.0.2"; src = fetchFromGitHub { owner = "topgrade-rs"; repo = "topgrade"; rev = "v${version}"; - hash = "sha256-LhTUzY2WrauWHYZU5jA6fn3DDheUgfxCPvjVTwUvF4w="; + hash = "sha256-0pMaFEkzyZkZ7bkPK4hJDjCo/OWYreG+/zyaPl1sNso="; }; - cargoHash = "sha256-ONLZrZjhNcli7ul6fDgVEKm2MS3YYIfPnHS+dmpJHu0="; + cargoHash = "sha256-RqJKwk3MeSYx4kfyzF55A7GltM5PZynHbRYCFFj9JkQ="; nativeBuildInputs = [ installShellFiles From c283f7a9891027c8809f08a618b97cbf01ab90b7 Mon Sep 17 00:00:00 2001 From: huantian Date: Tue, 2 May 2023 01:25:32 -0700 Subject: [PATCH 029/244] meslo-lgs-nf: 2021-09-03 -> unstable-2023-04-03 --- pkgs/data/fonts/meslo-lgs-nf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/meslo-lgs-nf/default.nix b/pkgs/data/fonts/meslo-lgs-nf/default.nix index 4d56af449cc2..51dacaba366c 100644 --- a/pkgs/data/fonts/meslo-lgs-nf/default.nix +++ b/pkgs/data/fonts/meslo-lgs-nf/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "meslo-lgs-nf"; - version = "2021-09-03"; + version = "unstable-2023-04-03"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k-media"; - rev = "389133fb8c9a2347929a23702ce3039aacc46c3d"; - sha256 = "sha256-dWqRxjqsa/Tiv0Ww8VLHRDhftD3eqa1t2/T0irFeMFI="; + rev = "145eb9fbc2f42ee408dacd9b22d8e6e0e553f83d"; + sha256 = "sha256-8xwVOlOP1SresbReNh1ce2Eu12KdIwdJSg6LKM+k2ng="; }; installPhase = '' From e9fee1110092f226e6e6884243ced9e87e149893 Mon Sep 17 00:00:00 2001 From: Filippo Berto Date: Mon, 1 May 2023 20:34:46 +0200 Subject: [PATCH 030/244] zscroll: 1.0 -> 2.0.1 --- pkgs/applications/misc/zscroll/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix index d3424938dd9b..bc53ade06a78 100644 --- a/pkgs/applications/misc/zscroll/default.nix +++ b/pkgs/applications/misc/zscroll/default.nix @@ -2,7 +2,7 @@ python3Packages.buildPythonApplication rec { pname = "zscroll"; - version = "1.0"; + version = "2.0.1"; # don't prefix with python version namePrefix = ""; @@ -10,8 +10,8 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "noctuid"; repo = "zscroll"; - rev = "v${version}"; - sha256 = "0rf9m1czy19hzpcp8dq9c5zawk0nhwfzzjxlhk9r2n06lhb81ig5"; + rev = version; + sha256 = "sha256-gEluWzCbztO4N1wdFab+2xH7l9w5HqZVzp2LrdjHSRM="; }; doCheck = false; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A text scroller for use with panels and shells"; homepage = "https://github.com/noctuid/zscroll"; - license = licenses.bsd2; + license = licenses.gpl3Plus; platforms = platforms.all; }; } From 5ddd329f7cd3be17b69e9bd475621edb37d75089 Mon Sep 17 00:00:00 2001 From: Alex Wied Date: Tue, 2 May 2023 12:40:20 -0400 Subject: [PATCH 031/244] python3Packages.cron-descriptor: 1.2.30 -> 1.2.35 --- .../python-modules/cron-descriptor/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cron-descriptor/default.nix b/pkgs/development/python-modules/cron-descriptor/default.nix index dd8755a9e900..bb946780009e 100644 --- a/pkgs/development/python-modules/cron-descriptor/default.nix +++ b/pkgs/development/python-modules/cron-descriptor/default.nix @@ -2,18 +2,19 @@ , python , buildPythonPackage , fetchFromGitHub +, mock , pytestCheckHook }: buildPythonPackage rec { pname = "cron_descriptor"; - version = "1.2.30"; + version = "1.2.35"; src = fetchFromGitHub { owner = "Salamek"; repo = "cron-descriptor"; rev = "refs/tags/${version}"; - hash = "sha256-Qei9f0HlIu5sautMEASvxdUqZyXKvHDWJgd3oST1gJo="; + hash = "sha256-m+h91cddmEPHCeUWWNpTvb89mFwm8ty8tTnw3YDjCFo="; }; # remove tests_require, as we don't do linting anyways @@ -21,6 +22,10 @@ buildPythonPackage rec { sed -i "/'pep8\|flake8\|pep8-naming',/d" setup.py ''; + checkInputs = [ + mock + ]; + checkPhase = '' ${python.interpreter} setup.py test ''; From 69392cf6e34902c851b5c7d42ee0e6d262acea23 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 1 May 2023 22:49:13 -0500 Subject: [PATCH 032/244] zimlib: 7.2.2 -> 8.2.0 See release notes: https://github.com/openzim/libzim/releases/tag/8.2.0 Move maintainership to greg --- maintainers/maintainer-list.nix | 6 ++++++ pkgs/development/libraries/zimlib/default.nix | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4216fff9adb8..7e4224d529c3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5866,6 +5866,12 @@ fingerprint = "7FC7 98AB 390E 1646 ED4D 8F1F 797F 6238 68CD 00C2"; }]; }; + greg = { + email = "greg.hellings@gmail.com"; + github = "greg-hellings"; + githubId = 273582; + name = "greg"; + }; greizgh = { email = "greizgh@ephax.org"; github = "greizgh"; diff --git a/pkgs/development/libraries/zimlib/default.nix b/pkgs/development/libraries/zimlib/default.nix index 15161b17c2a5..40f8e670b526 100644 --- a/pkgs/development/libraries/zimlib/default.nix +++ b/pkgs/development/libraries/zimlib/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "zimlib"; - version = "7.2.2"; + version = "8.2.0"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; rev = version; - sha256 = "sha256-AEhhjinnnMA4NbYL7NVHYeRZX/zfNiidbY/VeFjZuQs="; + sha256 = "sha256-ab7UUF+I0/xaGChvdjylEQRHLOjmtg/wk+/JEGehGLE="; }; testData = fetchzip rec { @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "Library for reading and writing ZIM files"; homepage = "https://www.openzim.org/wiki/Zimlib"; license = licenses.gpl2; - maintainers = with maintainers; [ ajs124 ]; + maintainers = with maintainers; [ greg ]; platforms = platforms.linux; }; } From 00b1cde808382820f4e289bcafb34c9e1c9cd6b6 Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Tue, 2 May 2023 16:32:52 -0400 Subject: [PATCH 033/244] borgmatic: make dependency on systemd conditional --- pkgs/tools/backup/borgmatic/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borgmatic/default.nix b/pkgs/tools/backup/borgmatic/default.nix index 53cb506992ab..db88c6a05989 100644 --- a/pkgs/tools/backup/borgmatic/default.nix +++ b/pkgs/tools/backup/borgmatic/default.nix @@ -1,4 +1,14 @@ -{ borgbackup, coreutils, lib, python3Packages, systemd, installShellFiles, borgmatic, testers }: +{ lib +, stdenv +, borgbackup +, coreutils +, python3Packages +, systemd +, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd +, installShellFiles +, borgmatic +, testers +}: python3Packages.buildPythonApplication rec { pname = "borgmatic"; @@ -31,7 +41,7 @@ python3Packages.buildPythonApplication rec { postInstall = '' installShellCompletion --cmd borgmatic \ --bash <($out/bin/borgmatic --bash-completion) - + '' + lib.optionalString enableSystemd '' mkdir -p $out/lib/systemd/system cp sample/systemd/borgmatic.timer $out/lib/systemd/system/ # there is another "sleep", so choose the one with the space after it From a9c0286bb1e6bed3dcfc43cfb6c616deab128a23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 2 May 2023 23:39:27 +0200 Subject: [PATCH 034/244] python310Packages.zeroconf: 0.58.2 -> 0.60.0 Diff: https://github.com/jstasiak/python-zeroconf/compare/refs/tags/0.58.2...0.60.0 Changelog: https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.60.0 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index e86ee8a8bb3c..ac920668c940 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.58.2"; + version = "0.60.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-phwGnAosPuH9zj3lS8o78bQohGAllICpbn1cNgRmh0Y="; + hash = "sha256-8DAklQhvZ5/NSWDVZQEaRHz+wb05tMPnVT8TvTho+Sc="; }; nativeBuildInputs = [ From 5cce9f0c442977c9570e608ac47624ea4cdea8b8 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 2 May 2023 21:57:17 -0300 Subject: [PATCH 035/244] cimg: 3.2.3 -> 3.2.4 --- pkgs/development/libraries/cimg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index f47bf7a36a24..6d8278425b08 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cimg"; - version = "3.2.3"; + version = "3.2.4"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; rev = "v.${version}"; - hash = "sha256-DFTqx4v3Hf2HyT02yBLo4n1yKPuPVz1oa2C5LsIeyCY="; + hash = "sha256-CQYY5aKRDe6F7GrBJfqt0t/rjjdZnr/c/cqhr6yVACA="; }; outputs = [ "out" "doc" ]; From 9735d32e8bcbcd17f67ac8d4232069d4fd946015 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 2 May 2023 21:57:49 -0300 Subject: [PATCH 036/244] cimg: cosmetic changes - use rec-less, finalAttrs-style attributes - remove nested `with` from meta attributes --- pkgs/development/libraries/cimg/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix index 6d8278425b08..b48986f9ce5e 100644 --- a/pkgs/development/libraries/cimg/default.nix +++ b/pkgs/development/libraries/cimg/default.nix @@ -5,14 +5,14 @@ , gmic-qt }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cimg"; version = "3.2.4"; src = fetchFromGitHub { owner = "GreycLab"; repo = "CImg"; - rev = "v.${version}"; + rev = "v.${finalAttrs.version}"; hash = "sha256-CQYY5aKRDe6F7GrBJfqt0t/rjjdZnr/c/cqhr6yVACA="; }; @@ -31,11 +31,11 @@ stdenv.mkDerivation rec { ''; passthru.tests = { - # Need to update in lockstep. + # Needs to update them all in lockstep. inherit gmic gmic-qt; }; - meta = with lib; { + meta = { homepage = "http://cimg.eu/"; description = "A small, open source, C++ toolkit for image processing"; longDescription = '' @@ -44,8 +44,11 @@ stdenv.mkDerivation rec { C++. Due to its generic conception, it can cover a wide range of image processing applications. ''; - license = licenses.cecill-c; - maintainers = [ maintainers.AndersonTorres maintainers.lilyinstarlight ]; - platforms = platforms.unix; + license = lib.licenses.cecill-c; + maintainers = [ + lib.maintainers.AndersonTorres + lib.maintainers.lilyinstarlight + ]; + platforms = lib.platforms.unix; }; -} +}) From 1a898558c8151c1e10c8519c700a45460475f27c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 2 May 2023 22:11:42 -0300 Subject: [PATCH 037/244] gmic: 3.2.3 -> 3.2.4 --- pkgs/tools/graphics/gmic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index 19b04054eedd..d077f13fef8f 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "3.2.3"; + version = "3.2.4"; outputs = [ "out" "lib" "dev" "man" ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { owner = "GreycLab"; repo = "gmic"; rev = "v.${version}"; - hash = "sha256-slEyZoYSNFrZ0d8a+mnJeqWQLqcJTPrkfpDpdag/vLA="; + hash = "sha256-ITKsPhfDfkHmE7a04cxrpIKsSVlrPN944ySu2DCnyEU="; }; # TODO: build this from source From 3765b2a1ee337d7d485b0ba8dc20bfeb801aa26e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 2 May 2023 22:11:57 -0300 Subject: [PATCH 038/244] gmic: cosmetic changes - reorder input set - include cimg to passthru.tests - use rec-less, finalAttrs-style attributes - remove nested `with` from meta attributes --- pkgs/tools/graphics/gmic/default.nix | 84 +++++++++++++++------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/pkgs/tools/graphics/gmic/default.nix b/pkgs/tools/graphics/gmic/default.nix index d077f13fef8f..b1df7fbcc063 100644 --- a/pkgs/tools/graphics/gmic/default.nix +++ b/pkgs/tools/graphics/gmic/default.nix @@ -1,30 +1,30 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchFromGitHub , fetchurl -, cmake -, ninja -, pkg-config -, opencv -, openexr -, graphicsmagick , cimg -, fftw -, zlib -, libjpeg -, libtiff -, libpng -, writeShellScript +, cmake , common-updater-scripts +, coreutils , curl +, fftw +, gmic-qt , gnugrep , gnused -, coreutils +, graphicsmagick , jq -, gmic-qt +, libjpeg +, libpng +, libtiff +, ninja +, opencv +, openexr +, pkg-config +, writeShellScript +, zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gmic"; version = "3.2.4"; @@ -33,15 +33,15 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "GreycLab"; repo = "gmic"; - rev = "v.${version}"; + rev = "v.${finalAttrs.version}"; hash = "sha256-ITKsPhfDfkHmE7a04cxrpIKsSVlrPN944ySu2DCnyEU="; }; # TODO: build this from source - # https://github.com/dtschump/gmic/blob/b36b2428db5926af5eea5454f822f369c2d9907e/src/Makefile#L675-L729 + # Reference: src/Makefile, directive gmic_stdlib.h gmic_stdlib = fetchurl { name = "gmic_stdlib.h"; - url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] version}.h"; + url = "http://gmic.eu/gmic_stdlib${lib.replaceStrings ["."] [""] finalAttrs.version}.h"; hash = "sha256-ExMCxFkkctqrdSy5M/TXD5GBRmRA9YEdsYW8nWiTEYY="; }; @@ -54,13 +54,13 @@ stdenv.mkDerivation rec { buildInputs = [ cimg fftw - zlib + graphicsmagick libjpeg - libtiff libpng + libtiff opencv openexr - graphicsmagick + zlib ]; cmakeFlags = [ @@ -71,47 +71,51 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # TODO: build from source - cp -r ${gmic_stdlib} src/gmic_stdlib.h + cp -r ${finalAttrs.gmic_stdlib} src/gmic_stdlib.h # CMake build files were moved to subdirectory. mv resources/CMakeLists.txt resources/cmake . - '' + lib.optionalString stdenv.isDarwin '' + '' + + lib.optionalString stdenv.isDarwin '' substituteInPlace CMakeLists.txt \ --replace "LD_LIBRARY_PATH" "DYLD_LIBRARY_PATH" ''; passthru = { tests = { - # Needs to update in lockstep. - inherit gmic-qt; + # Needs to update them all in lockstep. + inherit cimg gmic-qt; }; - updateScript = writeShellScript "${pname}-update-script" '' + updateScript = writeShellScript "gmic-update-script" '' set -o errexit - PATH=${lib.makeBinPath [ common-updater-scripts curl gnugrep gnused coreutils jq ]} + PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep gnused jq ]} - latestVersion=$(curl 'https://gmic.eu/files/source/' | grep -E 'gmic_[^"]+\.tar\.gz' | sed -E 's/.+ Date: Tue, 2 May 2023 22:17:55 -0300 Subject: [PATCH 039/244] gmic-qt: 3.2.3 -> 3.2.4 --- pkgs/tools/graphics/gmic-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index fa974aa97c82..a0cdf18ffced 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -46,11 +46,11 @@ assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps stdenv.mkDerivation rec { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.2.3"; + version = "3.2.4"; src = fetchzip { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - hash = "sha256-OTdf9BtaRak/jv1GknidDAkdxf99saBqj6EMoRJDIuo="; + hash = "sha256-FJ2zlsah/3Jf5ie4UhQsPvMoxDMc6iHl3AkhKsZSuqE="; }; sourceRoot = "source/gmic-qt"; From 136b947128c7fa19cc76d4d31f89eeb7a897d48c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 2 May 2023 22:23:58 -0300 Subject: [PATCH 040/244] gmic: cosmetic changes - reorder input set - use rec-less, finalAttrs-style attributes - include cimg and gmic to passthru.tests - use `preConfigure` instead of `sourceRoot` - remove nested `with` from meta attributes --- pkgs/tools/graphics/gmic-qt/default.nix | 71 ++++++++++++++----------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index a0cdf18ffced..f12a5b4da5c5 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -1,26 +1,27 @@ { lib , stdenv -, variant ? "standalone" , fetchzip +, cimg , cmake -, pkg-config +, curl +, fftw +, gimp +, gimpPlugins +, gmic +, graphicsmagick +, libjpeg +, libpng +, libtiff , ninja -, wrapQtAppsHook +, nix-update-script , opencv3 , openexr -, graphicsmagick -, fftw -, zlib -, libjpeg -, libtiff -, libpng -, curl -, gimp ? null -, gmic +, pkg-config , qtbase , qttools -, nix-update-script -, gimpPlugins +, wrapQtAppsHook +, zlib +, variant ? "standalone" }: let @@ -40,21 +41,23 @@ let in -assert lib.assertMsg (builtins.hasAttr variant variants) "gmic-qt variant “${variant}” is not supported. Please use one of ${lib.concatStringsSep ", " (builtins.attrNames variants)}."; +assert lib.assertMsg + (builtins.hasAttr variant variants) + "gmic-qt variant \"${variant}\" is not supported. Please use one of ${lib.concatStringsSep ", " (builtins.attrNames variants)}."; -assert lib.assertMsg (builtins.all (d: d != null) variants.${variant}.extraDeps or []) "gmic-qt variant “${variant}” is missing one of its dependencies."; +assert lib.assertMsg + (builtins.all (d: d != null) variants.${variant}.extraDeps or []) + "gmic-qt variant \"${variant}\" is missing one of its dependencies."; -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; version = "3.2.4"; src = fetchzip { - url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; + url = "https://gmic.eu/files/source/gmic_${finalAttrs.version}.tar.gz"; hash = "sha256-FJ2zlsah/3Jf5ie4UhQsPvMoxDMc6iHl3AkhKsZSuqE="; }; - sourceRoot = "source/gmic-qt"; - nativeBuildInputs = [ cmake pkg-config @@ -77,11 +80,9 @@ stdenv.mkDerivation rec { curl ] ++ variants.${variant}.extraDeps or []; - cmakeFlags = [ - "-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}" - "-DENABLE_SYSTEM_GMIC=ON" - "-DENABLE_DYNAMIC_LINKING=ON" - ]; + preConfigure = '' + cd gmic-qt + ''; postPatch = '' patchShebangs \ @@ -89,6 +90,12 @@ stdenv.mkDerivation rec { translations/lrelease.sh ''; + cmakeFlags = [ + "-DGMIC_QT_HOST=${if variant == "standalone" then "none" else variant}" + "-DENABLE_SYSTEM_GMIC=ON" + "-DENABLE_DYNAMIC_LINKING=ON" + ]; + postFixup = lib.optionalString (variant == "gimp") '' echo "wrapping $out/${gimp.targetPluginDir}/gmic_gimp_qt/gmic_gimp_qt" wrapQtApp "$out/${gimp.targetPluginDir}/gmic_gimp_qt/gmic_gimp_qt" @@ -97,17 +104,19 @@ stdenv.mkDerivation rec { passthru = { tests = { gimp-plugin = gimpPlugins.gmic; + # Needs to update them all in lockstep. + inherit cimg gmic; }; updateScript = nix-update-script { }; }; - meta = with lib; { - description = variants.${variant}.description; + meta = { homepage = "http://gmic.eu/"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.lilyinstarlight ]; - platforms = platforms.unix; + inherit (variants.${variant}) description; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.lilyinstarlight ]; + platforms = lib.platforms.unix; mainProgram = "gmic_qt"; }; -} +}) From 38b39c076b265652c58a0836a82a48466b64f087 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 3 May 2023 10:02:19 +0800 Subject: [PATCH 041/244] pantheon.gala: 7.0.2 -> 7.0.3 https://github.com/elementary/gala/releases/tag/7.0.3 --- pkgs/desktops/pantheon/desktop/gala/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index df430c99ce04..ab54f127f7bb 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "gala"; - version = "7.0.2"; + version = "7.0.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-+StE63q6niRK7ypFNzSsAQfPmbrzlBKm1GGESBKSSl4="; + sha256 = "sha256-RLKPYDWVqT2WfjLPXRFPCNNvcW+fJ0OUKjSLLgPBqdw="; }; patches = [ From 0fa6230b4637bf1e87a2f7decc74c344314c4c23 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 3 May 2023 10:04:38 +0800 Subject: [PATCH 042/244] pantheon.elementary-icon-theme: 7.2.0 -> 7.3.0 https://github.com/elementary/icons/releases/tag/7.3.0 --- .../pantheon/artwork/elementary-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index cd151ee19430..8fbf7ccde4ff 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -13,13 +13,13 @@ stdenvNoCC.mkDerivation rec { pname = "elementary-icon-theme"; - version = "7.2.0"; + version = "7.3.0"; src = fetchFromGitHub { owner = "elementary"; repo = "icons"; rev = version; - sha256 = "sha256-Hh7RiD85N48IpO2sfWSybhS7kJYXH4VOhQ6PVIP9IS8="; + sha256 = "sha256-4ZXqIMXyb9MLd6EHmPn672Dbw992GYYU64oB+4p6jXY="; }; nativeBuildInputs = [ From d5b8cd3b8b9fce62234f4ded2e1b301ac33a5179 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 3 May 2023 10:08:14 +0800 Subject: [PATCH 043/244] pantheon.elementary-onboarding: 7.0.1 -> 7.1.0 https://github.com/elementary/onboarding/releases/tag/7.1.0 --- .../pantheon/desktop/elementary-onboarding/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 27847245991e..e5a90d8f4f0a 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "elementary-onboarding"; - version = "7.0.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "onboarding"; rev = version; - sha256 = "sha256-qfkrjIct+Dcf2nep7ixgjC7ILz+gZt4SHGfb1hywwcY="; + sha256 = "sha256-OWALEcVOOh7wjEEvysd+MQhB/iK3105XCIVp5pklMwY="; }; nativeBuildInputs = [ From c11965197df733ba92fded26c98c62538396d657 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 3 May 2023 10:10:14 +0800 Subject: [PATCH 044/244] pantheon.switchboard-plug-pantheon-shell: 6.3.1 -> 6.4.0 https://github.com/elementary/switchboard-plug-pantheon-shell/releases/tag/6.4.0 --- .../apps/switchboard-plugs/pantheon-shell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index 8ee49d024057..1b531d77c436 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { pname = "switchboard-plug-pantheon-shell"; - version = "6.3.1"; + version = "6.4.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-lyqALaPbkAI6MITF353PNVLJT8eGIk8QURR+1mUmrv0="; + sha256 = "sha256-GJjtGLCBRISaopZWli/MfqrPcG+xjY7nHZKS+S806GI="; }; nativeBuildInputs = [ From 82028e1302d913a0066dea00717de3dc9c5b2141 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 3 May 2023 10:12:03 +0800 Subject: [PATCH 045/244] pantheon.elementary-mail: 7.0.1 -> 7.1.0 https://github.com/elementary/mail/releases/tag/7.1.0 --- .../pantheon/apps/elementary-mail/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index a9a98ad8e6f5..40eec233f662 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , pkg-config , meson @@ -22,24 +21,15 @@ stdenv.mkDerivation rec { pname = "elementary-mail"; - version = "7.0.1"; + version = "7.1.0"; src = fetchFromGitHub { owner = "elementary"; repo = "mail"; rev = version; - sha256 = "sha256-IY+ml/ftLSk0A3Emi0ZL2wxIDIngNU6QKbHErRAaaMA="; + sha256 = "sha256-dvDlvn8KvFmiP/NClRtHNEs5gPTUjlzgTYmgIaCfoLw="; }; - patches = [ - # MessageListItem: avoid crashing on empty Mime - # https://github.com/elementary/mail/pull/828 - (fetchpatch { - url = "https://github.com/elementary/mail/commit/7cb412dee4cc8c0bfab55057c47d5ecce6918788.patch"; - sha256 = "sha256-7rYvgFeVmV/rVYzC/xt/lioRlveM0d8ORqZdMYkm/d4="; - }) - ]; - nativeBuildInputs = [ libxml2 meson From 816aa8db8158b246b94d9476794d9d8b91a400bd Mon Sep 17 00:00:00 2001 From: Dmitry Bogatov Date: Wed, 3 May 2023 00:16:59 -0400 Subject: [PATCH 046/244] just: build offline documentation --- pkgs/development/tools/just/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/just/default.nix b/pkgs/development/tools/just/default.nix index fd97cc2634fd..ec21765e3a3e 100644 --- a/pkgs/development/tools/just/default.nix +++ b/pkgs/development/tools/just/default.nix @@ -6,11 +6,13 @@ , bash , installShellFiles , libiconv +, mdbook }: rustPlatform.buildRustPackage rec { pname = "just"; version = "1.13.0"; + outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; @@ -21,7 +23,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-91C/5m2avsW7GKQDg/Ez9fzzFhe8ih1De1RbV/MBJbM="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; preCheck = '' @@ -42,6 +44,15 @@ rustPlatform.buildRustPackage rec { cp $TMPDIR/string.rs tests/string.rs ''; + postBuild = '' + cargo run --package generate-book + + # No linkcheck in sandbox + echo 'optional = true' >> book/en/book.toml + mdbook build book/en + find . + ''; + checkFlags = [ "--skip=edit" # trying to run "vim" fails as there's no /usr/bin/env or which in the sandbox to find vim and the dependency is not easily patched "--skip=run_shebang" # test case very rarely fails with "Text file busy" @@ -49,6 +60,8 @@ rustPlatform.buildRustPackage rec { ]; postInstall = '' + mkdir -p $doc/share/doc/$name + mv ./book/en/build/html $doc/share/doc/$name installManPage man/just.1 installShellCompletion --cmd just \ From d9389772d2c255ce937f70b20c973c5ed56c5122 Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Wed, 3 May 2023 12:07:29 +0200 Subject: [PATCH 047/244] laurel: init at 0.5.2 --- pkgs/servers/monitoring/laurel/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/servers/monitoring/laurel/default.nix diff --git a/pkgs/servers/monitoring/laurel/default.nix b/pkgs/servers/monitoring/laurel/default.nix new file mode 100644 index 000000000000..8342915dffb1 --- /dev/null +++ b/pkgs/servers/monitoring/laurel/default.nix @@ -0,0 +1,31 @@ +{ acl +, fetchFromGitHub +, lib +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "laurel"; + version = "0.5.2"; + + src = fetchFromGitHub { + owner = "threathunters-io"; + repo = pname; + rev = "v${version}"; + hash = "sha256-MT3Zcuztb2QUwWR3HFViJQtygI0oIUE3TlMu+vWzbMI="; + }; + + cargoHash = "sha256-hX2nSBgXctAHGqvP/ZmMjGJf7C/wPJ/gL+gV7uI8gco="; + + nativeBuildInputs = [ rustPlatform.bindgenHook ]; + buildInputs = [ acl ]; + + meta = with lib; { + description = "Transform Linux Audit logs for SIEM usage"; + homepage = "https://github.com/threathunters-io/laurel"; + changelog = "https://github.com/threathunters-io/laurel/releases/tag/v${version}"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ indeednotjames ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c475a781e22d..de8f3599b3d5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20942,6 +20942,8 @@ with pkgs; LASzip = callPackage ../development/libraries/LASzip { }; LASzip2 = callPackage ../development/libraries/LASzip/LASzip2.nix { }; + laurel = callPackage ../servers/monitoring/laurel/default.nix { }; + lcm = callPackage ../development/libraries/lcm { }; lcms = lcms2; From c4b259c3b359aa3be0bde030b1497ef2723251b9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 May 2023 11:47:47 +0000 Subject: [PATCH 048/244] python310Packages.pallets-sphinx-themes: 2.0.2 -> 2.1.0 --- .../python-modules/pallets-sphinx-themes/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pallets-sphinx-themes/default.nix b/pkgs/development/python-modules/pallets-sphinx-themes/default.nix index 463ba1c0667e..be4329a41334 100644 --- a/pkgs/development/python-modules/pallets-sphinx-themes/default.nix +++ b/pkgs/development/python-modules/pallets-sphinx-themes/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pallets-sphinx-themes"; - version = "2.0.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "pallets"; repo = "pallets-sphinx-themes"; - rev = version; - sha256 = "0nvznv6abmkkda2fahydd4rykd94rmz74hx5aypv6j22zvf5pj8b"; + rev = "refs/tags/${version}"; + sha256 = "sha256-u1sHeO0fk11+M5M0yqDcWsMJKBMeAGW+GPOgu1oniok="; }; propagatedBuildInputs = [ packaging sphinx ]; From 96b170269a37e661be29a51e961f78757a92b46d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 May 2023 16:16:21 +0200 Subject: [PATCH 049/244] python310Packages.graphene-django: 3.0.1 -> 3.0.2 https://github.com/graphql-python/graphene-django/releases/tag/v3.0.2 --- pkgs/development/python-modules/graphene-django/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/graphene-django/default.nix b/pkgs/development/python-modules/graphene-django/default.nix index ae85b07d3d7f..abfeee89945b 100644 --- a/pkgs/development/python-modules/graphene-django/default.nix +++ b/pkgs/development/python-modules/graphene-django/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "graphene-django"; - version = "3.0.1"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "graphql-python"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-bW5P2casSFqM1uR9ERr5fLVvAO7bsbP+oqJ9vqcJp2U="; + hash = "sha256-dImot/jLKGePHk7ByM/gymgdstHHiS0OKxRq3YAmHuE="; }; postPatch = '' From 6415a44f15c38535358cd9c7f9369c4c5c77c471 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 May 2023 18:07:59 +0000 Subject: [PATCH 050/244] argocd: 2.6.7 -> 2.7.1 --- pkgs/applications/networking/cluster/argocd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index f14201eab038..45e15ab47bec 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.6.7"; + version = "2.7.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-KvnKz+NxCiCqX/lDsm4YdrUmtK028D9KM9Ke9mxiZQw="; + sha256 = "sha256-1P3FIgC9j0SbwzWo0aPUwVTKNlSY3FG7Iz6KD9pbv84="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-BqES6nhV17iqK1dsa+2IdNCd1Wl1O6hOBczqxRHewPk="; + vendorHash = "sha256-VRbNzJANWA7MjomzxNRK19Q4L+fsztMpumUbdYszYqw="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 From f18b8a775432727d0f02f4c90ee686f2f00f24eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 May 2023 18:42:08 +0000 Subject: [PATCH 051/244] chezmoi: 2.33.3 -> 2.33.4 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index f969a7a37566..4e6f6f184d62 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.33.3"; + version = "2.33.4"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-FHp4sBNuTi0cHECAE2u1DcNUmbo/6plAnPUMs3+OlIE="; + hash = "sha256-EV1/T+VQGUI18KnX1y7CvwbOS9EabBmHUOoID8QUzmM="; }; - vendorHash = "sha256-D1LxpTWqe40/49obXchF1udDQMeDLAk1RVPFiEqYwMg="; + vendorHash = "sha256-NfKpXphv8BF5wWs6c5VlI+riWtMXD8NSx3l9zwp7b/M="; doCheck = false; From 38412e10294bd9e4d7b4dc70912cdce955e31589 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 May 2023 19:10:55 +0000 Subject: [PATCH 052/244] libamqpcpp: 4.3.23 -> 4.3.24 --- pkgs/development/libraries/libamqpcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 3ba581c101b7..180a8874e50e 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.23"; + version = "4.3.24"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-9FwctFRMmHlRT12wVpqSc07nP12/2569wwhEohOEb4A="; + sha256 = "sha256-65/LsH1ZDkeBrtQUmKc5/5C2ce4nw4nSHXnJqZMKenI="; }; buildInputs = [ openssl ]; From be4b60bf4ffd9bc902ebce0ee9341a97c36061da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 May 2023 19:38:48 +0000 Subject: [PATCH 053/244] minimap2: 2.25 -> 2.26 --- pkgs/applications/science/biology/minimap2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/minimap2/default.nix b/pkgs/applications/science/biology/minimap2/default.nix index 733266971a59..35c1b076d7eb 100644 --- a/pkgs/applications/science/biology/minimap2/default.nix +++ b/pkgs/applications/science/biology/minimap2/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "minimap2"; - version = "2.25"; + version = "2.26"; src = fetchFromGitHub { repo = pname; owner = "lh3"; rev = "v${version}"; - sha256 = "sha256-9X2wYoUH11Ys4uPArwyGsXuQLQaAwtNV/pnO9yd7Oiw="; + sha256 = "sha256-vK8Z/j6Ndu1vMFYPPzViP4evtIhyVVFwsfTqNCYnXpQ="; }; buildInputs = [ zlib ]; From 4138d6a4496ab39e09252537c5bd971c6ae363e0 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Mon, 17 Apr 2023 15:52:41 +0200 Subject: [PATCH 054/244] qlandkartegt: remove --- .../manual/release-notes/rl-2305.section.md | 2 + .../misc/qlandkartegt/default.nix | 93 ------------------- .../misc/qlandkartegt/garmindev.nix | 23 ----- pkgs/top-level/aliases.nix | 2 + pkgs/top-level/all-packages.nix | 11 --- 5 files changed, 4 insertions(+), 127 deletions(-) delete mode 100644 pkgs/applications/misc/qlandkartegt/default.nix delete mode 100644 pkgs/applications/misc/qlandkartegt/garmindev.nix diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 73690ee3bb69..ead9b9ab005a 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -233,6 +233,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `baget` package and module was removed due to being unmaintained. +- The `qlandkartegt` and `garmindev` packages were removed due to being unmaintained and insecure. + - `go-ethereum` package has been updated to v1.11.5 and the `puppeth` command is no longer available as of v1.11.0. - The `pnpm` package has be updated to from version 7.29.1 to version 8.1.1 and Node.js 14 support has been discontinued (though, there are workarounds if Node.js 14 is still required) diff --git a/pkgs/applications/misc/qlandkartegt/default.nix b/pkgs/applications/misc/qlandkartegt/default.nix deleted file mode 100644 index cb30571e0552..000000000000 --- a/pkgs/applications/misc/qlandkartegt/default.nix +++ /dev/null @@ -1,93 +0,0 @@ -{ mkDerivation, lib, fetchurl, fetchpatch, cmake -, qtmultimedia, qtserialport, qtscript, qtwebkit -, garmindev, gdal, gpsd, libdmtx, libexif, libGLU, proj }: - -mkDerivation rec { - pname = "qlandkartegt"; - version = "1.8.1"; - - src = fetchurl { - url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1rwv5ar5jv15g1cc6pp0lk69q3ip10pjazsh3ds2ggaciymha1ly"; - }; - - patches = [ - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-gps_read.patch?h=qlandkartegt"; - sha256 = "1xyqxdqxwviq7b8jjxssxjlkldk01ms8dzqdjgvjs8n3fh7w0l70"; - }) - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-incomplete-type.patch?h=qlandkartegt"; - sha256 = "1q7rm321az3q6pq5mq0yjrihxl9sf3nln9z3xp20g9qldslv2cy2"; - }) - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-proj_api.patch?h=qlandkartegt"; - sha256 = "12yibxn85z2n30azmhyv02q091jj5r50nlnjq4gfzyqd3xb9582n"; - }) - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-qt5-build.patch?h=qlandkartegt"; - sha256 = "1wq2hr06gzq8m7zddh10vizmvpwp4lcy1g86rlpppvdc5cm3jpkl"; - }) - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-qtgui-include.patch?h=qlandkartegt"; - sha256 = "16hql8ignzw4n1hlp4icbvaddqcadh2rjns0bvis720535112sc8"; - }) - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-timespec.patch?h=qlandkartegt"; - sha256 = "1yzdwfsgjn7q04r9f7s5qk50y25hdl384dxrmpfmkm97fmpgyr7w"; - }) - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/fix-ver_str.patch?h=qlandkartegt"; - sha256 = "13fg05gqrjfa9j00lrqz1b06xf6r5j01kl6l06vkn0hz1jzxss5m"; - }) - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/improve-gpx-creator.patch?h=qlandkartegt"; - sha256 = "1sdf5z8qrd43azrhwfw06zc0qr48z925hgbcfqlp0xrsxv2n6kks"; - }) - (fetchpatch { - url = "https://aur.archlinux.org/cgit/aur.git/plain/improve-gpx-name.patch?h=qlandkartegt"; - sha256 = "10phafhns79i3rl4zpc7arw11x46cywgkdkxm7gw1i9y5h0cal79"; - }) - ]; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ - qtmultimedia qtserialport qtscript qtwebkit - garmindev gdal gpsd libdmtx libexif libGLU proj - ]; - - cmakeFlags = [ - "-DQK_QT5_PORT=ON" - "-DEXIF_LIBRARIES=${libexif}/lib/libexif.so" - "-DEXIF_INCLUDE_DIRS=${libexif}/include" - ]; - - postPatch = '' - substituteInPlace ConfigureChecks.cmake \ - --replace \$\{PLUGIN_INSTALL_DIR\} "${garmindev}/lib/qlandkartegt" - ''; - - postInstall = '' - mkdir -p $out/share/mime/packages - cat << EOF > $out/share/mime/packages/qlandkartegt.xml - - - QLandkarteGT File - - - - EOF - ''; - - meta = with lib; { - homepage = "http://www.qlandkarte.org/"; - description = '' - QLandkarte GT is the ultimate outdoor aficionado's tool. - It supports GPS maps in GeoTiff format as well as Garmin's img vector map format. - ''; - license = licenses.gpl2; - maintainers = with maintainers; [ sikmir ]; - platforms = with platforms; linux; - }; -} diff --git a/pkgs/applications/misc/qlandkartegt/garmindev.nix b/pkgs/applications/misc/qlandkartegt/garmindev.nix deleted file mode 100644 index 07b58b72c494..000000000000 --- a/pkgs/applications/misc/qlandkartegt/garmindev.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchurl, cmake, libusb-compat-0_1 }: - -stdenv.mkDerivation rec { - pname = "garmindev"; - version = "0.3.4"; - - src = fetchurl { - url = "mirror://sourceforge/qlandkartegt/${pname}-${version}.tar.gz"; - sha256 = "1mc7rxdn9790pgbvz02xzipxp2dp9h4hfq87xgawa18sp9jqzhw6"; - }; - - nativeBuildInputs = [ cmake ]; - - buildInputs = [ libusb-compat-0_1 ]; - - meta = with lib; { - homepage = "http://www.qlandkarte.org/"; - description = "Garmin Device Drivers for QlandkarteGT"; - license = licenses.gpl2; - maintainers = with maintainers; [ sikmir ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9d319aa08856..269aa9fdf6be 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -536,6 +536,7 @@ mapAliases ({ g4py = python3Packages.geant4; # Added 2020-06-06 gaia = throw "gaia has been removed because it seems abandoned upstream and uses no longer supported dependencies"; # Added 2020-06-06 gammy = throw "'gammy' is deprecated upstream and has been replaced by 'gummy'"; # Added 2022-09-03 + garmindev = throw "'garmindev' has been removed as the dependent software 'qlandkartegt' has been removed"; # Added 2023-04-17 gawp = throw "gawp has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 gdal_1_11 = throw "gdal_1_11 was removed. Use gdal instead"; # Added 2021-04-03 gdb-multitarget = throw "'gdb-multitarget' has been renamed to/replaced by 'gdb'"; # Converted to throw 2022-02-22 @@ -1374,6 +1375,7 @@ mapAliases ({ qcsxcad = libsForQt5.qcsxcad; # Added 2020-11-05 qflipper = qFlipper; # Added 2022-02-11 qmk_firmware = throw "qmk_firmware has been removed because it was broken"; # Added 2021-04-02 + qlandkartegt = throw "'qlandkartegt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-04-17 qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # Added 2020-12-02 qshowdiff = throw "'qshowdiff' (Qt4) is unmaintained and not been updated since its addition in 2010"; # Added 2022-06-14 qt-3 = throw "qt-3 has been removed from nixpkgs, as it's unmaintained and insecure"; # Added 2021-02-15 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 041a4ab2a9aa..02b971eb6a2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33172,17 +33172,6 @@ with pkgs; qimgv = libsForQt5.callPackage ../applications/graphics/qimgv { }; - qlandkartegt = libsForQt5.callPackage ../applications/misc/qlandkartegt { - gdal = gdal.override { - libgeotiff = libgeotiff.override { proj = proj_7; }; - libspatialite = libspatialite.override { proj = proj_7; }; - proj = proj_7; - }; - proj = proj_7; - }; - - garmindev = callPackage ../applications/misc/qlandkartegt/garmindev.nix { }; - qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { }; qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { }; From d1ab33d23078dec433c64953da81cb37b8ea7046 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 3 May 2023 22:13:54 +0200 Subject: [PATCH 055/244] guglielmo: 0.4 -> 0.5 --- pkgs/applications/radio/guglielmo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/guglielmo/default.nix b/pkgs/applications/radio/guglielmo/default.nix index 41d1407a9af3..f449fc061d3b 100644 --- a/pkgs/applications/radio/guglielmo/default.nix +++ b/pkgs/applications/radio/guglielmo/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "guglielmo"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "marcogrecopriolo"; repo = pname; rev = "v${version}"; - sha256 = "sha256-djBQTYbpgPFBtQZ9fZBpECP20RxB49AdxLbq8mUU6rg="; + sha256 = "sha256-W+KTwtxbTDrtONmkw95gXT28n3k9KS364WOzLLJdGLM="; }; postInstall = '' From 267ef1a20b495d19b2f358ceed5fd879a9c1d0fc Mon Sep 17 00:00:00 2001 From: IndeedNotJames Date: Wed, 3 May 2023 22:24:36 +0200 Subject: [PATCH 056/244] forgejo: 1.19.2-0 -> 1.19.3-0 https://codeberg.org/forgejo/forgejo/releases/tag/v1.19.3-0 --- pkgs/applications/version-management/forgejo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index b955d2081fce..e88f04dc2083 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -39,14 +39,14 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.19.2-0"; + version = "1.19.3-0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-JRCEHaqRzJNRTu5OS43UmCg+vW8G/1Xwweuo5vuFO+s="; + hash = "sha256-0T26EsU5lJ+Rxy/jSDn8nTk5IdHO8oK3LvN7tPArPgs="; }; vendorHash = "sha256-bnLcHmwOh/fw6ecgsndX2BmVf11hJWllE+f2J8YSzec="; From 4e5d5f24d460031db432c3b68c02704bf9a68d3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 May 2023 20:30:13 +0000 Subject: [PATCH 057/244] s3-credentials: 0.14 -> 0.15 --- pkgs/development/python-modules/s3-credentials/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/s3-credentials/default.nix b/pkgs/development/python-modules/s3-credentials/default.nix index 9d0d4a7e2f70..458f21618caf 100644 --- a/pkgs/development/python-modules/s3-credentials/default.nix +++ b/pkgs/development/python-modules/s3-credentials/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "s3-credentials"; - version = "0.14"; + version = "0.15"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-vKOcOSt9vscj5ixrHZGL6PRun/x38JLbni75nw2YAbg="; + hash = "sha256-YSsm5SMfDRqJ53XnBjMgaWWHjA6IXnmEBvxme4uiOPw="; }; propagatedBuildInputs = [ From 0cb697b2df391b5cf48c7ce757033b8a3e2f0414 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 4 May 2023 00:05:04 +0300 Subject: [PATCH 058/244] vulkan-validation-layers: fix hash, update spirv-headers to fix build --- .../vulkan-validation-layers/default.nix | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/vulkan-validation-layers/default.nix b/pkgs/development/tools/vulkan-validation-layers/default.nix index 9927a3a4baed..5a408913da4f 100644 --- a/pkgs/development/tools/vulkan-validation-layers/default.nix +++ b/pkgs/development/tools/vulkan-validation-layers/default.nix @@ -13,13 +13,30 @@ , libXdmcp , libXrandr , spirv-headers -, spirv-tools , vulkan-headers , wayland }: let robin-hood-hashing = callPackage ./robin-hood-hashing.nix {}; + + # Current VVL version requires a newer spirv-headers than the latest release tag. + # This should hopefully not be too common and the override should be removed after + # the next SPIRV headers release. + # FIXME: if this ever becomes common, figure out a way to pull revisions directly + # from upstream known-good.json + spirv-headers' = spirv-headers.overrideAttrs(_: { + version = "unstable-2023-04-27"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "7f1d2f4158704337aff1f739c8e494afc5716e7e"; + hash = "sha256-DHOYIZQqP5uWDYdb+vePpMBaQDOCB5Pcg8wPBMF8itk="; + }; + + postPatch = ""; + }); in stdenv.mkDerivation rec { pname = "vulkan-validation-layers"; @@ -34,7 +51,7 @@ stdenv.mkDerivation rec { owner = "KhronosGroup"; repo = "Vulkan-ValidationLayers"; rev = "v${version}"; - hash = "sha256-viVceH8qFz6Cl/RlMMWZnMIdzULELlnIvtPZ87ySs2M="; + hash = "sha256-+Vjy3hzzpC+bFNSEHLsfUaaHMSrMv2G+B8lGjui0fJs="; }; nativeBuildInputs = [ @@ -50,14 +67,13 @@ stdenv.mkDerivation rec { libXrandr libffi libxcb - spirv-tools vulkan-headers wayland ]; cmakeFlags = [ "-DGLSLANG_INSTALL_DIR=${glslang}" - "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers}" + "-DSPIRV_HEADERS_INSTALL_DIR=${spirv-headers'}" "-DROBIN_HOOD_HASHING_INSTALL_DIR=${robin-hood-hashing}" "-DBUILD_LAYER_SUPPORT_FILES=ON" "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" @@ -84,6 +100,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; - broken = (lib.all (pkg: pkg.version != version) [vulkan-headers glslang spirv-tools spirv-headers]); }; } From bfa29e52453428b5a9634362009f520f388db98d Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 4 May 2023 00:05:37 +0300 Subject: [PATCH 059/244] vulkan-tools-lunarg: 1.3.243.0 -> 1.3.249 --- pkgs/tools/graphics/vulkan-tools-lunarg/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix index 0150f4e5c6fb..88058d2caa3b 100644 --- a/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix +++ b/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -24,14 +24,13 @@ stdenv.mkDerivation rec { pname = "vulkan-tools-lunarg"; - # The version must match that in vulkan-headers - version = "1.3.243.0"; + version = "1.3.249"; src = fetchFromGitHub { owner = "LunarG"; repo = "VulkanTools"; - rev = "sdk-${version}"; - hash = "sha256-mvBP6wD1Z0VNLZ0mC4bA3i2IaBDtDr7K6XjHz4S3UA4="; + rev = "v${version}"; + hash = "sha256-yQE6tjUxIZEMspxDaO9AoSjoEHQl2eDAc0E/aVQZnxQ="; fetchSubmodules = true; }; @@ -102,6 +101,5 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.expipiplus1 ]; - broken = (version != vulkan-headers.version); }; } From 3d05e857456aab302aa10f1ae279731524718127 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 May 2023 21:05:59 +0000 Subject: [PATCH 060/244] open-policy-agent: 0.51.0 -> 0.52.0 --- pkgs/development/tools/open-policy-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index 1004618857de..28e1bde6edba 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -11,13 +11,13 @@ assert enableWasmEval && stdenv.isDarwin -> builtins.throw "building with wasm o buildGoModule rec { pname = "open-policy-agent"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - hash = "sha256-vyz0mmbM9zD1NLmMFGb5rQJAokgS+Equljd3okoJ7WE="; + hash = "sha256-6mMFu4jkH9k9K836p0007a9rwbe9tBZZoW+Bw9Rfwek="; }; vendorHash = null; From 4dc865249ae75361f05c8056af355235dd100a33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 May 2023 21:13:02 +0000 Subject: [PATCH 061/244] libva-utils: 2.18.0 -> 2.18.1 --- pkgs/development/libraries/libva/utils.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libva/utils.nix b/pkgs/development/libraries/libva/utils.nix index 52a3c5f1fb9b..7b187c394c35 100644 --- a/pkgs/development/libraries/libva/utils.nix +++ b/pkgs/development/libraries/libva/utils.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "libva-utils"; - version = "2.18.0"; + version = "2.18.1"; src = fetchFromGitHub { owner = "intel"; repo = "libva-utils"; rev = version; - sha256 = "sha256-Dg9OcDKqgJf+RYiTYuL2pviNsK4R5cDCAHCYonlp+d8="; + sha256 = "sha256-t8N+MQ/HueQWtNzEzfAPZb4q7FjFNhpTmX4JbJ5ZGqM="; }; nativeBuildInputs = [ meson ninja pkg-config ]; From 92df61ada1577086619dcc58d4e1a14bd371818a Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 3 May 2023 23:40:15 +0200 Subject: [PATCH 062/244] chromium: 112.0.5615.165 -> 113.0.5672.63 https://chromereleases.googleblog.com/2023/05/stable-channel-update-for-desktop.html This update includes 15 security fixes. CVEs: CVE-2023-2459 CVE-2023-2460 CVE-2023-2461 CVE-2023-2462 CVE-2023-2463 CVE-2023-2464 CVE-2023-2465 CVE-2023-2466 CVE-2023-2467 CVE-2023-2468 --- .../networking/browsers/chromium/default.nix | 4 ++++ .../browsers/chromium/upstream-info.json | 20 +++++++++---------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 47b768cfb307..dd479442e737 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,5 +1,6 @@ { newScope, config, stdenv, fetchurl, makeWrapper , llvmPackages_15 +, llvmPackages_16 , ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gtk4, gnome, gsettings-desktop-schemas, gn, fetchgit , libva, pipewire, wayland @@ -53,6 +54,9 @@ let inherit (upstream-info.deps.gn) url rev sha256; }; }); + } // lib.optionalAttrs (chromiumVersionAtLeast "113") rec { + llvmPackages = llvmPackages_16; + stdenv = llvmPackages_16.stdenv; }); browser = callPackage ./browser.nix { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index b36e0c0ba871..5a79d8908c08 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,21 +1,21 @@ { "stable": { - "version": "112.0.5615.165", - "sha256": "1zbrgkzcb211y1mvi9g35421dnp5bskkczwnpygzja7lm7z6530n", - "sha256bin64": "16da3zi0qy2nc92jf90zvncss3xk9ggiys3ld9j0ghbsrs1jxbvm", + "version": "113.0.5672.63", + "sha256": "07pf28yy5c4xw1xkycgzq53zbj14zvhh00sv601nggisq4fw3kkn", + "sha256bin64": "08jvhvgh4hbx7q98m6ax9snd9h2dbw8sp5a73273m126sv7409l2", "deps": { "gn": { - "version": "2023-02-17", + "version": "2023-03-18", "url": "https://gn.googlesource.com/gn", - "rev": "b25a2f8c2d33f02082f0f258350f5e22c0973108", - "sha256": "075p4jwk1apvwmqmvhwfw5f669ci7nxwjq9mz5aa2g5lz4fkdm4c" + "rev": "41fef642de70ecdcaaa26be96d56a0398f95abd4", + "sha256": "12w4g2dl58283allclpi1c4i6ih9v2xvdb9hpbmfda12v8lizmlq" } }, "chromedriver": { - "version": "112.0.5615.49", - "sha256_linux": "0acp7hck7p9v1ysyzdyyrj43z2azlj35l8sw2f8fn5nfbl4bsbkf", - "sha256_darwin": "14205fqfinlqw9kbs2p6pzb666mnz8rbfim1crpdkzsrfn5dlb9h", - "sha256_darwin_aarch64": "17v9k9k5p3rwq1i58xw19p93hzirp0r0aiq5s3gc20i7ka3bk1xj" + "version": "113.0.5672.63", + "sha256_linux": "09x1p7wk5am3ri7ahsdlg4nas22xcwmxzwa5d6fs6hjygghm2q8j", + "sha256_darwin": "1hbd7mk7lifhk72p0hppj9vz1rnfzklg3pdmfa4ixsbgachvxii6", + "sha256_darwin_aarch64": "1c4gyr86b463fq0k31ajsp2npad871nqpacpxr26imd5zzirmsgf" } }, "beta": { From eee33870cc31f0cfa9e05ec83480c3223d62db21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 May 2023 22:12:08 +0000 Subject: [PATCH 063/244] interactsh: 1.1.2 -> 1.1.3 --- pkgs/tools/misc/interactsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/interactsh/default.nix b/pkgs/tools/misc/interactsh/default.nix index 82719663cf2d..1d9f5eb965f3 100644 --- a/pkgs/tools/misc/interactsh/default.nix +++ b/pkgs/tools/misc/interactsh/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "interactsh"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-a/rJbBYRERujvy7HBRavLdv7NdG7ofCQec4Ia1WPflc="; + hash = "sha256-hoh7Nug0XLu/8SPb+YY/TeaRqBIaq3dUAC+8iJ1wvpI="; }; - vendorHash = "sha256-YfqprpftCFH+tuEhcK4xWwenjv8BjFhzlTRsy1rz5Ec="; + vendorHash = "sha256-B7DE2OEP0VikLfS6btILpdJ6rqwuoD2w7SqNnWD4Bdk="; modRoot = "."; subPackages = [ From d2be66648c4099f086e47caaafdc4fbeb3fbc618 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 May 2023 22:17:22 +0000 Subject: [PATCH 064/244] crowdin-cli: 3.10.1 -> 3.11.0 --- pkgs/tools/text/crowdin-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/crowdin-cli/default.nix b/pkgs/tools/text/crowdin-cli/default.nix index 614e2523c953..e2ec886b75a7 100644 --- a/pkgs/tools/text/crowdin-cli/default.nix +++ b/pkgs/tools/text/crowdin-cli/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "crowdin-cli"; - version = "3.10.1"; + version = "3.11.0"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-kHi8rLtIHrAfu/r2vvhzIrscqNaDW1Q1F+kTEn4AicQ="; + sha256 = "sha256-qT0vEqUISprR1pOPaO3r/HHA/Zt07Af/0WyY950MEgI="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; From 1ff12be32fa767e6c49659f5a6538113bdc606b5 Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Thu, 4 May 2023 00:21:08 +0200 Subject: [PATCH 065/244] jetbrains: 2022.2 -> 2023.1.1 --- .../editors/jetbrains/versions.json | 144 +++++++++--------- 1 file changed, 72 insertions(+), 72 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/versions.json b/pkgs/applications/editors/jetbrains/versions.json index 6167c6134c9f..2793d8c6d226 100644 --- a/pkgs/applications/editors/jetbrains/versions.json +++ b/pkgs/applications/editors/jetbrains/versions.json @@ -19,18 +19,18 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", - "version": "2023.1", - "sha256": "626314f6d2771e197214981fa2078da5affb4b7b55bcffd5c6960803270dcecd", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.tar.gz", - "build_number": "231.8109.187" + "version": "2023.1.1", + "sha256": "217196806daebd14e604d13247862e44e6a0b0b9f115f1b9ceadbcfb064b3c3c", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.1.tar.gz", + "build_number": "231.8770.69" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz", - "version": "2023.1", - "sha256": "f208e2471ef5c4e232ff49434e8c14ce614b7924963ebd28d4c863399dd42d2c", - "url": "https://download.jetbrains.com/go/goland-2023.1.tar.gz", - "build_number": "231.8109.199" + "version": "2023.1.1", + "sha256": "ed4334fbfde1c9416920ec1aa9ccdbaa6bdbbe6f211b15ca74239c44a0b7ed1c", + "url": "https://download.jetbrains.com/go/goland-2023.1.1.tar.gz", + "build_number": "231.8770.71" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", @@ -51,35 +51,35 @@ "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "version": "2022.2", - "sha256": "aaee4d2bb9bc34d0b4bc62c7ef08139cc6144b433ba1675ef306e6d3d95e37a1", - "url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2.tar.gz", - "build_number": "222.3345.1295" + "version": "2022.3", + "sha256": "6a8640ef9613fa562513788ae33d66c535ec230564d000cea61f7684a2f4042b", + "url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3.tar.gz", + "build_number": "223.8836.1185" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", - "version": "2023.1", - "sha256": "2e1feb9ae691ada21bd5ddc28a693f75a27aedc8f211729370ed03925e63400b", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.tar.gz", - "build_number": "231.8109.199", + "version": "2023.1.1", + "sha256": "be824ba2f0a55b8d246becde235a3308106d2115cea814e4b0cc2f3b9a736253", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.1.tar.gz", + "build_number": "231.8770.68", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz", - "version": "2023.1", - "sha256": "e8e9ed964ef8a397ad920ccaad41b30c3f29a2e125e7a5c4be50db791099e068", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.tar.gz", - "build_number": "231.8109.197" + "version": "2023.1.1", + "sha256": "4de47ea21ede9ed52fedf42513ab2d886683d7d66784c1ce9b4d3c8b84da7a29", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.1.tar.gz", + "build_number": "231.8770.66" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz", - "version": "2023.1", - "sha256": "26c3f49ad899178105943eb63e1abae85c40f2f44362a2b20629a6263a4f8da6", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.tar.gz", - "build_number": "231.8109.197" + "version": "2023.1.1", + "sha256": "aaa8d136e47077cfe970a5b42aa2058bb74038c5dab354c9f6ff22bfa3aa327d", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.1.tar.gz", + "build_number": "231.8770.66" }, "rider": { "update-channel": "Rider RELEASE", @@ -126,18 +126,18 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", - "version": "2023.1", - "sha256": "323066b6171ca2cb117b667d5b4e626a680bc6ac3f121ad3d6faf0a1b78692c3", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.dmg", - "build_number": "231.8109.187" + "version": "2023.1.1", + "sha256": "e580bf5bd657b721677fec0250ce582adb1cf92daa1ac065b56fc2d8148fac97", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.1.dmg", + "build_number": "231.8770.69" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg", - "version": "2023.1", - "sha256": "b1afadacb4c8d77fb8811abbfb5c4c447ec81ec27af2efef233c9f1164cab9c8", - "url": "https://download.jetbrains.com/go/goland-2023.1.dmg", - "build_number": "231.8109.199" + "version": "2023.1.1", + "sha256": "951d0940edebc9cba6a3e37eae3d3e146416d1951803e8a34706904e983bb6ee", + "url": "https://download.jetbrains.com/go/goland-2023.1.1.dmg", + "build_number": "231.8770.71" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", @@ -158,35 +158,35 @@ "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", - "version": "2022.2", - "sha256": "4e36c60d281596c220287ab2191165be37ef01c3c54ab5f5e4e535c8b81bc754", - "url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2-macos.dmg", - "build_number": "222.3345.1295" + "version": "2022.3", + "sha256": "17cb973af11118c246d4144ba0071ce31fe3f276be7029f613cdb0fa60b752cc", + "url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3-macos.dmg", + "build_number": "223.8836.1185" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", - "version": "2023.1", - "sha256": "825c4626f4f4359cb47f2e6f74d8fe23df0fb991f2ac4cbb86b99a6c8dbee5f6", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.dmg", - "build_number": "231.8109.199", + "version": "2023.1.1", + "sha256": "da5809e47bb6adaa61ecdbcc16ca452e25269e7dbeb316bc6022784c3d6edd28", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.1.dmg", + "build_number": "231.8770.68", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg", - "version": "2023.1", - "sha256": "01ef3582e4b0617649e4c0784a9a5be952688796766c34e025bc0cad5ba18a0f", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.dmg", - "build_number": "231.8109.197" + "version": "2023.1.1", + "sha256": "45f47c71f1621d054b4ceedb717bbb4c2f8e8ab2d3ef8acb7366088b866a4cf6", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.1.dmg", + "build_number": "231.8770.66" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg", - "version": "2023.1", - "sha256": "1b4b171d48ba046679de94985f20f3574af53e6d5fad9aab7bed0d820e504c4a", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.dmg", - "build_number": "231.8109.197" + "version": "2023.1.1", + "sha256": "601c427b292a76d7646fe81ed351447b79a5094b650f19c8acca6f8f42e6e609", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.1.dmg", + "build_number": "231.8770.66" }, "rider": { "update-channel": "Rider RELEASE", @@ -233,18 +233,18 @@ "gateway": { "update-channel": "Gateway RELEASE", "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg", - "version": "2023.1", - "sha256": "8b9c656cc4b5c6bd8822e888d0b7d93ef9184ace4afc80da55767be3cf3a01ac", - "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1-aarch64.dmg", - "build_number": "231.8109.187" + "version": "2023.1.1", + "sha256": "ab0c773315a6d8abcaae75440f7fc122a7e80237eddaa3487c3222a52a95497f", + "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2023.1.1-aarch64.dmg", + "build_number": "231.8770.69" }, "goland": { "update-channel": "GoLand RELEASE", "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg", - "version": "2023.1", - "sha256": "1774ededcf8dbea93bcd35142bffef5d0fe121b5fb5d2f146ef4b98352375862", - "url": "https://download.jetbrains.com/go/goland-2023.1-aarch64.dmg", - "build_number": "231.8109.199" + "version": "2023.1.1", + "sha256": "29963a09c83f193746f762a104e9c51fa5ff9f46a90376a0e518261f1990847e", + "url": "https://download.jetbrains.com/go/goland-2023.1.1-aarch64.dmg", + "build_number": "231.8770.71" }, "idea-community": { "update-channel": "IntelliJ IDEA RELEASE", @@ -265,35 +265,35 @@ "mps": { "update-channel": "MPS RELEASE", "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg", - "version": "2022.2", - "url": "https://download.jetbrains.com/mps/2022.2/MPS-2022.2-macos-aarch64.dmg", - "sha256": "bdc83d9c7a3430cc2b0b0361a9e4eab82e951bfe87f0e4754106d09850947077", - "build_number": "222.3345.1295" + "version": "2022.3", + "url": "https://download.jetbrains.com/mps/2022.3/MPS-2022.3-macos-aarch64.dmg", + "sha256": "40d8a928a1c1703544c9905a3f8e6a7d0ade3b17302782da2ed68fd1dcdafef9", + "build_number": "223.8836.1185" }, "phpstorm": { "update-channel": "PhpStorm RELEASE", "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg", - "version": "2023.1", - "sha256": "030d0b8f7ef486fa5dc757fcb2c5c5678d9f9dcc27769f79996c631c299657e7", - "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1-aarch64.dmg", - "build_number": "231.8109.199", + "version": "2023.1.1", + "sha256": "7857f77b2d28fc7e3a4380f43fe0f923616d39f13cb47a9f37c6cf5f32fd40a3", + "url": "https://download.jetbrains.com/webide/PhpStorm-2023.1.1-aarch64.dmg", + "build_number": "231.8770.68", "version-major-minor": "2022.3" }, "pycharm-community": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg", - "version": "2023.1", - "sha256": "59ed747fa81718bee0714da08ad9041c828fe7ca459ac3a004277eef71b463bd", - "url": "https://download.jetbrains.com/python/pycharm-community-2023.1-aarch64.dmg", - "build_number": "231.8109.197" + "version": "2023.1.1", + "sha256": "d3c3e5d4896be54e54c20603e8124220ee32f29f24b5068d1b56d1685c9bc2cd", + "url": "https://download.jetbrains.com/python/pycharm-community-2023.1.1-aarch64.dmg", + "build_number": "231.8770.66" }, "pycharm-professional": { "update-channel": "PyCharm RELEASE", "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg", - "version": "2023.1", - "sha256": "8caa44cef3c83bf8d059b7582951d411a854083aa34b3c3e72bc47daa3bd65a8", - "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1-aarch64.dmg", - "build_number": "231.8109.197" + "version": "2023.1.1", + "sha256": "3c1947ad4627fc4dfce9a01b8bf4b8d90627fa5e20e4c27f60d785430e99d25d", + "url": "https://download.jetbrains.com/python/pycharm-professional-2023.1.1-aarch64.dmg", + "build_number": "231.8770.66" }, "rider": { "update-channel": "Rider RELEASE", From ec828808431c577245db4fc0ad2e0e2a813c5968 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 May 2023 22:58:57 +0000 Subject: [PATCH 066/244] opentelemetry-collector: 0.75.0 -> 0.76.1 --- pkgs/tools/misc/opentelemetry-collector/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/opentelemetry-collector/default.nix b/pkgs/tools/misc/opentelemetry-collector/default.nix index f19396236f23..51b539a1ece2 100644 --- a/pkgs/tools/misc/opentelemetry-collector/default.nix +++ b/pkgs/tools/misc/opentelemetry-collector/default.nix @@ -12,17 +12,17 @@ let in buildGoModule rec { pname = "opentelemetry-collector"; - version = "0.75.0"; + version = "0.76.1"; src = fetchFromGitHub { owner = "open-telemetry"; repo = "opentelemetry-collector"; rev = "v${version}"; - sha256 = "sha256-1MkAFQ5+mQWIPt7xCj8rLvQAuu9JUCP2zavZFaahzm0="; + sha256 = "sha256-e+IdEGrJzDRUaAViUSyXdkYv9Hfub0ytmh3pl1f/nGM="; }; # there is a nested go.mod sourceRoot = "source/cmd/otelcorecol"; - vendorHash = "sha256-Nn5YqHqWaa++KcY2nFGrALkfp+QrRLtBww0a6mprtRA="; + vendorHash = "sha256-8OkKPrK0xLWK5hIPaI7hgCGY0g7sWbaS/1HHqoTuqxk="; preBuild = '' # set the build version, can't be done via ldflags From a1940b3da72d915b19c92fa10e5edb70eac5d425 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 3 May 2023 23:33:19 +0200 Subject: [PATCH 067/244] python310Packages.aionotion: 2022.10.0 -> 2023.04.2 https://github.com/bachya/aionotion/releases/tag/2023.04.0 https://github.com/bachya/aionotion/releases/tag/2023.04.1 https://github.com/bachya/aionotion/releases/tag/2023.04.2 --- pkgs/development/python-modules/aionotion/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index 1de22b698c2a..9c31395ef62b 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -4,6 +4,7 @@ , buildPythonPackage , fetchFromGitHub , poetry-core +, pydantic , pytest-aiohttp , pytest-asyncio , pytest-cov @@ -13,7 +14,7 @@ buildPythonPackage rec { pname = "aionotion"; - version = "2022.10.0"; + version = "2023.04.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - hash = "sha256-DJkqFj87N8OlWHNto+tInj8QvVoNA9faLBb/pBbQl0U="; + hash = "sha256-pMBUhCm16+Zs6xZExLB4Z5y+OKNHX+utjsfMLeYUSWY="; }; nativeBuildInputs = [ @@ -31,6 +32,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + pydantic ]; nativeCheckInputs = [ From 2c9b6dcde47c5be23843df6d92aff084dfb4d88c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 28 Apr 2023 10:24:10 +0200 Subject: [PATCH 068/244] python310Packages.bimmer-connected: 0.13.1 -> 0.13.2 Diff: https://github.com/bimmerconnected/bimmer_connected/compare/refs/tags/0.13.1...0.13.2 Changelog: https://github.com/bimmerconnected/bimmer_connected/releases/tag/0.13.2 --- pkgs/development/python-modules/bimmer-connected/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix index 19be27891f4e..1d3df8443fc6 100644 --- a/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/pkgs/development/python-modules/bimmer-connected/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.13.1"; + version = "0.13.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = "refs/tags/${version}"; - hash = "sha256-bkJhVMcQifNWT/TkUDR2xHlKFHf0lydHdRMQotZWeCM="; + hash = "sha256-3EKtWomzgtQlYgCQjahOEDo/yaPtprsp5WPQs/tVChU="; }; nativeBuildInputs = [ From eec6471a0a2a5b13f4bf7eac204a9422ec3e3973 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 May 2023 20:35:48 +0200 Subject: [PATCH 069/244] python310Packages.bluetooth-auto-recovery: 1.0.3 -> 1.1.1 Diff: https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/compare/refs/tags/v1.0.3...v1.1.1 Changelog: https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/blob/v1.1.1/CHANGELOG.md --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index a539c3fd9a42..d1e1d42eb1c3 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.0.3"; + version = "1.1.1"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-gDypj2Vud6JtbGREPotvawgcsu5hbf92gJxxutWHcII="; + hash = "sha256-Kr8KzegMlRYgAwL+oHdb9A+/pTL+Ckpuu21CtraMwXg="; }; nativeBuildInputs = [ From 1792aab8b036ea7c61abc7c04901110d6deb1a0f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 15 Apr 2023 13:01:56 +0200 Subject: [PATCH 070/244] python310Packages.bluetooth-data-tools: 0.3.1 -> 0.4.0 Changelog: https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/v0.4.0/CHANGELOG.md --- .../python-modules/bluetooth-data-tools/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix index c843016e4ebb..1466d435d3c8 100644 --- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -4,11 +4,12 @@ , poetry-core , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "bluetooth-data-tools"; - version = "0.3.1"; + version = "0.4.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -17,11 +18,12 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-MMsg1laEk9cKU4oMhjKI47ulLNaGPH6QjAdx/wuAvMM="; + hash = "sha256-Zu2tD5isiOKOn1/bNgVo1F2/CbFFj5wVp1CUO+6btBc="; }; nativeBuildInputs = [ poetry-core + setuptools ]; nativeCheckInputs = [ From 32c9aea4bb2765fb5d0edc6d12e5beb1d7d91cbe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 22 Apr 2023 09:50:43 +0200 Subject: [PATCH 071/244] python311Packages.dbus-fast: 1.84.2 -> 1.85.0 Diff: https://github.com/Bluetooth-Devices/dbus-fast/compare/refs/tags/v1.84.2...v1.85.0 Changelog: https://github.com/Bluetooth-Devices/dbus-fast/releases/tag/v1.85.0 --- pkgs/development/python-modules/dbus-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbus-fast/default.nix b/pkgs/development/python-modules/dbus-fast/default.nix index 7a81d88ebe26..f0a63c4909c4 100644 --- a/pkgs/development/python-modules/dbus-fast/default.nix +++ b/pkgs/development/python-modules/dbus-fast/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dbus-fast"; - version = "1.84.2"; + version = "1.85.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jrEyRP9Rf6oIrj6fXfTQtRGfLcBq/sy4KGGiUBU39oc="; + hash = "sha256-pl5Qs7llmUna+i85hMl14UhTDkibPEcMaRnsPM7ODFg="; }; nativeBuildInputs = [ From 6adf00596251b9d4e61887c01709dc76b8e5f644 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Apr 2023 22:46:37 +0200 Subject: [PATCH 072/244] python310Packages.snitun: 0.34.0 -> 0.35.0 Changelog: https://github.com/NabuCasa/snitun/releases/tag/0.35.0 --- pkgs/development/python-modules/snitun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 23a75fa32507..f02f82adf1ab 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "snitun"; - version = "0.34.0"; + version = "0.35.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "NabuCasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-7UGsziNUI4dxdMGuJWrvsQiwl+IvcO/rQqEOjl9wS1Y="; + hash = "sha256-sZMmou9uHThl7AIMnuBxABnWTF1CCFsDj1I7FYxgJ3Y="; }; propagatedBuildInputs = [ From bc8b59f08e3724281afe23bb488eb1d49f14ff8a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 00:35:23 +0200 Subject: [PATCH 073/244] python310Packages.hass-nabucasa: 0.64.0 -> 0.66.2 https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.64.1 https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.65.0 https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.66.0 https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.66.1 https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.66.2 --- .../python-modules/hass-nabucasa/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 7ed70976fedb..ddb9f123b00e 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -7,15 +7,17 @@ , fetchFromGitHub , pycognito , pytest-aiohttp +, pytest-timeout , pytestCheckHook , pythonOlder , snitun -, warrant +, syrupy +, xmltodict }: buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.64.0"; + version = "0.66.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +26,7 @@ buildPythonPackage rec { owner = "nabucasa"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-30Z8KBgcd53Nd9lf39Wt28PaYFcnBZ5LC7B+1cestKM="; + hash = "sha256-LlVT5WRd2uhUaghThJ5ghPbX40QjqTenUC4txMx3Jlo="; }; postPatch = '' @@ -41,12 +43,14 @@ buildPythonPackage rec { attrs pycognito snitun - warrant ]; nativeCheckInputs = [ pytest-aiohttp + pytest-timeout pytestCheckHook + syrupy + xmltodict ]; pythonImportsCheck = [ From 9cb81c3cff745827bf6581babd168b93dfff4317 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 00:37:34 +0200 Subject: [PATCH 074/244] home-assistant.intents: 2023.3.29 -> 2023.4.26 https://github.com/home-assistant/intents/compare/refs/tags/2023.3.29...2023.4.26 --- pkgs/servers/home-assistant/intents.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix index 5b9303583405..4444d6e9a242 100644 --- a/pkgs/servers/home-assistant/intents.nix +++ b/pkgs/servers/home-assistant/intents.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "home-assistant-intents"; - version = "2023.3.29"; + version = "2023.4.26"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "home-assistant"; repo = "intents"; rev = "refs/tags/${version}"; - hash = "sha256-wMm2C2C+2+pW5kgMHoYFKpwnOJbS5RwpZK5HiAno0H8="; + hash = "sha256-l22+scT/4qIU5qWlWURr5wVEBoWNXGqYEaS3IVwG1Zs="; }; sourceRoot = "source/package"; From 97c3bc59e1a807ec4b96e587093b590942f2734a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 00:46:18 +0200 Subject: [PATCH 075/244] python310Packages.insteon-frontend-home-assistant: 0.3.4 -> 0.3.5-1 https://github.com/pyinsteon/insteon-panel/releases/tag/0.3.5 --- .../insteon-frontend-home-assistant/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index 7c2ca75f3c4b..e2008e29dbad 100644 --- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "insteon-frontend-home-assistant"; - version = "0.3.4"; + version = "0.3.5-1"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-c4IvtTn1pLcPHKPyP0FRv3NOu1+Ie42B/Jkc7ej1Roo="; + hash = "sha256-R+P4pgKbLvf0mwpSDoujCvlJe/yS+nvSJ7ewLVOOg/0="; }; nativeBuildInputs = [ @@ -29,8 +29,9 @@ buildPythonPackage rec { ]; meta = with lib; { + changelog = "https://github.com/pyinsteon/insteon-panel/releases/tag/${version}"; description = "The Insteon frontend for Home Assistant"; - homepage = "https://github.com/teharris1/insteon-panel"; + homepage = "https://github.com/pyinsteon/insteon-panel"; license = licenses.mit; maintainers = with maintainers; [ dotlambda ]; }; From 784fbf65a390e1c8c75d1e88f1642cfed48f8f3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 00:48:59 +0200 Subject: [PATCH 076/244] python310Packages.locationsharinglib: 4.2.0 -> 5.0.1 https://github.com/costastf/locationsharinglib/blob/5.0.1/HISTORY.rst --- .../python-modules/locationsharinglib/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/locationsharinglib/default.nix b/pkgs/development/python-modules/locationsharinglib/default.nix index bb5e4b7fa96d..001a0705dab5 100644 --- a/pkgs/development/python-modules/locationsharinglib/default.nix +++ b/pkgs/development/python-modules/locationsharinglib/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "locationsharinglib"; - version = "4.2.0"; + version = "5.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-1Eu+gHhUDYbZPeLblizxKuHMQfy9DhrHTaEcDYnnuP8="; + hash = "sha256-KT/q1UIJ/DzGqz8T08MXG9UCstAcpDydM4Tkn33pruI="; }; propagatedBuildInputs = [ @@ -40,8 +40,9 @@ buildPythonPackage rec { # Tests requirements want to pull in multiple modules which we don't need substituteInPlace setup.py \ --replace "tests_require=test_requirements" "tests_require=[]" - substituteInPlace requirements.txt \ - --replace "coloredlogs>=15.0.1" "coloredlogs" + substituteInPlace requirements.txt \ + --replace "coloredlogs>=15.0.1" "coloredlogs" \ + --replace "pytz>=2023.3" "pytz" ''; checkPhase = '' From 8e927a3a31386fdfd2c06a16ef669f7d25ebf266 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Apr 2023 16:13:26 +0200 Subject: [PATCH 077/244] python310Packages.nextdns: 1.3.0 -> 1.4.0 Diff: https://github.com/bieniu/nextdns/compare/refs/tags/1.3.0...1.4.0 Changelog: https://github.com/bieniu/nextdns/releases/tag/1.4.0 --- pkgs/development/python-modules/nextdns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nextdns/default.nix b/pkgs/development/python-modules/nextdns/default.nix index 4c633aa4ce2e..9b94c6da08a2 100644 --- a/pkgs/development/python-modules/nextdns/default.nix +++ b/pkgs/development/python-modules/nextdns/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "nextdns"; - version = "1.3.0"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+ApchGB/+mV5i751jTfZoP8XJ3VAYPCwx6VoRkq5950="; + hash = "sha256-fW/fLbL4IMLN6LmFijH4+ew+cDdJY9tOha+010YEfNs="; }; propagatedBuildInputs = [ From 3853faab5d3741a5a65a50936008216e6864ece0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 May 2023 00:00:11 +0200 Subject: [PATCH 078/244] python310Packages.semver: 2.13.0 -> 3.0.0 Changelog: https://github.com/python-semver/python-semver/releases/tag/3.0.0 --- .../python-modules/semver/default.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix index 637681dd2d4f..d0e92a4cbc38 100644 --- a/pkgs/development/python-modules/semver/default.nix +++ b/pkgs/development/python-modules/semver/default.nix @@ -3,22 +3,29 @@ , fetchFromGitHub , pytestCheckHook , pythonOlder +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "semver"; - version = "2.13.0"; - format = "setuptools"; + version = "3.0.0"; + format = "pyproject"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "python-semver"; repo = "python-semver"; - rev = version; - hash = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w="; + rev = "refs/tags/${version}"; + hash = "sha256-ErLmKZswoNgsY82epNUmJDVs065JvSwz3zY+y8jQ0e8="; }; + nativeBuildInputs = [ + setuptools + setuptools-scm + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -40,6 +47,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python package to work with Semantic Versioning (http://semver.org/)"; homepage = "https://python-semver.readthedocs.io/"; + changelog = "https://github.com/python-semver/python-semver/releases/tag/3.0.0"; license = licenses.bsd3; maintainers = with maintainers; [ np ]; }; From 18a3e69dda3652849ac4098fe03eb27cd963308a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 Apr 2023 09:41:28 +0200 Subject: [PATCH 079/244] python310Packages.plugwise: 0.27.10 -> 0.31.2 Diff: https://github.com/plugwise/python-plugwise/compare/refs/tags/v0.27.10...v0.31.2 Changelog: https://github.com/plugwise/python-plugwise/releases/tag/v0.31.2 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index ccf19f25d261..82239b7e698c 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.27.10"; + version = "0.31.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-KH8bhDS1niMsPZIXuHZIcnbEaywxDjvhNAGTZIdxXG4="; + hash = "sha256-lxeOGNO5OF4lLIQf/7TrrF091RKjdq8k80bBA/v5O4A="; }; propagatedBuildInputs = [ From 80ffed01346b5c11690750c3eefba1c0fa757099 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Mar 2023 10:22:58 +0100 Subject: [PATCH 080/244] python310Packages.pyprosegur: 0.0.8 -> 0.0.9 Diff: https://github.com/dgomes/pyprosegur/compare/refs/tags/0.0.8...0.0.9 --- pkgs/development/python-modules/pyprosegur/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyprosegur/default.nix b/pkgs/development/python-modules/pyprosegur/default.nix index a1167b83441c..4e456e7eef31 100644 --- a/pkgs/development/python-modules/pyprosegur/default.nix +++ b/pkgs/development/python-modules/pyprosegur/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pyprosegur"; - version = "0.0.8"; + version = "0.0.9"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "dgomes"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Spxzyn0gZ1TIHrtt7W0j6VwKnm2Km5vLGZZ//HINyBA="; + hash = "sha256-FTCQ2noxodFKN7qXdc7DG3Zt4j/pR6DeuWIs0GtGRy8="; }; propagatedBuildInputs = [ @@ -30,7 +30,9 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pyprosegur" ]; + pythonImportsCheck = [ + "pyprosegur" + ]; meta = with lib; { description = "Python module to communicate with Prosegur Residential Alarms"; From 60853e3d2f530ae78473679e641805a6354c0094 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 19 Mar 2023 10:25:38 +0100 Subject: [PATCH 081/244] python310Packages.pyprosegur: add changelog and format --- pkgs/development/python-modules/pyprosegur/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/pyprosegur/default.nix b/pkgs/development/python-modules/pyprosegur/default.nix index 4e456e7eef31..3eba1a1df3b8 100644 --- a/pkgs/development/python-modules/pyprosegur/default.nix +++ b/pkgs/development/python-modules/pyprosegur/default.nix @@ -11,6 +11,8 @@ buildPythonPackage rec { pname = "pyprosegur"; version = "0.0.9"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -37,6 +39,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module to communicate with Prosegur Residential Alarms"; homepage = "https://github.com/dgomes/pyprosegur"; + changelog = "https://github.com/dgomes/pyprosegur/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 431b38908c698cc50a5ff7e2e1b62431d0b02307 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 13 Apr 2023 07:44:38 +0200 Subject: [PATCH 082/244] python310Packages.xknx: 2.7.0 -> 2.9.0 Diff: https://github.com/XKNX/xknx/compare/refs/tags/2.7.0...2.9.0 Changelog: - https://github.com/XKNX/xknx/releases/tag/2.8.0 - https://github.com/XKNX/xknx/releases/tag/2.9.0 --- pkgs/development/python-modules/xknx/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 33857bfbb76c..3fc8fec88941 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -1,19 +1,19 @@ { lib +, async-timeout , buildPythonPackage , fetchFromGitHub , cryptography , ifaddr -, voluptuous -, pyyaml , pytest-asyncio , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "xknx"; - version = "2.7.0"; - format = "setuptools"; + version = "2.9.0"; + format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,10 +21,15 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Hr2uDFsYArU4iSK0xKZONjEgVZU0C0e4UpAD03t10zA="; + hash = "sha256-1Nt69lIle4vKSXfsTKWry1DXqCBEvBJz2JOOWrUYdX4="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ + async-timeout cryptography ifaddr ]; From 50077bdbfeb4082dc2865f5eb2a8db84c2ba8da3 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 01:27:14 +0200 Subject: [PATCH 083/244] python310Packages.zigpy-deconz: 0.20.0 -> 0.21.0 https://github.com/zigpy/zigpy-deconz/releases/tag/0.21.0 --- pkgs/development/python-modules/zigpy-deconz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix index 0d778abb6917..3566158edf44 100644 --- a/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "zigpy-deconz"; - version = "0.20.0"; + version = "0.21.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-P0vlNO6hQ+yVMFCHgLBynZuNabMFO2lx6UiYMH1eU1E="; + hash = "sha256-/XsCQt3JHiPrXJH8w2zDmaMQBLWgcmkbj9RooVYuFw0="; }; propagatedBuildInputs = [ From e3eae9105338c508505b75e2560212ed48efc388 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 01:28:02 +0200 Subject: [PATCH 084/244] python310Packages.zigpy-xbee: 0.17.0 -> 0.18.0 https://github.com/zigpy/zigpy-xbee/releases/tag/0.18.0 --- pkgs/development/python-modules/zigpy-xbee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix index 36f2f47d3086..dc0cfb66596c 100644 --- a/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "zigpy-xbee"; - version = "0.17.0"; + version = "0.18.0"; # https://github.com/Martiusweb/asynctest/issues/152 # broken by upstream python bug with asynctest and # is used exclusively by home-assistant with python 3.8 @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy-xbee"; rev = "refs/tags/${version}"; - hash = "sha256-XJsaUDCtaBF8vLyLzZ77h/KpV5aM4+JP8ldie7+b510="; + hash = "sha256-zSaT9WdA4tR8tJAShSzqL+f/nTLQJbeIZnbSBe1EOks="; }; buildInputs = [ From 3a37babb078f5d13a2fd18571a1c6b171fe04c4d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 01:28:52 +0200 Subject: [PATCH 085/244] python310Packages.zwave-js-server-python: 0.47.3 -> 0.48.0 https://github.com/home-assistant-libs/zwave-js-server-python/releases/tag/0.48.0 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index a818987a05b5..84f40cf2e643 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.47.3"; + version = "0.48.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-TJXzB6w1Kp2cT3sRMtMyL0Nx3ZEUeaHfL0P+qC88ohU="; + hash = "sha256-jYjaYmYqk3B4Qz9T9Sb3wbyY6eFLcR6IQ7CwpkPilVY="; }; propagatedBuildInputs = [ From ca8ac924c09d1975280abdd8c98644aa4ee1aedb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Apr 2023 22:23:55 +0200 Subject: [PATCH 086/244] python310Packages.home-assistant-bluetooth: 1.9.3 -> 1.10.0 Diff: https://github.com/home-assistant-libs/home-assistant-bluetooth/compare/refs/tags/v1.9.3...v1.10.0 Changelog: https://github.com/home-assistant-libs/home-assistant-bluetooth/blob/v1.10.0/CHANGELOG.md --- .../python-modules/home-assistant-bluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix index 06f7946b1ef2..85a6b7b5a0ed 100644 --- a/pkgs/development/python-modules/home-assistant-bluetooth/default.nix +++ b/pkgs/development/python-modules/home-assistant-bluetooth/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "home-assistant-bluetooth"; - version = "1.9.3"; + version = "1.10.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-7wZocfTYTwTBwm61hKmIS4xlHq2nSvC6p8SlklnHq4M="; + hash = "sha256-g8vdg7YU3rkXW85U4w9Hvb6u9uvoDphbkIlVXchCRxQ="; }; postPatch = '' From 51045dde3e2ec7960885203ae388703bee6af7dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 01:32:34 +0200 Subject: [PATCH 087/244] python310Packages.ulid-transform: 0.6.3 -> 0.7.2 Diff: https://github.com/bdraco/ulid-transform/compare/refs/tags/v0.6.3...v0.7.2 Changelog: https://github.com/bdraco/ulid-transform/releases/tag/v0.7.2 --- pkgs/development/python-modules/ulid-transform/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ulid-transform/default.nix b/pkgs/development/python-modules/ulid-transform/default.nix index 15e64927f0e2..e22985753812 100644 --- a/pkgs/development/python-modules/ulid-transform/default.nix +++ b/pkgs/development/python-modules/ulid-transform/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ulid-transform"; - version = "0.6.3"; + version = "0.7.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hnEzWm5DWSGq5R2KpVHo5L5XYu6Hv3ZWQ4UdGC73By0="; + hash = "sha256-AQeCgos/6BCvITTSnBYxefvAMWHHbJBsmbVMACl6L3o="; }; nativeBuildInputs = [ From 2deb6be6f6fee4745612ab66982cebdc1b4528f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 3 May 2023 20:55:33 -0300 Subject: [PATCH 088/244] linuxKernel.kernels.linux_lqx: 6.2.12-lqx1 -> 6.2.14-lqx1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 7551a2804146..774fe4906c2c 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "6.2.12"; #lqx + version = "6.2.14"; #lqx suffix = "lqx1"; #lqx - sha256 = "1gjg4ln42p6c5qk2067irjx4czwr8sl2klnzw68nk9cdppf3w4z5"; #lqx + sha256 = "18c95lal9f2hak49rw888sc454pj7bmh1wnphlwb7sp8j944g8cf"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From be06db870f8e9b2c7ebbf883b731e2867b6d476d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 3 May 2023 20:57:00 -0300 Subject: [PATCH 089/244] linuxKernel.kernels.linux_zen: 6.2.12-zen1 -> 6.3.1-zen1 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 774fe4906c2c..7401748c2219 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,9 +4,9 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.2.12"; #zen + version = "6.3.1"; #zen suffix = "zen1"; #zen - sha256 = "0y1gs7yyijgwhdcxznj6l1frlqsnpjr0r5xk43dqnckz0f1ml3by"; #zen + sha256 = "1m3jvgvqycig8ls4dgqglz8f0hphc0dmvi0v98xdcxqclkhz87nj"; #zen isLqx = false; }; # ./update-zen.py lqx From 33d89c972fd7fcc2a6503daae93a796a03b9fa6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 00:04:02 +0000 Subject: [PATCH 090/244] go-ethereum: 1.11.5 -> 1.11.6 --- pkgs/applications/blockchains/go-ethereum/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index 93de297dab53..7e00aa33a220 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,16 +9,16 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.11.5"; + version = "1.11.6"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QFqPAWW0L9cSBvnDwJKtwWT2jZFyr+zhYaS+GF/nQ9g="; + sha256 = "sha256-mZ11xan3MGgaUORbiQczKrXSrxzjvQMhZbpHnEal11Y="; }; - vendorSha256 = "sha256-Y1srOcXZ4rQ0QIQx4LdYzYG6goGk6oO30C+OW+s81z4="; + vendorHash = "sha256-rjSGR2ie5sFK2OOo4HUZ6+hrDlQuUDtyTKn0sh8jFBY="; doCheck = false; @@ -45,7 +45,7 @@ in buildGoModule rec { "cmd/utils" ]; - # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.11.5/build/ci.go#L218 + # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.11.6/build/ci.go#L218 tags = [ "urfave_cli_no_docs" ]; # Fix for usb-related segmentation faults on darwin From 5471a96ff4a3395676707d3fc3c4d0189ff9595f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 3 May 2023 21:14:37 -0300 Subject: [PATCH 091/244] openasar: unstable-2023-04-01 -> unstable-2023-05-01 --- .../networking/instant-messengers/discord/openasar.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/openasar.nix b/pkgs/applications/networking/instant-messengers/discord/openasar.nix index b6b564c78ece..bcbb859b8732 100644 --- a/pkgs/applications/networking/instant-messengers/discord/openasar.nix +++ b/pkgs/applications/networking/instant-messengers/discord/openasar.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openasar"; - version = "unstable-2023-04-01"; + version = "unstable-2023-05-01"; src = fetchFromGitHub { owner = "GooseMod"; repo = "OpenAsar"; - rev = "ac0ad4d48a1a198c0a8a784da973b96684b336a7"; - hash = "sha256-Ul2fXH4yjGe2oub1uVYY0mPJ4ou79TdokxvxvCAPXqs="; + rev = "a8b07392808032f95ac3a7c5856e76d2619c91ae"; + hash = "sha256-moHeSrWvVOb9+vNhC2YunjTC3Ojh10APt/tvG/AuNco="; }; postPatch = '' From 194db19ba31f88322f8856fb94fe4ead1cbdbc10 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 02:15:22 +0200 Subject: [PATCH 092/244] python310Packages.fnv-hash-fast: init at 0.3.1 --- .../python-modules/fnv-hash-fast/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/fnv-hash-fast/default.nix diff --git a/pkgs/development/python-modules/fnv-hash-fast/default.nix b/pkgs/development/python-modules/fnv-hash-fast/default.nix new file mode 100644 index 000000000000..b6fdb148edb3 --- /dev/null +++ b/pkgs/development/python-modules/fnv-hash-fast/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, cython +, poetry-core +, setuptools +, wheel +, fnvhash +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "fnv-hash-fast"; + version = "0.3.1"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = "fnv-hash-fast"; + rev = "v${version}"; + hash = "sha256-yApMUTO6Kq2YESGMpkU4/FlN57+hX0uQr2fGH7QIdUE="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace "--cov=fnv_hash_fast --cov-report=term-missing:skip-covered" "" + ''; + + nativeBuildInputs = [ + cython + poetry-core + setuptools + wheel + ]; + + propagatedBuildInputs = [ + fnvhash + ]; + + pythonImportsCheck = [ + "fnv_hash_fast" + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "A fast version of fnv1a"; + homepage = "https://github.com/bdraco/fnv-hash-fast"; + changelog = "https://github.com/bdraco/fnv-hash-fast/blob/${src.rev}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ff60b1046a47..80a4ade815b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3691,6 +3691,8 @@ self: super: with self; { fn = callPackage ../development/python-modules/fn { }; + fnv-hash-fast = callPackage ../development/python-modules/fnv-hash-fast { }; + fnvhash = callPackage ../development/python-modules/fnvhash { }; folium = callPackage ../development/python-modules/folium { }; From 3ee348cb7f572ba52af0eb6de08a2d00cf224966 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 00:19:02 +0000 Subject: [PATCH 093/244] emborg: 1.34 -> 1.35 --- pkgs/development/python-modules/emborg/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix index a788a34098aa..14034483ca77 100644 --- a/pkgs/development/python-modules/emborg/default.nix +++ b/pkgs/development/python-modules/emborg/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "emborg"; - version = "1.34"; + version = "1.35"; format = "flit"; disabled = pythonOlder "3.7"; @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KenKundert"; repo = "emborg"; - rev = "v${version}"; - hash = "sha256-bnlELPZzTU9KyVsz5Q0aW9xWvVrgwpowQrjkQvX844g="; + rev = "refs/tags/v${version}"; + hash = "sha256-T6RfZNJ4k7ONYByy4J6Iuc7sVLKHlXti7p7x1QKgkNo="; }; propagatedBuildInputs = [ From 1527bfc2ee5abb068d3c78315c1041f11b2006d1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 02:20:43 +0200 Subject: [PATCH 094/244] python310Packages.coronavirus: remove The data is no longer provided by the data source. --- .../python-modules/coronavirus/default.nix | 32 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/development/python-modules/coronavirus/default.nix diff --git a/pkgs/development/python-modules/coronavirus/default.nix b/pkgs/development/python-modules/coronavirus/default.nix deleted file mode 100644 index ddf87816b8f7..000000000000 --- a/pkgs/development/python-modules/coronavirus/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, aiohttp -}: - -buildPythonPackage rec { - pname = "coronavirus"; - version = "1.1.1"; - - src = fetchFromGitHub { - owner = "nabucasa"; - repo = pname; - rev = version; - sha256 = "0mx6ifp8irj3669c67hs9r79k8gar6j4aq7d4ji21pllyhyahdwm"; - }; - - propagatedBuildInputs = [ - aiohttp - ]; - - # no tests are present - doCheck = false; - pythonImportsCheck = [ "coronavirus" ]; - - meta = with lib; { - description = "Python client for getting Corona virus info"; - homepage = "https://github.com/nabucasa/coronavirus"; - license = with licenses; [ mit ]; - maintainers = with maintainers; [ fab ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 85dd738194b2..d1652a947a61 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -63,6 +63,7 @@ mapAliases ({ ColanderAlchemy = colanderalchemy; # added 2023-02-19 CommonMark = commonmark; # added 2023-02-1 ConfigArgParse = configargparse; # added 2021-03-18 + coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23 dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80a4ade815b9..c28f09418c71 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2063,8 +2063,6 @@ self: super: with self; { cornice = callPackage ../development/python-modules/cornice { }; - coronavirus = callPackage ../development/python-modules/coronavirus { }; - corsair-scan = callPackage ../development/python-modules/corsair-scan { }; cot = callPackage ../development/python-modules/cot { }; From 974ad83f91e3d1c0ebb6644f62aea82d11987261 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 May 2023 22:57:38 +0000 Subject: [PATCH 095/244] erlang_24: 24.3.4.10 -> 24.3.4.11 --- pkgs/development/interpreters/erlang/24.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/24.nix b/pkgs/development/interpreters/erlang/24.nix index 26205ba0da1d..ae0a29d08208 100644 --- a/pkgs/development/interpreters/erlang/24.nix +++ b/pkgs/development/interpreters/erlang/24.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "24.3.4.10"; - sha256 = "sha256-mz9ZSqp/MgdW3tMLLV84Uiwqb4FIOAnYjYgri68LlWs="; + version = "24.3.4.11"; + sha256 = "sha256-1A73UOCPJnCRCAXTEPc3VTHsDJIWQjlPJXkuwQBV0r4="; } From 914b27a77966f599389083a39905bd6f352e88d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 00:33:11 +0000 Subject: [PATCH 096/244] prometheus-artifactory-exporter: 1.13.0 -> 1.13.1 --- pkgs/servers/monitoring/prometheus/artifactory-exporter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index f4535624f5b6..d26a05ad7e97 100644 --- a/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -6,14 +6,14 @@ buildGoModule rec { pname = "artifactory_exporter"; - version = "1.13.0"; + version = "1.13.1"; rev = "v${version}"; src = fetchFromGitHub { owner = "peimanja"; repo = pname; rev = rev; - hash = "sha256-URavjOb0OEFul4jM3VR0buIMXmNU7nLJ0R3e8vRUWQ8="; + hash = "sha256-TXLIuTY5COHlhyp8xL9X02DbK2ku9AKnW5a4FYdzMic="; }; vendorHash = "sha256-Gin134G4NPK8M2E2RrgH62ieiuCw15jwm9SJg03w9ts="; From 16100e187b666e37b3fc7d53b80d3b97b8f241f4 Mon Sep 17 00:00:00 2001 From: Ruixi-rebirth Date: Thu, 4 May 2023 08:33:35 +0800 Subject: [PATCH 097/244] go-musicfox: 4.0.5 -> 4.0.6 --- pkgs/applications/audio/go-musicfox/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index a7f8dcd4427e..2564c08eb2ba 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "go-musicfox"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { - owner = "anhoder"; + owner = "go-musicfox"; repo = pname; rev = "v${version}"; - hash = "sha256-NAAl/XmJqRnJyOYNJqmMlCIiGsCsSH7gGTMbD46gpss="; + hash = "sha256-ZqB3NL/pLIY1lHl3qMIOciqsOW9jNwjVQAq1j/ydDWs="; }; deleteVendor = true; - vendorHash = null; + vendorHash = "sha256-rJlyrPQS9UKinxIwGGo3EHlmWrzTKIm1jM1UDqnmVyg="; subPackages = [ "cmd/musicfox.go" ]; From 5914055503bea117a4db49a7013ae04688804b7b Mon Sep 17 00:00:00 2001 From: lelgenio Date: Mon, 1 May 2023 22:12:24 -0300 Subject: [PATCH 098/244] dart-sass: init at 1.62.1 --- maintainers/maintainer-list.nix | 6 + .../tools/misc/dart-sass/default.nix | 54 ++ .../tools/misc/dart-sass/pubspec.lock | 605 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 667 insertions(+) create mode 100644 pkgs/development/tools/misc/dart-sass/default.nix create mode 100644 pkgs/development/tools/misc/dart-sass/pubspec.lock diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4216fff9adb8..49f1551e735b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8764,6 +8764,12 @@ githubId = 567634; name = "Daniel Kuehn"; }; + lelgenio = { + email = "lelgenio@disroot.org"; + github = "lelgenio"; + githubId = 31388299; + name = "Leonardo Eugênio"; + }; leo60228 = { email = "leo@60228.dev"; matrix = "@leo60228:matrix.org"; diff --git a/pkgs/development/tools/misc/dart-sass/default.nix b/pkgs/development/tools/misc/dart-sass/default.nix new file mode 100644 index 000000000000..1035d29d4ce7 --- /dev/null +++ b/pkgs/development/tools/misc/dart-sass/default.nix @@ -0,0 +1,54 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +, dart +, callPackage +}: + +stdenvNoCC.mkDerivation (finalAttrs: rec { + pname = "dart-sass"; + version = "1.62.1"; + + src = fetchFromGitHub { + owner = "sass"; + repo = pname; + rev = finalAttrs.version; + hash = "sha256-U6enz8yJcc4Wf8m54eYIAnVg/jsGi247Wy8lp1r1wg4="; + }; + + nativeBuildInputs = [ + dart + (callPackage ../../../../build-support/dart/fetch-dart-deps { } { + buildDrvArgs = finalAttrs; + pubspecLockFile = ./pubspec.lock; + vendorHash = "sha256-Atm7zfnDambN/BmmUf4BG0yUz/y6xWzf0reDw3Ad41s="; + }) + ]; + + configurePhase = '' + runHook preConfigure + dart pub get --offline + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + dart compile exe --define=version=${finalAttrs.version} ./bin/sass.dart + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + install -D ./bin/sass.exe $out/bin/sass + runHook postInstall + ''; + + meta = with lib; { + inherit (dart.meta) platforms; + homepage = "https://github.com/sass/dart-sass"; + description = "The reference implementation of Sass, written in Dart"; + mainProgram = "sass"; + license = licenses.mit; + maintainers = with maintainers; [ lelgenio ]; + }; +}) diff --git a/pkgs/development/tools/misc/dart-sass/pubspec.lock b/pkgs/development/tools/misc/dart-sass/pubspec.lock new file mode 100644 index 000000000000..8e00c17d3a11 --- /dev/null +++ b/pkgs/development/tools/misc/dart-sass/pubspec.lock @@ -0,0 +1,605 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + _fe_analyzer_shared: + dependency: transitive + description: + name: _fe_analyzer_shared + sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8" + url: "https://pub.dev" + source: hosted + version: "47.0.0" + analyzer: + dependency: "direct dev" + description: + name: analyzer + sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80" + url: "https://pub.dev" + source: hosted + version: "4.7.0" + archive: + dependency: "direct dev" + description: + name: archive + sha256: "0c8368c9b3f0abbc193b9d6133649a614204b528982bebc7026372d61677ce3a" + url: "https://pub.dev" + source: hosted + version: "3.3.7" + args: + dependency: "direct main" + description: + name: args + sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440" + url: "https://pub.dev" + source: hosted + version: "2.4.0" + async: + dependency: "direct main" + description: + name: async + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" + source: hosted + version: "2.11.0" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + charcode: + dependency: "direct main" + description: + name: charcode + sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306 + url: "https://pub.dev" + source: hosted + version: "1.3.1" + checked_yaml: + dependency: transitive + description: + name: checked_yaml + sha256: "3d1505d91afa809d177efd4eed5bb0eb65805097a1463abdd2add076effae311" + url: "https://pub.dev" + source: hosted + version: "2.0.2" + cli_pkg: + dependency: "direct dev" + description: + name: cli_pkg + sha256: "0f76b0ea3f158e9c68e3ae132e90435cfd094c507ae6aaeccb05bbc2ef758517" + url: "https://pub.dev" + source: hosted + version: "2.4.4" + cli_repl: + dependency: "direct main" + description: + name: cli_repl + sha256: a2ee06d98f211cb960c777519cb3d14e882acd90fe5e078668e3ab4baab0ddd4 + url: "https://pub.dev" + source: hosted + version: "0.2.3" + cli_util: + dependency: transitive + description: + name: cli_util + sha256: "66f86e916d285c1a93d3b79587d94bd71984a66aac4ff74e524cfa7877f1395c" + url: "https://pub.dev" + source: hosted + version: "0.3.5" + collection: + dependency: "direct main" + description: + name: collection + sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c" + url: "https://pub.dev" + source: hosted + version: "1.17.1" + convert: + dependency: transitive + description: + name: convert + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" + source: hosted + version: "3.1.1" + coverage: + dependency: transitive + description: + name: coverage + sha256: "2fb815080e44a09b85e0f2ca8a820b15053982b2e714b59267719e8a9ff17097" + url: "https://pub.dev" + source: hosted + version: "1.6.3" + crypto: + dependency: "direct dev" + description: + name: crypto + sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + url: "https://pub.dev" + source: hosted + version: "3.0.2" + csslib: + dependency: transitive + description: + name: csslib + sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + url: "https://pub.dev" + source: hosted + version: "0.17.2" + dart_style: + dependency: "direct dev" + description: + name: dart_style + sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4" + url: "https://pub.dev" + source: hosted + version: "2.2.4" + dartdoc: + dependency: "direct dev" + description: + name: dartdoc + sha256: f236297ea9d0908e1510cfabbf9cfc318c9834067c1bbddbea0ad9d670cd0b1a + url: "https://pub.dev" + source: hosted + version: "6.1.1" + file: + dependency: transitive + description: + name: file + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" + source: hosted + version: "6.1.4" + frontend_server_client: + dependency: transitive + description: + name: frontend_server_client + sha256: "408e3ca148b31c20282ad6f37ebfa6f4bdc8fede5b74bc2f08d9d92b55db3612" + url: "https://pub.dev" + source: hosted + version: "3.2.0" + glob: + dependency: transitive + description: + name: glob + sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + grinder: + dependency: "direct dev" + description: + name: grinder + sha256: "1dabcd70f0d3975f9143d0cebf48a09cf56d4f5e0922f1d1931781e1047c8d00" + url: "https://pub.dev" + source: hosted + version: "0.9.3" + html: + dependency: transitive + description: + name: html + sha256: "79d498e6d6761925a34ee5ea8fa6dfef38607781d2fa91e37523474282af55cb" + url: "https://pub.dev" + source: hosted + version: "0.15.2" + http: + dependency: "direct main" + description: + name: http + sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + url: "https://pub.dev" + source: hosted + version: "0.13.6" + http_multi_server: + dependency: transitive + description: + name: http_multi_server + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" + source: hosted + version: "3.2.1" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" + source: hosted + version: "4.0.2" + io: + dependency: transitive + description: + name: io + sha256: "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e" + url: "https://pub.dev" + source: hosted + version: "1.0.4" + js: + dependency: "direct main" + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317 + url: "https://pub.dev" + source: hosted + version: "4.8.0" + lints: + dependency: "direct dev" + description: + name: lints + sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + url: "https://pub.dev" + source: hosted + version: "2.0.1" + logging: + dependency: transitive + description: + name: logging + sha256: "04094f2eb032cbb06c6f6e8d3607edcfcb0455e2bb6cbc010cb01171dcb64e6d" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + markdown: + dependency: transitive + description: + name: markdown + sha256: c2b81e184067b41d0264d514f7cdaa2c02d38511e39d6521a1ccc238f6d7b3f2 + url: "https://pub.dev" + source: hosted + version: "6.0.1" + matcher: + dependency: transitive + description: + name: matcher + sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb" + url: "https://pub.dev" + source: hosted + version: "0.12.15" + meta: + dependency: "direct main" + description: + name: meta + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + mime: + dependency: transitive + description: + name: mime + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" + source: hosted + version: "1.0.4" + node_interop: + dependency: "direct main" + description: + name: node_interop + sha256: "3af2420c728173806f4378cf89c53ba9f27f7f67792b898561bff9d390deb98e" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + node_preamble: + dependency: "direct dev" + description: + name: node_preamble + sha256: "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db" + url: "https://pub.dev" + source: hosted + version: "2.0.2" + oauth2: + dependency: transitive + description: + name: oauth2 + sha256: "1e8376c222651904caf7785fd2fa01b1e2be608c94bec842a94e116deca88f13" + url: "https://pub.dev" + source: hosted + version: "2.0.1" + package_config: + dependency: "direct main" + description: + name: package_config + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + path: + dependency: "direct main" + description: + name: path + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" + source: hosted + version: "1.8.3" + petitparser: + dependency: transitive + description: + name: petitparser + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" + source: hosted + version: "5.4.0" + pointycastle: + dependency: transitive + description: + name: pointycastle + sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" + url: "https://pub.dev" + source: hosted + version: "3.7.3" + pool: + dependency: transitive + description: + name: pool + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" + source: hosted + version: "1.5.1" + pub_api_client: + dependency: "direct dev" + description: + name: pub_api_client + sha256: d4bc6c9ec778da1a79675eab41bde456b392973216acd783156afaee69230e22 + url: "https://pub.dev" + source: hosted + version: "2.4.0" + pub_semver: + dependency: "direct main" + description: + name: pub_semver + sha256: "307de764d305289ff24ad257ad5c5793ce56d04947599ad68b3baa124105fc17" + url: "https://pub.dev" + source: hosted + version: "2.1.3" + pubspec: + dependency: transitive + description: + name: pubspec + sha256: f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e + url: "https://pub.dev" + source: hosted + version: "2.3.0" + pubspec_parse: + dependency: "direct dev" + description: + name: pubspec_parse + sha256: ec85d7d55339d85f44ec2b682a82fea340071e8978257e5a43e69f79e98ef50c + url: "https://pub.dev" + source: hosted + version: "1.2.2" + quiver: + dependency: transitive + description: + name: quiver + sha256: b1c1ac5ce6688d77f65f3375a9abb9319b3cb32486bdc7a1e0fdf004d7ba4e47 + url: "https://pub.dev" + source: hosted + version: "3.2.1" + retry: + dependency: transitive + description: + name: retry + sha256: a8a1e475a100a0bdc73f529ca8ea1e9c9c76bec8ad86a1f47780139a34ce7aea + url: "https://pub.dev" + source: hosted + version: "3.1.1" + shelf: + dependency: transitive + description: + name: shelf + sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c + url: "https://pub.dev" + source: hosted + version: "1.4.0" + shelf_packages_handler: + dependency: transitive + description: + name: shelf_packages_handler + sha256: aef74dc9195746a384843102142ab65b6a4735bb3beea791e63527b88cc83306 + url: "https://pub.dev" + source: hosted + version: "3.0.1" + shelf_static: + dependency: transitive + description: + name: shelf_static + sha256: e792b76b96a36d4a41b819da593aff4bdd413576b3ba6150df5d8d9996d2e74c + url: "https://pub.dev" + source: hosted + version: "1.1.1" + shelf_web_socket: + dependency: transitive + description: + name: shelf_web_socket + sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8 + url: "https://pub.dev" + source: hosted + version: "1.0.3" + source_map_stack_trace: + dependency: transitive + description: + name: source_map_stack_trace + sha256: "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + source_maps: + dependency: "direct main" + description: + name: source_maps + sha256: "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703" + url: "https://pub.dev" + source: hosted + version: "0.10.12" + source_span: + dependency: "direct main" + description: + name: source_span + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" + source: hosted + version: "1.10.0" + stack_trace: + dependency: "direct main" + description: + name: stack_trace + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" + source: hosted + version: "1.11.0" + stream_channel: + dependency: "direct dev" + description: + name: stream_channel + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" + source: hosted + version: "2.1.1" + stream_transform: + dependency: "direct main" + description: + name: stream_transform + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + string_scanner: + dependency: "direct main" + description: + name: string_scanner + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + term_glyph: + dependency: "direct main" + description: + name: term_glyph + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + test: + dependency: "direct dev" + description: + name: test + sha256: "4f92f103ef63b1bbac6f4bd1930624fca81b2574464482512c4f0896319be575" + url: "https://pub.dev" + source: hosted + version: "1.24.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: daadc9baabec998b062c9091525aa95786508b1c48e9c30f1f891b8bf6ff2e64 + url: "https://pub.dev" + source: hosted + version: "0.5.2" + test_core: + dependency: transitive + description: + name: test_core + sha256: "3642b184882f79e76ca57a9230fb971e494c3c1fd09c21ae3083ce891bcc0aa1" + url: "https://pub.dev" + source: hosted + version: "0.5.2" + test_descriptor: + dependency: "direct dev" + description: + name: test_descriptor + sha256: abe245e8b0d61245684127fe32343542c25dc2a1ce8f405531637241d98d07e4 + url: "https://pub.dev" + source: hosted + version: "2.0.1" + test_process: + dependency: "direct dev" + description: + name: test_process + sha256: b0e6702f58272d459d5b80b88696483f86eac230dab05ecf73d0662e305d005e + url: "https://pub.dev" + source: hosted + version: "2.0.3" + tuple: + dependency: "direct main" + description: + name: tuple + sha256: "0ea99cd2f9352b2586583ab2ce6489d1f95a5f6de6fb9492faaf97ae2060f0aa" + url: "https://pub.dev" + source: hosted + version: "2.0.1" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + url: "https://pub.dev" + source: hosted + version: "1.3.1" + uri: + dependency: transitive + description: + name: uri + sha256: "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "518254c0d3ee20667a1feef39eefe037df87439851e4b3cb277e5b3f37afa2f0" + url: "https://pub.dev" + source: hosted + version: "11.4.0" + watcher: + dependency: "direct main" + description: + name: watcher + sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + url: "https://pub.dev" + source: hosted + version: "1.0.2" + web_socket_channel: + dependency: transitive + description: + name: web_socket_channel + sha256: d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b + url: "https://pub.dev" + source: hosted + version: "2.4.0" + webkit_inspection_protocol: + dependency: transitive + description: + name: webkit_inspection_protocol + sha256: "67d3a8b6c79e1987d19d848b0892e582dbb0c66c57cc1fef58a177dd2aa2823d" + url: "https://pub.dev" + source: hosted + version: "1.2.0" + xml: + dependency: transitive + description: + name: xml + sha256: "80d494c09849dc3f899d227a78c30c5b949b985ededf884cb3f3bcd39f4b447a" + url: "https://pub.dev" + source: hosted + version: "5.4.1" + yaml: + dependency: "direct dev" + description: + name: yaml + sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + url: "https://pub.dev" + source: hosted + version: "3.1.1" +sdks: + dart: ">=2.19.0 <3.0.0" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8394f9e5a6b..0590ddfb1085 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39753,6 +39753,8 @@ with pkgs; dart = callPackage ../development/compilers/dart { }; + dart-sass = callPackage ../development/tools/misc/dart-sass { }; + httrack = callPackage ../tools/backup/httrack { }; httraqt = libsForQt5.callPackage ../tools/backup/httrack/qt.nix { }; From 632236eeb56ce3e479b53af3d967d3f6ecd39c23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 00:53:59 +0000 Subject: [PATCH 099/244] goeland: 0.14.0 -> 0.15.0 --- pkgs/applications/networking/feedreaders/goeland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/goeland/default.nix b/pkgs/applications/networking/feedreaders/goeland/default.nix index c750decc30b1..70da2b8796a4 100644 --- a/pkgs/applications/networking/feedreaders/goeland/default.nix +++ b/pkgs/applications/networking/feedreaders/goeland/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "goeland"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "slurdge"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O4/dKTphgvcL5V66pMk2blXZ1cVsUgazMBaZCoAAwkY="; + sha256 = "sha256-b/A76f9/pFDdG1ZiHQnJrxYmlvFIjhZZhTIGl09cMcg="; }; vendorHash = "sha256-jOtIA7+rM/2qObhR61utvmXD+Rxi/+dEvzgYkGR76I8="; From eefc3b651514cbcc5c22cbf01e7a2035426df352 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 01:15:12 +0000 Subject: [PATCH 100/244] protoc-gen-entgrpc: 0.4.3 -> 0.4.5 --- pkgs/development/tools/protoc-gen-entgrpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/pkgs/development/tools/protoc-gen-entgrpc/default.nix index 9a3ddd1a7363..2047974cf286 100644 --- a/pkgs/development/tools/protoc-gen-entgrpc/default.nix +++ b/pkgs/development/tools/protoc-gen-entgrpc/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "protoc-gen-entgrpc"; - version = "0.4.3"; + version = "0.4.5"; src = fetchFromGitHub { owner = "ent"; repo = "contrib"; rev = "v${version}"; - sha256 = "sha256-5gFdfMSAb0DWCMCzG0nVGU+VWam6yC26QYUPF1YjekM="; + sha256 = "sha256-bEJjVNWd4NsUdWPqMZQ86U9F32q5M1iBRcS9MYDp9GE="; }; vendorHash = "sha256-DgqCGXqEnLBxyLZJrTRZIeBIrHYA7TNMV4WTk/3IS8Y="; From fe13b20e5ecd13971c5fae31e5fd64a97d77d720 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 01:35:48 +0000 Subject: [PATCH 101/244] azure-static-sites-client: 1.0.022851 -> 1.0.023121 --- .../azure-static-sites-client/versions.json | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/development/tools/azure-static-sites-client/versions.json b/pkgs/development/tools/azure-static-sites-client/versions.json index 001796353350..b0e308dd1f67 100644 --- a/pkgs/development/tools/azure-static-sites-client/versions.json +++ b/pkgs/development/tools/azure-static-sites-client/versions.json @@ -1,25 +1,44 @@ [ { "version": "latest", - "buildId": "1.0.022851", - "publishDate": "2023-04-04T18:55:18.5999465Z", + "buildId": "1.0.023121", + "publishDate": "2023-05-01T20:32:05.431065Z", "files": { "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022851/linux/StaticSitesClient", - "sha": "dbbf2785549d2e002f69057c54d4df378c1e52e5e564d484f6871440ef336689" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/linux/StaticSitesClient", + "sha": "99c8b876922587ee0729d103ba5509ae88ec6b457c2d7d7bf69da26b1428ef6b" }, "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022851/windows/StaticSitesClient.exe", - "sha": "a3d37f5793ce433ba8cd7743285d9e6f9c0174c2d09c530483a6a50f8a448637" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/windows/StaticSitesClient.exe", + "sha": "7c24aa28e7e9758a08ee6a33fa085e46d4b92101b5396e78a1eba218853aff76" }, "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022851/macOS/StaticSitesClient", - "sha": "9de09ad2b000c6943a8103c323e95a0fb8fea1a3c2bd406859cc59b4b6cec548" + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/macOS/StaticSitesClient", + "sha": "cf2d799edcd87aeb4e9cab83bf8906770c1d05277130131740b50a95e31786f7" } } }, { "version": "stable", + "buildId": "1.0.023121", + "publishDate": "2023-05-01T20:32:05.431065Z", + "files": { + "linux-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/linux/StaticSitesClient", + "sha": "99c8b876922587ee0729d103ba5509ae88ec6b457c2d7d7bf69da26b1428ef6b" + }, + "win-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/windows/StaticSitesClient.exe", + "sha": "7c24aa28e7e9758a08ee6a33fa085e46d4b92101b5396e78a1eba218853aff76" + }, + "osx-x64": { + "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.023121/macOS/StaticSitesClient", + "sha": "cf2d799edcd87aeb4e9cab83bf8906770c1d05277130131740b50a95e31786f7" + } + } + }, + { + "version": "backup", "buildId": "1.0.022851", "publishDate": "2023-04-04T18:55:18.5999465Z", "files": { @@ -36,24 +55,5 @@ "sha": "9de09ad2b000c6943a8103c323e95a0fb8fea1a3c2bd406859cc59b4b6cec548" } } - }, - { - "version": "backup", - "buildId": "1.0.022431", - "publishDate": "2023-02-21T18:46:09.9616432Z", - "files": { - "linux-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/linux/StaticSitesClient", - "sha": "a0424f02b72b0e292e23fa1774a579f3a83cc2280af46a19682c11423e55a134" - }, - "win-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/windows/StaticSitesClient.exe", - "sha": "78476f93e8357ebd5b6676c66747c6f0432084615a5cecaa43e4afbda2533176" - }, - "osx-x64": { - "url": "https://swalocaldeploy.azureedge.net/downloads/1.0.022431/macOS/StaticSitesClient", - "sha": "0f2dc106903167d5900d9875321fd99a11349d21177b4794495b45e3df175755" - } - } } ] From a48f280da421686bd8c08e1860c3a725e0084d1e Mon Sep 17 00:00:00 2001 From: Dominik Ritter Date: Thu, 4 May 2023 03:42:38 +0200 Subject: [PATCH 102/244] josm: 18700 -> 18721 --- pkgs/applications/misc/josm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index ffcf26f7c003..ff0e995d71da 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -3,15 +3,15 @@ }: let pname = "josm"; - version = "18700"; + version = "18721"; srcs = { jar = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - hash = "sha256-rJw38pOHi+OIjIKgglU0Y2Tlc/b8K9f04ru2IH0CUJ0="; + hash = "sha256-nc6itoblAzP064xTTF8q990TiRX3+zf5uk+enS+C5Jo="; }; macosx = fetchurl { url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip"; - hash = "sha256-RTRe2GZz5B9QEYF04PiKtKJkWu0Em5WBqK4dVQVHK0g="; + hash = "sha256-uaj32PupxAS5Pa7us9sIeeepGJ6BIljm41e6onB7zxQ="; }; pkg = fetchsvn { url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested"; From bbc64faf64a3315586b757194172b801045fbae9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 02:04:11 +0000 Subject: [PATCH 103/244] kubelogin: 0.0.28 -> 0.0.29 --- pkgs/applications/networking/cluster/kubelogin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix index ec177fe85562..4dead551c21d 100644 --- a/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubelogin"; - version = "0.0.28"; + version = "0.0.29"; src = fetchFromGitHub { owner = "Azure"; repo = pname; rev = "v${version}"; - sha256 = "sha256-uIWlOVZIqwOSvFWRIWKTFEp0aToIBo1htUXb3F+njyI="; + sha256 = "sha256-B6p+quzFPx2KHVqUvJly2x+F9pHBWaUxuSdhG36V/5U="; }; - vendorHash = "sha256-CVBpBb8yYkc6/yLPsCPbVhBHecqZ03WE0NcKiH8SGYs="; + vendorHash = "sha256-H8hfphAcz/Lc1JLxejodV4YQ9IPyPgVeDXdPT9AYpmk="; ldflags = [ "-X main.version=${version}" From dd3c008537970513873aa7bfcf05de8bf05ed5e1 Mon Sep 17 00:00:00 2001 From: Yongun Seong Date: Thu, 27 Apr 2023 22:51:56 +0900 Subject: [PATCH 104/244] gnucash: 4.12 -> 5.1 - https://github.com/Gnucash/gnucash/releases/tag/5.0 - https://github.com/Gnucash/gnucash/releases/tag/5.1 Co-authored-by: Anderson Torres --- .../gnucash/0002-disable-gnc-fq-update.patch | 10 +- .../office/gnucash/0003-remove-valgrind.patch | 9 +- .../office/gnucash/0004-exec-fq-helpers.patch | 23 ---- .../office/gnucash/0004-exec-fq-wrapper.patch | 46 +++++++ .../0005-remove-gncquotes-online-wiggle.patch | 31 +++++ pkgs/applications/office/gnucash/default.nix | 127 ++---------------- 6 files changed, 98 insertions(+), 148 deletions(-) delete mode 100644 pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch create mode 100644 pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch create mode 100644 pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch diff --git a/pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch b/pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch index f379cd5e259d..25170b87129f 100644 --- a/pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch +++ b/pkgs/applications/office/gnucash/0002-disable-gnc-fq-update.patch @@ -1,12 +1,12 @@ diff --git a/libgnucash/quotes/CMakeLists.txt b/libgnucash/quotes/CMakeLists.txt -index b33569d39..fdbfa10a9 100644 +index 7e42016629..7211663408 100644 --- a/libgnucash/quotes/CMakeLists.txt +++ b/libgnucash/quotes/CMakeLists.txt @@ -1,6 +1,6 @@ set(_BIN_FILES "") --foreach(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-update.in gnc-fq-dump.in) -+foreach(file gnc-fq-check.in gnc-fq-helper.in gnc-fq-dump.in) +-foreach(file gnc-fq-update.in finance-quote-wrapper.in) ++foreach(file finance-quote-wrapper.in) string(REPLACE ".in" "" _OUTPUT_FILE_NAME ${file}) set(_ABS_OUTPUT_FILE ${BINDIR_BUILD}/${_OUTPUT_FILE_NAME}) configure_file( ${file} ${_ABS_OUTPUT_FILE} @ONLY) @@ -14,5 +14,5 @@ index b33569d39..fdbfa10a9 100644 install(FILES ${_MAN_FILES} DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) install(PROGRAMS ${_BIN_FILES} DESTINATION ${CMAKE_INSTALL_BINDIR}) --set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump.in gnc-fq-helper.in gnc-fq-update.in Quote_example.pl README) -+set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-check.in gnc-fq-dump.in gnc-fq-helper.in Quote_example.pl README) +-set_dist_list(quotes_DIST CMakeLists.txt gnc-fq-update.in finance-quote-wrapper.in README) ++set_dist_list(quotes_DIST CMakeLists.txt finance-quote-wrapper.in README) diff --git a/pkgs/applications/office/gnucash/0003-remove-valgrind.patch b/pkgs/applications/office/gnucash/0003-remove-valgrind.patch index 8bbb17e353fa..329b87985383 100644 --- a/pkgs/applications/office/gnucash/0003-remove-valgrind.patch +++ b/pkgs/applications/office/gnucash/0003-remove-valgrind.patch @@ -1,8 +1,8 @@ diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt -index 8e6e339d1..3936a8cb6 100644 +index 95ff42cd8f..1c1944a811 100644 --- a/gnucash/CMakeLists.txt +++ b/gnucash/CMakeLists.txt -@@ -163,13 +163,6 @@ set(GNUCASH_BIN_INSTALL_NAME "gnucash") +@@ -169,13 +169,6 @@ set(GNUCASH_BIN_INSTALL_NAME "gnucash") set(VALGRIND_OUTDIR ${BINDIR_BUILD}) @@ -16,7 +16,7 @@ index 8e6e339d1..3936a8cb6 100644 ## Create the environment file file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/environment.in ENV_STRINGS_IN) -@@ -253,7 +246,6 @@ file(COPY ${ENV_FILE_OUT} +@@ -259,14 +252,13 @@ file(COPY ${ENV_FILE_OUT} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE ) @@ -24,12 +24,11 @@ index 8e6e339d1..3936a8cb6 100644 install(FILES ${ENVIRONMENT_FILE_DIR}/environment DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/gnucash) -@@ -274,7 +266,7 @@ gnc_add_scheme_targets(price-quotes set_local_dist(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script gnucash.cpp gnucash-commands.cpp gnucash-cli.cpp gnucash-core-app.cpp - gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in gnucash-valgrind.in + gnucash-locale-macos.mm gnucash-locale-windows.c gnucash.rc.in - gnucash-gresources.xml ${gresource_files} price-quotes.scm + ${gnucash_GRESOURCES} ${gnucash_noinst_HEADERS} ${gnucash_EXTRA_DIST}) diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch b/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch deleted file mode 100644 index 289822365490..000000000000 --- a/pkgs/applications/office/gnucash/0004-exec-fq-helpers.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/gnucash/price-quotes.scm b/gnucash/price-quotes.scm -index 8e3ff255f..a6b805fa5 100644 ---- a/gnucash/price-quotes.scm -+++ b/gnucash/price-quotes.scm -@@ -44,7 +44,7 @@ - (define (start-program) - (set! program - (gnc-spawn-process-async -- (list "perl" "-w" gnc:*finance-quote-check*) #t))) -+ (list gnc:*finance-quote-check*) #t))) - - (define (get-sources) - (when program -@@ -119,7 +119,7 @@ - - (define (start-quoter) - (set! quoter -- (gnc-spawn-process-async (list "perl" "-w" gnc:*finance-quote-helper*) #t))) -+ (gnc-spawn-process-async (list gnc:*finance-quote-helper*) #t))) - - (define (get-quotes) - (when quoter - diff --git a/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch b/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch new file mode 100644 index 000000000000..e18337c74226 --- /dev/null +++ b/pkgs/applications/office/gnucash/0004-exec-fq-wrapper.patch @@ -0,0 +1,46 @@ +diff --git a/libgnucash/app-utils/gnc-quotes.cpp b/libgnucash/app-utils/gnc-quotes.cpp +index 3003fca71f..e01cb10b50 100644 +--- a/libgnucash/app-utils/gnc-quotes.cpp ++++ b/libgnucash/app-utils/gnc-quotes.cpp +@@ -122,7 +122,6 @@ private: + + class GncFQQuoteSource final : public GncQuoteSource + { +- const bfs::path c_cmd; + std::string c_fq_wrapper; + std::string m_version; + StrVec m_sources; +@@ -145,7 +144,6 @@ static std::string parse_quotesource_error(const std::string& line); + static const std::string empty_string{}; + + GncFQQuoteSource::GncFQQuoteSource() : +-c_cmd{bp::search_path("perl")}, + m_version{}, m_sources{}, m_api_key{} + { + char *bindir = gnc_path_get_bindir(); +@@ -197,7 +195,7 @@ m_version{}, m_sources{}, m_api_key{} + QuoteResult + GncFQQuoteSource::get_quotes(const std::string& json_str) const + { +- StrVec args{"-w", c_fq_wrapper, "-f" }; ++ StrVec args{"-f" }; + return run_cmd(args, json_str); + } + +@@ -215,13 +213,13 @@ GncFQQuoteSource::run_cmd (const StrVec& args, const std::string& json_string) c + auto input_buf = bp::buffer (json_string); + bp::child process; + if (m_api_key.empty()) +- process = bp::child(c_cmd, args, ++ process = bp::child(c_fq_wrapper, args, + bp::std_out > out_buf, + bp::std_err > err_buf, + bp::std_in < input_buf, + svc); + else +- process = bp::child(c_cmd, args, ++ process = bp::child(c_fq_wrapper, args, + bp::std_out > out_buf, + bp::std_err > err_buf, + bp::std_in < input_buf, + diff --git a/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch b/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch new file mode 100644 index 000000000000..14b68555f367 --- /dev/null +++ b/pkgs/applications/office/gnucash/0005-remove-gncquotes-online-wiggle.patch @@ -0,0 +1,31 @@ +diff --git a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp +index 8a5221d19d..d14e96cb66 100644 +--- a/libgnucash/app-utils/test/gtest-gnc-quotes.cpp ++++ b/libgnucash/app-utils/test/gtest-gnc-quotes.cpp +@@ -153,25 +153,6 @@ TEST_F(GncQuotesTest, quotable_commodities) + EXPECT_EQ(4u, commodities.size()); + } + +-#ifdef HAVE_F_Q +-TEST_F(GncQuotesTest, online_wiggle) +-{ +- GncQuotes quotes; +- quotes.fetch(m_book); +- auto pricedb{gnc_pricedb_get_db(m_book)}; +- auto failures{quotes.failures()}; +- ASSERT_EQ(1u, failures.size()); +- EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[0])); +-// EXPECT_EQ(GncQuoteError::QUOTE_FAILED, std::get<2>(failures[1])); +- EXPECT_EQ(3u, gnc_pricedb_get_num_prices(pricedb)); +-} +-#else +-TEST_F(GncQuotesTest, fq_failure) +-{ +- EXPECT_THROW(GncQuotes quotes;, GncQuoteException); +-} +-#endif +- + TEST_F(GncQuotesTest, offline_wiggle) + { + StrVec quote_vec{ + diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index e22cd17cefa3..64a02e811167 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch2 , fetchurl , aqbanking , boost @@ -27,12 +26,12 @@ stdenv.mkDerivation rec { pname = "gnucash"; - version = "4.12"; + version = "5.1"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { url = "https://github.com/Gnucash/gnucash/releases/download/${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-zIwFGla4u0M1ZtbiiQ31nz2JWjlcjPUkbBtygQLOEK4="; + hash = "sha256-imWB3ffHQJ22NlEGATUa9yTto2OrWbHV2o2YEDPyb3I="; }; nativeBuildInputs = [ @@ -61,7 +60,7 @@ stdenv.mkDerivation rec { webkitgtk ] ++ (with perlPackages; [ - DateManip + JSONParse FinanceQuote perl ]); @@ -73,124 +72,24 @@ stdenv.mkDerivation rec { ./0002-disable-gnc-fq-update.patch # this patch prevents the building of gnucash-valgrind ./0003-remove-valgrind.patch - # this patch makes gnucash exec the Finance::Quote helpers directly - ./0004-exec-fq-helpers.patch - # the following patches fix compilation with gcc 13 and glib > 2.76 - # "Build fails with gcc 13 and glib > 2.76" - (fetchpatch2 { - url = "https://github.com/Gnucash/gnucash/commit/184669f517744ac7be6e420e5e1f359384f676d5.patch"; - sha256 = "sha256-X5HCK//n+V5k/pEUNL6xwZY5NTeGnBt+7GhooqOXQ2I="; - }) - # "Build fails with gcc 13 and glib > 2.76, bis" - (fetchpatch2 { - url = "https://github.com/Gnucash/gnucash/commit/abcce5000ca72bf943ca8951867729942388848e.patch"; - sha256 = "sha256-WiMkozqMAYl5wrRhAQMNVDY77aRBa3E5/a0gvYyc9Zk="; - }) - # "Build fails with gcc 13 and glib > 2.76, ter" - (fetchpatch2 { - url = "https://github.com/Gnucash/gnucash/commit/89e63ef67235d231d242f018894295a6cb38cfc3.patch"; - sha256 = "sha256-xCkY8RlZPVDaRLbVn+QT28s4qIUgtMgjmuB0axSrNpw="; - }) - # "Build fails with gcc 13" - # "Protect against passing an lseek failure rv to read()." - (fetchpatch2 { - url = "https://github.com/Gnucash/gnucash/commit/ce3447e6ea8b2f734b24a2502e865ebbbc21aaaa.patch"; - sha256 = "sha256-mfPs/5rkCamihE0z1SRoX0tV4FNPkKUGd1T6iaCwy7E="; - }) - # "Fix crashes in test-engine on Arch Linux." - # Also fixes the same crashes in nixpkgs. - (fetchpatch2 { - url = "https://github.com/Gnucash/gnucash/commit/1020bde89c77f70cee6cc8181ead96e8fade47aa.patch"; - sha256 = "sha256-JCWm3M8hdgAwjuhLbFRN4Vk3BQqpn0FUwHk6Kg5Qa7Q="; - }) + # this patch makes gnucash exec the Finance::Quote wrapper directly + ./0004-exec-fq-wrapper.patch + # this patch removes the online_wiggle GncQuotes test + ./0005-remove-gncquotes-online-wiggle.patch ]; # this needs to be an environment variable and not a cmake flag to suppress # guile warning - GUILE_AUTO_COMPILE="0"; + env.GUILE_AUTO_COMPILE = "0"; env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [ # Needed with GCC 12 but breaks on darwin (with clang) or older gcc "-Wno-error=use-after-free" ]); - # `make check` target does not define its prerequisites but expects them to - # have already been built. The list of targets below was built through trial - # and error based on failing tests. doCheck = true; - preCheck = '' - make \ - test-account-object \ - test-address \ - test-agedver \ - test-app-utils \ - test-aqb \ - test-autoclear \ - test-backend-dbi \ - test-business \ - test-column-types \ - test-commodities \ - test-customer \ - test-dom-converters1 \ - test-dynload \ - test-employee \ - test-engine \ - test-exp-parser \ - test-gnc-glib-utils \ - test-gnc-guid \ - test-gnc-int128 \ - test-gnc-numeric \ - test-gnc-path-util \ - test-gnc-rational \ - test-group-vs-book \ - test-guid \ - test-import-account-matcher \ - test-import-backend \ - test-import-map \ - test-import-parse \ - test-import-pending-matches \ - test-incompatdep \ - test-job \ - test-kvp-frames \ - test-kvp-value \ - test-link-module-tax-us \ - test-link-ofx \ - test-load-backend \ - test-load-c \ - test-load-engine \ - test-load-example-account \ - test-load-xml2 \ - test-lots \ - test-modsysver \ - test-numeric \ - test-object \ - test-print-parse-amount \ - test-qof \ - test-qofquerycore \ - test-qofsession \ - test-query \ - test-querynew \ - test-recurrence \ - test-resolve-file-path \ - test-scm-query \ - test-scm-query-string \ - test-split-register-copy-ops \ - test-split-vs-account \ - test-sqlbe \ - test-string-converters \ - test-sx \ - test-tokenizer \ - test-transaction-reversal \ - test-transaction-voiding \ - test-userdata-dir \ - test-userdata-dir-invalid-home \ - test-vendor \ - test-xml-account \ - test-xml-commodity \ - test-xml-pricedb \ - test-xml-transaction \ - test-xml2-is-file - ''; + enableParallelChecking = true; + checkTarget = "check"; preFixup = '' gappsWrapperArgs+=( @@ -210,10 +109,8 @@ stdenv.mkDerivation rec { postFixup = '' wrapProgram $out/bin/gnucash "''${gappsWrapperArgs[@]}" - for file in $out/bin/gnc-fq-check $out/bin/gnc-fq-dump $out/bin/gnc-fq-helper; do - wrapProgram $file \ - --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ DateManip FinanceQuote ]}" - done + wrapProgram $out/bin/finance-quote-wrapper \ + --prefix PERL5LIB : "${with perlPackages; makeFullPerlPath [ JSONParse FinanceQuote ]}" ''; meta = with lib; { From 48a1e1f75363a3aaa5055d54d4d2fa6e9763892b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 02:05:57 +0000 Subject: [PATCH 105/244] trivy: 0.40.0 -> 0.41.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index eab60f269c49..03650768cab4 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.40.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vhzhYFmU4aIMDbqF33bQSl50DTLs8NQd0SSYsU1wnO0="; + sha256 = "sha256-GDApctrRWRJ9svPBWGt86slnCtmZyciQ03rhYW1958s="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorHash = "sha256-3h4S97wygLH957+PyeaQyc8qnQHie77gJ1kjsTKVFtQ="; + vendorHash = "sha256-JlLQpBiviVXcX1xK0pi2igErCzvOXBc28m4fzDuIQ1U="; excludedPackages = [ "magefiles" "misc" ]; From 28c12f08f92622e80deed02179423c5ccf3d47bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 02:18:48 +0000 Subject: [PATCH 106/244] imgproxy: 3.16.0 -> 3.16.1 --- pkgs/servers/imgproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 8cca579af7c8..06f3750154a8 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.16.0"; + version = "3.16.1"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "sha256-TdJRoburmJl2Ez0wzJnqm2jpJpFOSOmaBx0O9Z/8DXQ="; + sha256 = "sha256-l5THMK6YUfScTeralhEl5SDBDoeV3Olt1xzdzeJ8BEQ="; rev = "v${version}"; }; From 3756e506dfd7be3eb72370e7da48003d4484abee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 02:33:13 +0000 Subject: [PATCH 107/244] lazygit: 0.37.0 -> 0.38.1 --- pkgs/development/tools/lazygit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/lazygit/default.nix b/pkgs/development/tools/lazygit/default.nix index 4e60fffbeb59..2131392a827f 100644 --- a/pkgs/development/tools/lazygit/default.nix +++ b/pkgs/development/tools/lazygit/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "lazygit"; - version = "0.37.0"; + version = "0.38.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = pname; rev = "v${version}"; - sha256 = "sha256-A6aFHC4MNNFl7IieR/7aQ3cMzhBXfQwq6sPv+v5Gu4o="; + sha256 = "sha256-w4hdzPpv+/Uap7Uh3Op67yPYIJuWOc6ag1uMNs0uJRM="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "." ]; ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; From cd83399d4fff48ee2e077eb3d03d65c53dd91eb9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 02:40:46 +0000 Subject: [PATCH 108/244] usql: 0.14.4 -> 0.14.5 --- pkgs/applications/misc/usql/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/usql/default.nix b/pkgs/applications/misc/usql/default.nix index b695286085d1..3049f56657a0 100644 --- a/pkgs/applications/misc/usql/default.nix +++ b/pkgs/applications/misc/usql/default.nix @@ -10,18 +10,18 @@ buildGoModule rec { pname = "usql"; - version = "0.14.4"; + version = "0.14.5"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - hash = "sha256-AUZFrASwROmcOhoObAdV/Dn9dA7HvxmEqqZOIJH+rI0="; + hash = "sha256-WjQdRSucp9iwjUisaz4V/d4JVuFOmYwQA6f3DK5GskU="; }; buildInputs = [ unixODBC icu ]; - vendorHash = "sha256-oReSh0acGcjH+a7GRRV6cy6qgU4puN+iuXzLuRQmx3A="; + vendorHash = "sha256-kGq+IrdhyFEoaqUeXTKRXziQnFfzG49GIMAsljnWQPA="; proxyVendor = true; # Exclude broken impala & hive driver From de9e53d994e637d217927fa65c3bee319464f32c Mon Sep 17 00:00:00 2001 From: lelgenio Date: Wed, 3 May 2023 16:11:35 -0300 Subject: [PATCH 109/244] amdgpu_top: fix GUI mode missing x11 and wayland libs --- pkgs/tools/system/amdgpu_top/default.nix | 34 ++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/amdgpu_top/default.nix b/pkgs/tools/system/amdgpu_top/default.nix index 75dd1bd4ac94..8355486ff540 100644 --- a/pkgs/tools/system/amdgpu_top/default.nix +++ b/pkgs/tools/system/amdgpu_top/default.nix @@ -1,4 +1,16 @@ -{ lib, rustPlatform, fetchFromGitHub, libdrm }: +{ lib +, rustPlatform +, fetchFromGitHub +, libdrm +, libX11 +, libGL +, wayland +, wayland-protocols +, libxkbcommon +, libXrandr +, libXi +, libXcursor +}: rustPlatform.buildRustPackage rec { pname = "amdgpu_top"; @@ -13,7 +25,25 @@ rustPlatform.buildRustPackage rec { cargoLock.lockFile = ./Cargo.lock; - buildInputs = [ libdrm ]; + buildInputs = [ + libdrm + libX11 + libGL + wayland + wayland-protocols + libxkbcommon + libXrandr + libXi + libXcursor + ]; + + postInstall = '' + install -D ./assets/${pname}.desktop -t $out/share/applications/ + ''; + + postFixup = '' + patchelf --set-rpath "${lib.makeLibraryPath buildInputs}" $out/bin/${pname} + ''; meta = with lib; { description = "Tool to display AMDGPU usage"; From c77a8c10a7982a6959bb9e83f64ebe58e2340952 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 03:12:08 +0000 Subject: [PATCH 110/244] elinks: 0.16.0 -> 0.16.1.1 --- pkgs/applications/networking/browsers/elinks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/elinks/default.nix b/pkgs/applications/networking/browsers/elinks/default.nix index 7bf6fdfe0bcb..f78afa8176a6 100644 --- a/pkgs/applications/networking/browsers/elinks/default.nix +++ b/pkgs/applications/networking/browsers/elinks/default.nix @@ -13,13 +13,13 @@ assert enablePython -> python != null; stdenv.mkDerivation rec { pname = "elinks"; - version = "0.16.0"; + version = "0.16.1.1"; src = fetchFromGitHub { owner = "rkd77"; repo = "felinks"; rev = "v${version}"; - sha256 = "sha256-4+V1j78sjs3/6SnVLO34jCcNuegpZan8Ykd8Gy0vc3k="; + sha256 = "sha256-u6QGhfi+uWeIzSUFuYHAH3Xu0Fky0yw2h4NOKgYFLsM="; }; buildInputs = [ From eceb1adcd319ea88ceec500978c0d8cd74a74856 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 3 May 2023 23:22:38 -0400 Subject: [PATCH 111/244] brave: 1.50.125 -> 1.51.110 https://community.brave.com/t/release-channel-1-51-110/485343/1 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index d3c4e67b114d..d9999de2ad11 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.50.125"; + version = "1.51.110"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-QVKCH8w593uF948tyavABI0g6sG0oteS/1O8Ncz77ps="; + sha256 = "sha256-O0nzJvnZU1xIzEtGdp/syQJqS4xMTrWBcNj01dLKc0U="; }; dontConfigure = true; From b5655ee52d0cfc94f4260d71ec1c76af3dd6af04 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 03:28:54 +0000 Subject: [PATCH 112/244] jc: 1.23.1 -> 1.23.2 --- pkgs/development/python-modules/jc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jc/default.nix b/pkgs/development/python-modules/jc/default.nix index 579b558d5d0c..f7e0c302465e 100644 --- a/pkgs/development/python-modules/jc/default.nix +++ b/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.23.1"; + version = "1.23.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-3AH/NKYMACNuS0I2RsyU+L5Vksdv9H/q3aV1US64rk0="; + hash = "sha256-nj7HyYjo5jDnA+H5/er/GPgC/bUR0UYBqu5zOSDA4p0="; }; propagatedBuildInputs = [ ruamel-yaml xmltodict pygments ]; From d987f2b9504f12812a283a095dc2347e6b1157c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 03:41:02 +0000 Subject: [PATCH 113/244] sentencepiece: 0.1.98 -> 0.1.99 --- pkgs/development/libraries/sentencepiece/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sentencepiece/default.nix b/pkgs/development/libraries/sentencepiece/default.nix index 67875df02e25..f2fc6a1a8676 100644 --- a/pkgs/development/libraries/sentencepiece/default.nix +++ b/pkgs/development/libraries/sentencepiece/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sentencepiece"; - version = "0.1.98"; + version = "0.1.99"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-afODoC4G3ibVXMLEIxusmju4wkTcOtlEzS17+EuyIZw="; + sha256 = "sha256-RxzysZsfTdhAtJCO3JOa/bSBNnHBRWkqBdwBa8sB74I="; }; nativeBuildInputs = [ cmake ]; From 91011996040e71228e58f4f0fc44b8582ddb6450 Mon Sep 17 00:00:00 2001 From: ran xiao Date: Thu, 4 May 2023 11:04:32 +1000 Subject: [PATCH 114/244] python3.pkgs.mlflow: fix build --- pkgs/development/python-modules/mlflow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 1da81bba8954..dc8dd1c7b600 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -53,7 +53,7 @@ buildPythonPackage rec { # but not mlflow has a 'skinny' install option which does not require `shap`. nativeBuildInputs = [ pythonRelaxDepsHook ]; pythonRemoveDeps = [ "shap" ]; - pythonRelaxDeps = [ "pytz" ]; + pythonRelaxDeps = [ "pytz" "pyarrow" ]; propagatedBuildInputs = [ alembic From b25043119fce3ecfa4c1381d510dd5041bf995aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 03:51:33 +0000 Subject: [PATCH 115/244] trayscale: 0.9.6 -> 0.9.7 --- pkgs/applications/networking/trayscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/trayscale/default.nix b/pkgs/applications/networking/trayscale/default.nix index 173a87ac8b76..01c79a1153ea 100644 --- a/pkgs/applications/networking/trayscale/default.nix +++ b/pkgs/applications/networking/trayscale/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "trayscale"; - version = "0.9.6"; + version = "0.9.7"; src = fetchFromGitHub { owner = "DeedleFake"; repo = "trayscale"; rev = "v${version}"; - hash = "sha256-qMQ0WykBHXyXZ6GkDM5l5ki27X1h8rl3sUBooqF3234="; + hash = "sha256-PMcpVBJVJNX+5vICubBUqlyHC0CEZC9EGUfw6O3pCeA="; }; vendorHash = "sha256-K1Za2j4kUtsktFi9DjZYXrtfsWF1r6vIbyocLUrj5IU="; From 60cac18263061199cd874478b38d4f9507463912 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 03:58:47 +0000 Subject: [PATCH 116/244] gobgpd: 3.13.0 -> 3.14.0 --- pkgs/servers/misc/gobgpd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 284159bc4970..5dee67ba7791 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-qXLg/EZF2eU7BhILHO7Uu4juz0tVZLq37foQcSKv0P8="; + hash = "sha256-R64Mm8fWZ8VZgsKcnc+ZqAk0V3L+TkpxTmSkx6+KVs0="; }; - vendorHash = "sha256-ofPz9IX+4ylch6Qe0ksGZqrP5x6AktqF0JAs/hLBQo0="; + vendorHash = "sha256-Z7vYpDQIKc4elVBLiGtxF3D9pec4QNvWFLpux/29t1Y="; postConfigure = '' export CGO_ENABLED=0 From afab97963a4e6f90bb15a80dc80dd35b2b33e04b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 04:02:42 +0000 Subject: [PATCH 117/244] nixpacks: 1.6.1 -> 1.7.0 --- pkgs/applications/virtualization/nixpacks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 097b9a657a77..f11ce9eb6888 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ldX1V2QCqeCWkBT3qolkw6rYfuawnxE0ERMzgrjFmUQ="; + sha256 = "sha256-iz/lTm/8Oqmo16lMDxpI2vFFq6BnnG2yeDAgKc8jTFU="; }; - cargoHash = "sha256-DEXVoG3uWXPiNVBaSdl/523MFXC21EtXZD8PFs+3rmQ="; + cargoHash = "sha256-/V4Zj9yJtl3Fo7vXc0f3J6cp/mSxFG9YJg1r/RoHx/M="; # skip test due FHS dependency doCheck = false; From 9237be6b9d9fdf8bda7a9a3904932e8a4d262749 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 04:21:56 +0000 Subject: [PATCH 118/244] python310Packages.plaid-python: 12.0.0 -> 13.0.0 --- pkgs/development/python-modules/plaid-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plaid-python/default.nix b/pkgs/development/python-modules/plaid-python/default.nix index b94cec292402..37223e779801 100644 --- a/pkgs/development/python-modules/plaid-python/default.nix +++ b/pkgs/development/python-modules/plaid-python/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "plaid-python"; - version = "12.0.0"; + version = "13.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-m/U7O859pWOB+qF4PVcXg3pI7M2Zpl2uWPjaubeV2dE="; + hash = "sha256-xe0HK6S612q/DiNLGpBqhfTg1RVvzeeez5Y0ot/+Tqk="; }; propagatedBuildInputs = [ From 20309557f46549c3bb0fbc2e4965e2ca52c0b6b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 04:41:24 +0000 Subject: [PATCH 119/244] python310Packages.galois: 0.3.3 -> 0.3.4 --- pkgs/development/python-modules/galois/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/galois/default.nix b/pkgs/development/python-modules/galois/default.nix index 1f5ef06ea1c4..f0e07e6e2923 100644 --- a/pkgs/development/python-modules/galois/default.nix +++ b/pkgs/development/python-modules/galois/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "galois"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "mhostetter"; repo = "galois"; rev = "refs/tags/v${version}"; - hash = "sha256-nlNy4+GwStyuCD8f47w07NhNmepxBRtu6PXiL31vzwA="; + hash = "sha256-yvF57ErcaknKcK6UgINt65uASNZpEtXk+LOizYDH1Bo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 9a05ffc92a78b8b34b008c871af462f7a77ed13e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 04:42:33 +0000 Subject: [PATCH 120/244] python310Packages.pycoin: 0.92.20220529 -> 0.92.20230326 --- pkgs/development/python-modules/pycoin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index 46c6777f9b31..249d19f69f54 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pycoin"; - version = "0.92.20220529"; + version = "0.92.20230326"; src = fetchPypi { inherit pname version; - hash = "sha256-PQOWR1teLZ2npQV+q3K+DgiFBejkRoB4gQYjaHLFQqI="; + hash = "sha256-DYXwATRHw1ay9swLuQOtB+5LcoBe4TtAKWzQgxESwN8="; }; propagatedBuildInputs = [ setuptools ]; From 7f892230ba3891ddae65be4be18f5c336489170a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 03:07:08 +0000 Subject: [PATCH 121/244] terraform-providers.cloudamqp: 1.25.0 -> 1.26.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 440d57119f2f..d30770f4b6af 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -209,13 +209,13 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-sXt0q6eKWk1BRm0GDsXKl/Rr3mro7FZkQcSIDan1df4=", + "hash": "sha256-cFXQgB++BcTKCFuJ3bMm8Qw3Zdr9m9d6LaZMz5tKXBM=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.25.0", + "rev": "v1.26.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-w7Rsr3UgijW/3RMKzhMyWCvn5b1R1oqRs87/ZPO7jHs=" + "vendorHash": "sha256-wyPwStUCprrnq0S6jKzDqAXeWTZW43ml+vBOuX05eRs=" }, "cloudflare": { "hash": "sha256-0bHKQe4wIieKdxPF0S7Qv8QLlg+AZzBOG8n2qiMOM0g=", From e25ab1bd0f7f642b2d5c7c0617d182e00742b85f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 03:07:55 +0000 Subject: [PATCH 122/244] terraform-providers.datadog: 3.24.0 -> 3.24.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d30770f4b6af..84769190849f 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -282,11 +282,11 @@ "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" }, "datadog": { - "hash": "sha256-3C+jh9rGw2v2ME3PHLc+TIAY4UWcZVFdmNy4N4WyRM8=", + "hash": "sha256-i6v55pIooA+7L5V2yNL+T2KCgGNLU5ZrqeKzdzdvNoA=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.24.0", + "rev": "v3.24.1", "spdx": "MPL-2.0", "vendorHash": "sha256-MMPE1Urnlt7QCoiEnHqWnFZzmeSs/i4UtiotyrXZF2U=" }, From c78c89f7d2d6e937bd1b699c16cacced48dd98d5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 03:10:54 +0000 Subject: [PATCH 123/244] terraform-providers.ovh: 0.29.0 -> 0.30.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 84769190849f..b713e0c9742e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -873,11 +873,11 @@ "vendorHash": null }, "ovh": { - "hash": "sha256-ePF3lojT4Dit3n4oI/74u3372gsSW8B1FQfEPhdfmz4=", + "hash": "sha256-1AM0kHLr+wXkpncAQvt+nbYAaI25V/2asEiWDNCKsgA=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v0.29.0", + "rev": "v0.30.0", "spdx": "MPL-2.0", "vendorHash": null }, From 679cace1c747130c4e8024240d816ed9f52617d6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 03:16:53 +0000 Subject: [PATCH 124/244] terraform-providers.oci: 4.118.0 -> 4.119.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index b713e0c9742e..24d2ef027627 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -810,11 +810,11 @@ "vendorHash": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=" }, "oci": { - "hash": "sha256-WtdB5aI5YS5Kc33g3RXh/gneOVXhhhKXq+pW+fm44/I=", + "hash": "sha256-/p/NBw8dPzStLs9LTvvqDUSNJ9oMCG0e4bT+gIsPEGA=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v4.118.0", + "rev": "v4.119.0", "spdx": "MPL-2.0", "vendorHash": null }, From ff7edb3c7f07db8d348450e78127a23884970e2a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 03:18:00 +0000 Subject: [PATCH 125/244] terraform-providers.vault: 3.15.0 -> 3.15.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 24d2ef027627..142cc1879cd0 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1180,12 +1180,12 @@ "vendorHash": "sha256-bNE5HxOcj0K2vdqWPVECeTojnWz0hF9mw0TnRRBhqkQ=" }, "vault": { - "hash": "sha256-oyR9xqEnpt5JoTIe1jgV3aMDxKFdvrDx39UWNc5ECTM=", + "hash": "sha256-etQTHPZ1bngVMpeQ/IZ8yaoe94ZPNT2IG4ip4d+73Xg=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-vault", - "rev": "v3.15.0", + "rev": "v3.15.1", "spdx": "MPL-2.0", "vendorHash": "sha256-Ox8Onq44NdE/KMrmzbOpKetJKww9T2PvEliLbWU/bLU=" }, From 466a00effa72f21ffea35a3b3dd75f416a838cef Mon Sep 17 00:00:00 2001 From: Hugh O'Brien Date: Thu, 4 May 2023 00:49:20 -0400 Subject: [PATCH 126/244] sidequest: 0.10.24 -> 0.10.33 --- pkgs/applications/misc/sidequest/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/sidequest/default.nix b/pkgs/applications/misc/sidequest/default.nix index b1c99ab3857e..7c6f9249a2dc 100644 --- a/pkgs/applications/misc/sidequest/default.nix +++ b/pkgs/applications/misc/sidequest/default.nix @@ -1,7 +1,7 @@ -{ stdenv, lib, fetchurl, buildFHSEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: +{ stdenv, lib, fetchurl, buildFHSEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, libxkbcommon, libxshmfence, at-spi2-atk, icu, openssl, zlib }: let pname = "sidequest"; - version = "0.10.24"; + version = "0.10.33"; desktopItem = makeDesktopItem rec { name = "SideQuest"; @@ -16,7 +16,7 @@ src = fetchurl { url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "0bnd16f22sgy67z3d6rf4z20n56ljxczsql455p2j6kck5f75lh4"; + sha256 = "8ac3d97400a8e3ce86902b5bea7b8d042a092acd888d20e5139490a38507f995"; }; nativeBuildInputs = [ makeWrapper ]; @@ -59,6 +59,7 @@ sidequest # Needed in the environment on runtime, to make QuestSaberPatch work icu openssl zlib + libxkbcommon libxshmfence ]; extraInstallCommands = '' From 9e2e5308b7b82a1936ad08c8c9fa245a526372c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 04:50:44 +0000 Subject: [PATCH 127/244] python310Packages.dkimpy: 1.1.2 -> 1.1.3 --- pkgs/development/python-modules/dkimpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index 47e6df8f0653..765f9032aaf6 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "1.1.2"; + version = "1.1.3"; src = fetchPypi { inherit pname version; - hash = "sha256-DDpa953ooBkSP4Gqf1flEaTqcTonLqi2KkQahN3cSyw="; + hash = "sha256-8zIhlR9jOBEXb9D1qGH0S8I721/cKn+jWXUxlUAbEwg="; }; nativeCheckInputs = [ pytest ]; From 8ac9f0270cd4c7e7dbea6a1a81ebccd6b20f76c1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 05:22:59 +0000 Subject: [PATCH 128/244] html-xml-utils: 8.5 -> 8.6 --- pkgs/tools/text/xml/html-xml-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index 4e2566e5c525..df91cbcea566 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "html-xml-utils"; - version = "8.5"; + version = "8.6"; src = fetchurl { url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz"; - sha256 = "sha256-8gpGrE7TDQKM14R25fIPXikXqVy3vOfffxfY+z5Peec="; + sha256 = "sha256-XoRynvNszTkk0ocu1O5pVMYzMtylQAuo606u8fLbT7I="; }; buildInputs = [curl libiconv]; From 0bd85a74469bc12b6a44eee262c42cafd9a24aee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 05:31:37 +0000 Subject: [PATCH 129/244] python310Packages.google-cloud-redis: 2.12.0 -> 2.12.1 --- .../development/python-modules/google-cloud-redis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-redis/default.nix b/pkgs/development/python-modules/google-cloud-redis/default.nix index 147407a428ab..4f37f90c2e37 100644 --- a/pkgs/development/python-modules/google-cloud-redis/default.nix +++ b/pkgs/development/python-modules/google-cloud-redis/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "google-cloud-redis"; - version = "2.12.0"; + version = "2.12.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-0uhWndF50vKVUk71DwoInQORAiR5vQyNMMA+T2p69W4="; + hash = "sha256-gQ3xG2QcnrSvl1hsvlcY9g77JW8fFk/Pci01tNqpAUs="; }; propagatedBuildInputs = [ From 183f12cdb0c4434fc235541b45cb2944a3efa033 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 02:25:35 +0200 Subject: [PATCH 130/244] home-assistant: 2023.4.6 -> 2023.5.0 https://www.home-assistant.io/blog/2023/05/03/release-20235/ --- .../home-assistant/component-packages.nix | 629 ++++++++++++++---- pkgs/servers/home-assistant/default.nix | 39 +- pkgs/servers/home-assistant/frontend.nix | 4 +- 3 files changed, 515 insertions(+), 157 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index eedac461c542..a754989c207c 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2023.4.6"; + version = "2023.5.0"; components = { "3_day_blinds" = ps: with ps; [ ]; @@ -69,11 +69,16 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "airtouch4" = ps: with ps; [ @@ -129,7 +134,8 @@ ]; "analytics" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "android_ip_webcam" = ps: with ps; [ @@ -143,8 +149,12 @@ ++ adb-shell.optional-dependencies.async ++ androidtv.optional-dependencies.async ++ pure-python-adb.optional-dependencies.async; + "androidtv_remote" = ps: with ps; [ + ]; # missing inputs: androidtvremote2 "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant + "anova" = ps: with ps; [ + ]; # missing inputs: anova-wifi "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav "anwb_energie" = ps: with ps; [ @@ -160,15 +170,17 @@ ]; "apple_tv" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant pyatv sqlalchemy zeroconf ]; "application_credentials" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "apprise" = ps: with ps; [ @@ -196,11 +208,16 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "arcam_fmj" = ps: with ps; [ @@ -222,6 +239,13 @@ "aseko_pool_live" = ps: with ps; [ aioaseko ]; + "assist_pipeline" = ps: with ps; [ + aiohttp-cors + hassil + home-assistant-intents + mutagen + webrtcvad + ]; "asterisk_cdr" = ps: with ps; [ asterisk-mbox ]; @@ -290,7 +314,8 @@ ]; "backup" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant securetar sqlalchemy ]; @@ -348,11 +373,16 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "blueprint" = ps: with ps; [ @@ -368,7 +398,8 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast - fnvhash + fnv-hash-fast + psutil-home-assistant pyserial pyudev sqlalchemy @@ -385,11 +416,16 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "bluetooth_le_tracker" = ps: with ps; [ @@ -404,11 +440,16 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "bluetooth_tracker" = ps: with ps; [ @@ -424,8 +465,9 @@ "bosch_shc" = ps: with ps; [ aiohttp-cors boschshcpy - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy zeroconf ]; @@ -473,11 +515,16 @@ bthome-ble dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "bticino" = ps: with ps; [ @@ -506,15 +553,19 @@ "cast" = ps: with ps; [ pyturbojpeg aiohttp-cors - fnvhash + fnv-hash-fast hass-nabucasa + hassil + home-assistant-intents ifaddr mutagen plexapi plexauth plexwebsocket + psutil-home-assistant pychromecast sqlalchemy + webrtcvad zeroconf ]; "cert_expiry" = ps: with ps; [ @@ -550,6 +601,10 @@ pyturbojpeg aiohttp-cors hass-nabucasa + hassil + home-assistant-intents + mutagen + webrtcvad ]; "cloudflare" = ps: with ps; [ pycfdns @@ -592,9 +647,6 @@ "coolmaster" = ps: with ps; [ pycoolmasternet-async ]; - "coronavirus" = ps: with ps; [ - coronavirus - ]; "counter" = ps: with ps; [ ]; "cover" = ps: with ps; [ @@ -611,7 +663,8 @@ crownstone-cloud crownstone-sse crownstone-uart - fnvhash + fnv-hash-fast + psutil-home-assistant pyserial pyudev sqlalchemy @@ -657,7 +710,7 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast - fnvhash + fnv-hash-fast av hass-nabucasa hassil @@ -665,6 +718,7 @@ home-assistant-intents ifaddr janus + mutagen numpy pillow psutil-home-assistant @@ -673,6 +727,7 @@ scapy securetar sqlalchemy + webrtcvad zeroconf ]; "delijn" = ps: with ps; [ @@ -704,8 +759,9 @@ "devolo_home_control" = ps: with ps; [ aiohttp-cors devolo-home-control-api - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy zeroconf ]; @@ -743,9 +799,10 @@ ]; "discovery" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast ifaddr netdisco + psutil-home-assistant sqlalchemy zeroconf ]; @@ -760,17 +817,19 @@ "dlna_dmr" = ps: with ps; [ aiohttp-cors async-upnp-client - fnvhash + fnv-hash-fast getmac ifaddr + psutil-home-assistant sqlalchemy zeroconf ]; "dlna_dms" = ps: with ps; [ aiohttp-cors async-upnp-client - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy zeroconf ]; @@ -802,12 +861,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant py-dormakaba-dkey pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "dovado" = ps: with ps; [ @@ -891,8 +955,9 @@ "elkm1" = ps: with ps; [ aiohttp-cors elkm1-lib - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy ]; "elmax" = ps: with ps; [ @@ -913,8 +978,9 @@ ]; "emulated_hue" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy ]; "emulated_kasa" = ps: with ps; [ @@ -923,15 +989,17 @@ "emulated_roku" = ps: with ps; [ aiohttp-cors emulated-roku - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy ]; "energie_vanons" = ps: with ps; [ ]; "energy" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "energyzero" = ps: with ps; [ @@ -976,11 +1044,16 @@ construct dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; # missing inputs: python-eq3bt "escea" = ps: with ps; [ @@ -998,11 +1071,16 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "etherscan" = ps: with ps; [ @@ -1023,11 +1101,16 @@ dbus-fast esphome-dashboard-api eufylife-ble-client - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "everlights" = ps: with ps; [ @@ -1087,7 +1170,8 @@ "filesize" = ps: with ps; [ ]; "filter" = ps: with ps; [ - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "fints" = ps: with ps; [ @@ -1124,11 +1208,16 @@ dbus-fast esphome-dashboard-api fjaraskupan - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "fleetgo" = ps: with ps; [ @@ -1161,8 +1250,9 @@ "flux_led" = ps: with ps; [ aiohttp-cors flux-led - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy ]; "folder" = ps: with ps; [ @@ -1178,7 +1268,8 @@ ]; "forked_daapd" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant spotipy sqlalchemy ]; # missing inputs: pyforked-daapd pylibrespot-java @@ -1195,6 +1286,7 @@ ]; # missing inputs: freesms "freebox" = ps: with ps; [ freebox-api + ha-ffmpeg ]; "freedns" = ps: with ps; [ ]; @@ -1203,9 +1295,10 @@ ]; "fritz" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast fritzconnection ifaddr + psutil-home-assistant sqlalchemy xmltodict ]; @@ -1220,10 +1313,11 @@ ]; "frontend" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast home-assistant-frontend janus pillow + psutil-home-assistant sqlalchemy ]; "frontier_silicon" = ps: with ps; [ @@ -1255,7 +1349,8 @@ "generic_hygrostat" = ps: with ps; [ ]; "generic_thermostat" = ps: with ps; [ - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "geniushub" = ps: with ps; [ @@ -1271,8 +1366,9 @@ ]; "geocaching" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast geocachingapi + psutil-home-assistant sqlalchemy ]; "geofency" = ps: with ps; [ @@ -1311,9 +1407,10 @@ ]; "google" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast gcal-sync oauth2client + psutil-home-assistant sqlalchemy ]; "google_assistant" = ps: with ps; [ @@ -1322,8 +1419,9 @@ ]; "google_assistant_sdk" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast gassist-text + psutil-home-assistant sqlalchemy ]; "google_cloud" = ps: with ps; [ @@ -1333,8 +1431,9 @@ ]; "google_mail" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast google-api-python-client + psutil-home-assistant sqlalchemy ]; "google_maps" = ps: with ps; [ @@ -1345,8 +1444,9 @@ ]; "google_sheets" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast gspread + psutil-home-assistant sqlalchemy ]; "google_translate" = ps: with ps; [ @@ -1369,12 +1469,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast govee-ble + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "gpsd" = ps: with ps; [ @@ -1387,9 +1492,10 @@ ]; "gree" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast greeclimate ifaddr + psutil-home-assistant sqlalchemy ]; "greeneye_monitor" = ps: with ps; [ @@ -1463,11 +1569,13 @@ ]; "history" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "history_stats" = ps: with ps; [ - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "hitron_coda" = ps: with ps; [ @@ -1480,8 +1588,9 @@ ]; "home_connect" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast homeconnect + psutil-home-assistant sqlalchemy ]; "home_plus_control" = ps: with ps; [ @@ -1495,9 +1604,10 @@ "homeassistant_hardware" = ps: with ps; [ aiohttp-cors bellows - fnvhash + fnv-hash-fast janus pillow + psutil-home-assistant pyserial-asyncio pyserial pyudev @@ -1512,7 +1622,7 @@ "homeassistant_sky_connect" = ps: with ps; [ aiohttp-cors bellows - fnvhash + fnv-hash-fast janus pillow psutil-home-assistant @@ -1530,7 +1640,7 @@ "homeassistant_yellow" = ps: with ps; [ aiohttp-cors bellows - fnvhash + fnv-hash-fast janus pillow psutil-home-assistant @@ -1551,9 +1661,10 @@ pyturbojpeg aiohttp-cors base36 - fnvhash + fnv-hash-fast ha-ffmpeg ifaddr + psutil-home-assistant sqlalchemy zeroconf ]; @@ -1570,13 +1681,18 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyroute2 pyserial python-otbr-api pyudev sqlalchemy + webrtcvad zeroconf ]; "homematic" = ps: with ps; [ @@ -1654,12 +1770,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ibeacon-ble ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "icloud" = ps: with ps; [ @@ -1692,6 +1813,8 @@ aioimaplib ]; "imap_email_content" = ps: with ps; [ + aiohttp-cors + aioimaplib ]; "incomfort" = ps: with ps; [ incomfort-client @@ -1712,12 +1835,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr inkbird-ble + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "input_boolean" = ps: with ps; [ @@ -1736,11 +1864,12 @@ ]; "insteon" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast home-assistant-frontend insteon-frontend-home-assistant janus pillow + psutil-home-assistant pyinsteon pyserial pyudev @@ -1761,8 +1890,9 @@ ]; "ios" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy zeroconf ]; @@ -1843,12 +1973,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr kegtron-ble + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "keyboard" = ps: with ps; [ @@ -1870,18 +2005,24 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "kira" = ps: with ps; [ pykira ]; "kitchen_sink" = ps: with ps; [ - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "kiwi" = ps: with ps; [ @@ -1924,12 +2065,14 @@ "lametric" = ps: with ps; [ aiohttp-cors demetriek - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "landisgyr_heat_meter" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant pyserial pyudev sqlalchemy @@ -1961,12 +2104,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr ld2410-ble + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "led_ble" = ps: with ps; [ @@ -1981,12 +2129,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr led-ble + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "legrand" = ps: with ps; [ @@ -2008,8 +2161,9 @@ aiolifx aiolifx-effects aiolifx-themes - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy ]; "lifx_cloud" = ps: with ps; [ @@ -2049,8 +2203,9 @@ ]; "local_ip" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy ]; "locative" = ps: with ps; [ @@ -2060,10 +2215,11 @@ ]; "logbook" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast home-assistant-frontend janus pillow + psutil-home-assistant sqlalchemy ]; "logentries" = ps: with ps; [ @@ -2106,7 +2262,8 @@ "lyric" = ps: with ps; [ aiohttp-cors aiolyric - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "mailbox" = ps: with ps; [ @@ -2125,10 +2282,11 @@ ]; "map" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast home-assistant-frontend janus pillow + psutil-home-assistant sqlalchemy ]; "marantz" = ps: with ps; [ @@ -2145,7 +2303,8 @@ ]; "matter" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant python-matter-server sqlalchemy ]; @@ -2188,11 +2347,16 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; # missing inputs: melnor-bluetooth "meraki" = ps: with ps; [ @@ -2272,24 +2436,32 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr moat-ble + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "mobile_app" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors - fnvhash + fnv-hash-fast hass-nabucasa hassil home-assistant-intents + mutagen pillow + psutil-home-assistant sqlalchemy + webrtcvad ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad @@ -2298,8 +2470,9 @@ ]; "modem_callerid" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast phone-modem + psutil-home-assistant pyserial pyudev sqlalchemy @@ -2311,6 +2484,8 @@ ]; # missing inputs: moehlenhoff-alpha2 "mold_indicator" = ps: with ps; [ ]; + "monessen" = ps: with ps; [ + ]; "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ @@ -2327,19 +2502,25 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr mopeka-iot-ble + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "motion_blinds" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast ifaddr motionblinds + psutil-home-assistant sqlalchemy ]; "motioneye" = ps: with ps; [ @@ -2388,10 +2569,11 @@ ]; "my" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast home-assistant-frontend janus pillow + psutil-home-assistant sqlalchemy ]; "mycroft" = ps: with ps; [ @@ -2426,7 +2608,8 @@ ]; "neato" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant pybotvac sqlalchemy ]; @@ -2438,19 +2621,25 @@ ]; "nest" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast google-nest-sdm ha-ffmpeg + psutil-home-assistant python-nest sqlalchemy ]; "netatmo" = ps: with ps; [ pyturbojpeg aiohttp-cors - fnvhash + fnv-hash-fast hass-nabucasa + hassil + home-assistant-intents + mutagen + psutil-home-assistant pyatmo sqlalchemy + webrtcvad ]; "netdata" = ps: with ps; [ netdata @@ -2466,8 +2655,9 @@ ]; # missing inputs: pynetio "network" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy ]; "neurio_energy" = ps: with ps; [ @@ -2509,11 +2699,12 @@ ]; "nmap_tracker" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast getmac ifaddr mac-vendor-lookup netmap + psutil-home-assistant sqlalchemy ]; "nmbs" = ps: with ps; [ @@ -2588,8 +2779,9 @@ ]; "onboarding" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast pillow + psutil-home-assistant sqlalchemy ]; "oncue" = ps: with ps; [ @@ -2673,12 +2865,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen oralb-ble + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "oru" = ps: with ps; [ @@ -2691,7 +2888,7 @@ "otbr" = ps: with ps; [ aiohttp-cors bellows - fnvhash + fnv-hash-fast ifaddr janus pillow @@ -2724,8 +2921,12 @@ pyturbojpeg aiohttp-cors hass-nabucasa + hassil + home-assistant-intents janus + mutagen paho-mqtt + webrtcvad ]; "p1_monitor" = ps: with ps; [ p1monitor @@ -2741,18 +2942,20 @@ ]; "panel_custom" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast home-assistant-frontend janus pillow + psutil-home-assistant sqlalchemy ]; "panel_iframe" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast home-assistant-frontend janus pillow + psutil-home-assistant sqlalchemy ]; "pcs_lighting" = ps: with ps; [ @@ -2793,10 +2996,15 @@ pyturbojpeg aiohttp-cors hass-nabucasa + hassil + home-assistant-intents + mutagen pyplaato + webrtcvad ]; "plant" = ps: with ps; [ - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "plex" = ps: with ps; [ @@ -2899,12 +3107,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev qingping-ble sqlalchemy + webrtcvad zeroconf ]; "qld_bushfire" = ps: with ps; [ @@ -2935,7 +3148,11 @@ pyturbojpeg aiohttp-cors hass-nabucasa + hassil + home-assistant-intents + mutagen rachiopy + webrtcvad ]; "radarr" = ps: with ps; [ aiopyarr @@ -2961,6 +3178,31 @@ ]; "random" = ps: with ps; [ ]; + "rapt_ble" = ps: with ps; [ + aioesphomeapi + aiohttp-cors + aioruuvigateway + aioshelly + bleak-retry-connector + bleak + bluetooth-adapters + bluetooth-auto-recovery + bluetooth-data-tools + dbus-fast + esphome-dashboard-api + fnv-hash-fast + hassil + home-assistant-intents + ifaddr + mutagen + psutil-home-assistant + pyserial + pyudev + rapt-ble + sqlalchemy + webrtcvad + zeroconf + ]; "raspberry_pi" = ps: with ps; [ aiohttp-cors psutil-home-assistant @@ -2976,7 +3218,8 @@ aiorecollect ]; "recorder" = ps: with ps; [ - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "recswitch" = ps: with ps; [ @@ -3043,6 +3286,7 @@ pyrmvtransport ]; "roborock" = ps: with ps; [ + python-roborock ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API @@ -3092,7 +3336,8 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast - fnvhash + fnv-hash-fast + psutil-home-assistant pyserial pyudev sqlalchemy @@ -3109,12 +3354,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev ruuvitag-ble sqlalchemy + webrtcvad zeroconf ]; "rympro" = ps: with ps; [ @@ -3125,12 +3375,17 @@ "safe_mode" = ps: with ps; [ pyturbojpeg aiohttp-cors - fnvhash + fnv-hash-fast hass-nabucasa + hassil home-assistant-frontend + home-assistant-intents janus + mutagen pillow + psutil-home-assistant sqlalchemy + webrtcvad ]; "saj" = ps: with ps; [ pysaj @@ -3138,9 +3393,10 @@ "samsungtv" = ps: with ps; [ aiohttp-cors async-upnp-client - fnvhash + fnv-hash-fast getmac ifaddr + psutil-home-assistant samsungctl samsungtvws sqlalchemy @@ -3175,7 +3431,8 @@ ]; # missing inputs: scsgate "search" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "season" = ps: with ps; [ @@ -3207,15 +3464,21 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; # missing inputs: sensirion-ble "sensor" = ps: with ps; [ - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "sensorblue" = ps: with ps; [ @@ -3232,12 +3495,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sensorpro-ble sqlalchemy + webrtcvad zeroconf ]; "sensorpush" = ps: with ps; [ @@ -3252,12 +3520,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sensorpush-ble sqlalchemy + webrtcvad zeroconf ]; "sentry" = ps: with ps; [ @@ -3266,7 +3539,8 @@ "senz" = ps: with ps; [ aiohttp-cors aiosenz - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "serial" = ps: with ps; [ @@ -3300,7 +3574,8 @@ bluetooth-auto-recovery bluetooth-data-tools dbus-fast - fnvhash + fnv-hash-fast + psutil-home-assistant pyserial pyudev sqlalchemy @@ -3386,8 +3661,12 @@ pyturbojpeg aiohttp-cors hass-nabucasa + hassil + home-assistant-intents + mutagen pysmartapp pysmartthings + webrtcvad ]; "smarttub" = ps: with ps; [ python-smarttub @@ -3425,12 +3704,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pysnooz pyudev sqlalchemy + webrtcvad zeroconf ]; "solaredge" = ps: with ps; [ @@ -3462,12 +3746,14 @@ "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client - fnvhash + fnv-hash-fast ifaddr plexapi plexauth plexwebsocket + psutil-home-assistant soco + sonos-websocket spotipy sqlalchemy zeroconf @@ -3494,7 +3780,8 @@ ]; # missing inputs: hass_splunk "spotify" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant spotipy sqlalchemy ]; @@ -3510,8 +3797,9 @@ "ssdp" = ps: with ps; [ aiohttp-cors async-upnp-client - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy zeroconf ]; @@ -3526,7 +3814,8 @@ xmltodict ]; "statistics" = ps: with ps; [ - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "statsd" = ps: with ps; [ @@ -3539,8 +3828,9 @@ aiohttp-cors aiosteamist discovery30303 - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy ]; "stiebel_eltron" = ps: with ps; [ @@ -3605,11 +3895,16 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad zeroconf ]; "switcher_kis" = ps: with ps; [ @@ -3629,6 +3924,7 @@ "synology_chat" = ps: with ps; [ ]; "synology_dsm" = ps: with ps; [ + aiohttp-cors py-synologydsm-api ]; "synology_srm" = ps: with ps; [ @@ -3637,8 +3933,9 @@ ]; "system_bridge" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy zeroconf ]; # missing inputs: systembridgeconnector @@ -3727,12 +4024,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy thermobeacon-ble + webrtcvad zeroconf ]; "thermoplus" = ps: with ps; [ @@ -3749,12 +4051,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy thermopro-ble + webrtcvad zeroconf ]; "thermoworks_smoke" = ps: with ps; [ @@ -3770,8 +4077,9 @@ ]; "thread" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant pyroute2 python-otbr-api sqlalchemy @@ -3780,7 +4088,8 @@ "threshold" = ps: with ps; [ ]; "tibber" = ps: with ps; [ - fnvhash + fnv-hash-fast + psutil-home-assistant pytibber sqlalchemy ]; @@ -3801,12 +4110,17 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy tilt-ble + webrtcvad zeroconf ]; "time_date" = ps: with ps; [ @@ -3833,7 +4147,11 @@ pyturbojpeg aiohttp-cors hass-nabucasa + hassil + home-assistant-intents + mutagen toonapi + webrtcvad ]; "torque" = ps: with ps; [ aiohttp-cors @@ -3845,8 +4163,9 @@ ]; # missing inputs: pytouchline "tplink" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant python-kasa sqlalchemy ]; @@ -3965,9 +4284,10 @@ "upnp" = ps: with ps; [ aiohttp-cors async-upnp-client - fnvhash + fnv-hash-fast getmac ifaddr + psutil-home-assistant sqlalchemy zeroconf ]; @@ -3980,7 +4300,8 @@ ]; "usb" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant pyserial pyudev sqlalchemy @@ -4003,7 +4324,8 @@ ]; # missing inputs: vtjp "velbus" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant pyserial pyudev sqlalchemy @@ -4052,14 +4374,15 @@ "vlc_telnet" = ps: with ps; [ aiovlc ]; - "voice_assistant" = ps: with ps; [ + "voicerss" = ps: with ps; [ + ]; + "voip" = ps: with ps; [ aiohttp-cors hassil home-assistant-intents mutagen - ]; - "voicerss" = ps: with ps; [ - ]; + webrtcvad + ]; # missing inputs: voip-utils "volkszaehler" = ps: with ps; [ volkszaehler ]; @@ -4112,7 +4435,8 @@ ]; "websocket_api" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy ]; "wemo" = ps: with ps; [ @@ -4134,14 +4458,16 @@ ]; # missing inputs: wirelesstagpy "withings" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy withings-api ]; "wiz" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant pywizlight sqlalchemy ]; @@ -4164,17 +4490,17 @@ ]; "wsdot" = ps: with ps; [ ]; + "wyoming" = ps: with ps; [ + ]; # missing inputs: wyoming "x10" = ps: with ps; [ ]; "xbox" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy xbox-webapi ]; - "xbox_live" = ps: with ps; [ - xboxapi - ]; "xeoma" = ps: with ps; [ pyxeoma ]; @@ -4184,9 +4510,10 @@ "xiaomi_aqara" = ps: with ps; [ pyxiaomigateway aiohttp-cors - fnvhash + fnv-hash-fast ifaddr netdisco + psutil-home-assistant sqlalchemy zeroconf ]; @@ -4202,11 +4529,16 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad xiaomi-ble zeroconf ]; @@ -4238,11 +4570,16 @@ bluetooth-data-tools dbus-fast esphome-dashboard-api - fnvhash + fnv-hash-fast + hassil + home-assistant-intents ifaddr + mutagen + psutil-home-assistant pyserial pyudev sqlalchemy + webrtcvad yalexs-ble zeroconf ]; @@ -4253,8 +4590,9 @@ aiohttp-cors aiomusiccast async-upnp-client - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy zeroconf ]; @@ -4266,8 +4604,9 @@ "yeelight" = ps: with ps; [ aiohttp-cors async-upnp-client - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy yeelight zeroconf @@ -4280,7 +4619,8 @@ ]; "yolink" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant sqlalchemy yolink-api ]; @@ -4298,8 +4638,9 @@ ]; # missing inputs: zengge "zeroconf" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy zeroconf ]; @@ -4314,9 +4655,10 @@ "zha" = ps: with ps; [ aiohttp-cors bellows - fnvhash + fnv-hash-fast janus pillow + psutil-home-assistant pyserial-asyncio pyserial pyudev @@ -4341,7 +4683,8 @@ ]; "zwave_js" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast + psutil-home-assistant pyserial pyudev sqlalchemy @@ -4349,8 +4692,9 @@ ]; "zwave_me" = ps: with ps; [ aiohttp-cors - fnvhash + fnv-hash-fast ifaddr + psutil-home-assistant sqlalchemy url-normalize zeroconf @@ -4398,6 +4742,7 @@ "aranet" "arcam_fmj" "aseko_pool_live" + "assist_pipeline" "asuswrt" "atag" "august" @@ -4429,6 +4774,7 @@ "braviatv" "broadlink" "brother" + "brottsplatskartan" "brunt" "bsblan" "bthome" @@ -4454,7 +4800,6 @@ "control4" "conversation" "coolmaster" - "coronavirus" "counter" "cover" "cpuspeed" @@ -4851,6 +5196,7 @@ "rainforest_eagle" "rainmachine" "random" + "rapt_ble" "raspberry_pi" "rdw" "recollect_waste" @@ -4870,6 +5216,7 @@ "risco" "rituals_perfume_genie" "rmvtransport" + "roborock" "roku" "roomba" "roon" @@ -4922,6 +5269,7 @@ "smarttub" "smhi" "smtp" + "snapcast" "snips" "snmp" "snooz" @@ -5041,7 +5389,6 @@ "vilfo" "vizio" "vlc_telnet" - "voice_assistant" "voicerss" "volumio" "volvooncall" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 6a40111f11fa..cd5ef40863c0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -34,15 +34,6 @@ let # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (self: super: { - advantage-air = super.advantage-air.overridePythonAttrs (oldAttrs: rec { - version = "0.4.1"; - src = super.fetchPypi { - pname = "advantage_air"; - inherit version; - hash = "sha256-I9HMDLZX9xKDJuYSAweM2r4v3ZKevHTn5dHTYxN3EuE="; - }; - }); - aiowatttime = super.aiowatttime.overridePythonAttrs (oldAttrs: rec { version = "0.1.1"; src = fetchFromGitHub { @@ -166,6 +157,16 @@ let }; }); + py-synologydsm-api = super.py-synologydsm-api.overridePythonAttrs (oldAttrs: rec { + version = "2.1.4"; + src = fetchFromGitHub { + owner = "mib1185"; + repo = "py-synologydsm-api"; + rev = "refs/tags/v${version}"; + hash = "sha256-37JzdhMny6YDTBO9NRzfrZJAVAOPnpcr95fOKxisbTg="; + }; + }); + # Pinned due to API changes >0.3.5.3 pyatag = super.pyatag.overridePythonAttrs (oldAttrs: rec { version = "0.3.5.3"; @@ -186,6 +187,16 @@ let }; }); + python-roborock = super.python-roborock.overridePythonAttrs (oldAttrs: rec { + version = "0.8.3"; + src = fetchFromGitHub { + owner = "humbertogontijo"; + repo = "python-roborock"; + rev = "refs/tags/v${version}"; + hash = "sha256-O7MjxCQ4JwFFC2ibdU8hCPhFPQhV5/LsmDO6vRdyYL0="; + }; + }); + python-slugify = super.python-slugify.overridePythonAttrs (oldAttrs: rec { pname = "python-slugify"; version = "4.0.1"; @@ -235,11 +246,11 @@ let }); sqlalchemy = super.sqlalchemy.overridePythonAttrs (oldAttrs: rec { - version = "2.0.9"; + version = "2.0.12"; src = super.fetchPypi { pname = "SQLAlchemy"; inherit version; - hash = "sha256-lXGSFePscze59Xw8LtoOanYZvhlKUWbAfB5Zn2r8IPo="; + hash = "sha256-vd/FvR3uXbD93J2rJvgAwoPzJD5ygbvxByAP7TASX5w="; }; }); @@ -310,7 +321,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2023.4.6"; + hassVersion = "2023.5.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -326,7 +337,7 @@ in python.pkgs.buildPythonApplication rec { # Primary source is the pypi sdist, because it contains translations src = fetchPypi { inherit pname version; - hash = "sha256-054MOhLU7sImD5Sl5vUuik6mt7GCupMeBI2pdtpWuls="; + hash = "sha256-zTOOQiA9nSJJR59fjkR1k+JNOvqXh1XB21i4nzQq4ZQ="; }; # Secondary source is git for tests @@ -334,7 +345,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-/SYJUW028HvxLMNHhm6cqQ6jv0J+8NatbZ7h7HyGYXs="; + hash = "sha256-spH1gu045VQeC21OeOEYKTLkql0Gflpha927Kvd7q1w="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 34db1be39d26..dd113385e2b7 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20230411.1"; + version = "20230503.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - hash = "sha256-SV1SglO9XqkxfUD/jUyFgdJIWgKgnPNNQR94MHTYew0="; + hash = "sha256-h3M2mnlJOwo05zSmjlPKZVh5npR2IAKT2ff4gIz6f0Y="; }; # there is nothing to strip in this package From 6d934088ea17b6e93ed88f56ffa15be09251114a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 02:26:33 +0200 Subject: [PATCH 131/244] nixos/home-assistant: update bluetooth components --- nixos/modules/services/home-automation/home-assistant.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/home-automation/home-assistant.nix b/nixos/modules/services/home-automation/home-assistant.nix index ac905a274af2..abe0b93e412c 100644 --- a/nixos/modules/services/home-automation/home-assistant.nix +++ b/nixos/modules/services/home-automation/home-assistant.nix @@ -461,6 +461,7 @@ in { "mopeka" "oralb" "qingping" + "rapt_ble" "ruuvi_gateway" "ruuvitag_ble" "sensirion_ble" From 1990723fd59ed322b03aa5e7f6222fd174028798 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 4 May 2023 11:19:07 +0530 Subject: [PATCH 132/244] nerdfonts: 2.3.3 -> 3.0.0 --- pkgs/data/fonts/nerdfonts/shas.nix | 108 +++++++++++++------------- pkgs/data/fonts/nerdfonts/version.nix | 2 +- 2 files changed, 56 insertions(+), 54 deletions(-) diff --git a/pkgs/data/fonts/nerdfonts/shas.nix b/pkgs/data/fonts/nerdfonts/shas.nix index b8b5f490e3d6..c55376ce98cb 100644 --- a/pkgs/data/fonts/nerdfonts/shas.nix +++ b/pkgs/data/fonts/nerdfonts/shas.nix @@ -1,55 +1,57 @@ { - "3270" = "03rf3prn4c9q5mggbdzpp3la7in1dq12anqxjpinxwla7ngdh4rv"; - "Agave" = "177b2yljw4fxbsmjp8yrwvjzj9186f8g0s59xnz56nrl9ndx84qm"; - "AnonymousPro" = "0qn5xa37g9y47ski5hc2vxhvfbfpl58ranpziiw733kv83pkbkq6"; - "Arimo" = "0b69gh5qgl0v6b1cirma7l32yxj2d53w305gpfr6flral3ljq6if"; - "AurulentSansMono" = "165hfg67061zqbs28fl66ldi910n5pnzb6n6d39wh70pclgy2g4n"; - "BigBlueTerminal" = "1adindb4lvihya3mphmshk4vigragskyrx6ixydrp8i1f7s9sp20"; - "BitstreamVeraSansMono" = "0mi9j69f8s48fygwb7fz9m81871nvajh895mpch7qj69xmpp9acs"; - "CascadiaCode" = "13vlfbagjx033j97li6ypvr0zhxbm96lcz8xcn715225mslr2ib4"; - "CodeNewRoman" = "1r4q48p315x021m0qrd1xmfgqw4xif3snlc764hq5iy10vxdv9ni"; - "Cousine" = "18m2dlcg6dymi0xwrky4q7ynjx4bqnr5lnvbgr9cdnyf3zz9b6rj"; - "DaddyTimeMono" = "0qq5lb4xpqggaz0bml8c2awlgwal6xvyx9nydxqgs672jq7hn1cd"; - "DejaVuSansMono" = "1qnl6gyfyq4cyx0nyl7f39cm3mz33rfngv9kq2g7b187n4dmawaa"; - "DroidSansMono" = "1l2cl2ryv9p7wlg6q5zsmg5wmfp27s3h47lq75d07chydyr08vii"; - "FantasqueSansMono" = "1m2xkr7dhfa9bn9vha0s1x7sl1n8l1kdl8f4c876cwjh1mvrwkar"; - "FiraCode" = "02gnxi9rs25i7mpzkir62w6khvijpma0j0sm3a7gfm0kfdkqzi8j"; - "FiraMono" = "1kn5vl90xi6ba7msfgwvv9frpfr33xv8q93r62lnqs3avfk743j9"; - "FontPatcher" = "039yiz7clkghyc6djf4zcaq6k83w2jhxcy66z4i9zmqh3km81wlr"; - "Go-Mono" = "0bmd7r38ss754gpkndlag0gxap5ga473y778fyrrr3ccccg6d8iv"; - "Gohu" = "0cvfdli8kzrd9n2h152432f8zr9ffvp29vsfcf98nla3ax2p0v05"; - "Hack" = "1q3xdlpxps41pi724697mb5bc98mmql8s2lc4xh9zwddjvchd3zl"; - "Hasklig" = "0xmg0h5bjjiqj00pv51q2babfm7j6bl1b8r1w26z95jvrpnifi1z"; - "HeavyData" = "1rppgk2lj95kv67c9s97wkqkbrmyp5y7qm1b0a1sk49sg7l4mljp"; - "Hermit" = "1cw8ia9b5adb7z63cag6l25sahp82gr6bsz9qqc3p12nzi5lxsk8"; - "iA-Writer" = "01bx8j6hqpl5zmx96d6zrwn3n6ckic5zxr53wls6zdmp01wnkg72"; - "IBMPlexMono" = "1m1qzxls16cfsxwly5r4vlwpfv477sf3gi6yj9krvkxp0d5ymz74"; - "Inconsolata" = "1vavavjdiwrlxy9klp0cm6pvmr0nkl7dpls7ja79zgkw7yjhsifq"; - "InconsolataGo" = "0cp76c6s2r3q8vgild0jpc94b13ypzbyvmas9gwhq1mvf24k4jp5"; - "InconsolataLGC" = "16a59y1idqp1zgkw9wxcdgcjg6bjlxwbj3a3a00h4gwkczlp2r42"; - "Iosevka" = "0qg88d2rqbm1x0vfyyr495dznnviga8979dg0ik5yw27fc43hrjj"; - "JetBrainsMono" = "19ja9dksxq2dl2hi8nyflvl7skyi2wd65s4z14jcilbynxmk2z0q"; - "Lekton" = "03378znmbss5qq75jmc0r51qwpxsiy2ng8gi164s2mjykr83gr2n"; - "LiberationMono" = "13r13drx8r1mkbndfw6ip48sjyhf6qw0wgrwyqlgz5dcm3z9c3gx"; - "Lilex" = "1w2iw9ksnkmwa37a30vrlwg6sxh6l19wc95f8s5mx06sa3ywfs11"; - "Meslo" = "0fli7njkhq89ykdmdch313mzswlb23b716d0656qw8q3fbyh9dzh"; - "Monofur" = "0lhfm5dxh4nsq0whwvpqbr2grb27pl03wi7l7vdjbf5x1iacrpfp"; - "Monoid" = "1jrknl6yz6k6a8l9iiw2s74xkfqckn9y9vjdk49cyf2iy3fzbi30"; - "Mononoki" = "0jw1kx7ryakx1wdgk9jf2ygrcq65wjaar5w1bggv5zlsxpxdllis"; - "MPlus" = "1lvmv4vcs36137fv1vbw3vnyxxar8klgngn77202lhgvgi44x60a"; - "NerdFontsSymbolsOnly" = "0sizriiwa7xh2dscz96gyr4sg04dxxi4f3sv27qk3g46vq0ciw4w"; - "Noto" = "0dwjj3l7ryx7ysbnp5hh81n3qqqn3yf4h8jypm4ri96vf360myad"; - "OpenDyslexic" = "1gpmzcgp6bpidi8h1l5a0n3q912swqk04mdhqwpqskj1jn77d2hb"; - "Overpass" = "1ywp6fphy6akdfd96a37jqcjqry9w15zr0r609vf5a11n1aq3s0w"; - "ProFont" = "0g3qa8lcp199mln5myn3yn4hdgyx3n16ajdm8a7anjfi9im2i6ns"; - "ProggyClean" = "0q4m7kq3k0ga6i2kr6a4k59na8b7m6zvvj9zyp61375lm6wb3bv2"; - "RobotoMono" = "0j055qjm0x4ksy19snplykm9dm9jkmn9swsis49k96mfw7wx9mfq"; - "ShareTechMono" = "055hg15ghd1ca8wxq3sfjpck8w4x6qnzjyn3r8rslyrbhl51v9aj"; - "SourceCodePro" = "05fs5ralnz9m6zdck9bvzf1rjgr4f5m1fr9m51cmr60wzhag9qsz"; - "SpaceMono" = "1m3x85qzykxg5mb56d1zgl367q55ndndxzzmsrlibmybqvc1ffq9"; - "Terminus" = "0fkqd85qfp8dk8sbyjfxirfiwlfl9a40z8jhybzzd7ys4yrzlq1c"; - "Tinos" = "11bbg7ssf7wndxrm6kklggsfhmyaijfg4xi6cw743kcwzfvi8kd1"; - "Ubuntu" = "14w55vh42mz5lvbpl4p1vx31hba957c5345qfpmym5majz83hx3q"; - "UbuntuMono" = "1xybn0q1xx5sidhllna5y7584fl75qw6v5alb2p1b6933a5czg0m"; - "VictorMono" = "02c5c9ljnmkf4awfhbjna6g86220ckv977rrc1sh6qr7q8zci6vr"; + "3270" = "1lv95hvdgm7cpqfy1p6j88yvs7s55y1zn79qrgjbfn6ydsd99k6j"; + "Agave" = "1g932cdffxswm7ca32vi985i9gz10igsg91b7qlmp3w489yxj6pk"; + "AnonymousPro" = "18ckaq7qbbjwqis74m67vnqmw64sdka1cbscsbh48p6gif7r5z65"; + "Arimo" = "1akkryjqgq4syyrih2yqfp6rzvg1vrss8x49gglj1dgrav5lx80l"; + "AurulentSansMono" = "1skkczg398kilkwniy24skhs8f6x4k2gi3723dr0sbs7xxvm7x2x"; + "BigBlueTerminal" = "0i738nmybrp6glhz7jijhnhxhvxfcr64k7m7qzlw4y8s3jmxn5yh"; + "BitstreamVeraSansMono" = "12v3wbslcmj3pkldv4hrwhdgzk5v9zipn23pfcfrx5b850fgdsqa"; + "CascadiaCode" = "1z1xfl3j2wr77x97cka6239kjmarw84y9ly1f7ybk742yz32ys8q"; + "CodeNewRoman" = "1x2x5bm8fq30rxhxd6wpzc94j70dk8f0244y7j5gn4a5aq19slh1"; + "ComicShannsMono" = "09609068c4ivk78lkii9brxk67wzn8hf178n3chll2djjryqznrm"; + "Cousine" = "0cjgf002vhvvs84mb842rj8qvl3dgy8b86y82bjbzq5wrk9mgymk"; + "DaddyTimeMono" = "086sjbjpam8a71jjyvwf3y7g3dljfgxj40zlh5fbcm2lw3izap9d"; + "DejaVuSansMono" = "0w369n056pzwi62f8bpa2w8d75vas68f1awn3hjv4b65ss26sh5g"; + "DroidSansMono" = "15xicnfgzqrzgpj9xbfwb7pmbip48fqxb194krxwdrvcb9pk71ni"; + "FantasqueSansMono" = "1nr0ngqbdxya0igzq7zf74h6skcpsnrpx09l7mz7i9qbd46qk274"; + "FiraCode" = "0z7kc51hdj75iddaxrkimjyhrgjh88qn3ab51v68fyb8bfm7wnvh"; + "FiraMono" = "1nz4hps7hzxjihskksqy88ynnclpawsx0fibxjsnblqwfcjfhp4y"; + "FontPatcher" = "135kgqhzh87z31n2qazcrd07p08i0g8bgs0wh90plf11xg3dffa2"; + "Go-Mono" = "13kc5vxd5jqbvydr9xymya6p4n9b1lb78lg8yp73h9s0f8ar4scr"; + "Gohu" = "0rbr5rhb6w7biqkwwwk0pv57g8gffrvjmasdbzfghc8qrgszniav"; + "Hack" = "13h572s5yn8knabavm89b9r9pzpzlqyy9ri96sji30ld564ls7fs"; + "Hasklig" = "1qjfbysx97grrb45zaa80i56lqap0gj0vqjs40bl6s3qcv81knf1"; + "HeavyData" = "1d0b37gq47sy2q1vvfd9ymw5y77qbs22qckhy4rayvhj64rlq5h0"; + "Hermit" = "1ds2hrg2zxs9zla97xwvvks0ln78dxc9cln7rfcqr5r0ncw10a79"; + "iA-Writer" = "156imrbkwkf0plg4rlvn0gxf02ys3kkmf8hpv4nk70ihz14pzr88"; + "IBMPlexMono" = "08ynxnrynxc1gsi7jc3219jqzp93g5ic4j08mml7ih4xc9c4646a"; + "Inconsolata" = "0gp19rmw3bn1r0a9lgsq76mpxdpm5qvizcwns5rckk4gk5xrbfj2"; + "InconsolataGo" = "13lwsq9bay3qn56hik68j69hsw0w9fvd6s833r8pkqlz5vz735z3"; + "InconsolataLGC" = "02zkjp596p5lcrc0j4s9pmf5w1qh6pargmm2qbigc9ilmhxcacrd"; + "Iosevka" = "06s8kd7mk67i2d0xqdk0za6xm1pqbcr9y1h5riaqzvc2i6cyakqh"; + "IosevkaTerm" = "14ljgnswddvbdj3ir9irdvjm8fg0m3r00kp9j3xrmv13jm1p9win"; + "JetBrainsMono" = "1szfx4v4sdlpq599nnrdjblcw9pplrcivk9w4ny4f2x24lk9ranc"; + "Lekton" = "0c19xqxgxp3pfcxqcmbsnarl696amy0wapcjkb2wxzwzf8bl9jvc"; + "LiberationMono" = "1gahjf0ysg887fq072sk6m35s494ah3b96341xfinrq0n20a2spn"; + "Lilex" = "0db9fjkkm6ckgmgw8f3d1rax47iskhl19d6l09mz2n4fis02jxin"; + "Meslo" = "1lzwdryb8sj3ap892qzf837v49zccrncr7ds7vmxfd7lpksr0zz8"; + "Monofur" = "0j9gm70n0qnyd3aghjs800rbvdc7w07d9qhpdqa9dp6p0vgp1ywd"; + "Monoid" = "0080707jxqd8lwnnasrkgfpr8150606cdxp97njv7z1ph8wiblmr"; + "Mononoki" = "1v60wk7jbxdgjf4n21himqva3vvhsg369iq6x0vkf7s71mz6j55w"; + "MPlus" = "18s2lv84mxi8xbjxp21ji4814ykkbxm3q44nvk1328hvrb3a76xm"; + "NerdFontsSymbolsOnly" = "0jr3ar6ysgw5zpbmzw77478gdlhqvzjb2fk9pnmqr5qdd6wbph4i"; + "Noto" = "1vkb3vvzim15pqbca1hmznf9j13x7maycqwlfjmc41jrwa7z3px6"; + "OpenDyslexic" = "013lfsm5jrgkwjf038ixx7z0qm0qgw3fclk3wzp778lw8152fl05"; + "Overpass" = "01261xhfjlw2x5vbz5gy80z7r8q5rn74g52fi6cwicd42fl2p0f9"; + "ProFont" = "0iclvxhprz355yf2q8m2prbmxjp6wywa3c9sj6q2kyzbwknpyh3c"; + "ProggyClean" = "07k263bckwfa8q8bqwb654hccf054rmb52lsgvxiw69mmk335z40"; + "RobotoMono" = "188cp7nhgh0xw6qbfly7cfgk977vfpjb6hzbq4191wfi2rngn1km"; + "ShareTechMono" = "1zyz1jpidg72h559yjb0c1n83zwg5y7c9jlc1vjkv4vh1gj04q4h"; + "SourceCodePro" = "0gpjr9khk5fia6qh0h3rdlkgf78l3zjqphsf93yb1542l71dyf99"; + "SpaceMono" = "08lx2l9fq6z62gx2lbk0iyyywpwnm0dyih1qz537qjx0hzccn966"; + "Terminus" = "11mbml586nzymlbr5xmjrpy30mkpfavwgm9pr9mn7ywd3g0f2cy1"; + "Tinos" = "0a9gkzzv7wsaczcs4n24zychc5qxh2gkjxgr2psv98aglm442wcz"; + "Ubuntu" = "1fnz5w50728hfs8jmqm0m7m2pcp9hmxl78avw4xlcr3d070nyx58"; + "UbuntuMono" = "11zmiscxqrcwwldyqm79cnm52lazgz3d5svf2jqpmqz8ia893wbs"; + "VictorMono" = "10dhjdyykj5rwgji5l771sy5zbcdmf1b4xjzz95dwz6qap2qvq1h"; } diff --git a/pkgs/data/fonts/nerdfonts/version.nix b/pkgs/data/fonts/nerdfonts/version.nix index 1719346d0931..b96657be7a03 100644 --- a/pkgs/data/fonts/nerdfonts/version.nix +++ b/pkgs/data/fonts/nerdfonts/version.nix @@ -1 +1 @@ -"2.3.3" +"3.0.0" From d4c2564bb6d3a3a62acac3c8bf0214c276141ee0 Mon Sep 17 00:00:00 2001 From: misuzu Date: Thu, 4 May 2023 08:55:00 +0300 Subject: [PATCH 133/244] llvmPackages_16.llvm: fix build on armv7l-linux --- pkgs/development/compilers/llvm/16/llvm/default.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/compilers/llvm/16/llvm/default.nix b/pkgs/development/compilers/llvm/16/llvm/default.nix index 59d620cb9015..af9cc58747da 100644 --- a/pkgs/development/compilers/llvm/16/llvm/default.nix +++ b/pkgs/development/compilers/llvm/16/llvm/default.nix @@ -239,12 +239,6 @@ in rm test/tools/gold/X86/split-dwarf.ll rm test/tools/llvm-dwarfdump/X86/prettyprint_types.s rm test/tools/llvm-dwarfdump/X86/simplified-template-names.s - - # !!! Note: these tests are removed in LLVM 16. - # - # See here for context: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999790443 - rm test/CodeGen/RISCV/rv32zbp.ll - rm test/CodeGen/RISCV/rv64zbp.ll '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' # Seems to require certain floating point hardware (NEON?) rm test/ExecutionEngine/frem.ll From 2a78118fdd9cb6c7e51f9db3bc09107be7e37d54 Mon Sep 17 00:00:00 2001 From: Yaya Date: Thu, 4 May 2023 05:57:25 +0000 Subject: [PATCH 134/244] sftpgo: 2.4.5 -> 2.5.0 https://github.com/drakkan/sftpgo/releases/tag/v2.5.0 --- pkgs/servers/sftpgo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sftpgo/default.nix b/pkgs/servers/sftpgo/default.nix index 3c727f171ec5..74bb33d4d957 100644 --- a/pkgs/servers/sftpgo/default.nix +++ b/pkgs/servers/sftpgo/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "sftpgo"; - version = "2.4.5"; + version = "2.5.0"; src = fetchFromGitHub { owner = "drakkan"; repo = "sftpgo"; rev = "refs/tags/v${version}"; - hash = "sha256-r7vnUzI0NBXe1bFLB3k/fl9+4Sby2W0WsN7SSqaPUgc="; + hash = "sha256-UL/CSNRvT9e+WAmE7nwd/EU7YOJ1mwMSnOIrd0dQJrk="; }; - vendorHash = "sha256-MAx5ue2YpEtkglPMHr+fep1Scw/ST2D6zkKVNWUbF0c="; + vendorHash = "sha256-q6GgaMlmBPjovCpLku9/ENlEc0lF8gck1fM+fpptti4="; ldflags = [ "-s" From 8c32a5b2ce0e2b29c5d21424109539c953bca04e Mon Sep 17 00:00:00 2001 From: Pauan Date: Thu, 4 May 2023 08:02:14 +0200 Subject: [PATCH 135/244] blender 3.4.1 -> 3.5.1 (#229570) --- pkgs/applications/misc/blender/blender-numpy.patch | 14 -------------- pkgs/applications/misc/blender/default.nix | 9 +++------ 2 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 pkgs/applications/misc/blender/blender-numpy.patch diff --git a/pkgs/applications/misc/blender/blender-numpy.patch b/pkgs/applications/misc/blender/blender-numpy.patch deleted file mode 100644 index c76324846b1c..000000000000 --- a/pkgs/applications/misc/blender/blender-numpy.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py b/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py -index 41dd4d03..a97f9d38 100755 ---- a/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py -+++ b/release/scripts/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py -@@ -572,7 +572,7 @@ def set_poly_smoothing(gltf, pymesh, mesh, vert_normals, loop_vidxs): - # Try to guess which polys should be flat based on the fact that all the - # loop normals for a flat poly are = the poly's normal. - -- poly_smooths = np.empty(num_polys, dtype=np.bool) -+ poly_smooths = np.empty(num_polys, dtype=np.bool_) - - poly_normals = np.empty(num_polys * 3, dtype=np.float32) - mesh.polygons.foreach_get('normal', poly_normals) - diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 50344fe7c4fe..a8cadffcf631 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -27,17 +27,14 @@ let in stdenv.mkDerivation rec { pname = "blender"; - version = "3.4.1"; + version = "3.5.1"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - hash = "sha256-JHxMEignDJAQ9HIcmFy1tiirUKvPnyZ4Ywc3FC7rkcM="; + hash = "sha256-vXQox+bLpakAIWJpwyER3/qrrxvbVHLyMZZeYVF0qAk="; }; - patches = [ - # remove with 3.5.X - ./blender-numpy.patch - ] ++ lib.optional stdenv.isDarwin ./darwin.patch; + patches = lib.optional stdenv.isDarwin ./darwin.patch; nativeBuildInputs = [ cmake makeWrapper python310Packages.wrapPython llvmPackages.llvm.dev ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ]; From 5a277c1c88d8a52cc7c0d1648bf1a1965a61d47c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 06:08:01 +0000 Subject: [PATCH 136/244] klipper-estimator: 3.2.1 -> 3.3.0 --- pkgs/applications/misc/klipper-estimator/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/klipper-estimator/default.nix b/pkgs/applications/misc/klipper-estimator/default.nix index 488e4da9b725..831ee0a39d29 100644 --- a/pkgs/applications/misc/klipper-estimator/default.nix +++ b/pkgs/applications/misc/klipper-estimator/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "klipper-estimator"; - version = "3.2.1"; + version = "3.3.0"; src = fetchFromGitHub { owner = "Annex-Engineering"; repo = "klipper_estimator"; rev = "v${version}"; - hash = "sha256-0QDEaRJpjiE7aH6PpessCGUe4TT31FhsxTFw7OglPUc="; + hash = "sha256-bWKR7+eX7tcc9KywKIg6CY+3qALPqOSSiSSlK44iTDQ="; }; - cargoHash = "sha256-W0Vo4bA2QNfzBqcZiblf6eJnQ3cRgrnNELzS9O1O6bU="; + cargoHash = "sha256-cPdFRBU8B4C2el9N069QooiJdpopns8RJEyavemYdUc="; buildInputs = [ openssl ] From 1e47b466aa7eb15166cd9a9d837940ae70ffd0a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 06:21:00 +0000 Subject: [PATCH 137/244] pretender: 1.0.0 -> 1.1.0 --- pkgs/tools/security/pretender/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/pretender/default.nix b/pkgs/tools/security/pretender/default.nix index d665b72a749d..e51205ab37af 100644 --- a/pkgs/tools/security/pretender/default.nix +++ b/pkgs/tools/security/pretender/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pretender"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "RedTeamPentesting"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JTNmebubaJQMtZm1ZGZote1qXjjiMcxSGQYPgLZXd0o="; + sha256 = "sha256-iWAejgI/q1lh8daybPItzQA91Ayg3ZgddGFXWm3cuww="; }; - vendorSha256 = "sha256-CpMrxAZ+7Dc1UgH+AnuGh+gpBZpLshck/1+9WJNssEk="; + vendorHash = "sha256-uw3mpf27OH5uNKmvCFcTw+YFoxVEqT4Fz/CSl9Wjbv0="; # Tests require network access doCheck = false; From c65c2f09e5bb54cbbbc4aa72030d62e138d8f0cf Mon Sep 17 00:00:00 2001 From: Jonas Nick Date: Thu, 4 May 2023 06:35:11 +0000 Subject: [PATCH 138/244] lnd: 0.16.1 -> 0.16.2 --- pkgs/applications/blockchains/lnd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/lnd/default.nix b/pkgs/applications/blockchains/lnd/default.nix index 9b3a15889a6e..a62b8d18b403 100644 --- a/pkgs/applications/blockchains/lnd/default.nix +++ b/pkgs/applications/blockchains/lnd/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.16.1-beta"; + version = "0.16.2-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "sha256-m592dRYAKKkeQa4SOP+8pTHuY07hSMICdyAcAOKn3+w="; + sha256 = "sha256-s0m/aS99uB6LZb0+73SQ++mF0Ukg6IYIL+jbEi8ezW0="; }; - vendorSha256 = "sha256-yY6H2K9B9ko5bVdmsGPDJkxPXpfAs0O2fuaZryrcuc0="; + vendorSha256 = "sha256-7Ydl56Z6aOMBQ1RamFzjD/yp3zgQLkF5WEoOQe1Urv0="; subPackages = [ "cmd/lncli" "cmd/lnd" ]; From fb91facda232392df1c2fe3a10e5a28232be54d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 4 May 2023 08:29:04 +0200 Subject: [PATCH 139/244] nixos/tests/installer.nix: add missing kbd.dev Sometimes the tests fail since splitting kbd.dev in PR #226247 https://hydra.nixos.org/build/218620685/nixlog/2/tail Apparently the failure isn't 100% reproducible; I don't know how/why. --- nixos/tests/installer.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index f385a99ce652..51d0d232ebbf 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -345,6 +345,7 @@ let (docbook-xsl-ns.override { withManOptDedupPatch = true; }) + kbd.dev kmod.dev libarchive.dev libxml2.bin From faabcd4b2eec8f33bc3a92e97abf9e5542ab169d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 06:36:44 +0000 Subject: [PATCH 140/244] jackett: 0.20.4029 -> 0.20.4078 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 47edabbbfb4c..3f13abf991d9 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.20.4029"; + version = "0.20.4078"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-ldciP2TAq8qN754NGcwkZ+NnjrvfhiVLFW8WyAgL77agfpwgps1BxlPM5s9rCXKJoOaFQdmLoYMBsImApU9i4A=="; + hash = "sha512-RZAp4eHCZfZmFUjIgiKvTIBAt5PH14ZIYz4ptGkKbVnoPaorWqCudVlNbKmTbx8cRv+I+hOI2Rcxb/S0dh0rhg=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From 67fff45e4b02cdfc6002fdcd4dddf7fe1dc6861e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 08:37:59 +0200 Subject: [PATCH 141/244] python310Packages.zeroconf: 0.60.0 -> 0.61.0 Diff: https://github.com/jstasiak/python-zeroconf/compare/refs/tags/0.60.0...0.61.0 Changelog: https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.61.0 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index ac920668c940..5030857a86af 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.60.0"; + version = "0.61.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-8DAklQhvZ5/NSWDVZQEaRHz+wb05tMPnVT8TvTho+Sc="; + hash = "sha256-I2j7eflLC30gHOoEDkbvdZyxGumgoeVMyVVdz+Dmhls="; }; nativeBuildInputs = [ From 9b4a751f761090f62f5b203b2aa572d376959c19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 08:40:09 +0200 Subject: [PATCH 142/244] python310Packages.zeroconf: 0.61.0 -> 0.62.0 Diff: https://github.com/jstasiak/python-zeroconf/compare/refs/tags/0.61.0...0.62.0 Changelog: https://github.com/python-zeroconf/python-zeroconf/releases/tag/0.62.0 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 5030857a86af..2a962bf085b3 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.61.0"; + version = "0.62.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = "refs/tags/${version}"; - hash = "sha256-I2j7eflLC30gHOoEDkbvdZyxGumgoeVMyVVdz+Dmhls="; + hash = "sha256-+jaZ582GdO7dUDr9dPPyy4uUm1mHigDieWN0mgBR+iI="; }; nativeBuildInputs = [ From cc09d6a1d08538173df65d217e31b12a6cd29189 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 06:44:53 +0000 Subject: [PATCH 143/244] unciv: 4.6.7 -> 4.6.8 --- pkgs/games/unciv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/unciv/default.nix b/pkgs/games/unciv/default.nix index f40579f59ee3..d5e6660304c9 100644 --- a/pkgs/games/unciv/default.nix +++ b/pkgs/games/unciv/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "unciv"; - version = "4.6.7"; + version = "4.6.8"; src = fetchurl { url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar"; - hash = "sha256-aaCGo/vogi5HV0hM0Lz4Gw/IRbLp5U7eqAhfL7ztDos="; + hash = "sha256-ECj94r/0jEB9xzlX5A8q4jvOr92yRsTpD4IkxXMF2EM="; }; dontUnpack = true; From fa96c4dc96b51831a6161b0df8c513613c00eebc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 May 2023 09:47:45 +0300 Subject: [PATCH 144/244] python310Packages.pyvista: 0.38.5 -> 0.38.6 --- pkgs/development/python-modules/pyvista/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix index 6b2903d7ba20..291f42671654 100644 --- a/pkgs/development/python-modules/pyvista/default.nix +++ b/pkgs/development/python-modules/pyvista/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyvista"; - version = "0.38.5"; + version = "0.38.6"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-2EH9S67xj3Z2wHWAvBt7alZPZj5/K5787cQnE53lzA0="; + hash = "sha256-CK9KdIpi46QI1KxWkzo/rQ+Vp+NZfhnFEeSjdFCwgzI="; }; propagatedBuildInputs = [ From e2adc3a3a23d8735937e23105741763b05140812 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 May 2023 09:51:11 +0300 Subject: [PATCH 145/244] bootstrap-tools-cross: add loongarch64-linux --- pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index d9105c8c4499..e67b5aef95c5 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -21,6 +21,7 @@ in lib.mapAttrs (n: make) (with lib.systems.examples; { armv6l-musl = muslpi; aarch64-musl = aarch64-multiplatform-musl; riscv64 = riscv64; + loongarch64-linux = loongarch64-linux; mips64el-linux-gnuabin32 = mips64el-linux-gnuabin32; mips64el-linux-gnuabi64 = mips64el-linux-gnuabi64; mipsel-linux-gnu = mipsel-linux-gnu; From 1348f199a5d9b836a6672fcc8588fd1b90578ffd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 May 2023 09:52:01 +0300 Subject: [PATCH 146/244] lib/systems: move loongarch64-linux out of mips block --- lib/systems/examples.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 3ae5d6ffd47b..4edbf4df4b61 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -90,10 +90,6 @@ rec { config = "mipsel-unknown-linux-gnu"; } // platforms.fuloong2f_n32; - loongarch64-linux = { - config = "loongarch64-unknown-linux-gnu"; - }; - # can execute on 32bit chip mips-linux-gnu = { config = "mips-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32; mipsel-linux-gnu = { config = "mipsel-unknown-linux-gnu"; } // platforms.gcc_mips32r2_o32; @@ -139,6 +135,10 @@ rec { libc = "newlib"; }; + loongarch64-linux = { + config = "loongarch64-unknown-linux-gnu"; + }; + mmix = { config = "mmix-unknown-mmixware"; libc = "newlib"; From a294e0bc87c327b18c6af0d1b23b60b76bf72cf4 Mon Sep 17 00:00:00 2001 From: betaboon Date: Thu, 4 May 2023 09:26:25 +0200 Subject: [PATCH 147/244] skaffold: 2.3.0 -> 2.4.0 Diff: https://github.com/GoogleContainerTools/skaffold/compare/v2.3.0...v2.4.0 Changelog: https://github.com/GoogleContainerTools/skaffold/releases/tag/v2.4.0 --- pkgs/development/tools/skaffold/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 932fac51b08c..0c3cfd6fef91 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "skaffold"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - hash = "sha256-8w8Qt1WJUB566uXBDbkLsZekoOwmmd7iC/cSG+68dAU="; + hash = "sha256-feUR8R8mlKfSV2ct9EeAcEHJiK7Hb5PAXTnES9UG2Qc="; }; - vendorHash = "sha256-/3ThO/gsR5VfYsZYUk9oqTiLfnzCxzYEsZKd19fiLDk="; + vendorHash = null; subPackages = ["cmd/skaffold"]; From 12f749211ef7c6801d140e0f7b352a5aa87c66ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 07:39:37 +0000 Subject: [PATCH 148/244] pythia: 8.307 -> 8.309 --- pkgs/development/libraries/physics/pythia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/physics/pythia/default.nix b/pkgs/development/libraries/physics/pythia/default.nix index a4706520ba4b..3048a1a51ac8 100644 --- a/pkgs/development/libraries/physics/pythia/default.nix +++ b/pkgs/development/libraries/physics/pythia/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pythia"; - version = "8.307"; + version = "8.309"; src = fetchurl { url = "https://pythia.org/download/pythia83/pythia${builtins.replaceStrings ["."] [""] version}.tgz"; - sha256 = "sha256-5bFNRKpZQzMuMt1d2poY/dGgCFxxmOKNhA4EFn+mAT0="; + sha256 = "sha256-W9r9nyxKHEf9ik6C+58Nj8+6TeEAO44Uvk4DR0NtbDM="; }; nativeBuildInputs = [ rsync ] From 8a00768ffb9b27f8885ed5b766ff8080280f11bb Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle Date: Thu, 4 May 2023 09:39:45 +0200 Subject: [PATCH 149/244] qc: init at 0.0.4 --- pkgs/development/tools/qc/default.nix | 40 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/tools/qc/default.nix diff --git a/pkgs/development/tools/qc/default.nix b/pkgs/development/tools/qc/default.nix new file mode 100644 index 000000000000..4e9f35510829 --- /dev/null +++ b/pkgs/development/tools/qc/default.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "qc"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "qownnotes"; + repo = "qc"; + rev = "v${version}"; + hash = "sha256-6dH7pmsd7kUgwHplvCfNqoq/ucDY/UZnyVxC3VvV+fQ="; + }; + + vendorHash = "sha256-7t5rQliLm6pMUHhtev/kNrQ7AOvmA/rR93SwNQhov6o="; + + ldflags = [ + "-s" "-w" "-X=github.com/qownnotes/qc/cmd.version=${version}" + ]; + + doCheck = false; + + subPackages = [ "." ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installShellCompletion --cmd qc \ + --zsh ./misc/completions/zsh/_qc + ''; + + meta = with lib; { + description = "QOwnNotes command-line snippet manager"; + homepage = "https://github.com/qownnotes/qc"; + license = licenses.mit; + maintainers = with maintainers; [ pbek totoroot ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 750c8a15a53f..98e13d753260 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18824,6 +18824,8 @@ with pkgs; pylint-exit = callPackage ../development/tools/pylint-exit { }; + qc = callPackage ../development/tools/qc { }; + qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { inherit (linuxPackages) perf; }; From d0099d200d5a417e42f26ead283ce99a19c7f7c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 08:58:22 +0200 Subject: [PATCH 150/244] python310Packages.appthreat-vulnerability-db: allow later semver releases --- .../appthreat-vulnerability-db/default.nix | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 662f21e94cbc..17626ca23f52 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -9,6 +9,7 @@ , packageurl-python , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , semver , tabulate }: @@ -27,6 +28,22 @@ buildPythonPackage rec { hash = "sha256-lbaDoLEOMzMGwqBx6gBynVpXz/NM/uCJELwd4d1IEwk="; }; + postPatch = '' + substituteInPlace pytest.ini \ + --replace " --cov-append --cov-report term --cov vdb" "" + # https://github.com/AppThreat/vulnerability-db/pull/48 + substituteInPlace vdb/lib/utils.py \ + --replace "isvalid(" "is_valid(" + ''; + + pythonRelaxDeps = [ + "semver" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ appdirs cvss @@ -42,11 +59,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pytest.ini \ - --replace " --cov-append --cov-report term --cov vdb" "" - ''; - preCheck = '' export HOME=$(mktemp -d); ''; From f1db23835d272bb67efb82b381aa2cdb8c600dbc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 08:33:37 +0200 Subject: [PATCH 151/244] circup: relaex semver constraint --- pkgs/development/tools/circup/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix index 429b1a179c2a..4767e638eca7 100644 --- a/pkgs/development/tools/circup/default.nix +++ b/pkgs/development/tools/circup/default.nix @@ -17,8 +17,13 @@ python3.pkgs.buildPythonApplication rec { SETUPTOOLS_SCM_PRETEND_VERSION = version; + pythonRelaxDeps = [ + "semver" + ]; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm + pythonRelaxDepsHook ]; propagatedBuildInputs = with python3.pkgs; [ From 2d8ce3358ed04ffd141d4ddbe216f21a71e628f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 09:47:45 +0200 Subject: [PATCH 152/244] python310Packages.pkutils: remove semver constraint --- pkgs/development/python-modules/pkutils/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pkutils/default.nix b/pkgs/development/python-modules/pkutils/default.nix index 6ca68dbe6245..e626c9bd587c 100644 --- a/pkgs/development/python-modules/pkutils/default.nix +++ b/pkgs/development/python-modules/pkutils/default.nix @@ -3,6 +3,7 @@ , fetchFromGitHub , nose , pythonOlder +, pythonRelaxDepsHook , semver }: @@ -16,10 +17,18 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "reubano"; repo = "pkutils"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-AK+xX+LPz6IVLZedsqMUm7G28ue0s3pXgIzxS4EHHLE="; }; + pythonRelaxDeps = [ + "semver" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ semver ]; From 996db6d059cd8e6f3b5815a33816bf8ea16f42b5 Mon Sep 17 00:00:00 2001 From: Peter Kling Date: Thu, 4 May 2023 09:52:49 +0200 Subject: [PATCH 153/244] virtualisation/qemu-vm: escape bash variable in shell script Fixes #229729 --- nixos/modules/virtualisation/qemu-vm.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index f9f88b7340a7..5f6bf4b39e97 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -130,7 +130,7 @@ let ${concatStringsSep " \\\n" ([ "-f qcow2" ] ++ optional (cfg.useBootLoader && cfg.useDefaultFilesystems) "-F qcow2 -b ${systemImage}/nixos.qcow2" ++ optional (!(cfg.useBootLoader && cfg.useDefaultFilesystems)) "-o size=${toString config.virtualisation.diskSize}M" - ++ [ "$NIX_DISK_IMAGE" ])} + ++ [ ''"$NIX_DISK_IMAGE"'' ])} echo "Virtualisation disk image created." fi From de12878190cdd2140653688a8ea30e0129eeb9ba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 09:54:15 +0200 Subject: [PATCH 154/244] python310Packages.pulumi: remove semver constraint --- pkgs/development/python-modules/pulumi/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pulumi/default.nix b/pkgs/development/python-modules/pulumi/default.nix index 68e5391b9691..11d1721fdc97 100644 --- a/pkgs/development/python-modules/pulumi/default.nix +++ b/pkgs/development/python-modules/pulumi/default.nix @@ -44,7 +44,8 @@ buildPythonPackage rec { cp ../../README.md . substituteInPlace setup.py \ --replace "3.0.0" "${version}" \ - --replace "grpcio==1.51.3" "grpcio" + --replace "grpcio==1.51.3" "grpcio" \ + --replace "semver~=2.13" "semver" ''; # Allow local networking in tests on Darwin From c83681761b2d90ce2bdf3ef30eeba50f7f946ac4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 09:59:58 +0200 Subject: [PATCH 155/244] python311Packages.pontos: 23.4.9 -> 23.5.0 Diff: https://github.com/greenbone/pontos/compare/refs/tags/v23.4.9...v23.5.0 Changelog: https://github.com/greenbone/pontos/releases/tag/v23.5.0 --- pkgs/development/python-modules/pontos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix index 7b7143434388..4fc01a41bd33 100644 --- a/pkgs/development/python-modules/pontos/default.nix +++ b/pkgs/development/python-modules/pontos/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pontos"; - version = "23.4.9"; + version = "23.5.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "greenbone"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-rShSVoDL5jY1xCZ6O9jUdGpErMMmq91Ypb0rBoTApIQ="; + hash = "sha256-GboOp0lsJ5nsZ6PIUqqCVLmroppKFR/xBnd9DqNw030="; }; nativeBuildInputs = [ From 6a54ce23e2532baf587d1e1427fc8bb794d96bdc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 10:11:59 +0200 Subject: [PATCH 156/244] python311Packages.pyvicare: 2.25.0 -> 2.27.1 Diff: https://github.com/somm15/PyViCare/compare/refs/tags/2.25.0...2.27.1 --- .../python-modules/pyvicare/default.nix | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/pyvicare/default.nix b/pkgs/development/python-modules/pyvicare/default.nix index 14773604be36..846eacbf1bc4 100644 --- a/pkgs/development/python-modules/pyvicare/default.nix +++ b/pkgs/development/python-modules/pyvicare/default.nix @@ -1,16 +1,16 @@ { lib +, authlib , buildPythonPackage , fetchFromGitHub , pkce , pytestCheckHook , pythonOlder -, requests-oauthlib , simplejson }: buildPythonPackage rec { pname = "pyvicare"; - version = "2.25.0"; + version = "2.27.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,28 +18,28 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "somm15"; repo = "PyViCare"; - rev = version; - hash = "sha256-OZvYl8wl8kOIOfsWVn74XFKMX/jAmtoMTIEQpAZmTeo="; + rev = "refs/tags/${version}"; + hash = "sha256-PlXVsDLCEBjsll9cXPJqvNSFyjtGol9jXYWzaYHWNw4="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; - propagatedBuildInputs = [ - requests-oauthlib - simplejson - pkce - ]; - - nativeCheckInputs = [ - pytestCheckHook - ]; - postPatch = '' substituteInPlace setup.py \ --replace "version_config=True," 'version="${version}",' \ --replace "'setuptools-git-versioning<1.8.0'" "" ''; + propagatedBuildInputs = [ + authlib + pkce + ]; + + nativeCheckInputs = [ + pytestCheckHook + simplejson + ]; + pythonImportsCheck = [ "PyViCare" ]; From cae55ac31d4d904d5281c8c382e4eb68f36bb6d0 Mon Sep 17 00:00:00 2001 From: Giorgio Gallo Date: Thu, 4 May 2023 10:16:19 +0200 Subject: [PATCH 157/244] gomplate: use go 1.20 --- pkgs/development/tools/gomplate/default.nix | 4 ---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/tools/gomplate/default.nix b/pkgs/development/tools/gomplate/default.nix index e28836ffed21..e6a99d1eeae6 100644 --- a/pkgs/development/tools/gomplate/default.nix +++ b/pkgs/development/tools/gomplate/default.nix @@ -7,10 +7,6 @@ buildGoModule rec { pname = "gomplate"; version = "3.11.5"; - # gomplate is currently built w/ go 1.19 (see pkgs/top-level/all-packages.nix), but - # it seems the reported "go 1.20 build failure" does no longer occurr. - # TODO remove indication to use go 1.19 in pkgs/top-level/all-packages.nix when next upgrading gomplate - src = fetchFromGitHub { owner = "hairyhenderson"; repo = pname; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 750c8a15a53f..54e10a9b9fee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26540,9 +26540,7 @@ with pkgs; gomp = callPackage ../applications/version-management/gomp { }; - gomplate = callPackage ../development/tools/gomplate { - buildGoModule = buildGo119Module; # go 1.20 build failure - }; + gomplate = callPackage ../development/tools/gomplate { }; gpm = callPackage ../servers/gpm { withNcurses = false; # Keep curses disabled for lack of value From c54779686e7e4cf9933a2b7303f1c50ac3b42252 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 10:21:14 +0200 Subject: [PATCH 158/244] python310Packages.univers: equalize - add changelog to meta - disable on unsupported Python releases - add format --- .../python-modules/univers/default.nix | 47 ++++++++++++++----- 1 file changed, 35 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/univers/default.nix b/pkgs/development/python-modules/univers/default.nix index 3669009d530e..718925eee087 100644 --- a/pkgs/development/python-modules/univers/default.nix +++ b/pkgs/development/python-modules/univers/default.nix @@ -1,21 +1,25 @@ { lib -, fetchPypi -, fetchpatch -, buildPythonPackage -, setuptools-scm , attrs +, buildPythonPackage +, commoncode +, fetchpatch +, fetchPypi , packaging , pyparsing +, pytestCheckHook +, pythonOlder +, saneyaml , semantic-version , semver -, commoncode -, pytestCheckHook -, saneyaml +, setuptools-scm }: buildPythonPackage rec { pname = "univers"; version = "30.7.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; @@ -31,19 +35,38 @@ buildPythonPackage rec { }) ]; - nativeBuildInputs = [ setuptools-scm ]; - propagatedBuildInputs = [ attrs packaging pyparsing semantic-version semver ]; - nativeCheckInputs = [ commoncode pytestCheckHook saneyaml ]; + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + attrs + packaging + pyparsing + semantic-version + semver + ]; + + nativeCheckInputs = [ + commoncode + pytestCheckHook + saneyaml + ]; dontConfigure = true; # ./configure tries to setup virtualenv and downloads dependencies - disabledTests = [ "test_codestyle" ]; + disabledTests = [ + "test_codestyle" + ]; - pythonImportsCheck = [ "univers" ]; + pythonImportsCheck = [ + "univers" + ]; meta = with lib; { description = "Library for parsing version ranges and expressions"; homepage = "https://github.com/nexB/univers"; + changelog = "https://github.com/nexB/univers/blob/v${version}/CHANGELOG.rst"; license = with licenses; [ asl20 bsd3 mit ]; maintainers = with maintainers; [ armijnhemel sbruder ]; }; From 71495d99b19d6682ae08901dd418d98b9ff04ab9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 10:27:43 +0200 Subject: [PATCH 159/244] python310Packages.univers: 30.7.0 -> 30.10.0 Changelog: https://github.com/nexB/univers/blob/v30.10.0/CHANGELOG.rst --- .../python-modules/univers/default.nix | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/univers/default.nix b/pkgs/development/python-modules/univers/default.nix index 718925eee087..ea450651da7e 100644 --- a/pkgs/development/python-modules/univers/default.nix +++ b/pkgs/development/python-modules/univers/default.nix @@ -2,7 +2,6 @@ , attrs , buildPythonPackage , commoncode -, fetchpatch , fetchPypi , packaging , pyparsing @@ -16,25 +15,16 @@ buildPythonPackage rec { pname = "univers"; - version = "30.7.0"; + version = "30.10.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-yM0SDBpkiZEbaZ0ugjiMwwUFKqZGbmh1JNlv5qvPAYo="; + hash = "sha256-IJeM9Nzfqs1B0xP43i6u65XSEVPdiGhXWuORglbNARI="; }; - patches = [ - # Make tests work when not using virtualenv, can be dropped with the next version - # Upstream PR (already merged): https://github.com/nexB/univers/pull/77 - (fetchpatch { - url = "https://github.com/nexB/univers/commit/b74229cc1c8790287633cd7220d6b2e97c508302.patch"; - hash = "sha256-i6zWv9rAlwCMghd9g5FP6WIQLLDLYvp+6qJ1E7nfTSY="; - }) - ]; - nativeBuildInputs = [ setuptools-scm ]; @@ -55,14 +45,18 @@ buildPythonPackage rec { dontConfigure = true; # ./configure tries to setup virtualenv and downloads dependencies - disabledTests = [ - "test_codestyle" - ]; - pythonImportsCheck = [ "univers" ]; + disabledTests = [ + # No value for us + "test_codestyle" + # AssertionError starting with 30.10.0 + "test_enhanced_semantic_version" + "test_semver_version" + ]; + meta = with lib; { description = "Library for parsing version ranges and expressions"; homepage = "https://github.com/nexB/univers"; From b58efa65f5b14e3043183e125e1b20b12db05492 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 08:33:15 +0000 Subject: [PATCH 160/244] portal: 1.2.2 -> 1.2.3 --- pkgs/tools/misc/portal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/portal/default.nix b/pkgs/tools/misc/portal/default.nix index a99f2be7f61e..978d3632da1f 100644 --- a/pkgs/tools/misc/portal/default.nix +++ b/pkgs/tools/misc/portal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "portal"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "SpatiumPortae"; repo = pname; rev = "v${version}"; - sha256 = "sha256-80ZWMYGH5D5C5Lw97Sic3duw+oXBzIxQjJ+6uQLBwJQ="; + sha256 = "sha256-hGB82a2WirUL1Tph6EuoITOQGYA0Lo4zOeKPC46B5Qk="; }; - vendorSha256 = "sha256-SbNFi5DE3zhTUw0rsX6n+dpYcdDsaDh+zVUrfxgo/4g="; + vendorHash = "sha256-SbNFi5DE3zhTUw0rsX6n+dpYcdDsaDh+zVUrfxgo/4g="; subPackages = [ "cmd/portal/" ]; ldflags = [ "-s -X main.version=${version}" ]; # from: https://github.com/SpatiumPortae/portal/blob/master/Makefile#L3 From 50e37f67b3ca2a893aa38073d4100f090f8bec74 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 4 May 2023 08:35:58 +0000 Subject: [PATCH 161/244] d2: 0.4.1 -> 0.4.2 --- pkgs/tools/text/d2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/d2/default.nix b/pkgs/tools/text/d2/default.nix index 63e8768c6c92..efddd0ab6c79 100644 --- a/pkgs/tools/text/d2/default.nix +++ b/pkgs/tools/text/d2/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "d2"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "terrastruct"; repo = pname; rev = "v${version}"; - hash = "sha256-4VoWAft9d0v/kB+B8Ukv/XN613a8N484SMqCbOD2GFI="; + hash = "sha256-kfpCu79lJUxPvxSKplRziVnDyohY8xnxnO3ZoG2WgEs="; }; vendorHash = "sha256-oPI6FPfBIPKZDLoyGblcG5UcmoFWufZ2NIEClpSIJzU="; From f67654a67f15b4879bbcbe9abb0cda4d9555093a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 09:07:35 +0000 Subject: [PATCH 162/244] terragrunt: 0.45.5 -> 0.45.8 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 7b97af410d0d..453b6764c52d 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.45.5"; + version = "0.45.8"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Azf9A/ZHb8wFRsd7iv9Y4jr9xs8R7vNUffz9ky07SVk="; + hash = "sha256-YKlx3+cBBXpWlytPnoyEaZYUZODEwfzjEphG11sgS/M="; }; - vendorHash = "sha256-V7+N+vEOS4DXHglErD5YoUzu6EN4YRljV581kFnjK2M="; + vendorHash = "sha256-5Umoqi2D6iUk2Ut7YB/nmkOyA6Rx2qFhy/ZbfqoX5qA="; doCheck = false; From f8663d8e49619e9ae17b669665fd4de5968d41c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 09:14:31 +0000 Subject: [PATCH 163/244] sentry-cli: 2.17.4 -> 2.17.5 --- pkgs/development/tools/sentry-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/sentry-cli/default.nix b/pkgs/development/tools/sentry-cli/default.nix index b61fb1e34cb4..089e2cf417d0 100644 --- a/pkgs/development/tools/sentry-cli/default.nix +++ b/pkgs/development/tools/sentry-cli/default.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage rec { pname = "sentry-cli"; - version = "2.17.4"; + version = "2.17.5"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-cli"; rev = version; - sha256 = "sha256-k5Zw4M1mDo/AIMROvpGyak2UR9GryubgyLmXF5/0JoM="; + sha256 = "sha256-7qBw0MT1FM1rAbOEtVuf/XEBY8yosRWsnGwVbqpc3QQ="; }; doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; nativeBuildInputs = [ pkg-config ]; - cargoHash = "sha256-uPlJTwm+DRY1t/jqkk0cuE7Gz327qJPnpsaTVnVWIlI="; + cargoHash = "sha256-LAasV0rY4jgoC+soBshECUXvXYIe5zQZmnKtBONAD6g="; meta = with lib; { homepage = "https://docs.sentry.io/cli/"; From 29c6be7d33d437f0852dff791c522882a5a2a7a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 09:19:55 +0000 Subject: [PATCH 164/244] function-runner: 3.3.0 -> 3.3.1 --- pkgs/development/web/function-runner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/function-runner/default.nix b/pkgs/development/web/function-runner/default.nix index 9a41d6b28864..8ccc566c9bb0 100644 --- a/pkgs/development/web/function-runner/default.nix +++ b/pkgs/development/web/function-runner/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "function-runner"; - version = "3.3.0"; + version = "3.3.1"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AnY9WIb3bHhC9o0ymdFM2MFro1Rx/yoVXMsbjCSNJaE="; + sha256 = "sha256-bks73G9oZgZpkSbrRWD34+UcFOMkJJa4qkJIQxcx/Ao="; }; - cargoHash = "sha256-oM6DMtQhtHR47AEw5RubNCGNpUKbIx/jVZeeoK3utlY="; + cargoHash = "sha256-V0lr1gqn8w4MrHQO5UVxUl+OdK/ODutAr+nMYHc+4hQ="; meta = with lib; { description = "A CLI tool which allows you to run Wasm Functions intended for the Shopify Functions infrastructure"; From 02adfa101af4386781d0ab959cfe02feeecee9f9 Mon Sep 17 00:00:00 2001 From: Ruixi-rebirth Date: Thu, 4 May 2023 17:49:48 +0800 Subject: [PATCH 165/244] go-musicfox: add nix-update-script to passthru go-musicfox: add nix-update-script to passthru --- pkgs/applications/audio/go-musicfox/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/audio/go-musicfox/default.nix b/pkgs/applications/audio/go-musicfox/default.nix index 2564c08eb2ba..f67a6d8052c6 100644 --- a/pkgs/applications/audio/go-musicfox/default.nix +++ b/pkgs/applications/audio/go-musicfox/default.nix @@ -4,6 +4,7 @@ , pkg-config , alsa-lib , flac +, nix-update-script }: buildGoModule rec { @@ -38,6 +39,8 @@ buildGoModule rec { flac ]; + passthru.updateScript = nix-update-script { }; + meta = with lib; { description = "Terminal netease cloud music client written in Go"; homepage = "https://github.com/anhoder/go-musicfox"; From 48fe29f726d53dcacb55a3cff7e2720c763647de Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 09:55:53 +0000 Subject: [PATCH 166/244] sherpa: 2.2.14 -> 2.2.15 --- pkgs/applications/science/physics/sherpa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix index 6b5cb29863ee..21a5ee7ec234 100644 --- a/pkgs/applications/science/physics/sherpa/default.nix +++ b/pkgs/applications/science/physics/sherpa/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sherpa"; - version = "2.2.14"; + version = "2.2.15"; src = fetchurl { url = "https://www.hepforge.org/archive/sherpa/SHERPA-MC-${version}.tar.gz"; - sha256 = "sha256-24nO2cFeHx/XTNsC/hxnQu+fRWJm5A5idRtFz6bTo2Q="; + sha256 = "sha256-3zvLa1k/bm7uOWKUsTyQM39cPBXJJlF1OgPgznl1hks="; }; postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") '' From be177b2204b9a7825a603437241722e24a661100 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Thu, 4 May 2023 11:57:27 +0200 Subject: [PATCH 167/244] python3Packages.desktop-notifier: 3.5.1 -> 3.5.2 --- pkgs/development/python-modules/desktop-notifier/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/desktop-notifier/default.nix b/pkgs/development/python-modules/desktop-notifier/default.nix index ddbd9143ef6c..f0abd25962cf 100644 --- a/pkgs/development/python-modules/desktop-notifier/default.nix +++ b/pkgs/development/python-modules/desktop-notifier/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "desktop-notifier"; - version = "3.5.1"; + version = "3.5.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-l7Ykja1LDtbRt65wI1LjGkxxs3oMvN3bKqveGNZ5Fgc="; + hash = "sha256-IZY5vGQoJHcnMBcPjsrYYyuBI4WWyLCRZ/PC3TeVX9k="; }; nativeBuildInputs = [ From 3c7fba2b0f70f0d6860f0be3780fa0176f6339a8 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 May 2023 10:17:02 +0300 Subject: [PATCH 168/244] llvmPackages_16.llvm: fix postPatch on darwin --- pkgs/development/compilers/llvm/16/llvm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/16/llvm/default.nix b/pkgs/development/compilers/llvm/16/llvm/default.nix index 59d620cb9015..604ad63492db 100644 --- a/pkgs/development/compilers/llvm/16/llvm/default.nix +++ b/pkgs/development/compilers/llvm/16/llvm/default.nix @@ -163,7 +163,7 @@ in # This test tries to call `sw_vers` by absolute path (`/usr/bin/sw_vers`) # and thus fails under the sandbox: - substituteInPlace unittests/Support/Host.cpp \ + substituteInPlace unittests/TargetParser/Host.cpp \ --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' # This test tries to call the intrinsics `@llvm.roundeven.f32` and @@ -208,7 +208,7 @@ in # not clear to me when/where/for what this even gets used in LLVM. # # TODO(@rrbutani): fix/follow-up - substituteInPlace unittests/Support/Host.cpp \ + substituteInPlace unittests/TargetParser/Host.cpp \ --replace "getMacOSHostVersion" "DISABLED_getMacOSHostVersion" # This test fails with a `dysmutil` crash; have not yet dug into what's From fd155c2a9494bd706bea5dc3916869bb3ffa739a Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 May 2023 11:42:54 +0300 Subject: [PATCH 169/244] llvmPackages_16.llvm: avoid calling roundevenf on darwin --- pkgs/development/compilers/llvm/16/llvm/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/llvm/16/llvm/default.nix b/pkgs/development/compilers/llvm/16/llvm/default.nix index 604ad63492db..63fe28277fd8 100644 --- a/pkgs/development/compilers/llvm/16/llvm/default.nix +++ b/pkgs/development/compilers/llvm/16/llvm/default.nix @@ -165,21 +165,19 @@ in # and thus fails under the sandbox: substituteInPlace unittests/TargetParser/Host.cpp \ --replace '/usr/bin/sw_vers' "${(builtins.toString darwin.DarwinTools) + "/bin/sw_vers" }" - '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' + # This test tries to call the intrinsics `@llvm.roundeven.f32` and # `@llvm.roundeven.f64` which seem to (incorrectly?) lower to `roundevenf` - # and `roundeven` on x86_64 macOS. + # and `roundeven` on macOS. # # However these functions are glibc specific so the test fails: # - https://www.gnu.org/software/gnulib/manual/html_node/roundevenf.html # - https://www.gnu.org/software/gnulib/manual/html_node/roundeven.html # - # TODO(@rrbutani): this seems to run fine on `aarch64-darwin`, why does it - # pass there? substituteInPlace test/ExecutionEngine/Interpreter/intrinsics.ll \ --replace "%roundeven32 = call float @llvm.roundeven.f32(float 0.000000e+00)" "" \ --replace "%roundeven64 = call double @llvm.roundeven.f64(double 0.000000e+00)" "" - + '' + optionalString (stdenv.isDarwin && stdenv.hostPlatform.isx86) '' # This test fails on darwin x86_64 because `sw_vers` reports a different # macOS version than what LLVM finds by reading # `/System/Library/CoreServices/SystemVersion.plist` (which is passed into From 00d3b01fe155dea36e7bb04cd1cf084bd632b3c9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 10:02:10 +0000 Subject: [PATCH 170/244] libiodbc: 3.52.15 -> 3.52.16 --- pkgs/development/libraries/libiodbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libiodbc/default.nix b/pkgs/development/libraries/libiodbc/default.nix index 6b9510a46ba5..6d6d7d46576d 100644 --- a/pkgs/development/libraries/libiodbc/default.nix +++ b/pkgs/development/libraries/libiodbc/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "libiodbc"; - version = "3.52.15"; + version = "3.52.16"; src = fetchurl { url = "mirror://sourceforge/iodbc/${pname}-${version}.tar.gz"; - sha256 = "sha256-x0VB4zJ/yaHHzPEDZFRxxnvAFFQtcPVyR26wfAst1Dw="; + sha256 = "sha256-OJizLQeWE2D28s822zYDa3GaIw5HZGklioDzIkPoRfo="; }; nativeBuildInputs = [ pkg-config ]; From 9f8b8befcfc9a6a4f7da99cac8f7bd9737e95848 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 4 May 2023 20:21:17 +1000 Subject: [PATCH 171/244] nginxModules.zstd: add missing meta --- pkgs/servers/http/nginx/modules.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index f21ccbc0983d..aa070df188c4 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -1023,6 +1023,13 @@ let self = { }; inputs = [ zstd ]; + + meta = with lib; { + description = "Nginx modules for the Zstandard compression"; + homepage = "https://github.com/tokers/zstd-nginx-module"; + license = with licenses; [ bsd2 ]; + maintainers = with maintainers; [ ]; + }; }; }; in self // lib.optionalAttrs config.allowAliases { # deprecated or renamed packages From 7002437a4c26db81663090465c7aea97f71a0a09 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 10:26:12 +0000 Subject: [PATCH 172/244] minizinc: 2.7.2 -> 2.7.3 --- pkgs/development/tools/minizinc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/minizinc/default.nix b/pkgs/development/tools/minizinc/default.nix index 75053505b80a..5fbe37174b3c 100644 --- a/pkgs/development/tools/minizinc/default.nix +++ b/pkgs/development/tools/minizinc/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, flex, bison }: stdenv.mkDerivation rec { pname = "minizinc"; - version = "2.7.2"; + version = "2.7.3"; nativeBuildInputs = [ cmake flex bison ]; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { owner = "MiniZinc"; repo = "libminizinc"; rev = version; - sha256 = "sha256-XiaLD6tJDn8DTQwknlVd1+xf+DNCiOZ12yn1zugCVxY="; + sha256 = "sha256-qDAFXyWEwdei1jBHb5ONgivlp2ftMNfBbq8a/Ibh2BM="; }; meta = with lib; { From af67c942bb6e7edfd0fc6d587794cd2d8ad241c4 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Thu, 4 May 2023 18:27:29 +0800 Subject: [PATCH 173/244] warp: 0.5.3 -> 0.5.4 --- pkgs/applications/networking/warp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/warp/default.nix b/pkgs/applications/networking/warp/default.nix index d53e6d6e1f0c..81e4c393851f 100644 --- a/pkgs/applications/networking/warp/default.nix +++ b/pkgs/applications/networking/warp/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "warp"; - version = "0.5.3"; + version = "0.5.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = "v${version}"; - hash = "sha256-RwsrE4ZIG0i0B7Xu7fDKyDQt4+W2Ntd+epTST8s/YDc="; + hash = "sha256-twK0C2BvD3GLmJ9H05sas0bce/dIMIWeCoFRU/f+1eg="; }; postPatch = '' @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-0L7Wz/vOudZ4Bd3umn+auejYGDnSoU6o07+u/MfrgqE="; + hash = "sha256-mxM+V4gWGfW8M56+kV/Ljtzde7oRPH0twJtEImkUIF4="; }; nativeBuildInputs = [ From 3b04533b367dd12da34078df8b0d03c606522be1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 10:36:33 +0000 Subject: [PATCH 174/244] openimageio: 2.4.10.0 -> 2.4.11.0 --- pkgs/development/libraries/openimageio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openimageio/default.nix b/pkgs/development/libraries/openimageio/default.nix index cd219dc976f2..024a91df0964 100644 --- a/pkgs/development/libraries/openimageio/default.nix +++ b/pkgs/development/libraries/openimageio/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "openimageio"; - version = "2.4.10.0"; + version = "2.4.11.0"; src = fetchFromGitHub { owner = "OpenImageIO"; repo = "oiio"; rev = "v${version}"; - hash = "sha256-EQ9/G41AZJJ+KMIwDRZDf5V0VOx5fewmebeHlPWSPCQ="; + hash = "sha256-YWVKmvUHq1QSpTCP0UBfSxqWTIWjxOF0gVE7qljCOyY="; }; outputs = [ "bin" "out" "dev" "doc" ]; From dcbb1a17775ffe64a5fc0c08310bc220efcd68f4 Mon Sep 17 00:00:00 2001 From: Ran Xiao Date: Thu, 4 May 2023 20:23:56 +1000 Subject: [PATCH 175/244] mlflow-server: fix build --- pkgs/servers/mlflow-server/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/mlflow-server/default.nix b/pkgs/servers/mlflow-server/default.nix index 45dd6dd43ae3..e140eac00748 100644 --- a/pkgs/servers/mlflow-server/default.nix +++ b/pkgs/servers/mlflow-server/default.nix @@ -5,7 +5,6 @@ let in py.toPythonApplication (py.mlflow.overridePythonAttrs(old: rec { - pname = "mlflow-server"; propagatedBuildInputs = old.propagatedBuildInputs ++ [ py.boto3 From 2b4ab2579624d9916d9c847217663c237dc7523d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 10:49:53 +0000 Subject: [PATCH 176/244] python311Packages.pynisher: 1.0.0 -> 1.0.5 --- pkgs/development/python-modules/pynisher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 8dc5d1eaa9f6..389e438daa17 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pynisher"; - version = "1.0.0"; + version = "1.0.5"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-5FJQCN+yO1gh7HK47MRR/SAr8Qzix3bfrjyzsakBQXA="; + hash = "sha256-usSowgCwGTATiX1dbPpScO9/FI+E567dvGZxAC+zS14="; }; propagatedBuildInputs = [ From bf9f1cf3f98842116c05caaeaf621eb1ab54498d Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Thu, 4 May 2023 18:57:09 +0800 Subject: [PATCH 177/244] moar: 1.13.0 -> 1.14.0 --- pkgs/tools/misc/moar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 2861afee8a07..15b6eb9ed2e5 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5gWPqGrnb/wMdr+AQ1nkl3wUUpmgn3eDTaktWHLDAxc="; + sha256 = "sha256-fpUfIKDKjIHkMWzv0ZWb0mYuDDj2j7AyaiM9+LlVmPA="; }; vendorHash = "sha256-aFCv6VxHD1bOLhCHXhy4ubik8Z9uvU6AeqcMqIZI2Oo="; From f0569c8d96e1e6f1f0cc5dbbbe10a4503731be0c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 13:05:08 +0200 Subject: [PATCH 178/244] python310Packages.ndeflib: init at 0.3.3 --- .../python-modules/ndeflib/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/ndeflib/default.nix diff --git a/pkgs/development/python-modules/ndeflib/default.nix b/pkgs/development/python-modules/ndeflib/default.nix new file mode 100644 index 000000000000..3699955627ec --- /dev/null +++ b/pkgs/development/python-modules/ndeflib/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ndeflib"; + version = "0.3.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nfcpy"; + repo = "ndeflib"; + rev = "refs/tags/v${version}"; + hash = "sha256-cpfztE+/AW7P0J7QeTDfVGYc2gEkr7gzA352hC9bdTM="; + }; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ndef" + ]; + + disabledTests = [ + # AssertionError caused due to wrong size + "test_decode_error" + ]; + + meta = with lib; { + description = "Python package for parsing and generating NFC Data Exchange Format messages"; + homepage = "https://github.com/nfcpy/ndeflib"; + license = licenses.isc; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bc2bb0ced484..7e18d1cd6032 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6500,6 +6500,8 @@ self: super: with self; { nclib = callPackage ../development/python-modules/nclib { }; + ndeflib = callPackage ../development/python-modules/ndeflib { }; + ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; ndindex = callPackage ../development/python-modules/ndindex { }; From 4fb94eae0fc19852888125087033296ff6e70894 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 11:13:24 +0000 Subject: [PATCH 179/244] python310Packages.gsd: 2.8.0 -> 2.8.1 --- pkgs/development/python-modules/gsd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix index 934ba6270182..338471e56dcf 100644 --- a/pkgs/development/python-modules/gsd/default.nix +++ b/pkgs/development/python-modules/gsd/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "gsd"; - version = "2.8.0"; + version = "2.8.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "glotzerlab"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-S2BEEGifHt4ZXOxCEtwXh7wr/n1fI+gwImnrEJmYjzI="; + hash = "sha256-6Ixy62hHbSjArlDzBICdk0e8DDKxaHShamHpHEKOqqU="; }; nativeBuildInputs = [ From 4f4354aa03d69acfa2f7bec007e0bed16b2e1272 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 11:14:42 +0000 Subject: [PATCH 180/244] coin-utils: 2.11.8 -> 2.11.9 --- .../development/libraries/science/math/coin-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/coin-utils/default.nix b/pkgs/development/libraries/science/math/coin-utils/default.nix index 392d80a317a0..6cb7666e5688 100644 --- a/pkgs/development/libraries/science/math/coin-utils/default.nix +++ b/pkgs/development/libraries/science/math/coin-utils/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, pkg-config }: stdenv.mkDerivation rec { - version = "2.11.8"; + version = "2.11.9"; pname = "coinutils"; src = fetchFromGitHub { owner = "coin-or"; repo = "CoinUtils"; rev = "releases/${version}"; - hash = "sha256-ZV2nLP/oOLfnBGk1yow+b/oTKpoxyEkcCPHCSNAk+Tk="; + hash = "sha256-DgHVbcXd36WW6JQbiq1MUHAiKLs8CTau87rs0T76sGs="; }; doCheck = true; From 4e0a4f2d8202a09d1094a00a4148f70219e03825 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 13:23:27 +0200 Subject: [PATCH 181/244] python310Packages.homeassistant-stubs: 2023.4.6 -> 2023.5.0 https://github.com/KapJI/homeassistant-stubs/releases/tag/2023.5.0 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 798b4c441e39..dd2674843cfa 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2023.4.6"; + version = "2023.5.0"; format = "pyproject"; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-uPSES/yK6pgZJ68tRgmWuAwitlBOhYxMWPIi2tcEPh8="; + hash = "sha256-5aWt+x1KpLzC9ApV9n/lSJb6HweKMIJGZzAwvbFel1k="; }; nativeBuildInputs = [ From d67dfdbdf8fc17e541c050c7cbd2442d2c4d0c61 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 11:29:10 +0000 Subject: [PATCH 182/244] micronaut: 3.9.0 -> 3.9.1 --- pkgs/development/tools/micronaut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/micronaut/default.nix b/pkgs/development/tools/micronaut/default.nix index 90f146704f17..4220a378b23c 100644 --- a/pkgs/development/tools/micronaut/default.nix +++ b/pkgs/development/tools/micronaut/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "micronaut"; - version = "3.9.0"; + version = "3.9.1"; src = fetchzip { url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip"; - sha256 = "sha256-RGM8yOKtLeBRZi1tw2UHTfG0hvrg8zu62ws8MMzXy3M="; + sha256 = "sha256-Z4Nf4U6hPuSDvCLCxymaouPz+msUytR7Gqof4opATxo="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From 1d3ffa6fbca2ccbd67c3a26668c95b301ab5b7d8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 13:22:32 +0200 Subject: [PATCH 183/244] python310Packages.ledgerblue: 0.1.41 -> 0.1.47 --- pkgs/development/python-modules/ledgerblue/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index be5b87146901..d6b316b3db1f 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -8,8 +8,9 @@ , protobuf , pycrypto , pycryptodomex -, pythonOlder +, pyelftools , python-u2flib-host +, pythonOlder , websocket-client }: @@ -33,6 +34,7 @@ buildPythonPackage rec { protobuf pycrypto pycryptodomex + pyelftools python-u2flib-host websocket-client ]; From ac848b1e6896957ba84177844be0f0b41d06ae5f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 13:33:55 +0200 Subject: [PATCH 184/244] sublime-music: Pin semver at 2.13.0 --- .../audio/sublime-music/default.nix | 31 ++++++++++++++----- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/sublime-music/default.nix b/pkgs/applications/audio/sublime-music/default.nix index 39de4728f3da..e6dcb86eb948 100644 --- a/pkgs/applications/audio/sublime-music/default.nix +++ b/pkgs/applications/audio/sublime-music/default.nix @@ -1,6 +1,7 @@ { lib , fetchFromGitLab -, python3Packages +, fetchFromGitHub +, python3 , gobject-introspection , gtk3 , pango @@ -15,7 +16,22 @@ , networkmanager }: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + semver = super.semver.overridePythonAttrs (oldAttrs: rec { + version = "2.13.0"; + src = fetchFromGitHub { + owner = "python-semver"; + repo = "python-semver"; + rev = "refs/tags/${version}"; + hash = "sha256-IWTo/P9JRxBQlhtcH3JMJZZrwAA8EALF4dtHajWUc4w="; + }; + }); + }; + }; +in +python.pkgs.buildPythonApplication rec { pname = "sublime-music"; version = "0.11.16"; format = "pyproject"; @@ -29,10 +45,11 @@ python3Packages.buildPythonApplication rec { nativeBuildInputs = [ gobject-introspection - python3Packages.poetry-core - python3Packages.pythonRelaxDepsHook wrapGAppsHook - ]; + ] ++ (with python.pkgs; [ + poetry-core + pythonRelaxDepsHook + ]); # Can be removed in later versions (probably > 0.11.16) pythonRelaxDeps = [ @@ -57,7 +74,7 @@ python3Packages.buildPythonApplication rec { ++ lib.optional networkSupport networkmanager ; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with python.pkgs; [ bleach dataclasses-json deepdiff @@ -75,7 +92,7 @@ python3Packages.buildPythonApplication rec { ++ lib.optional serverSupport bottle ; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python.pkgs; [ pytest ]; From 540c7b84b6daf602876cc13b9b8554cacb74e5ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 13:38:54 +0200 Subject: [PATCH 185/244] python310Packages.nfcpy: init at 1.0.4 --- .../python-modules/ledgerblue/default.nix | 8 ++- .../python-modules/nfcpy/default.nix | 61 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 3 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/python-modules/nfcpy/default.nix diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix index d6b316b3db1f..ea89a9ac688f 100644 --- a/pkgs/development/python-modules/ledgerblue/default.nix +++ b/pkgs/development/python-modules/ledgerblue/default.nix @@ -1,9 +1,11 @@ { lib +, bleak , buildPythonPackage , ecpy , fetchPypi , future , hidapi +, nfcpy , pillow , protobuf , pycrypto @@ -16,20 +18,22 @@ buildPythonPackage rec { pname = "ledgerblue"; - version = "0.1.44"; + version = "0.1.47"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-pOLpeej10G7Br8juTuQOSuCbhMjAP4aY0/JwnmJRblk="; + hash = "sha256-xe8ude2JzrdmJqwzqLlxRO697IjcGuQgGG6c3nQ/drg="; }; propagatedBuildInputs = [ + bleak ecpy future hidapi + nfcpy pillow protobuf pycrypto diff --git a/pkgs/development/python-modules/nfcpy/default.nix b/pkgs/development/python-modules/nfcpy/default.nix new file mode 100644 index 000000000000..bf5f538da33c --- /dev/null +++ b/pkgs/development/python-modules/nfcpy/default.nix @@ -0,0 +1,61 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, libusb1 +, mock +, ndeflib +, pydes +, pyserial +, pytest-mock +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nfcpy"; + version = "1.0.4"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "nfcpy"; + repo = "nfcpy"; + rev = "refs/tags/v${version}"; + hash = "sha256-HFWOCiz6ISfxEeC6KPKNKGZoHvFjFGUn7QJWnwvJKYw="; + }; + + propagatedBuildInputs = [ + libusb1 + ndeflib + pydes + pyserial + ]; + + nativeCheckInputs = [ + mock + pytest-mock + pytestCheckHook + ]; + + pythonImportsCheck = [ + "nfc" + ]; + + disabledTestPaths = [ + # AttributeError: 'NoneType' object has no attribute 'EC_KEY' + "tests/test_llcp_llc.py" + "tests/test_llcp_sec.py" + # Doesn't work on Hydra + "tests/test_clf_udp.py" + ]; + + meta = with lib; { + description = "A Python module to read/write NFC tags or communicate with another NFC device"; + homepage = "https://github.com/nfcpy/nfcpy"; + changelog = "https://github.com/nfcpy/nfcpy/blob/v${version}/HISTORY.rst"; + license = licenses.eupl11; + maintainers = with maintainers; [ fab ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7e18d1cd6032..a519ef815bb1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6566,6 +6566,8 @@ self: super: with self; { nextdns = callPackage ../development/python-modules/nextdns { }; + nfcpy = callPackage ../development/python-modules/nfcpy { }; + nftables = toPythonModule (pkgs.nftables.override { python3 = python; withPython = true; From c2102b64256c4b45f70f08b6c5a1115b3a1d139c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 12:10:00 +0000 Subject: [PATCH 186/244] k6: 0.43.1 -> 0.44.0 --- pkgs/development/tools/k6/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/k6/default.nix b/pkgs/development/tools/k6/default.nix index f73d1dfdcaf4..bfa42df8ab7a 100644 --- a/pkgs/development/tools/k6/default.nix +++ b/pkgs/development/tools/k6/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k6"; - version = "0.43.1"; + version = "0.44.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JiXVDdCbXCsOSgYXIjJwXcgsbFPPoF/bY4nftaSgtdM="; + sha256 = "sha256-U7/PJzjIKIKKC3Ao7HtiSDaRK1L7ZGUz/KP2SIoZXfo="; }; subPackages = [ "./" ]; From 3e6667cb013f78fa87d62f4a8be238e23b36ee27 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 14:20:01 +0200 Subject: [PATCH 187/244] python311Packages.aliyun-python-sdk-cdn: 3.8.6 -> 3.8.7 Changelog: https://github.com/aliyun/aliyun-openapi-python-sdk/blob/master/aliyun-python-sdk-cdn/ChangeLog.txt --- .../python-modules/aliyun-python-sdk-cdn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix index 825f53aa583c..59f38108298c 100644 --- a/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix +++ b/pkgs/development/python-modules/aliyun-python-sdk-cdn/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "aliyun-python-sdk-cdn"; - version = "3.8.6"; + version = "3.8.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-WdpQfyPI3uegJaaIhdu1sXWgWFbyfpzXPKgRIXD+Dp0="; + hash = "sha256-/fhHR/6nepDOKsL69lztUkPqXrV091BLMTSn7O0jvPk="; }; propagatedBuildInputs = [ From 52801e32b2042cfc2e43ce7402e62029db12ae3f Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Thu, 4 May 2023 14:19:20 +0200 Subject: [PATCH 188/244] ocamlPackages.hacl-star-raw: fix build --- pkgs/development/ocaml-modules/hacl-star/raw.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/hacl-star/raw.nix b/pkgs/development/ocaml-modules/hacl-star/raw.nix index ce076ca779ad..027d6fe17854 100644 --- a/pkgs/development/ocaml-modules/hacl-star/raw.nix +++ b/pkgs/development/ocaml-modules/hacl-star/raw.nix @@ -38,12 +38,14 @@ stdenv.mkDerivation rec { runHook postBuild ''; + preInstall = '' + mkdir $out + mkdir -p $OCAMLFIND_DESTDIR/stublibs + ''; + installPhase = '' runHook preInstall - echo $OCAMLFIND_DESTDIR - mkdir $out - mkdir -p $OCAMLFIND_DESTDIR/stublibs make -C hacl-star-raw install runHook postInstall From b2bae4652b8674b5c655b50313647fa27e1fe346 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 12:36:51 +0000 Subject: [PATCH 189/244] libcouchbase: 3.3.5 -> 3.3.6 --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 6c4949237046..745c0e5eff60 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.3.5"; + version = "3.3.6"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-kaKraMdbA87+7TgauYMkIDSjy8kFpkFX0og9nkuoa84="; + sha256 = "sha256-sq/sPEZO6/9WYukOQ1w47ZTW0G8uLCJqnBS6mTD6P+M="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; From 8b9ea18d2823e315e1afe754aaff4b5f034d6be7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 14:39:33 +0200 Subject: [PATCH 190/244] python310Packages.django_4: 4.2 -> 4.2.1 https://docs.djangoproject.com/en/4.2/releases/4.2.1/ Fixes: CVE-2023-31047 --- pkgs/development/python-modules/django/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index 26b7391c51ef..f6b19807a87e 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -42,14 +42,14 @@ buildPythonPackage rec { pname = "Django"; - version = "4.2"; + version = "4.2.1"; format = "pyproject"; disabled = pythonOlder "3.10"; src = fetchPypi { inherit pname version; - hash = "sha256-w24qsSgk4qw2r6iyUVpwxTx3QvDW6u+nMR7DeVWNuZc="; + hash = "sha256-fvprH3gaYRmhCslLR5Te2Q24rMvngCKBzSb4Zk/+1Zw="; }; patches = [ From a7c20f3060defcfe8e017c0e02bbebbac377334f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 13:13:15 +0000 Subject: [PATCH 191/244] oven-media-engine: 0.15.9 -> 0.15.10 --- pkgs/servers/misc/oven-media-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index 2601ad233372..6df1a03764d4 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "oven-media-engine"; - version = "0.15.9"; + version = "0.15.10"; src = fetchFromGitHub { owner = "AirenSoft"; repo = "OvenMediaEngine"; rev = "v${version}"; - sha256 = "sha256-/sIPDP1Pa8tUpFGkbnTKFNBW1cQxc3i+8ghCpRFRDy8="; + sha256 = "sha256-gQ9Z8VMu5v4zEo4vtViNFG0QP5JooHsQxJPMOnZmVZM="; }; sourceRoot = "source/src"; From fb4c0490cc829763aa913fff853c462d3ca71c29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 15:15:49 +0200 Subject: [PATCH 192/244] pretender: add changelog to meta --- pkgs/tools/security/pretender/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pretender/default.nix b/pkgs/tools/security/pretender/default.nix index e51205ab37af..2f855c183275 100644 --- a/pkgs/tools/security/pretender/default.nix +++ b/pkgs/tools/security/pretender/default.nix @@ -10,8 +10,8 @@ buildGoModule rec { src = fetchFromGitHub { owner = "RedTeamPentesting"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-iWAejgI/q1lh8daybPItzQA91Ayg3ZgddGFXWm3cuww="; + rev = "refs/tags/v${version}"; + hash = "sha256-iWAejgI/q1lh8daybPItzQA91Ayg3ZgddGFXWm3cuww="; }; vendorHash = "sha256-uw3mpf27OH5uNKmvCFcTw+YFoxVEqT4Fz/CSl9Wjbv0="; @@ -22,6 +22,7 @@ buildGoModule rec { meta = with lib; { description = "Tool for handling machine-in-the-middle tasks"; homepage = "https://github.com/RedTeamPentesting/pretender"; + changelog = "https://github.com/RedTeamPentesting/pretender/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 912dd6977ef365518c7c092d980ac7160fbc6842 Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle Date: Thu, 4 May 2023 15:33:53 +0200 Subject: [PATCH 193/244] qc: remove platforms --- pkgs/development/tools/qc/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/qc/default.nix b/pkgs/development/tools/qc/default.nix index 4e9f35510829..14cdaf3ee355 100644 --- a/pkgs/development/tools/qc/default.nix +++ b/pkgs/development/tools/qc/default.nix @@ -35,6 +35,5 @@ buildGoModule rec { homepage = "https://github.com/qownnotes/qc"; license = licenses.mit; maintainers = with maintainers; [ pbek totoroot ]; - platforms = platforms.unix; }; } From 6a8cb457725a3f09d252abd5e8225fbcd846edcf Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Wed, 19 Apr 2023 11:58:22 +0200 Subject: [PATCH 194/244] playwright-test: init at 1.31.1 Adds "playwright test" command. --- .../web/playwright-test/default.nix | 17 + .../web/playwright-test/node-env.nix | 686 ++++++++++++++++++ .../web/playwright-test/node-packages.json | 3 + .../web/playwright-test/node-packages.nix | 60 ++ .../web/playwright-test/wrapped.nix | 29 + pkgs/top-level/all-packages.nix | 1 + 6 files changed, 796 insertions(+) create mode 100644 pkgs/development/web/playwright-test/default.nix create mode 100644 pkgs/development/web/playwright-test/node-env.nix create mode 100644 pkgs/development/web/playwright-test/node-packages.json create mode 100644 pkgs/development/web/playwright-test/node-packages.nix create mode 100644 pkgs/development/web/playwright-test/wrapped.nix diff --git a/pkgs/development/web/playwright-test/default.nix b/pkgs/development/web/playwright-test/default.nix new file mode 100644 index 000000000000..08f947ea46bc --- /dev/null +++ b/pkgs/development/web/playwright-test/default.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.11.1. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + +let + nodeEnv = import ./node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; +} diff --git a/pkgs/development/web/playwright-test/node-env.nix b/pkgs/development/web/playwright-test/node-env.nix new file mode 100644 index 000000000000..5dad9ec63d47 --- /dev/null +++ b/pkgs/development/web/playwright-test/node-env.nix @@ -0,0 +1,686 @@ +# This file originates from node2nix + +{lib, stdenv, nodejs, python2, pkgs, libtool, runCommand, writeTextFile, writeShellScript}: + +let + # Workaround to cope with utillinux in Nixpkgs 20.09 and util-linux in Nixpkgs master + utillinux = if pkgs ? utillinux then pkgs.utillinux else pkgs.util-linux; + + python = if nodejs ? python then nodejs.python else python2; + + # Create a tar wrapper that filters all the 'Ignoring unknown extended header keyword' noise + tarWrapper = runCommand "tarWrapper" {} '' + mkdir -p $out/bin + + cat > $out/bin/tar <> $out/nix-support/hydra-build-products + ''; + }; + + # Common shell logic + installPackage = writeShellScript "install-package" '' + installPackage() { + local packageName=$1 src=$2 + + local strippedName + + local DIR=$PWD + cd $TMPDIR + + unpackFile $src + + # Make the base dir in which the target dependency resides first + mkdir -p "$(dirname "$DIR/$packageName")" + + if [ -f "$src" ] + then + # Figure out what directory has been unpacked + packageDir="$(find . -maxdepth 1 -type d | tail -1)" + + # Restore write permissions to make building work + find "$packageDir" -type d -exec chmod u+x {} \; + chmod -R u+w "$packageDir" + + # Move the extracted tarball into the output folder + mv "$packageDir" "$DIR/$packageName" + elif [ -d "$src" ] + then + # Get a stripped name (without hash) of the source directory. + # On old nixpkgs it's already set internally. + if [ -z "$strippedName" ] + then + strippedName="$(stripHash $src)" + fi + + # Restore write permissions to make building work + chmod -R u+w "$strippedName" + + # Move the extracted directory into the output folder + mv "$strippedName" "$DIR/$packageName" + fi + + # Change to the package directory to install dependencies + cd "$DIR/$packageName" + } + ''; + + # Bundle the dependencies of the package + # + # Only include dependencies if they don't exist. They may also be bundled in the package. + includeDependencies = {dependencies}: + lib.optionalString (dependencies != []) ( + '' + mkdir -p node_modules + cd node_modules + '' + + (lib.concatMapStrings (dependency: + '' + if [ ! -e "${dependency.packageName}" ]; then + ${composePackage dependency} + fi + '' + ) dependencies) + + '' + cd .. + '' + ); + + # Recursively composes the dependencies of a package + composePackage = { name, packageName, src, dependencies ? [], ... }@args: + builtins.addErrorContext "while evaluating node package '${packageName}'" '' + installPackage "${packageName}" "${src}" + ${includeDependencies { inherit dependencies; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + ''; + + pinpointDependencies = {dependencies, production}: + let + pinpointDependenciesFromPackageJSON = writeTextFile { + name = "pinpointDependencies.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function resolveDependencyVersion(location, name) { + if(location == process.env['NIX_STORE']) { + return null; + } else { + var dependencyPackageJSON = path.join(location, "node_modules", name, "package.json"); + + if(fs.existsSync(dependencyPackageJSON)) { + var dependencyPackageObj = JSON.parse(fs.readFileSync(dependencyPackageJSON)); + + if(dependencyPackageObj.name == name) { + return dependencyPackageObj.version; + } + } else { + return resolveDependencyVersion(path.resolve(location, ".."), name); + } + } + } + + function replaceDependencies(dependencies) { + if(typeof dependencies == "object" && dependencies !== null) { + for(var dependency in dependencies) { + var resolvedVersion = resolveDependencyVersion(process.cwd(), dependency); + + if(resolvedVersion === null) { + process.stderr.write("WARNING: cannot pinpoint dependency: "+dependency+", context: "+process.cwd()+"\n"); + } else { + dependencies[dependency] = resolvedVersion; + } + } + } + } + + /* Read the package.json configuration */ + var packageObj = JSON.parse(fs.readFileSync('./package.json')); + + /* Pinpoint all dependencies */ + replaceDependencies(packageObj.dependencies); + if(process.argv[2] == "development") { + replaceDependencies(packageObj.devDependencies); + } + else { + packageObj.devDependencies = {}; + } + replaceDependencies(packageObj.optionalDependencies); + replaceDependencies(packageObj.peerDependencies); + + /* Write the fixed package.json file */ + fs.writeFileSync("package.json", JSON.stringify(packageObj, null, 2)); + ''; + }; + in + '' + node ${pinpointDependenciesFromPackageJSON} ${if production then "production" else "development"} + + ${lib.optionalString (dependencies != []) + '' + if [ -d node_modules ] + then + cd node_modules + ${lib.concatMapStrings (dependency: pinpointDependenciesOfPackage dependency) dependencies} + cd .. + fi + ''} + ''; + + # Recursively traverses all dependencies of a package and pinpoints all + # dependencies in the package.json file to the versions that are actually + # being used. + + pinpointDependenciesOfPackage = { packageName, dependencies ? [], production ? true, ... }@args: + '' + if [ -d "${packageName}" ] + then + cd "${packageName}" + ${pinpointDependencies { inherit dependencies production; }} + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + fi + ''; + + # Extract the Node.js source code which is used to compile packages with + # native bindings + nodeSources = runCommand "node-sources" {} '' + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} + mv node-* $out + ''; + + # Script that adds _integrity fields to all package.json files to prevent NPM from consulting the cache (that is empty) + addIntegrityFieldsScript = writeTextFile { + name = "addintegrityfields.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + function augmentDependencies(baseDir, dependencies) { + for(var dependencyName in dependencies) { + var dependency = dependencies[dependencyName]; + + // Open package.json and augment metadata fields + var packageJSONDir = path.join(baseDir, "node_modules", dependencyName); + var packageJSONPath = path.join(packageJSONDir, "package.json"); + + if(fs.existsSync(packageJSONPath)) { // Only augment packages that exist. Sometimes we may have production installs in which development dependencies can be ignored + console.log("Adding metadata fields to: "+packageJSONPath); + var packageObj = JSON.parse(fs.readFileSync(packageJSONPath)); + + if(dependency.integrity) { + packageObj["_integrity"] = dependency.integrity; + } else { + packageObj["_integrity"] = "sha1-000000000000000000000000000="; // When no _integrity string has been provided (e.g. by Git dependencies), add a dummy one. It does not seem to harm and it bypasses downloads. + } + + if(dependency.resolved) { + packageObj["_resolved"] = dependency.resolved; // Adopt the resolved property if one has been provided + } else { + packageObj["_resolved"] = dependency.version; // Set the resolved version to the version identifier. This prevents NPM from cloning Git repositories. + } + + if(dependency.from !== undefined) { // Adopt from property if one has been provided + packageObj["_from"] = dependency.from; + } + + fs.writeFileSync(packageJSONPath, JSON.stringify(packageObj, null, 2)); + } + + // Augment transitive dependencies + if(dependency.dependencies !== undefined) { + augmentDependencies(packageJSONDir, dependency.dependencies); + } + } + } + + if(fs.existsSync("./package-lock.json")) { + var packageLock = JSON.parse(fs.readFileSync("./package-lock.json")); + + if(![1, 2].includes(packageLock.lockfileVersion)) { + process.stderr.write("Sorry, I only understand lock file versions 1 and 2!\n"); + process.exit(1); + } + + if(packageLock.dependencies !== undefined) { + augmentDependencies(".", packageLock.dependencies); + } + } + ''; + }; + + # Reconstructs a package-lock file from the node_modules/ folder structure and package.json files with dummy sha1 hashes + reconstructPackageLock = writeTextFile { + name = "reconstructpackagelock.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var lockObj = { + name: packageObj.name, + version: packageObj.version, + lockfileVersion: 2, + requires: true, + packages: { + "": { + name: packageObj.name, + version: packageObj.version, + license: packageObj.license, + bin: packageObj.bin, + dependencies: packageObj.dependencies, + engines: packageObj.engines, + optionalDependencies: packageObj.optionalDependencies + } + }, + dependencies: {} + }; + + function augmentPackageJSON(filePath, packages, dependencies) { + var packageJSON = path.join(filePath, "package.json"); + if(fs.existsSync(packageJSON)) { + var packageObj = JSON.parse(fs.readFileSync(packageJSON)); + packages[filePath] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: packageObj.dependencies, + engines: packageObj.engines, + optionalDependencies: packageObj.optionalDependencies + }; + dependencies[packageObj.name] = { + version: packageObj.version, + integrity: "sha1-000000000000000000000000000=", + dependencies: {} + }; + processDependencies(path.join(filePath, "node_modules"), packages, dependencies[packageObj.name].dependencies); + } + } + + function processDependencies(dir, packages, dependencies) { + if(fs.existsSync(dir)) { + var files = fs.readdirSync(dir); + + files.forEach(function(entry) { + var filePath = path.join(dir, entry); + var stats = fs.statSync(filePath); + + if(stats.isDirectory()) { + if(entry.substr(0, 1) == "@") { + // When we encounter a namespace folder, augment all packages belonging to the scope + var pkgFiles = fs.readdirSync(filePath); + + pkgFiles.forEach(function(entry) { + if(stats.isDirectory()) { + var pkgFilePath = path.join(filePath, entry); + augmentPackageJSON(pkgFilePath, packages, dependencies); + } + }); + } else { + augmentPackageJSON(filePath, packages, dependencies); + } + } + }); + } + } + + processDependencies("node_modules", lockObj.packages, lockObj.dependencies); + + fs.writeFileSync("package-lock.json", JSON.stringify(lockObj, null, 2)); + ''; + }; + + # Script that links bins defined in package.json to the node_modules bin directory + # NPM does not do this for top-level packages itself anymore as of v7 + linkBinsScript = writeTextFile { + name = "linkbins.js"; + text = '' + var fs = require('fs'); + var path = require('path'); + + var packageObj = JSON.parse(fs.readFileSync("package.json")); + + var nodeModules = Array(packageObj.name.split("/").length).fill("..").join(path.sep); + + if(packageObj.bin !== undefined) { + fs.mkdirSync(path.join(nodeModules, ".bin")) + + if(typeof packageObj.bin == "object") { + Object.keys(packageObj.bin).forEach(function(exe) { + if(fs.existsSync(packageObj.bin[exe])) { + console.log("linking bin '" + exe + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.bin[exe]), + path.join(nodeModules, ".bin", exe) + ); + } + else { + console.log("skipping non-existent bin '" + exe + "'"); + } + }) + } + else { + if(fs.existsSync(packageObj.bin)) { + console.log("linking bin '" + packageObj.bin + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.bin), + path.join(nodeModules, ".bin", packageObj.name.split("/").pop()) + ); + } + else { + console.log("skipping non-existent bin '" + packageObj.bin + "'"); + } + } + } + else if(packageObj.directories !== undefined && packageObj.directories.bin !== undefined) { + fs.mkdirSync(path.join(nodeModules, ".bin")) + + fs.readdirSync(packageObj.directories.bin).forEach(function(exe) { + if(fs.existsSync(path.join(packageObj.directories.bin, exe))) { + console.log("linking bin '" + exe + "'"); + fs.symlinkSync( + path.join("..", packageObj.name, packageObj.directories.bin, exe), + path.join(nodeModules, ".bin", exe) + ); + } + else { + console.log("skipping non-existent bin '" + exe + "'"); + } + }) + } + ''; + }; + + prepareAndInvokeNPM = {packageName, bypassCache, reconstructLock, npmFlags, production}: + let + forceOfflineFlag = if bypassCache then "--offline" else "--registry http://www.example.com"; + in + '' + # Pinpoint the versions of all dependencies to the ones that are actually being used + echo "pinpointing versions of dependencies..." + source $pinpointDependenciesScriptPath + + # Patch the shebangs of the bundled modules to prevent them from + # calling executables outside the Nix store as much as possible + patchShebangs . + + # Deploy the Node.js package by running npm install. Since the + # dependencies have been provided already by ourselves, it should not + # attempt to install them again, which is good, because we want to make + # it Nix's responsibility. If it needs to install any dependencies + # anyway (e.g. because the dependency parameters are + # incomplete/incorrect), it fails. + # + # The other responsibilities of NPM are kept -- version checks, build + # steps, postprocessing etc. + + export HOME=$TMPDIR + cd "${packageName}" + runHook preRebuild + + ${lib.optionalString bypassCache '' + ${lib.optionalString reconstructLock '' + if [ -f package-lock.json ] + then + echo "WARNING: Reconstruct lock option enabled, but a lock file already exists!" + echo "This will most likely result in version mismatches! We will remove the lock file and regenerate it!" + rm package-lock.json + else + echo "No package-lock.json file found, reconstructing..." + fi + + node ${reconstructPackageLock} + ''} + + node ${addIntegrityFieldsScript} + ''} + + npm ${forceOfflineFlag} --nodedir=${nodeSources} ${npmFlags} ${lib.optionalString production "--production"} rebuild + + runHook postRebuild + + if [ "''${dontNpmInstall-}" != "1" ] + then + # NPM tries to download packages even when they already exist if npm-shrinkwrap is used. + rm -f npm-shrinkwrap.json + + npm ${forceOfflineFlag} --nodedir=${nodeSources} --no-bin-links --ignore-scripts ${npmFlags} ${lib.optionalString production "--production"} install + fi + + # Link executables defined in package.json + node ${linkBinsScript} + ''; + + # Builds and composes an NPM package including all its dependencies + buildNodePackage = + { name + , packageName + , version ? null + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , preRebuild ? "" + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , meta ? {} + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; + in + stdenv.mkDerivation ({ + name = "${name}${if version == null then "" else "-${version}"}"; + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit nodejs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall preRebuild unpackPhase buildPhase; + + compositionScript = composePackage args; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "compositionScript" "pinpointDependenciesScript" ]; + + installPhase = '' + source ${installPackage} + + # Create and enter a root node_modules/ folder + mkdir -p $out/lib/node_modules + cd $out/lib/node_modules + + # Compose the package and all its dependencies + source $compositionScriptPath + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Create symlink to the deployed executable folder, if applicable + if [ -d "$out/lib/node_modules/.bin" ] + then + ln -s $out/lib/node_modules/.bin $out/bin + + # Patch the shebang lines of all the executables + ls $out/bin/* | while read i + do + file="$(readlink -f "$i")" + chmod u+rwx "$file" + patchShebangs "$file" + done + fi + + # Create symlinks to the deployed manual page folders, if applicable + if [ -d "$out/lib/node_modules/${packageName}/man" ] + then + mkdir -p $out/share + for dir in "$out/lib/node_modules/${packageName}/man/"* + do + mkdir -p $out/share/man/$(basename "$dir") + for page in "$dir"/* + do + ln -s $page $out/share/man/$(basename "$dir") + done + done + fi + + # Run post install hook, if provided + runHook postInstall + ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; + } // extraArgs); + + # Builds a node environment (a node_modules folder and a set of binaries) + buildNodeDependencies = + { name + , packageName + , version ? null + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" ]; + in + stdenv.mkDerivation ({ + name = "node-dependencies-${name}${if version == null then "" else "-${version}"}"; + + buildInputs = [ tarWrapper python nodejs ] + ++ lib.optional (stdenv.isLinux) utillinux + ++ lib.optional (stdenv.isDarwin) libtool + ++ buildInputs; + + inherit dontStrip; # Stripping may fail a build for some package deployments + inherit dontNpmInstall unpackPhase buildPhase; + + includeScript = includeDependencies { inherit dependencies; }; + pinpointDependenciesScript = pinpointDependenciesOfPackage args; + + passAsFile = [ "includeScript" "pinpointDependenciesScript" ]; + + installPhase = '' + source ${installPackage} + + mkdir -p $out/${packageName} + cd $out/${packageName} + + source $includeScriptPath + + # Create fake package.json to make the npm commands work properly + cp ${src}/package.json . + chmod 644 package.json + ${lib.optionalString bypassCache '' + if [ -f ${src}/package-lock.json ] + then + cp ${src}/package-lock.json . + chmod 644 package-lock.json + fi + ''} + + # Go to the parent folder to make sure that all packages are pinpointed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + ${prepareAndInvokeNPM { inherit packageName bypassCache reconstructLock npmFlags production; }} + + # Expose the executables that were installed + cd .. + ${lib.optionalString (builtins.substring 0 1 packageName == "@") "cd .."} + + mv ${packageName} lib + ln -s $out/lib/node_modules/.bin $out/bin + ''; + } // extraArgs); + + # Builds a development shell + buildNodeShell = + { name + , packageName + , version ? null + , src + , dependencies ? [] + , buildInputs ? [] + , production ? true + , npmFlags ? "" + , dontNpmInstall ? false + , bypassCache ? false + , reconstructLock ? false + , dontStrip ? true + , unpackPhase ? "true" + , buildPhase ? "true" + , ... }@args: + + let + nodeDependencies = buildNodeDependencies args; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "unpackPhase" "buildPhase" ]; + in + stdenv.mkDerivation ({ + name = "node-shell-${name}${if version == null then "" else "-${version}"}"; + + buildInputs = [ python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ buildInputs; + buildCommand = '' + mkdir -p $out/bin + cat > $out/bin/shell < Date: Thu, 4 May 2023 13:43:00 +0000 Subject: [PATCH 195/244] treesheets: unstable-2023-04-17 -> unstable-2023-05-03 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index dd7290636a92..21f6b396a70b 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "unstable-2023-04-17"; + version = "unstable-2023-05-03"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "49b7592b6b59412d14884d19d9911d59b13f8c9f"; - sha256 = "PS/g/ZdeCz/BHud6WtMkzvVQi+TBqEZLZaw05xRTmrQ="; + rev = "b942b919a2f6b4e6d04ea62a4a82623f9e815cdd"; + sha256 = "rfYEpbhfWiviojqWWMhmYjpDh04hfRPGPdDQtcqhr8o="; }; nativeBuildInputs = [ From 10b5a8e4ba31448af0928e691019c0491fbbe64d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 14:12:07 +0000 Subject: [PATCH 196/244] automatic-timezoned: 1.0.85 -> 1.0.87 --- pkgs/tools/system/automatic-timezoned/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 36eb6775616a..d1948b0f4b27 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.85"; + version = "1.0.87"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YHcPAYJVodD9b8FFMhqAI6AOuuB4IHCuc+hCV6foUy8="; + sha256 = "sha256-em+uGqws+cwHFIh4G8TzBbXaNNdjlhQpnjqxsGlgSo0="; }; - cargoHash = "sha256-NcQgpzuUwhsv0HvV/T1XOy8H3ktGMfxml/bKs/2ChgQ="; + cargoHash = "sha256-s/QWLddWj0SfAK8reoi7QHPEsmNMa0igtV2TDwqA4WA="; meta = with lib; { description = "Automatically update system timezone based on location"; From a70c7aba366aea14866c4114af7d29fd8eaa8b1e Mon Sep 17 00:00:00 2001 From: Rene Hollander Date: Mon, 1 May 2023 19:35:43 +0200 Subject: [PATCH 197/244] nixos/networkd: Fix typo in usage sectionBridgeVLAN The `B` in bridge should be capitalized. It currently leads to an evuluation error: ``` error: attribute 'sectionbridgeVLAN' missing at /nix/store/7wmrwj0sgwg1iivxk43lpkqjhji57mq7-source/nixos/modules/system/boot/networkd.nix:2386:56: 2385| example = { VLAN = "10-20"; }; 2386| type = types.addCheck (types.attrsOf unitOption) check.network.sectionbridgeVLAN; | ^ 2387| description = lib.mdDoc '' Did you mean sectionBridgeVLAN? ``` --- nixos/modules/system/boot/networkd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index e6b96433e841..2341b2ab83d3 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -2383,7 +2383,7 @@ let bridgeVLANConfig = mkOption { default = {}; example = { VLAN = "10-20"; }; - type = types.addCheck (types.attrsOf unitOption) check.network.sectionbridgeVLAN; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionBridgeVLAN; description = lib.mdDoc '' Each attribute in this set specifies an option in the `[BridgeVLAN]` section of the unit. See From ad29cf7d850ce80b99dcdec76a3d7a9adbe449ee Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 May 2023 17:22:39 +0300 Subject: [PATCH 198/244] python311Packages.pynisher: update homepage --- pkgs/development/python-modules/pynisher/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pynisher/default.nix b/pkgs/development/python-modules/pynisher/default.nix index 8dc5d1eaa9f6..64fb8013726f 100644 --- a/pkgs/development/python-modules/pynisher/default.nix +++ b/pkgs/development/python-modules/pynisher/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module intended to limit a functions resources"; - homepage = "https://github.com/sfalkner/pynisher"; + homepage = "https://github.com/automl/pynisher"; license = licenses.mit; maintainers = with maintainers; [ psyanticy ]; }; From 2b615ebf84def4b295484bc64dc225226c28279c Mon Sep 17 00:00:00 2001 From: tilpner Date: Thu, 4 May 2023 16:34:19 +0200 Subject: [PATCH 199/244] maintainers: update tilpner --- maintainers/maintainer-list.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7e4224d529c3..e9f8aef688e5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15644,10 +15644,11 @@ githubId = 18621411; }; tilpner = { - email = "till@hoeppner.ws"; + name = "Till Höppner"; + email = "nixpkgs@tilpner.com"; + matrix = "@tilpner:tx0.co"; github = "tilpner"; githubId = 4322055; - name = "Till Höppner"; }; timbertson = { email = "tim@gfxmonk.net"; From 96726133820f5975e5c8c0bb4727e8a1527c2aca Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 4 May 2023 10:24:18 -0400 Subject: [PATCH 200/244] cargo-ui: 0.3.2 -> 0.3.3 Changelog: https://github.com/slint-ui/cargo-ui/blob/v0.3.3/CHANGELOG.md --- .../tools/rust/cargo-ui/default.nix | 27 ++---- .../tools/rust/cargo-ui/update-git2.patch | 94 ------------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 10 insertions(+), 113 deletions(-) delete mode 100644 pkgs/development/tools/rust/cargo-ui/update-git2.patch diff --git a/pkgs/development/tools/rust/cargo-ui/default.nix b/pkgs/development/tools/rust/cargo-ui/default.nix index 1eac0e90577a..764648055bdb 100644 --- a/pkgs/development/tools/rust/cargo-ui/default.nix +++ b/pkgs/development/tools/rust/cargo-ui/default.nix @@ -2,8 +2,7 @@ , rustPlatform , fetchCrate , pkg-config -, makeWrapper -, libgit2 +, libgit2_1_5 , openssl , stdenv , expat @@ -15,27 +14,21 @@ rustPlatform.buildRustPackage rec { pname = "cargo-ui"; - version = "0.3.2"; + version = "0.3.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-IL7BxiJg6eTuFM0pJ3qLxYCVofE/RjmgQjvOW96QF9A="; + hash = "sha256-M/ljgtTHMSc7rY/a8CpKGNuOSdVDwRt6+tzPPHdpKOw="; }; - # update dependencies so it is compatible with libgit2 1.5 - # libgit2-sys 0.14.3 is only compatible with libgit2 1.4 - cargoPatches = [ ./update-git2.patch ]; - - cargoSha256 = "sha256-i/ERVPzAWtN4884051VoA/ItypyURpHb/Py6w3KDOAo="; + cargoHash = "sha256-u3YqXQZCfveSBjxdWb+GC0IA9bpruAYQdxX1zanT3fw="; nativeBuildInputs = [ pkg-config - ] ++ lib.optionals stdenv.isLinux [ - makeWrapper ]; buildInputs = [ - libgit2 + libgit2_1_5 openssl ] ++ lib.optionals stdenv.isLinux [ expat @@ -47,14 +40,12 @@ rustPlatform.buildRustPackage rec { xorg.libXrandr xorg.libxcb ] ++ lib.optionals stdenv.isDarwin [ - # dark-light doesn't build on apple sdk < 10.14 - # see https://github.com/frewsxcv/rust-dark-light/issues/14 - darwin.apple_sdk_11_0.frameworks.AppKit + darwin.apple_sdk.frameworks.AppKit ]; - postInstall = lib.optionalString stdenv.isLinux '' - wrapProgram $out/bin/cargo-ui \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]} + postFixup = lib.optionalString stdenv.isLinux '' + patchelf $out/bin/cargo-ui \ + --add-rpath ${lib.makeLibraryPath [ fontconfig libGL ]} ''; meta = with lib; { diff --git a/pkgs/development/tools/rust/cargo-ui/update-git2.patch b/pkgs/development/tools/rust/cargo-ui/update-git2.patch deleted file mode 100644 index 4636a7e42c16..000000000000 --- a/pkgs/development/tools/rust/cargo-ui/update-git2.patch +++ /dev/null @@ -1,94 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -720,9 +720,9 @@ dependencies = [ - - [[package]] - name = "crates-index" --version = "0.18.7" -+version = "0.18.10" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0044896374c388ccbf1497dad6384bf6111dbcad9d7069506df7450ce9b62ea3" -+checksum = "3447ec855b0c44cad8eedb3d32b53837f233894d5f4584a2648a7ebc5d3feef4" - dependencies = [ - "git2", - "hex", -@@ -1387,9 +1387,9 @@ dependencies = [ - - [[package]] - name = "git2" --version = "0.14.3" -+version = "0.15.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "5e77a14ffc6ba4ad5188d6cf428894c4fcfda725326b37558f35bb677e712cec" -+checksum = "2994bee4a3a6a51eb90c218523be382fd7ea09b16380b9312e9dbe955ff7c7d1" - dependencies = [ - "bitflags", - "libc", -@@ -1884,9 +1884,9 @@ checksum = "5916d2ae698f6de9bfb891ad7a8d65c09d232dc58cc4ac433c7da3b2fd84bc2b" - - [[package]] - name = "libgit2-sys" --version = "0.13.3+1.4.2" -+version = "0.14.0+1.5.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c24d36c3ac9b9996a2418d6bf428cc0bc5d1a814a84303fc60986088c5ed60de" -+checksum = "47a00859c70c8a4f7218e6d1cc32875c4b55f6799445b842b0d8ed5e4c3d959b" - dependencies = [ - "cc", - "libc", -@@ -2712,9 +2712,9 @@ dependencies = [ - - [[package]] - name = "rayon" --version = "1.5.2" -+version = "1.5.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" -+checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" - dependencies = [ - "autocfg", - "crossbeam-deque", -diff --git a/Cargo.toml b/Cargo.toml -index ca5269d..6fa4ec2 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -33,7 +33,7 @@ version = "1.0.53" - version = "0.14" - - [dependencies.crates-index] --version = "0.18.0" -+version = "0.18.10" - - [dependencies.dunce] - version = "1.0.2" -@@ -42,7 +42,7 @@ version = "1.0.2" - version = "0.3" - - [dependencies.git2] --version = "0.14.3" -+version = "0.15.0" - - [dependencies.itertools] - version = "0.10" -diff --git a/Cargo.toml.orig b/Cargo.toml.orig -index 52eadbd..ef8aa7c 100644 ---- a/Cargo.toml.orig -+++ b/Cargo.toml.orig -@@ -22,7 +22,7 @@ default = ["slint-backend-qt", "slint-backend-gl-all"] - [dependencies] - anyhow = "1.0.53" - cargo_metadata = "0.14" --crates-index = { version = "0.18.0" } -+crates-index = { version = "0.18.10" } - dunce = "1.0.2" - futures = "0.3" - itertools = "0.10" -@@ -34,7 +34,7 @@ shlex = "1.1" - slint = { version = "0.2.4", default-features = false, features = [ "compat-0-2-0" ] } - tokio = { version = "1.16.1", features= ["full"] } - toml_edit = "0.14.3" --git2 = "0.14.3" -+git2 = "0.15.0" - - [build-dependencies] - slint-build = { version = "0.2.4" } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11ac14eed425..7bfec2ab49de 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16273,7 +16273,7 @@ with pkgs; cargo-udeps = callPackage ../development/tools/rust/cargo-udeps { inherit (darwin.apple_sdk.frameworks) CoreServices Security SystemConfiguration; }; - cargo-ui = darwin.apple_sdk_11_0.callPackage ../development/tools/rust/cargo-ui { }; + cargo-ui = callPackage ../development/tools/rust/cargo-ui { }; cargo-unused-features = callPackage ../development/tools/rust/cargo-unused-features { }; cargo-tauri = callPackage ../development/tools/rust/cargo-tauri { }; From fcbb2f74fe1c892ca3d8cd8d7f55b1e9d5493fb5 Mon Sep 17 00:00:00 2001 From: Phil Clifford Date: Thu, 4 May 2023 09:00:59 +0100 Subject: [PATCH 201/244] maintainers: add philclifford --- maintainers/maintainer-list.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7e4224d529c3..77248c3b6ad4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -12180,6 +12180,16 @@ githubId = 581269; name = "Philip Potter"; }; + philclifford = { + email = "philip.clifford@gmail.com"; + matrix = "@phil8o:matrix.org"; + github = "philclifford"; + githubId = 8797027; + keys = [{ + fingerprint = "FC15 E59F 0CFA 9329 101B 71D9 92F7 A790 E9BA F1F7"; + }]; + name = "Phil Clifford"; + }; phile314 = { email = "nix@314.ch"; github = "phile314"; From af599f5b8ef0a091f26e4f54130d1b703dee3df2 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Wed, 3 May 2023 17:12:40 +0200 Subject: [PATCH 202/244] paperless-ngx: 1.14.2 -> 1.14.4 Small enhancement (better keyboard nav for filter/edit dropdowns/visual changes) and various fixes: https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.14.3 https://github.com/paperless-ngx/paperless-ngx/releases/tag/v1.14.4 --- pkgs/applications/office/paperless-ngx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 1eab6d808656..a60f926278ef 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -17,13 +17,13 @@ }: let - version = "1.14.2"; + version = "1.14.4"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-QpSp+8gsFApp4i4PajAQHHYZgwej/gusAw4J3Zetk4M="; + hash = "sha256-9+8XqENpSdsND6g59oJkVoCe5tJ1Pwo8HD7Cszv/t7o="; }; # Use specific package versions required by paperless-ngx @@ -82,7 +82,7 @@ let pname = "paperless-ngx-frontend"; inherit version src; - npmDepsHash = "sha256-wUlybMxnXLNmeu2z+RFFOHVEhH12XD3ZfMo5K+HSBpY="; + npmDepsHash = "sha256-XTk4DpQAU/rI2XoUvLm0KVjuXFWdz2wb2EAg8EBVEdU="; nativeBuildInputs = [ python3 From 286e0ac8dfe4e135cc71420a1b30b9ff2b5e6e74 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 16:29:27 +0000 Subject: [PATCH 203/244] lobster: 2023.4 -> 2023.5 --- pkgs/development/compilers/lobster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/lobster/default.nix b/pkgs/development/compilers/lobster/default.nix index 6bee313e3677..a89a406bc8d6 100644 --- a/pkgs/development/compilers/lobster/default.nix +++ b/pkgs/development/compilers/lobster/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "lobster"; - version = "2023.4"; + version = "2023.5"; src = fetchFromGitHub { owner = "aardappel"; repo = "lobster"; rev = "v${version}"; - sha256 = "sha256-/TVVdBDVx+3ySqa4MrRHFadLkvVhOY0+lw/yGy/X9W8="; + sha256 = "sha256-3jF5Ab8P8w1WxgsE8d0ByldzL/YVt/fvLVGKOEzBzPI="; }; nativeBuildInputs = [ cmake ]; From 0f4252aa0aedd008ebb0845280eaf07e913f85e7 Mon Sep 17 00:00:00 2001 From: OTABI Tomoya Date: Fri, 5 May 2023 01:35:39 +0900 Subject: [PATCH 204/244] tone: fix build, update description, restrict the platform to "x86_64-linux" (#229434) --- pkgs/applications/audio/tone/default.nix | 13 ++++--------- pkgs/applications/audio/tone/nuget-deps.nix | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/tone/default.nix b/pkgs/applications/audio/tone/default.nix index c235fff4b724..230d78ddbfe9 100644 --- a/pkgs/applications/audio/tone/default.nix +++ b/pkgs/applications/audio/tone/default.nix @@ -1,11 +1,6 @@ -{ lib, stdenv, fetchFromGitHub, fetchNuGet, linkFarmFromDrvs, buildDotnetModule, ffmpeg-full, msbuild, dotnetCorePackages }: +{ lib, fetchFromGitHub, buildDotnetModule, ffmpeg-full, dotnetCorePackages }: -let - nugetSource = linkFarmFromDrvs "nuget-packages" ( - import ./nuget-deps.nix { inherit fetchNuGet; } - ); - -in buildDotnetModule rec { +buildDotnetModule rec { pname = "tone"; version = "0.1.5"; @@ -31,9 +26,9 @@ in buildDotnetModule rec { meta = with lib; { homepage = "https://github.com/sandreas/tone"; - description = "tone is a cross platform utility to dump and modify audio metadata for a wide variety of formats"; + description = "A cross platform utility to dump and modify audio metadata for a wide variety of formats"; license = licenses.asl20; maintainers = [ maintainers.jvanbruegge ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/applications/audio/tone/nuget-deps.nix b/pkgs/applications/audio/tone/nuget-deps.nix index 4b372fe51244..3093809f2bd3 100644 --- a/pkgs/applications/audio/tone/nuget-deps.nix +++ b/pkgs/applications/audio/tone/nuget-deps.nix @@ -28,7 +28,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "7.0.0"; sha256 = "1liyprh0zha2vgmqh92n8kkjz61zwhr7g16f0gmr297z2rg1j5pj"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "7.0.0"; sha256 = "1b4km9fszid9vp2zb3gya5ni9fn8bq62bzaas2ck2r7gs0sdys80"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.15"; sha256 = "0lcz7dniv3arkdzlmjgr9168rjb0an9xf3v3m3pdwjmy8yaipfba"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.16"; sha256 = "0rn46d2lrdyv8cjl2xxjj8zgahv1x4mz4z56vvw6zqfa10g5cnjh"; }) (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.2"; sha256 = "1p9splg1min274dpz7xdfgzrwkyfd3xlkygwpr1xgjvvyjvs6b0i"; }) (fetchNuGet { pname = "Sandreas.AudioMetadata"; version = "0.1.1"; sha256 = "11ibv23h7qj5qshibmlsqmjca51dqbhib9p1gz66c5kqhk7ci38j"; }) (fetchNuGet { pname = "Sandreas.Files"; version = "1.1.2"; sha256 = "08qk229q2y1dpdxdnp8xi9mgk8fgpjxrxm4z6ak8n09npp67nhn0"; }) From 2562718511cd8fa309f020529f34081cfa334385 Mon Sep 17 00:00:00 2001 From: natsukium Date: Fri, 5 May 2023 01:54:37 +0900 Subject: [PATCH 205/244] python3Packages.pyowm: fix build --- pkgs/development/python-modules/pyowm/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/pyowm/default.nix b/pkgs/development/python-modules/pyowm/default.nix index c43107599d29..d95cda12d600 100644 --- a/pkgs/development/python-modules/pyowm/default.nix +++ b/pkgs/development/python-modules/pyowm/default.nix @@ -6,6 +6,7 @@ , pythonOlder , requests , pytestCheckHook +, pythonRelaxDepsHook }: buildPythonPackage rec { @@ -22,6 +23,14 @@ buildPythonPackage rec { hash = "sha256-cSOhm3aDksLBChZzgw1gjUjLQkElR2/xGFMOb9K9RME="; }; + pythonRelaxDeps = [ + "geojson" + ]; + + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ geojson pysocks From b6b2079faa9480711c58059169919227d328fad3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 16:56:30 +0000 Subject: [PATCH 206/244] exoscale-cli: 1.67.0 -> 1.68.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index 81f801a697ba..bb69242acf90 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "exoscale-cli"; - version = "1.67.0"; + version = "1.68.0"; src = fetchFromGitHub { owner = "exoscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-nJhz9hRyUhYxb9Yes7zwnseDySONrpu2X1m1gGtbzpE="; + sha256 = "sha256-GDnHwHKbe+8Qv2zxcKqHQ9s9dS9jvE6qNXe35FeQEKQ="; }; vendorHash = null; From f701114548ba22bdf03f465dcc25649d8bd0f5c4 Mon Sep 17 00:00:00 2001 From: rogarb Date: Mon, 24 Apr 2023 17:04:33 +0200 Subject: [PATCH 207/244] hexdiff: init at unstable-2018-01-24 A command line tool to display differences in binary files using a hexadecimal formatting. https://github.com/ahroach/hexdiff --- pkgs/tools/misc/hexdiff/default.nix | 39 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/misc/hexdiff/default.nix diff --git a/pkgs/tools/misc/hexdiff/default.nix b/pkgs/tools/misc/hexdiff/default.nix new file mode 100644 index 000000000000..8205cfdd0ab4 --- /dev/null +++ b/pkgs/tools/misc/hexdiff/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation { + pname = "hexdiff"; + version = "unstable-2018-01-24"; + + src = fetchFromGitHub { + owner = "ahroach"; + repo = "hexdiff"; + rev = "3e96f27e65167c619ede35ab04232163dc273e69"; + sha256 = "sha256-G6Qi7e4o+0ahcslJ8UfJrdoc8NNkY+nl6kyDlkJCo9I="; + }; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + $CC -o hexdiff hexdiff.c + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -D hexdiff -t $out/bin/ + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/ahroach/hexdiff"; + description = "A terminal application for differencing two binary files, with color-coded output"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ rogarb ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 20f1e7b4aaae..5395aa5c4fcd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1554,6 +1554,8 @@ with pkgs; headset-charge-indicator = callPackage ../tools/audio/headset-charge-indicator { }; + hexdiff = callPackage ../tools/misc/hexdiff { }; + httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { }; inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service; From d14647974ef3855952ca2a30206cab765cabc8cb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 17:02:48 +0000 Subject: [PATCH 208/244] coreth: 0.12.0 -> 0.12.1 --- pkgs/applications/networking/coreth/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/coreth/default.nix b/pkgs/applications/networking/coreth/default.nix index 1acbd96817c2..c45ca464a177 100644 --- a/pkgs/applications/networking/coreth/default.nix +++ b/pkgs/applications/networking/coreth/default.nix @@ -6,19 +6,19 @@ buildGoModule rec { pname = "coreth"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromGitHub { owner = "ava-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-VZxViKtpdDkEC94DgYPHCjCcqrA3H3Uef/pK/ZqINkU="; + hash = "sha256-Wf4abvBOX98A2IjALkMMOAqDvEtXtLddxhrV2LQM1dU="; }; # go mod vendor has a bug, see: golang/go#57529 proxyVendor = true; - vendorHash = "sha256-+tgDdhrSJb3h3NXhwcdgSWo2+NvYl18HW6dVEUOSpVs="; + vendorHash = "sha256-nQfb94IileWTkSZOliDT6B6o7qQ8aQ0MdY0jzc84VIM="; ldflags = [ "-s" From 7dc5413649be700c1ce08781df5106abc0b2f18d Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 4 May 2023 20:12:41 +0300 Subject: [PATCH 209/244] python310Packages.safe-pysha3: 1.0.3 -> 1.0.4 --- .../python-modules/safe-pysha3/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/safe-pysha3/default.nix b/pkgs/development/python-modules/safe-pysha3/default.nix index cf654cfd714b..a71cce569ce7 100644 --- a/pkgs/development/python-modules/safe-pysha3/default.nix +++ b/pkgs/development/python-modules/safe-pysha3/default.nix @@ -7,23 +7,15 @@ buildPythonPackage rec { pname = "safe-pysha3"; - version = "1.0.3"; + version = "1.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-Kd+lb9t5ney50BvdfbwPKAb0Ro0sKW+DtuN9hlMZF8I="; + hash = "sha256-5CkUax7dGYssqTSiBGplZWxdMbDsiUu9YFUSf03q/xc="; }; - checkPhase = '' - runHook preCheck - - ${python.interpreter} tests.py - - runHook postCheck - ''; - pythonImportsCheck = [ "sha3" ]; From eaf8bba9f8e21cc39aab628abb0f3dcc65f98c7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 17:19:36 +0000 Subject: [PATCH 210/244] cglm: 0.8.9 -> 0.9.0 --- pkgs/development/libraries/cglm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index 578b4341e73e..44d86c7b5f97 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.8.9"; + version = "0.9.0"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "sha256-e90N8bHFt3dOzppa4xkB7qra7/bHhAexTEYGXPFXS4s="; + sha256 = "sha256-V6qX6f1pETjDHVu+VJXRDcKKiCBYuQnh8Bz48HRyRR8="; }; nativeBuildInputs = [ cmake ]; From 2c55bef565acef427a299bb4beadc7574f4de1e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 18 Mar 2023 21:15:56 +0000 Subject: [PATCH 211/244] =?UTF-8?q?sublime4-dev:=204147=20=E2=86=92=204149?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/sublime/4/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index 5a60ce185c12..9d4f4f042f15 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -11,9 +11,9 @@ in } {}; sublime4-dev = common { - buildVersion = "4147"; + buildVersion = "4149"; dev = true; - x64sha256 = "9zs+2cp+pid0y/v5tHJN4jp7sM1oGB5EgGzMASL3y4o="; - aarch64sha256 = "KyvHJPqBEfeQQJnuyWZA7vGhWkYFqMaTMx+uy+3cZ30="; + x64sha256 = "heP37UBUNula8RV82tSXwKAYwi2DNubHASD2FcLRkjs="; + aarch64sha256 = "u1KUI+st/+T9tNVh+u9+5ZSQIj26YyXGtQRrjB+paOQ="; } {}; } From 5eccb8782dbcf1f3cd36caa52e27c8592b6da29a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 17:30:48 +0000 Subject: [PATCH 212/244] grpc_cli: 1.54.0 -> 1.54.1 --- pkgs/tools/networking/grpc_cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/grpc_cli/default.nix b/pkgs/tools/networking/grpc_cli/default.nix index 0f654316da28..cb20dfd8d1db 100644 --- a/pkgs/tools/networking/grpc_cli/default.nix +++ b/pkgs/tools/networking/grpc_cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "grpc_cli"; - version = "1.54.0"; + version = "1.54.1"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - hash = "sha256-WVH7rYyFx2LyAnctnNbX4KevoJ5KKZujN+SmL0Y6wvw="; + hash = "sha256-svQxWHCoDHYZSvSrzUuwO0+6WMtgKsu+uVDV1mP/nL4="; fetchSubmodules = true; }; nativeBuildInputs = [ automake cmake autoconf ]; From c13aaba583fa5253d343468c50a4734c712362f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= Date: Thu, 4 May 2023 19:31:31 +0200 Subject: [PATCH 213/244] ldtk: 1.3.0 -> 1.3.2 --- pkgs/applications/editors/ldtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/ldtk/default.nix b/pkgs/applications/editors/ldtk/default.nix index ef21add4b32e..ecdb9946ce26 100644 --- a/pkgs/applications/editors/ldtk/default.nix +++ b/pkgs/applications/editors/ldtk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "ldtk"; - version = "1.3.0"; + version = "1.3.2"; src = fetchurl { url = "https://github.com/deepnight/ldtk/releases/download/v${version}/ubuntu-distribution.zip"; - hash = "sha256-2gGxl6l7J/L0CfMJk6PVmc1ABQISzAnjKDJgnMyx2PM="; + hash = "sha256-8GiMm1Nb2jRLFWtGNsSfrW1jIi9yKCcyuUKwMEqoUZI="; }; nativeBuildInputs = [ unzip makeWrapper copyDesktopItems appimage-run ]; From c5bf4b91e8ed2772533fe3c704e5936cfbfad645 Mon Sep 17 00:00:00 2001 From: Joshua Campbell Date: Wed, 3 May 2023 20:50:59 -0700 Subject: [PATCH 214/244] davinci-resolve: override appimage-run to use buildFHSEnvChroot --- pkgs/applications/video/davinci-resolve/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/davinci-resolve/default.nix b/pkgs/applications/video/davinci-resolve/default.nix index 0b7cec347739..56a672404d27 100644 --- a/pkgs/applications/video/davinci-resolve/default.nix +++ b/pkgs/applications/video/davinci-resolve/default.nix @@ -9,6 +9,7 @@ , libGLU , xorg , buildFHSEnv +, buildFHSEnvChroot , bash , writeText , ocl-icd @@ -26,7 +27,11 @@ let pname = "davinci-resolve"; version = "17.4.3"; - nativeBuildInputs = [ unzip appimage-run addOpenGLRunpath ]; + nativeBuildInputs = [ + unzip + (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } ) + addOpenGLRunpath + ]; # Pretty sure, there are missing dependencies ... buildInputs = [ libGLU xorg.libXxf86vm ]; From a7676539f5443ba8ee49cc6907f0000bec303523 Mon Sep 17 00:00:00 2001 From: ornxka Date: Sun, 24 Oct 2021 23:13:45 -0400 Subject: [PATCH 215/244] rivalcfg: init at 4.8.0 --- pkgs/misc/rivalcfg/default.nix | 38 +++++ pkgs/misc/rivalcfg/rival.rules | 242 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 282 insertions(+) create mode 100644 pkgs/misc/rivalcfg/default.nix create mode 100644 pkgs/misc/rivalcfg/rival.rules diff --git a/pkgs/misc/rivalcfg/default.nix b/pkgs/misc/rivalcfg/default.nix new file mode 100644 index 000000000000..e30f27ddec2a --- /dev/null +++ b/pkgs/misc/rivalcfg/default.nix @@ -0,0 +1,38 @@ +{ lib, fetchFromGitHub, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "rivalcfg"; + version = "4.8.0"; + + src = fetchFromGitHub { + owner = "flozz"; + repo = "rivalcfg"; + rev = "v${version}"; + sha256 = "sha256-fCl+XY+R+QF7jWLkqii4v0sbXr7xoX3A3upm+XoBAms="; + }; + + propagatedBuildInputs = with python3Packages; [ hidapi setuptools ]; + + checkInputs = [ python3Packages.pytest ]; + checkPhase = "pytest"; + + # tests are broken + doCheck = false; + + # this file has to be copied here instead of generated at build time because + # rivalcfg --update-udev will fail if it detects a supported device but cannot + # access it + # it should probably be regenerated on version bumps + postInstall = '' + set -x + mkdir -p $out/lib/udev/rules.d + substitute ${./rival.rules} $out/lib/udev/rules.d/99-rivalcfg.rules --replace MODE=\"0666\" "MODE=\"0664\", GROUP=\"input\"" + ''; + + meta = with lib; { + description = "Utility program that allows you to configure SteelSeries Rival gaming mice"; + homepage = "https://github.com/flozz/rivalcfg"; + license = licenses.wtfpl; + maintainers = with maintainers; [ ornxka ]; + }; +} diff --git a/pkgs/misc/rivalcfg/rival.rules b/pkgs/misc/rivalcfg/rival.rules new file mode 100644 index 000000000000..c7c2c8fee589 --- /dev/null +++ b/pkgs/misc/rivalcfg/rival.rules @@ -0,0 +1,242 @@ +# Generated by rivalcfg v4.8.0 +# Do not edit this file. It can be regenerated with the following command: +# +# rivalcfg --update-udev + +# SteelSeries Aerox 3 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1836", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1836", MODE="0666" + +# SteelSeries Aerox 3 Wireless (wired mode) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="183a", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="183a", MODE="0666" + +# SteelSeries Aerox 3 Wireless (2.4 GHz wireless mode) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1838", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1838", MODE="0666" + +# SteelSeries Aerox 5 Wireless (wired mode) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1854", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1854", MODE="0666" + +# SteelSeries Aerox 5 Wireless (2.4 GHz wireless mode) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1852", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1852", MODE="0666" + +# SteelSeries Aerox 9 Wireless (wired mode) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="185a", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="185a", MODE="0666" + +# SteelSeries Aerox 9 Wireless (2.4 GHz wireless mode) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1858", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1858", MODE="0666" + +# SteelSeries Kana v2 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="137a", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="137a", MODE="0666" + +# SteelSeries Kinzu v2 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1366", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1366", MODE="0666" + +# SteelSeries Kinzu v2 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1378", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1378", MODE="0666" + +# SteelSeries Prime +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="182e", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="182e", MODE="0666" + +# SteelSeries Prime Rainbow 6 Siege Black Ice Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="182a", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="182a", MODE="0666" + +# SteelSeries Prime CS:GO Neo Noir Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1856", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1856", MODE="0666" + +# SteelSeries Prime Wireless (wired mode) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1842", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1842", MODE="0666" + +# SteelSeries Prime Wireless (2.4 GHz wireless mode) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1840", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1840", MODE="0666" + +# SteelSeries Rival 3 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1824", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1824", MODE="0666" + +# SteelSeries Rival 3 (firmware v0.37.0.0) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="184c", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="184c", MODE="0666" + +# SteelSeries Rival 3 Wireless (2.4 GHz mode) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1830", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1830", MODE="0666" + +# SteelSeries Rival 95 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1706", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1706", MODE="0666" + +# SteelSeries Rival 95 MSI Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1707", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1707", MODE="0666" + +# SteelSeries Rival 95 PC Bang +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1704", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1704", MODE="0666" + +# SteelSeries Rival 100 PC Bang +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1708", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1708", MODE="0666" + +# SteelSeries Rival 100 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1702", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1702", MODE="0666" + +# SteelSeries Rival 100 (Dell China) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170a", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170a", MODE="0666" + +# SteelSeries Rival 100 Dota 2 Edition (retail) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170b", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170b", MODE="0666" + +# SteelSeries Rival 100 Dota 2 Edition (Lenovo) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170c", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170c", MODE="0666" + +# SteelSeries Rival 105 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1814", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1814", MODE="0666" + +# SteelSeries Rival 110 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1729", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1729", MODE="0666" + +# SteelSeries Rival 106 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1816", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1816", MODE="0666" + +# SteelSeries Rival +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1384", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1384", MODE="0666" + +# SteelSeries Rival Dota 2 Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1392", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1392", MODE="0666" + +# SteelSeries Rival 300 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1710", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1710", MODE="0666" + +# SteelSeries Rival 300 Fallout 4 Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1712", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1712", MODE="0666" + +# SteelSeries Rival 300 Evil Geniuses Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="171c", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="171c", MODE="0666" + +# SteelSeries Rival 300 CS:GO Fade Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1394", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1394", MODE="0666" + +# SteelSeries Rival 300 CS:GO Hyper Beast Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="171a", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="171a", MODE="0666" + +# SteelSeries Rival 300 CS:GO Fade Edition (stm32) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1716", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1716", MODE="0666" + +# SteelSeries Rival 300 Acer Predator Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1714", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1714", MODE="0666" + +# SteelSeries Rival 300 HP OMEN Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1718", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1718", MODE="0666" + +# SteelSeries Rival 300S +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1810", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1810", MODE="0666" + +# SteelSeries Rival 310 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1720", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1720", MODE="0666" + +# SteelSeries Rival 310 CS:GO Howl Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="171e", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="171e", MODE="0666" + +# SteelSeries Rival 310 PUBG Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1736", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1736", MODE="0666" + +# SteelSeries Rival 500 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170e", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170e", MODE="0666" + +# SteelSeries Rival 600 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1724", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1724", MODE="0666" + +# SteelSeries Rival 600 Dota 2 Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="172e", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="172e", MODE="0666" + +# SteelSeries Rival 650 Wireless (wired mode) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="172b", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="172b", MODE="0666" + +# SteelSeries Rival 650 Wireless (2.4 GHz wireless mode) +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1726", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1726", MODE="0666" + +# SteelSeries Rival 700 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1700", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1700", MODE="0666" + +# SteelSeries Rival 710 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1730", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1730", MODE="0666" + +# SteelSeries Sensei 310 +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1722", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1722", MODE="0666" + +# SteelSeries Sensei [RAW] +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1369", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1369", MODE="0666" + +# SteelSeries Sensei [RAW] Diablo III Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1362", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1362", MODE="0666" + +# SteelSeries Sensei [RAW] Guild Wars 2 Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="136d", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="136d", MODE="0666" + +# SteelSeries Sensei [RAW] CoD Black Ops II Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="136f", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="136f", MODE="0666" + +# SteelSeries Sensei [RAW] World of Tanks Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1380", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1380", MODE="0666" + +# SteelSeries Sensei [RAW] Heroes of the Storm Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1390", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1390", MODE="0666" + +# SteelSeries Sensei TEN +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1832", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1832", MODE="0666" + +# SteelSeries Sensei TEN CS:GO Neon Rider Edition +SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1834", MODE="0666" +SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1834", MODE="0666" + + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61c015fe1334..bca22fbfaba9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -39194,6 +39194,8 @@ with pkgs; ricty = callPackage ../data/fonts/ricty { }; + rivalcfg = callPackage ../misc/rivalcfg { }; + rmfakecloud = callPackage ../servers/rmfakecloud { }; rmfuse = callPackage ../tools/filesystems/rmfuse { }; From e4474334415ac41efb5fda33d4cc8f312397ef05 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Sun, 23 Apr 2023 15:08:31 -0500 Subject: [PATCH 216/244] rivalcfg: generate udev dynamically --- pkgs/misc/rivalcfg/default.nix | 14 +- pkgs/misc/rivalcfg/rival.rules | 242 --------------------------------- 2 files changed, 8 insertions(+), 248 deletions(-) delete mode 100644 pkgs/misc/rivalcfg/rival.rules diff --git a/pkgs/misc/rivalcfg/default.nix b/pkgs/misc/rivalcfg/default.nix index e30f27ddec2a..737a3839d7a0 100644 --- a/pkgs/misc/rivalcfg/default.nix +++ b/pkgs/misc/rivalcfg/default.nix @@ -19,20 +19,22 @@ python3Packages.buildPythonPackage rec { # tests are broken doCheck = false; - # this file has to be copied here instead of generated at build time because - # rivalcfg --update-udev will fail if it detects a supported device but cannot - # access it - # it should probably be regenerated on version bumps postInstall = '' set -x mkdir -p $out/lib/udev/rules.d - substitute ${./rival.rules} $out/lib/udev/rules.d/99-rivalcfg.rules --replace MODE=\"0666\" "MODE=\"0664\", GROUP=\"input\"" + tmpl_udev="$out/lib/udev/rules.d/99-rivalcfg.rules" + tmpudev="''${tmpl_udev}.in" + finaludev="$tmpl_udev" + "$out/bin/rivalcfg" --print-udev > "$tmpudev" + substitute "$tmpudev" "$out/lib/udev/rules.d/99-rivalcfg.rules" \ + --replace MODE=\"0666\" "MODE=\"0664\", GROUP=\"input\"" + rm "$tmpudev" ''; meta = with lib; { description = "Utility program that allows you to configure SteelSeries Rival gaming mice"; homepage = "https://github.com/flozz/rivalcfg"; - license = licenses.wtfpl; + license = licenses.wtfpl; maintainers = with maintainers; [ ornxka ]; }; } diff --git a/pkgs/misc/rivalcfg/rival.rules b/pkgs/misc/rivalcfg/rival.rules deleted file mode 100644 index c7c2c8fee589..000000000000 --- a/pkgs/misc/rivalcfg/rival.rules +++ /dev/null @@ -1,242 +0,0 @@ -# Generated by rivalcfg v4.8.0 -# Do not edit this file. It can be regenerated with the following command: -# -# rivalcfg --update-udev - -# SteelSeries Aerox 3 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1836", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1836", MODE="0666" - -# SteelSeries Aerox 3 Wireless (wired mode) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="183a", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="183a", MODE="0666" - -# SteelSeries Aerox 3 Wireless (2.4 GHz wireless mode) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1838", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1838", MODE="0666" - -# SteelSeries Aerox 5 Wireless (wired mode) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1854", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1854", MODE="0666" - -# SteelSeries Aerox 5 Wireless (2.4 GHz wireless mode) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1852", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1852", MODE="0666" - -# SteelSeries Aerox 9 Wireless (wired mode) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="185a", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="185a", MODE="0666" - -# SteelSeries Aerox 9 Wireless (2.4 GHz wireless mode) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1858", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1858", MODE="0666" - -# SteelSeries Kana v2 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="137a", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="137a", MODE="0666" - -# SteelSeries Kinzu v2 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1366", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1366", MODE="0666" - -# SteelSeries Kinzu v2 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1378", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1378", MODE="0666" - -# SteelSeries Prime -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="182e", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="182e", MODE="0666" - -# SteelSeries Prime Rainbow 6 Siege Black Ice Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="182a", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="182a", MODE="0666" - -# SteelSeries Prime CS:GO Neo Noir Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1856", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1856", MODE="0666" - -# SteelSeries Prime Wireless (wired mode) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1842", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1842", MODE="0666" - -# SteelSeries Prime Wireless (2.4 GHz wireless mode) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1840", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1840", MODE="0666" - -# SteelSeries Rival 3 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1824", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1824", MODE="0666" - -# SteelSeries Rival 3 (firmware v0.37.0.0) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="184c", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="184c", MODE="0666" - -# SteelSeries Rival 3 Wireless (2.4 GHz mode) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1830", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1830", MODE="0666" - -# SteelSeries Rival 95 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1706", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1706", MODE="0666" - -# SteelSeries Rival 95 MSI Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1707", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1707", MODE="0666" - -# SteelSeries Rival 95 PC Bang -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1704", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1704", MODE="0666" - -# SteelSeries Rival 100 PC Bang -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1708", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1708", MODE="0666" - -# SteelSeries Rival 100 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1702", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1702", MODE="0666" - -# SteelSeries Rival 100 (Dell China) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170a", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170a", MODE="0666" - -# SteelSeries Rival 100 Dota 2 Edition (retail) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170b", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170b", MODE="0666" - -# SteelSeries Rival 100 Dota 2 Edition (Lenovo) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170c", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170c", MODE="0666" - -# SteelSeries Rival 105 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1814", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1814", MODE="0666" - -# SteelSeries Rival 110 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1729", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1729", MODE="0666" - -# SteelSeries Rival 106 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1816", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1816", MODE="0666" - -# SteelSeries Rival -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1384", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1384", MODE="0666" - -# SteelSeries Rival Dota 2 Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1392", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1392", MODE="0666" - -# SteelSeries Rival 300 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1710", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1710", MODE="0666" - -# SteelSeries Rival 300 Fallout 4 Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1712", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1712", MODE="0666" - -# SteelSeries Rival 300 Evil Geniuses Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="171c", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="171c", MODE="0666" - -# SteelSeries Rival 300 CS:GO Fade Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1394", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1394", MODE="0666" - -# SteelSeries Rival 300 CS:GO Hyper Beast Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="171a", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="171a", MODE="0666" - -# SteelSeries Rival 300 CS:GO Fade Edition (stm32) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1716", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1716", MODE="0666" - -# SteelSeries Rival 300 Acer Predator Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1714", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1714", MODE="0666" - -# SteelSeries Rival 300 HP OMEN Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1718", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1718", MODE="0666" - -# SteelSeries Rival 300S -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1810", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1810", MODE="0666" - -# SteelSeries Rival 310 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1720", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1720", MODE="0666" - -# SteelSeries Rival 310 CS:GO Howl Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="171e", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="171e", MODE="0666" - -# SteelSeries Rival 310 PUBG Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1736", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1736", MODE="0666" - -# SteelSeries Rival 500 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170e", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="170e", MODE="0666" - -# SteelSeries Rival 600 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1724", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1724", MODE="0666" - -# SteelSeries Rival 600 Dota 2 Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="172e", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="172e", MODE="0666" - -# SteelSeries Rival 650 Wireless (wired mode) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="172b", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="172b", MODE="0666" - -# SteelSeries Rival 650 Wireless (2.4 GHz wireless mode) -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1726", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1726", MODE="0666" - -# SteelSeries Rival 700 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1700", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1700", MODE="0666" - -# SteelSeries Rival 710 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1730", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1730", MODE="0666" - -# SteelSeries Sensei 310 -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1722", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1722", MODE="0666" - -# SteelSeries Sensei [RAW] -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1369", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1369", MODE="0666" - -# SteelSeries Sensei [RAW] Diablo III Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1362", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1362", MODE="0666" - -# SteelSeries Sensei [RAW] Guild Wars 2 Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="136d", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="136d", MODE="0666" - -# SteelSeries Sensei [RAW] CoD Black Ops II Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="136f", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="136f", MODE="0666" - -# SteelSeries Sensei [RAW] World of Tanks Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1380", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1380", MODE="0666" - -# SteelSeries Sensei [RAW] Heroes of the Storm Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1390", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1390", MODE="0666" - -# SteelSeries Sensei TEN -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1832", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1832", MODE="0666" - -# SteelSeries Sensei TEN CS:GO Neon Rider Edition -SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1834", MODE="0666" -SUBSYSTEM=="usb", ATTRS{idVendor}=="1038", ATTRS{idProduct}=="1834", MODE="0666" - - From 76abab80cd63696e2de495d5cb6b3be3ac71f2d9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 18:18:34 +0000 Subject: [PATCH 217/244] dagger: 0.4.2 -> 0.5.1 --- .../tools/continuous-integration/dagger/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/dagger/default.nix b/pkgs/development/tools/continuous-integration/dagger/default.nix index 334c52cd47f8..04ec923368d3 100644 --- a/pkgs/development/tools/continuous-integration/dagger/default.nix +++ b/pkgs/development/tools/continuous-integration/dagger/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dagger"; - version = "0.4.2"; + version = "0.5.1"; src = fetchFromGitHub { owner = "dagger"; repo = "dagger"; rev = "v${version}"; - hash = "sha256-R9O+ilOz5AZmsSR0uoOhXLNMTUEej9sV4ONaIF6ZnVc="; + hash = "sha256-8RYfLuIFF/J7BSan+C135ntg1/CYuvUhcueKiccMPIo="; }; - vendorHash = "sha256-/ZwIuzUvs7GvpoR6CfxdCivyOS8kDOukM92NuWFXJCY="; + vendorHash = "sha256-w8eWWyKEedEopQyliKKDNOn00KDlcrZHXK/8LMFvx7o="; proxyVendor = true; subPackages = [ From 9307a0f393f8299021095eebe48e19a4ecacaea4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 18:22:53 +0000 Subject: [PATCH 218/244] uncover: 1.0.3 -> 1.0.4 --- pkgs/tools/security/uncover/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/uncover/default.nix b/pkgs/tools/security/uncover/default.nix index 38421ad70553..475525908fa3 100644 --- a/pkgs/tools/security/uncover/default.nix +++ b/pkgs/tools/security/uncover/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "uncover"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-emfS5/HEt+I0DlUDgbWGqjF8bVLHsKxgAS4CKB8WO9E="; + hash = "sha256-hugGRMxY0cmcfIjUOvmaTCC19VkxODZLwP2lYdrIfo8="; }; - vendorHash = "sha256-ckswffKbTXq8GMO2RvVz43ig27LKBxI2WqHRAx04dk0="; + vendorHash = "sha256-AzIncQtNhzOJDlEXr5tbxXpt6V7RAgoGxks/zZ3Uakw="; meta = with lib; { description = "API wrapper to search for exposed hosts"; From 9db09bd760312ac76e24d7ee485b77684b842b6d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 18:34:26 +0000 Subject: [PATCH 219/244] gh-dash: 3.7.7 -> 3.7.8 --- pkgs/tools/misc/gh-dash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix index 8d2d7258071b..d2d6cdcd4155 100644 --- a/pkgs/tools/misc/gh-dash/default.nix +++ b/pkgs/tools/misc/gh-dash/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gh-dash"; - version = "3.7.7"; + version = "3.7.8"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-Ih9Vdt/ds8f37n7onWhvfrgMrE2iXQPwSTgxrui5TYY="; + hash = "sha256-nt/HJGWdDMolJJzuOpKZ7USgzmq7gJIeHGTzSnkXdzw="; }; - vendorHash = "sha256-ZpX+0AyHFWOb75jlIS5/BqKpRkqNpE4SkOJ01CqO/0w="; + vendorHash = "sha256-F/T4VU9FhztGEl7bpbAr8CIA4LInen5q/Y3ycBIHJV0="; ldflags = [ "-s" From 3d118da4417891c8ac64d8e6dcbc9da3ade8eb80 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 18:44:45 +0000 Subject: [PATCH 220/244] git-stack: 0.10.15 -> 0.10.16 --- pkgs/applications/version-management/git-stack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-stack/default.nix b/pkgs/applications/version-management/git-stack/default.nix index ec86a344fb5a..c22245956781 100644 --- a/pkgs/applications/version-management/git-stack/default.nix +++ b/pkgs/applications/version-management/git-stack/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "git-stack"; - version = "0.10.15"; + version = "0.10.16"; src = fetchFromGitHub { owner = "gitext-rs"; repo = "git-stack"; rev = "v${version}"; - hash = "sha256-DUr3kD27wWuWuArVVhGFYHmX7cA5+J1/dGsZIuWh30c="; + hash = "sha256-QpRgAcbaZP5pgqMCoYAUybp8NkSkfGqNsZYXZp3Zdtc="; }; - cargoHash = "sha256-4p6vWVVHzjE66mnoXKbZJrh77q40OM49fHwCFCgE0W4="; + cargoHash = "sha256-L+GtqbPQCgw0n1aW/2rU8ba+acC5n0sdEl9C6lveb1I="; buildInputs = lib.optionals stdenv.isDarwin [ Security From fb36a1da5609fde4ff07f94fa75619a723089922 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 4 May 2023 20:56:53 +0200 Subject: [PATCH 221/244] zsh-powerlevel10k: 1.17.0 -> 1.18.0 Diff: https://github.com/romkatv/powerlevel10k/compare/refs/tags/v1.17.0...v1.18.0 Changelog: https://github.com/romkatv/powerlevel10k/releases/tag/v1.18.0 --- pkgs/shells/zsh/zsh-powerlevel10k/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix index 3fd0920e9b3f..261774755bfd 100644 --- a/pkgs/shells/zsh/zsh-powerlevel10k/default.nix +++ b/pkgs/shells/zsh/zsh-powerlevel10k/default.nix @@ -19,13 +19,13 @@ let in stdenv.mkDerivation rec { pname = "powerlevel10k"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "romkatv"; repo = "powerlevel10k"; rev = "refs/tags/v${version}"; - hash = "sha256-fgrwbWj6CcPoZ6GbCZ47HRUg8ZSJWOsa7aipEqYuE0Q="; + hash = "sha256-IiMYGefF+p4bUueO/9/mJ4mHMyJYiq+67GgNdGJ6Eew="; }; strictDeps = true; From 39afca1d80f3291fecb28f382de7a24d33b0f44b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 19:18:13 +0000 Subject: [PATCH 222/244] esphome: 2023.4.3 -> 2023.4.4 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index adde794be9d3..f3f4003ccd5d 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -16,14 +16,14 @@ let in python.pkgs.buildPythonApplication rec { pname = "esphome"; - version = "2023.4.3"; + version = "2023.4.4"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-UKcHtrHU7Gh48G0ImgW/+2rT+ucxFzxKCur7/OfDif0="; + hash = "sha256-zRzojc2cmBTpvP3yOADWTTK0MOsgCvUcr6idGiRovXo="; }; postPatch = '' From 0e3cb3fcea101aa193847048a0e337ccc91161b9 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 4 May 2023 16:38:16 -0300 Subject: [PATCH 223/244] shellhub-agent: 0.11.8 -> 0.12.0 Signed-off-by: Otavio Salvador --- pkgs/applications/networking/shellhub-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index 3e3a5eee5f89..bbe6122c547f 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -11,18 +11,18 @@ buildGo120Module rec { pname = "shellhub-agent"; - version = "0.11.8"; + version = "0.12.0"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "/nBwi94VFKzdZxQ030tCqEhDM0fE3bxc4MraOCNtmbE="; + sha256 = "+aLs0+nHWglFYAM6CHyrPAALS/7x4vYOtu/M1mKH6hg="; }; modRoot = "./agent"; - vendorSha256 = "sha256-1R5K/BlMNKtCESV5xVFh2MawfloSDmST2764WDXmqZk="; + vendorSha256 = "sha256-TInS0uTpjTrLuthRn0SOSDh3j0bf+XCP4PVcL19mBiQ="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; From fc3de20c748defdeef471209cf303ecf414a1e81 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 4 May 2023 16:03:01 -0400 Subject: [PATCH 224/244] cargo-nextest: 0.9.51 -> 0.9.52 Diff: https://github.com/nextest-rs/nextest/compare/cargo-nextest-0.9.51...cargo-nextest-0.9.52 Changelog: https://nexte.st/CHANGELOG.html --- pkgs/development/tools/rust/cargo-nextest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 8bc1b5607c28..8732a9628274 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.51"; + version = "0.9.52"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-0ofONXhVK095gIh3FHBQrUKokMT5wbBtYJeMV8zx+dc="; + hash = "sha256-Sl3ax2s81LiXejb0QP1fnmByAjAl8/JosUnw/RjEff8="; }; - cargoSha256 = "sha256-Q+4zr1Ab9O70q3erLZdIv0ocgF5q8XF4u4KhMCg1rhs="; + cargoHash = "sha256-H3MzVH3868wqT1/j827u13nvGbTti8ePoCtrVQHoSCY="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From bfe287be95f816723baf9d5c883782fa3b38fe05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 20:22:56 +0000 Subject: [PATCH 225/244] python311Packages.pyrevolve: 2.2 -> 2.2.2 --- pkgs/development/python-modules/pyrevolve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyrevolve/default.nix b/pkgs/development/python-modules/pyrevolve/default.nix index 767d94ac0df9..e99c547198db 100644 --- a/pkgs/development/python-modules/pyrevolve/default.nix +++ b/pkgs/development/python-modules/pyrevolve/default.nix @@ -10,13 +10,13 @@ buildPythonPackage rec { pname = "pyrevolve"; - version = "2.2"; + version = "2.2.2"; src = fetchFromGitHub { owner = "devitocodes"; repo = pname; - rev = "v${version}"; - hash = "sha256-5a4zvyf2vfz8aI6vFMI2vxekYrcUi/YuPFvZnUOx+Zs="; + rev = "refs/tags/v${version}"; + hash = "sha256-JLDn3WEBcdO8YYzt/MWOHB/1kcmbmZUsiH00/4Uwlxo="; }; nativeBuildInputs = [ versioneer cython ]; From 24852fbbb44199739eef95de43816fdbee4089dd Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 4 May 2023 16:24:06 -0400 Subject: [PATCH 226/244] typeshare: 1.5.0 -> 1.5.1 Diff: https://github.com/1password/typeshare/compare/v1.5.0...v1.5.1 Changelog: https://github.com/1password/typeshare/blob/v1.5.1/CHANGELOG.md --- pkgs/development/tools/rust/typeshare/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/typeshare/default.nix b/pkgs/development/tools/rust/typeshare/default.nix index 34fba48d8ad4..f21290d0afe9 100644 --- a/pkgs/development/tools/rust/typeshare/default.nix +++ b/pkgs/development/tools/rust/typeshare/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "typeshare"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "1password"; repo = "typeshare"; rev = "v${version}"; - hash = "sha256-Zmb6GZVtjx/PXOT1vaxKjPObY902pRqttOYExDx5UvI="; + hash = "sha256-PjIKxX1xIALyWD8NyDeoIZMMfsS4/w/AweAcYOcsLNs="; }; - cargoHash = "sha256-83LAZ7b1j/iBnYmY0oSSWDH0w7WPU1O85X+IBwSe1bs="; + cargoHash = "sha256-3vF7bgN2qhzgYIjH1rSfEwOLqR4VR4IQvVtNjwBS6+M="; nativeBuildInputs = [ installShellFiles ]; From 9680729a53114fb3e3ea665edc9f97972dd08f94 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 4 May 2023 16:40:42 -0400 Subject: [PATCH 227/244] vimPlugins.vim-clap: 0.42 -> 0.43 Diff: https://github.com/liuchengxu/vim-clap/compare/v0.42...v0.43 Changelog: https://github.com/liuchengxu/vim-clap/blob/v0.43/CHANGELOG.md --- .../editors/vim/plugins/vim-clap/Cargo.lock | 906 ++++++++++++------ .../editors/vim/plugins/vim-clap/default.nix | 4 +- 2 files changed, 609 insertions(+), 301 deletions(-) diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock b/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock index 9bb6200d6818..d1acdf2a91fc 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock +++ b/pkgs/applications/editors/vim/plugins/vim-clap/Cargo.lock @@ -2,6 +2,21 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli", +] + +[[package]] +name = "adler" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" + [[package]] name = "aho-corasick" version = "0.7.20" @@ -21,31 +36,60 @@ dependencies = [ ] [[package]] -name = "anyhow" -version = "1.0.68" +name = "anstream" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cb2f989d18dd141ab8ae82f64d1a8cdd37e0840f73a406896cf5e99502fab61" - -[[package]] -name = "async-trait" -version = "0.1.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282" +checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" dependencies = [ - "proc-macro2", - "quote", - "syn", + "anstyle", + "anstyle-parse", + "anstyle-wincon", + "concolor-override", + "concolor-query", + "is-terminal", + "utf8parse", ] [[package]] -name = "atty" -version = "0.2.14" +name = "anstyle" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + +[[package]] +name = "anstyle-parse" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +dependencies = [ + "anstyle", + "windows-sys 0.45.0", +] + +[[package]] +name = "anyhow" +version = "1.0.70" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" + +[[package]] +name = "async-trait" +version = "0.1.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.13", ] [[package]] @@ -54,12 +98,33 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +[[package]] +name = "backtrace" +version = "0.3.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" +dependencies = [ + "addr2line", + "cc", + "cfg-if", + "libc", + "miniz_oxide", + "object", + "rustc-demangle", +] + [[package]] name = "base64" version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" +[[package]] +name = "base64" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" + [[package]] name = "bitflags" version = "1.3.2" @@ -68,9 +133,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bstr" -version = "1.1.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b45ea9b00a7b3f2988e9a65ad3917e62123c38dba709b666506207be96d1790b" +checksum = "c3d4260bcc2e8fc9df1eac4919a720effeb63a3f0952f5bf4944adfa18897f09" dependencies = [ "memchr", "once_cell", @@ -90,9 +155,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba" +checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" [[package]] name = "bytecount" @@ -102,9 +167,9 @@ checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c" [[package]] name = "bytes" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb24e866b15a1af2a1b663f10c6b6b8f397a84aadb828f12e5b289ec23a3a3c" +checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be" [[package]] name = "cargo-lock" @@ -120,9 +185,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20104e2335ce8a659d6dd92a51a767a0c062599c73b343fd152cb401e828c3d" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" dependencies = [ "jobserver", ] @@ -135,9 +200,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.23" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b0a3d9ed01224b22057780a37bb8c5dbfe1be8ba48678e7bf57ec4b385411f" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ "iana-time-zone", "js-sys", @@ -151,42 +216,45 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.23" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71655c45cb9845d3270c9d6df84ebe72b4dad3c2ba3f7023ad47c144e4e473a5" +checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" dependencies = [ - "atty", - "bitflags", + "clap_builder", "clap_derive", - "clap_lex", - "indexmap", "once_cell", +] + +[[package]] +name = "clap_builder" +version = "4.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +dependencies = [ + "anstream", + "anstyle", + "bitflags", + "clap_lex", "strsim", - "termcolor", - "textwrap", ] [[package]] name = "clap_derive" -version = "3.2.18" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65" +checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" dependencies = [ "heck", - "proc-macro-error", "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] name = "clap_lex" -version = "0.2.4" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] +checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" [[package]] name = "cli" @@ -226,28 +294,70 @@ dependencies = [ ] [[package]] -name = "console" -version = "0.15.4" +name = "color-eyre" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9b6515d269224923b26b5febea2ed42b2d5f2ce37284a4dd670fedd6cb8347a" +checksum = "5a667583cca8c4f8436db8de46ea8233c42a7d9ae424a82d338f2e4675229204" +dependencies = [ + "backtrace", + "color-spantrace", + "eyre", + "indenter", + "once_cell", + "owo-colors", + "tracing-error", +] + +[[package]] +name = "color-spantrace" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +dependencies = [ + "once_cell", + "owo-colors", + "tracing-core", + "tracing-error", +] + +[[package]] +name = "concolor-override" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" + +[[package]] +name = "concolor-query" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" +dependencies = [ + "windows-sys 0.45.0", +] + +[[package]] +name = "console" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d79fbe8970a77e3e34151cc13d3b3e248aa0faaecb9f6091fa07ebefe5ad60" dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys", + "windows-sys 0.42.0", ] [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "crossbeam-channel" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" +checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" dependencies = [ "cfg-if", "crossbeam-utils", @@ -255,9 +365,9 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if", "crossbeam-epoch", @@ -266,9 +376,9 @@ dependencies = [ [[package]] name = "crossbeam-epoch" -version = "0.9.13" +version = "0.9.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01a9af1f4c2ef74bb8aa1f7e19706bc72d03598c8a570bb5de72243c7a9d9d5a" +checksum = "46bd5f3f85273295a9d14aedfb86f6aadbff6d8f5295c4a9edb08e819dcf5695" dependencies = [ "autocfg", "cfg-if", @@ -279,18 +389,18 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.14" +version = "0.8.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb766fa798726286dbbb842f174001dab8abc7b627a1dd86e0b7222a95d929f" +checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b" dependencies = [ "cfg-if", ] [[package]] name = "cxx" -version = "1.0.86" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" +checksum = "f61f1b6389c3fe1c316bf8a4dccc90a38208354b330925bce1f74a6c4756eb93" dependencies = [ "cc", "cxxbridge-flags", @@ -300,9 +410,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.86" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" +checksum = "12cee708e8962df2aeb38f594aae5d827c022b6460ac71a7a3e2c3c2aae5a07b" dependencies = [ "cc", "codespan-reporting", @@ -310,24 +420,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn", + "syn 2.0.13", ] [[package]] name = "cxxbridge-flags" -version = "1.0.86" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" [[package]] name = "cxxbridge-macro" -version = "1.0.86" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" +checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] @@ -360,9 +470,9 @@ dependencies = [ [[package]] name = "either" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" +checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "encode_unicode" @@ -372,9 +482,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.31" +version = "0.8.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" +checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394" dependencies = [ "cfg-if", ] @@ -388,10 +498,41 @@ dependencies = [ "encoding_rs", ] +[[package]] +name = "errno" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50d6a0976c999d473fe89ad888d5a284e55366d9dc9038b1ba2aa15128c4afa0" +dependencies = [ + "errno-dragonfly", + "libc", + "windows-sys 0.45.0", +] + +[[package]] +name = "errno-dragonfly" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +dependencies = [ + "cc", + "libc", +] + [[package]] name = "extracted_fzy" version = "0.1.0" +[[package]] +name = "eyre" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +dependencies = [ + "indenter", + "once_cell", +] + [[package]] name = "filter" version = "0.1.0" @@ -428,9 +569,9 @@ dependencies = [ [[package]] name = "futures" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -443,9 +584,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -453,15 +594,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -470,38 +611,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] name = "futures-sink" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.25" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures-channel", "futures-core", @@ -535,6 +676,12 @@ dependencies = [ "wasi 0.11.0+wasi-snapshot-preview1", ] +[[package]] +name = "gimli" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" + [[package]] name = "git2" version = "0.16.1" @@ -602,9 +749,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.15" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4" +checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" dependencies = [ "bytes", "fnv", @@ -627,18 +774,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" @@ -650,10 +788,16 @@ dependencies = [ ] [[package]] -name = "http" -version = "0.2.8" +name = "hermit-abi" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75f43d41e26995c17e71ee126451dd3941010b0514a81a9d11f3b341debc2399" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "http" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ "bytes", "fnv", @@ -685,9 +829,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.23" +version = "0.14.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "034711faac9d2166cb1baf1a2fb0b60b1f277f8492fd72176c17f3515e1abd3c" +checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" dependencies = [ "bytes", "futures-channel", @@ -722,16 +866,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.53" +version = "0.1.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" +checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "winapi", + "windows", ] [[package]] @@ -765,9 +909,9 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a05705bc64e0b66a806c3740bd6578ea66051b157ec42dc219c785cbf185aef3" +checksum = "dbe7873dab538a9a44ad79ede1faf5f30d49f9a5c883ddbab48bce81b64b7492" dependencies = [ "globset", "lazy_static", @@ -781,10 +925,16 @@ dependencies = [ ] [[package]] -name = "indexmap" -version = "1.9.2" +name = "indenter" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" +checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" + +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ "autocfg", "hashbrown", @@ -803,10 +953,33 @@ dependencies = [ ] [[package]] -name = "ipnet" -version = "2.7.0" +name = "io-lifetimes" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "9c66c74d2ae7e79a5a8f7ac924adbe38ee42a859c6539ad869eb51f0b52dc220" +dependencies = [ + "hermit-abi 0.3.1", + "libc", + "windows-sys 0.48.0", +] + +[[package]] +name = "ipnet" +version = "2.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f" + +[[package]] +name = "is-terminal" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "256017f749ab3117e93acb91063009e1f1bb56d03965b14c2c8df4eb02c524d8" +dependencies = [ + "hermit-abi 0.3.1", + "io-lifetimes", + "rustix", + "windows-sys 0.45.0", +] [[package]] name = "itertools" @@ -819,24 +992,24 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "jobserver" -version = "0.1.25" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "068b1ee6743e4d11fb9c6a1e6064b3693a1b600e7f5f5988047d98b3dc9fb90b" +checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49409df3e3bf0856b916e2ceaca09ee28e6871cf7d9ce97a692cacfdb2a25a47" +checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" dependencies = [ "wasm-bindgen", ] @@ -849,9 +1022,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.139" +version = "0.2.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" +checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" [[package]] name = "libgit2-sys" @@ -886,6 +1059,12 @@ dependencies = [ "cc", ] +[[package]] +name = "linux-raw-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + [[package]] name = "lock_api" version = "0.4.9" @@ -907,12 +1086,13 @@ dependencies = [ [[package]] name = "maple" -version = "0.1.42" +version = "0.1.43" dependencies = [ "built", "chrono", "clap", "cli", + "color-eyre", "tokio", "upgrade", ] @@ -923,7 +1103,7 @@ version = "0.1.0" dependencies = [ "anyhow", "async-trait", - "base64", + "base64 0.13.1", "bytecount", "chrono", "directories", @@ -939,6 +1119,7 @@ dependencies = [ "once_cell", "parking_lot", "pattern", + "percent-encoding", "printer", "rayon", "regex", @@ -974,38 +1155,47 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" [[package]] name = "memmap2" -version = "0.5.8" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b182332558b18d807c4ce1ca8ca983b34c3ee32765e47b3f0f69b90355cc1dc" +checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327" dependencies = [ "libc", ] [[package]] name = "memoffset" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4" +checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" dependencies = [ "autocfg", ] [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] [[package]] name = "mio" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de" +checksum = "5b9d9a46eff5b4ff64b45a9e316a6d1e0bc719ef429cbec4dc630684212bfdf9" dependencies = [ "libc", "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1054,16 +1244,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" [[package]] -name = "once_cell" -version = "1.17.0" +name = "object" +version = "0.30.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" +checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439" +dependencies = [ + "memchr", +] [[package]] -name = "os_str_bytes" -version = "6.4.1" +name = "once_cell" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee" +checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" [[package]] name = "overload" @@ -1071,6 +1264,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "owo-colors" +version = "3.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" + [[package]] name = "parking_lot" version = "0.12.1" @@ -1083,15 +1282,15 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba" +checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521" dependencies = [ "cfg-if", "libc", "redox_syscall", "smallvec", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] @@ -1139,53 +1338,29 @@ dependencies = [ "utils", ] -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" -version = "1.0.49" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a8eca9f9c4ffde41714334dee777596264c7825420f521abc92b5b5deb63a5" +checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.23" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" dependencies = [ "proc-macro2", ] [[package]] name = "rayon" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db3a213adf02b3bcfd2d3846bb41cb22857d131789e01df434fb7e7bc0759b7" +checksum = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" dependencies = [ "either", "rayon-core", @@ -1193,9 +1368,9 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.10.1" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac410af5d00ab6884528b4ab69d1e8e146e8d471201800fa1b4524126de6ad3" +checksum = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" dependencies = [ "crossbeam-channel", "crossbeam-deque", @@ -1225,9 +1400,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" dependencies = [ "aho-corasick", "memchr", @@ -1242,17 +1417,17 @@ checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" [[package]] name = "regex-syntax" -version = "0.6.28" +version = "0.6.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "reqwest" -version = "0.11.13" +version = "0.11.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c" +checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" dependencies = [ - "base64", + "base64 0.21.0", "bytes", "encoding_rs", "futures-core", @@ -1311,10 +1486,30 @@ dependencies = [ ] [[package]] -name = "rustls" -version = "0.20.7" +name = "rustc-demangle" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "539a2bfe908f471bfa933876bd1eb6a19cf2176d375f82ef7f99530a40e48c2c" +checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" + +[[package]] +name = "rustix" +version = "0.37.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aae838e49b3d63e9274e1c01833cc8139d3fec468c3b84688c628f44b1ae11d" +dependencies = [ + "bitflags", + "errno", + "io-lifetimes", + "libc", + "linux-raw-sys", + "windows-sys 0.45.0", +] + +[[package]] +name = "rustls" +version = "0.20.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" dependencies = [ "log", "ring", @@ -1324,18 +1519,18 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0864aeff53f8c05aa08d86e5ef839d3dfcf07aeba2db32f12db0ef716e87bd55" +checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b" dependencies = [ - "base64", + "base64 0.21.0", ] [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" [[package]] name = "same-file" @@ -1354,9 +1549,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "scratch" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddccb15bcce173023b3fedd9436f882a0739b8dfb45e4f6b6002bee5929f61b2" +checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "sct" @@ -1370,38 +1565,38 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.16" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bc9567378fc7690d6b2addae4e60ac2eeea07becb2c64b9f218b53865cba2a" +checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" dependencies = [ "serde", ] [[package]] name = "serde" -version = "1.0.152" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.152" +version = "1.0.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] name = "serde_json" -version = "1.0.91" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877c235533714907a8c2464236f5c4b2a17262ef1bd71f38f35ea592c8da6883" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" dependencies = [ "itoa", "ryu", @@ -1431,9 +1626,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] @@ -1446,9 +1641,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" [[package]] name = "slab" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" +checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d" dependencies = [ "autocfg", ] @@ -1461,9 +1656,9 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "socket2" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2d2db9033d13a1567121ddd7a095ee144db4e1ca1b1bda3419bc0da294ebd" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi", @@ -1492,9 +1687,20 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.107" +version = "1.0.109" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" dependencies = [ "proc-macro2", "quote", @@ -1503,45 +1709,40 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] name = "thread_local" -version = "1.1.4" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5516c27b78311c50bf42c071425c560ac799b11c30b31f87e3081965fe5e0180" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" dependencies = [ + "cfg-if", "once_cell", ] @@ -1558,9 +1759,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.17" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a561bf4617eebd33bca6434b988f39ed798e527f51a1e797d0ee4f61c0a38376" +checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" dependencies = [ "itoa", "serde", @@ -1576,9 +1777,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" [[package]] name = "time-macros" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d967f99f534ca7e495c575c62638eebc2898a8c84c119b89e250477bc4ba16b2" +checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" dependencies = [ "time-core", ] @@ -1594,38 +1795,37 @@ dependencies = [ [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.24.1" +version = "1.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae" +checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" dependencies = [ "autocfg", "bytes", "libc", - "memchr", "mio", "num_cpus", "pin-project-lite", "signal-hook-registry", "socket2", "tokio-macros", - "windows-sys", + "windows-sys 0.45.0", ] [[package]] name = "tokio-macros" -version = "1.8.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" +checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 2.0.13", ] [[package]] @@ -1641,9 +1841,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.4" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bb2e075f03b3d66d8d8785356224ba688d2906a371015e225beeb65ca92c740" +checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" dependencies = [ "bytes", "futures-core", @@ -1655,9 +1855,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.5.10" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1333c76748e868a4d9d1017b5ab53171dfd095f70c712fdb4653a406547f598f" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] @@ -1687,7 +1887,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" dependencies = [ "crossbeam-channel", - "time 0.3.17", + "time 0.3.20", "tracing-subscriber", ] @@ -1699,7 +1899,7 @@ checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", ] [[package]] @@ -1712,6 +1912,16 @@ dependencies = [ "valuable", ] +[[package]] +name = "tracing-error" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" +dependencies = [ + "tracing", + "tracing-subscriber", +] + [[package]] name = "tracing-log" version = "0.1.3" @@ -1753,15 +1963,15 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.8" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] name = "unicode-normalization" @@ -1806,6 +2016,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "utils" version = "0.1.0" @@ -1828,20 +2044,13 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - [[package]] name = "walkdir" -version = "2.3.2" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56" +checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698" dependencies = [ "same-file", - "winapi", "winapi-util", ] @@ -1869,9 +2078,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaf9f5aceeec8be17c128b2e93e031fb8a4d469bb9c4ae2d7dc1888b26887268" +checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -1879,24 +2088,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c8ffb332579b0557b52d268b91feab8df3615f265d5270fec2a8c95b17c1142" +checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" dependencies = [ "cfg-if", "js-sys", @@ -1906,9 +2115,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "052be0f94026e6cbc75cdefc9bae13fd6052cdcaf532fa6c45e7ae33a1e6c810" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1916,28 +2125,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bc0c051dc5f23e307b13285f9d75df86bfdf816c5721e573dec1f9b8aa193c" +checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" dependencies = [ "proc-macro2", "quote", - "syn", + "syn 1.0.109", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.83" +version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c38c045535d93ec4f0b4defec448e4291638ee608530863b1e2ba115d4fff7f" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" dependencies = [ "js-sys", "wasm-bindgen", @@ -1993,62 +2202,161 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-targets 0.48.0", +] + [[package]] name = "windows-sys" version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets 0.48.0", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + +[[package]] +name = "windows-targets" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5" +dependencies = [ + "windows_aarch64_gnullvm 0.48.0", + "windows_aarch64_msvc 0.48.0", + "windows_i686_gnu 0.48.0", + "windows_i686_msvc 0.48.0", + "windows_x86_64_gnu 0.48.0", + "windows_x86_64_gnullvm 0.48.0", + "windows_x86_64_msvc 0.48.0", ] [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winreg" diff --git a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix index 51ec65134a23..80b745683444 100644 --- a/pkgs/applications/editors/vim/plugins/vim-clap/default.nix +++ b/pkgs/applications/editors/vim/plugins/vim-clap/default.nix @@ -10,13 +10,13 @@ }: let - version = "0.42"; + version = "0.43"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; rev = "v${version}"; - hash = "sha256-Vd0T8RrpJb2aybuxIY2PaLT7bDtbkZF/N9VgbcZfPIE="; + hash = "sha256-UHsDSah8Fn67w11s/lwL76qbGPqXhz6tYlBBuiqTNXs="; }; meta = with lib; { From 774fc98ec6aa2ceb59cac1a4c19d152f459e3306 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 22:44:34 +0200 Subject: [PATCH 228/244] python311Packages.pyrevolve: add changelog to meta - disable on unsupported Python releases - add format --- .../python-modules/pyrevolve/default.nix | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pyrevolve/default.nix b/pkgs/development/python-modules/pyrevolve/default.nix index e99c547198db..754baf91ad38 100644 --- a/pkgs/development/python-modules/pyrevolve/default.nix +++ b/pkgs/development/python-modules/pyrevolve/default.nix @@ -6,11 +6,15 @@ , cython , numpy , pytest +, pythonOlder }: buildPythonPackage rec { pname = "pyrevolve"; version = "2.2.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "devitocodes"; @@ -19,8 +23,15 @@ buildPythonPackage rec { hash = "sha256-JLDn3WEBcdO8YYzt/MWOHB/1kcmbmZUsiH00/4Uwlxo="; }; - nativeBuildInputs = [ versioneer cython ]; - propagatedBuildInputs = [ contexttimer numpy ]; + nativeBuildInputs = [ + versioneer + cython + ]; + + propagatedBuildInputs = [ + contexttimer + numpy + ]; nativeCheckInputs = [ pytest ]; # Using approach bellow bcs the tests fail with the pytestCheckHook, throwing the following error @@ -30,10 +41,13 @@ buildPythonPackage rec { pytest ''; - pythonImportsCheck = [ "pyrevolve" ]; + pythonImportsCheck = [ + "pyrevolve" + ]; meta = with lib; { homepage = "https://github.com/devitocodes/pyrevolve"; + changelog = "https://github.com/devitocodes/pyrevolve/releases/tag/v${version}"; description = "Python library to manage checkpointing for adjoints"; license = licenses.epl10; maintainers = with maintainers; [ atila ]; From f4ca1bde6e596f01bc63e5178f6a4349bfad9be8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 22:52:38 +0200 Subject: [PATCH 229/244] python311Packages.bluetooth-auto-recovery: 1.1.1 -> 1.1.2 Diff: https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/compare/refs/tags/v1.1.1...v1.1.2 Changelog: https://github.com/Bluetooth-Devices/bluetooth-auto-recovery/blob/v1.1.2/CHANGELOG.md --- .../python-modules/bluetooth-auto-recovery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix index d1e1d42eb1c3..56fdc5ed8211 100644 --- a/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix +++ b/pkgs/development/python-modules/bluetooth-auto-recovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bluetooth-auto-recovery"; - version = "1.1.1"; + version = "1.1.2"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Kr8KzegMlRYgAwL+oHdb9A+/pTL+Ckpuu21CtraMwXg="; + hash = "sha256-lOtdrNXY9IYMGFdqhX4rM228OAZ2bUEBZKP+gcDGfuM="; }; nativeBuildInputs = [ From 8dc6ea5d4298c0753aaf78483e3f83907f9dbc87 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 22:53:37 +0200 Subject: [PATCH 230/244] python311Packages.aionotion: 2023.04.2 -> 2023.05.0 Diff: https://github.com/bachya/aionotion/compare/2023.04.2...2023.05.0 --- pkgs/development/python-modules/aionotion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aionotion/default.nix b/pkgs/development/python-modules/aionotion/default.nix index 9c31395ef62b..93fd0f9f6fc2 100644 --- a/pkgs/development/python-modules/aionotion/default.nix +++ b/pkgs/development/python-modules/aionotion/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "aionotion"; - version = "2023.04.2"; + version = "2023.05.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = version; - hash = "sha256-pMBUhCm16+Zs6xZExLB4Z5y+OKNHX+utjsfMLeYUSWY="; + hash = "sha256-wnyM8ERHJydhBdX9ZAskGdvIrvZNhYh/UVJv/JdxChE="; }; nativeBuildInputs = [ From c97205806d6191b0ab4d27a63232f9a39d9d1b34 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Tue, 18 Apr 2023 00:53:55 -0400 Subject: [PATCH 231/244] grafx2: 2.4.2035 -> 2.8.3091 --- pkgs/applications/graphics/grafx2/default.nix | 47 ++++++++++++------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index db297f70095a..26454897ddab 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -1,29 +1,41 @@ -{ lib, stdenv, fetchurl, SDL, SDL_image, SDL_ttf, zlib, libpng, pkg-config, lua5 }: +{ lib +, stdenv +, fetchurl +, SDL +, SDL_image +, SDL_ttf +, fontconfig +, libpng +, libtiff +, lua5 +, pkg-config +, zlib +}: stdenv.mkDerivation rec { - - version = "2.4.2035"; + version = "2.8.3091"; pname = "grafx2"; src = fetchurl { - url = "https://grafx2.googlecode.com/files/${pname}-${version}-src.tgz"; - sha256 = "0svsy6rqmdj11b400c242i2ixihyz0hds0dgicqz6g6dcgmcl62q"; + url = "https://pulkomandy.tk/projects/GrafX2/downloads/65"; + name = "${pname}-${version}.tar.gz"; + hash = "sha256-KdY7GUhQp/Q7t/ktLPGxI66ZHy2gDAffn2yB5pmcJCM="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL SDL_image SDL_ttf libpng zlib lua5 ]; + buildInputs = [ + SDL + SDL_image + SDL_ttf + fontconfig + libpng + libtiff + lua5 + zlib + ]; - preBuild = "cd src"; - - # Workaround build failure on -fno-common toolchains like upstream - # gcc-10. Otherwise build fails as: - # ld: ../obj/unix/tiles.o:/build/grafx2/src/global.h:306: multiple definition of - # `Main_selector'; ../obj/unix/main.o:/build/grafx2/src/global.h:306: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preInstall = '' mkdir -p "$out" ''; - - installPhase = ''make install prefix="$out"''; + makeFlags = [ "-C src" ]; + installFlags = [ "-C src" "PREFIX=$(out)" ]; meta = { description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance"; @@ -31,5 +43,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; maintainers = []; + mainProgram = "grafx2-sdl"; }; } From 62b0017f8675d2407979260f78a27595572bbce9 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 4 May 2023 23:10:57 +0200 Subject: [PATCH 232/244] envoy: mark with `knownVulnerabilities` Attempts to update `envoy` have not been successful. Nobody with enough Bazel skills has step up to untangle the build issues with the latest version. --- pkgs/servers/http/envoy/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index ad518e43aa87..d9236d531139 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -176,5 +176,13 @@ buildBazelPackage rec { license = licenses.asl20; maintainers = with maintainers; [ lukegb ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; + knownVulnerabilities = [ + "CVE-2023-27487" + "CVE-2023-27488" + "CVE-2023-27491" + "CVE-2023-27492" + "CVE-2023-27493" + "CVE-2023-27496" + ]; }; } From 2a6ff46ca2a227bf7e757b5e122810cc048b5061 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 23:18:20 +0200 Subject: [PATCH 233/244] nuclei: 2.9.2 -> 2.9.3 Diff: https://github.com/projectdiscovery/nuclei/compare/v2.9.2...v2.9.3 Changelog: https://github.com/projectdiscovery/nuclei/releases/tag/v2.9.3 --- pkgs/tools/security/nuclei/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/nuclei/default.nix b/pkgs/tools/security/nuclei/default.nix index 979203eed641..ee449bea9aab 100644 --- a/pkgs/tools/security/nuclei/default.nix +++ b/pkgs/tools/security/nuclei/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "nuclei"; - version = "2.9.2"; + version = "2.9.3"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = pname; rev = "v${version}"; - hash = "sha256-TGlslIWSV3cOzm+jv0MR2joSS9zpqbcTZDusa//hDRA="; + hash = "sha256-QiegMoBy0gZMyQl2MRAwR14zXeh8wvVonyETdAzHbj0="; }; - vendorHash = "sha256-pSiODP/PYzPuEG/9H+33ZYwJBvI4zBoZNtfV5Fh8Erk="; + vendorHash = "sha256-0JNwoBqLKH1F/0Tr8o35gCSNT/2plIjIQvZRuzAZ5P8="; modRoot = "./v2"; subPackages = [ From f587113e89243099428cde1873ba9d2eee735b3a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 23:20:51 +0200 Subject: [PATCH 234/244] python311Packages.bthome-ble: 2.10.1 -> 2.11.0 Diff: https://github.com/Bluetooth-Devices/bthome-ble/compare/refs/tags/v2.10.1...v2.11.0 Changelog: https://github.com/bluetooth-devices/bthome-ble/blob/v2.11.0/CHANGELOG.md --- pkgs/development/python-modules/bthome-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix index 61c6af129472..9336a83aacec 100644 --- a/pkgs/development/python-modules/bthome-ble/default.nix +++ b/pkgs/development/python-modules/bthome-ble/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "bthome-ble"; - version = "2.10.1"; + version = "2.11.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-pwhq8MAy2FueddEZgAYgsDs7eCrK/bStUhNDhfa+zqk="; + hash = "sha256-VCdXkUdSFX7ARVtgcbsRgh9Kcy490PA+HrT0Eaj8KvI="; }; nativeBuildInputs = [ From 3ba33c98f5dea269a0425e7223aade1bcf2a79f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 23:23:54 +0200 Subject: [PATCH 235/244] python311Packages.nibe: 2.1.4 -> 2.2.0 Diff: https://github.com/yozik04/nibe/compare/refs/tags/2.1.4...2.2.0 Changelog: https://github.com/yozik04/nibe/releases/tag/2.2.0 --- pkgs/development/python-modules/nibe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nibe/default.nix b/pkgs/development/python-modules/nibe/default.nix index 7c29e3e2e7b9..ee167fbc9882 100644 --- a/pkgs/development/python-modules/nibe/default.nix +++ b/pkgs/development/python-modules/nibe/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nibe"; - version = "2.1.4"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "yozik04"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gz5+vGjZAU+sBqtQJWi8MR5PL7ZpKQcdR6CmImxEi28="; + hash = "sha256-wuW8No3G+l5rG2xoqBi1lhIcqqgfrQ5CrkaEtSct38k="; }; nativeBuildInputs = [ From db77b19d762f318c7e9e08e172970f3426ba0583 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 23:26:19 +0200 Subject: [PATCH 236/244] python311Packages.onvif-zeep-async: 1.3.1 -> 2.1.0 --- pkgs/development/python-modules/onvif-zeep-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/onvif-zeep-async/default.nix b/pkgs/development/python-modules/onvif-zeep-async/default.nix index 28e170429613..d39bcf5a09b7 100644 --- a/pkgs/development/python-modules/onvif-zeep-async/default.nix +++ b/pkgs/development/python-modules/onvif-zeep-async/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "onvif-zeep-async"; - version = "1.3.1"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-Bh7QA86oL/CeRSLHdwvBdO39+AZwTqA7ZVERw1jvJtU="; + hash = "sha256-HQ8SUr4LSelXjRYZRMJixfk/H38zEYg/Qaj23mdAhV8="; }; propagatedBuildInputs = [ From 705555006e2e1608024e7b4603c6b01c3df27402 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 23:29:38 +0200 Subject: [PATCH 237/244] python311Packages.python-roborock: 0.10.0 -> 0.11.0 Diff: https://github.com/humbertogontijo/python-roborock/compare/refs/tags/v0.10.0...v0.11.0 Changelog: https://github.com/humbertogontijo/python-roborock/blob/v0.11.0/CHANGELOG.md --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index a52dd48833d7..ebdaada6ca7d 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.10.0"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-3t9ep6JHczvNBJdJqdwrZSS+ZEh4UYQkPCx0X4e7gNY="; + hash = "sha256-DH3JKBjBGZQjDCYzjLQc64qARALyfQZagOy7kkK7Sew="; }; nativeBuildInputs = [ From 6cf957a10c7b2308ea5484cb8af42d611a64bff3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 23:32:39 +0200 Subject: [PATCH 238/244] python311Packages.pytrafikverket: 0.2.3 -> 0.3.1 Changelog: https://github.com/endor-force/pytrafikverket/releases/tag/0.3.1 --- pkgs/development/python-modules/pytrafikverket/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytrafikverket/default.nix b/pkgs/development/python-modules/pytrafikverket/default.nix index f3785f5fb6db..4a0debfe0f3f 100644 --- a/pkgs/development/python-modules/pytrafikverket/default.nix +++ b/pkgs/development/python-modules/pytrafikverket/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pytrafikverket"; - version = "0.2.3"; + version = "0.3.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bbg1FzzJ3cJIbV+u3Ih70hkgu23Joxc1xeLELiRYt8g="; + hash = "sha256-foTIzWk/Y1H6OK+OAIU5VPlb/+gevc8WP9TzpYtnWvM="; }; propagatedBuildInputs = [ From c35f64efbe62f33058691e4d2cfb31079f9b068e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 4 May 2023 23:41:11 +0200 Subject: [PATCH 239/244] checkov: 2.3.216 -> 2.3.223 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/2.3.216...2.3.223 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/2.3.223 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index db35da57c663..f29278db9ac0 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -22,14 +22,14 @@ with py.pkgs; buildPythonApplication rec { pname = "checkov"; - version = "2.3.216"; + version = "2.3.223"; format = "setuptools"; src = fetchFromGitHub { owner = "bridgecrewio"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-A9X7QrqgPgVxCf1O7dbhoaRaZDDI73e1Wl5elBZDbO4="; + hash = "sha256-/m/B2yR/NxQnd2di6ERZHFTT4xOI5mH6xFQwp3p2bEo="; }; patches = [ From e0d993080395ce784dff6072d3652cbee4461e65 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 4 May 2023 11:31:18 +0300 Subject: [PATCH 240/244] vscode: 1.77.3 -> 1.78.0 --- pkgs/applications/editors/vscode/generic.nix | 3 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index bd9b7b468101..bf6a8a1120f9 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -135,9 +135,6 @@ let # this fixes bundled ripgrep chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg - - # see https://github.com/gentoo/gentoo/commit/4da5959 - chmod +x resources/app/node_modules/node-pty/build/Release/spawn-helper ''; inherit meta; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 872bc81d5db0..1ee9ac930575 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0sf8kkhvz73b8q7dxy53vikgpksgdffzj9qbkd9mbx6qjv0k60yw"; - x86_64-darwin = "1223c05vinlkm6y7f9k31wlsncg3c0yz8j8ja5xilgjgq8ynr1kw"; - aarch64-linux = "013bhl630zvdxwxgjs7rzd3a254jx4axp2mavar06fwgysz83q3y"; - aarch64-darwin = "0hqjcrdy7x8pc6zvzx7rv8dp39dwpmmkri36jwxaq86zhqhf650c"; - armv7l-linux = "1vb068c2aqjihdhsrd42vy60aw4ffrqbmisajm3yz84b2hcfmjy2"; + x86_64-linux = "11ibgnpcs0qvirgjnk799zkb63zp0nbc8y636l5g9nay6jm8lr8s"; + x86_64-darwin = "0wg2xbvg3v20w4dh9vf27xcf95r5dv2l118vxxjfz2chfxmkk1qw"; + aarch64-linux = "1gff1ildisczwb0dx7a0jvhj8rgn60n93rzcj1d7lihkgd00zjg6"; + aarch64-darwin = "1zmfg1lv6izv1dmhawmnjs108pg99kq37pi6adyqnfw9yssn0ar5"; + armv7l-linux = "10gr9p5vf0wcc9dgyc79p20vip12ja15qas4i3kwdp9lp4hzh1ss"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.77.3"; + version = "1.78.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 0d108189c7824efaddb5f7c4399424b269dcf30f Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 5 May 2023 00:45:31 +0300 Subject: [PATCH 241/244] vscode/generic: restore hack conditional on version --- pkgs/applications/editors/vscode/generic.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index bf6a8a1120f9..baf801ca45d6 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -135,6 +135,9 @@ let # this fixes bundled ripgrep chmod +x resources/app/node_modules/@vscode/ripgrep/bin/rg + '' + lib.optionalString (lib.versionOlder version "1.78.0") '' + # see https://github.com/gentoo/gentoo/commit/4da5959 + chmod +x resources/app/node_modules/node-pty/build/Release/spawn-helper ''; inherit meta; From aa2cbfd02dabc15d8c1f0e8a908e07e159901972 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Thu, 4 May 2023 22:52:25 +0200 Subject: [PATCH 242/244] newsflash: 2.2.4 -> 2.3.0 --- .../feedreaders/newsflash/Cargo.lock | 567 +++++++----------- .../feedreaders/newsflash/default.nix | 9 +- 2 files changed, 215 insertions(+), 361 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock index 8d09ee5c778d..1e058229933d 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock +++ b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock @@ -17,12 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - [[package]] name = "aes" version = "0.7.5" @@ -37,9 +31,9 @@ dependencies = [ [[package]] name = "aho-corasick" -version = "0.7.20" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04" dependencies = [ "memchr", ] @@ -83,49 +77,58 @@ dependencies = [ [[package]] name = "anstream" -version = "0.2.6" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342258dd14006105c2b75ab1bd7543a03bdf0cfc94383303ac212a04939dff6f" +checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450" dependencies = [ "anstyle", "anstyle-parse", + "anstyle-query", "anstyle-wincon", - "concolor-override", - "concolor-query", + "colorchoice", "is-terminal", "utf8parse", ] [[package]] name = "anstyle" -version = "0.3.5" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" +checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" [[package]] name = "anstyle-parse" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" +checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" dependencies = [ "utf8parse", ] [[package]] -name = "anstyle-wincon" -version = "0.2.0" +name = "anstyle-query" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" +checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +dependencies = [ + "windows-sys 0.48.0", +] + +[[package]] +name = "anstyle-wincon" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" dependencies = [ "anstyle", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "anyhow" -version = "1.0.70" +version = "1.0.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7de8ce5e0f9f8d88245311066a578d72b7af3e7088f32783804676302df237e4" +checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8" [[package]] name = "arc-swap" @@ -135,20 +138,22 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "article_scraper" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7438721a1e5c9d060dd4fbb65977cbf0f19feeb57c336dc40f2b9942c2420d1" +version = "2.0.0-alpha.0" +source = "git+https://gitlab.com/news-flash/article_scraper.git#d8ceee140330137501ad187eab057b31ee289c40" dependencies = [ - "base64 0.13.1", + "base64 0.21.0", "chrono", "encoding_rs", - "failure", - "image 0.23.14", - "libxml 0.2.16", + "escaper", + "futures", + "image", + "libxml", "log", - "parking_lot 0.11.2", + "once_cell", "regex", "reqwest", + "rust-embed", + "thiserror", "tokio", "url", ] @@ -284,7 +289,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -327,7 +332,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -405,9 +410,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.1.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c70beb79cbb5ce9c4f8e20849978f34225931f665bb49efa6982875a4d5facb3" +checksum = "24a6904aef64d73cf10ab17ebace7befb918b82164785cb89907993be7f83813" [[package]] name = "block" @@ -488,9 +493,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.0" +version = "3.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535" +checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" [[package]] name = "bytemuck" @@ -543,11 +548,12 @@ checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-expr" -version = "0.14.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a35b255461940a32985c627ce82900867c61db1659764d3675ea81963f72a4c6" +checksum = "c8790cf1286da485c72cf5fc7aeba308438800036ec67d89425924c4807268c9" dependencies = [ "smallvec", + "target-lexicon", ] [[package]] @@ -582,18 +588,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.2.1" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +checksum = "8a1f23fa97e1d1641371b51f35535cb26959b8e27ab50d167a8b996b5bada819" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.2.1" +version = "4.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" +checksum = "0fdc5d93c358224b4d6867ef1356d740de2303e9892edc06c5340daeccd96bab" dependencies = [ "anstream", "anstyle", @@ -636,19 +642,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] -name = "concolor-override" +name = "colorchoice" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a855d4a1978dc52fb0536a04d384c2c0c1aa273597f08b77c8c4d3b2eec6037f" - -[[package]] -name = "concolor-query" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d11d52c3d7ca2e6d0040212be9e4dbbcd78b6447f535b6b561f449427944cf" -dependencies = [ - "windows-sys 0.45.0", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "concurrent-queue" @@ -704,9 +701,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "280a9f2d8b3a38871a3c8a46fb80db65e5e5ed97da80c4d08bf27fb63e35e181" +checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" dependencies = [ "libc", ] @@ -731,9 +728,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf2b3e8478797446514c91ef04bafcb59faba183e621ad488df88983cc14128c" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" dependencies = [ "cfg-if", "crossbeam-utils", @@ -822,7 +819,7 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -839,7 +836,7 @@ checksum = "2345488264226bf682893e25de0769f3360aac9957980ec49361b083ddaa5bc5" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -854,16 +851,6 @@ version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f578e8e2c440e7297e008bb5486a3a8a194775224bbc23729b0dbdfaeebf162e" -[[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - [[package]] name = "derivative" version = "2.2.0" @@ -894,9 +881,9 @@ checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" [[package]] name = "diesel" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4391a22b19c916e50bec4d6140f29bdda3e3bb187223fe6e3ea0b6e4d1021c04" +checksum = "72eb77396836a4505da85bae0712fa324b74acfe1876d7c2f7e694ef3d0ee373" dependencies = [ "bigdecimal", "chrono", @@ -1051,9 +1038,9 @@ dependencies = [ [[package]] name = "enumflags2" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0044ebdf7fbb2a772e0c0233a9d3173c5cd8af8ae7078d4c5188af44ffffaa4b" +checksum = "c041f5090df68b32bcd905365fd51769c8b9d553fe87fde0b683534f10c01bd2" dependencies = [ "enumflags2_derive", "serde", @@ -1061,13 +1048,13 @@ dependencies = [ [[package]] name = "enumflags2_derive" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2c772ccdbdfd1967b4f5d79d17c98ebf92009fdcc838db7aa434462f600c26" +checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -1132,28 +1119,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - [[package]] name = "fastrand" version = "1.9.0" @@ -1163,6 +1128,15 @@ dependencies = [ "instant", ] +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + [[package]] name = "feed-rs" version = "1.3.0" @@ -1240,12 +1214,12 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.25" +version = "1.0.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841" +checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743" dependencies = [ "crc32fast", - "miniz_oxide 0.6.2", + "miniz_oxide 0.7.1", ] [[package]] @@ -1373,7 +1347,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -1520,16 +1494,6 @@ dependencies = [ "temp-dir", ] -[[package]] -name = "gif" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" -dependencies = [ - "color_quant", - "weezl", -] - [[package]] name = "gif" version = "0.12.0" @@ -1548,9 +1512,9 @@ checksum = "ad0a93d233ebf96623465aad4046a8d3aa4da22d4f4beba5388838c8a434bbb4" [[package]] name = "gio" -version = "0.17.4" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2261a3b4e922ec676d1c27ac466218c38cf5dcb49a759129e54bb5046e442125" +checksum = "d14522e56c6bcb6f7a3aebc25cbcfb06776af4c0c25232b601b4383252d7cb92" dependencies = [ "bitflags 1.3.2", "futures-channel", @@ -1581,9 +1545,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.17.5" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfb53061756195d76969292c2d2e329e01259276524a9bae6c9b73af62854773" +checksum = "a7f1de7cbde31ea4f0a919453a2dcece5d54d5b70e08f8ad254dc4840f5f09b6" dependencies = [ "bitflags 1.3.2", "futures-channel", @@ -1604,9 +1568,9 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.17.7" +version = "0.17.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc4cf346122086f196260783aa58987190dbd5f43bfab01946d2bf9786e8d9ef" +checksum = "0a7206c5c03851ef126ea1444990e81fdd6765fb799d5bc694e4897ca01bb97f" dependencies = [ "anyhow", "heck", @@ -1723,9 +1687,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.4" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e30e124b5a605f6f5513db13958bfcd51d746607b20bc7bb718b33e303274ed" +checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" dependencies = [ "bitflags 1.3.2", "cairo-rs", @@ -1746,9 +1710,9 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f041a797fb098bfb06e432c61738133604bfa3af57f13f1da3b9d46271422ef0" +checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" dependencies = [ "anyhow", "proc-macro-crate", @@ -1779,9 +1743,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.16" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be7b54589b581f624f566bf5d8eb2bab1db736c51528720b6bd36b96b55924d" +checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" dependencies = [ "bytes", "fnv", @@ -1955,9 +1919,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.25" +version = "0.14.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc5e554ff619822309ffd57d8734d77cd5ce6238bc956f037ea06c58238c9899" +checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4" dependencies = [ "bytes", "futures-channel", @@ -2048,25 +2012,6 @@ dependencies = [ "unicode-normalization", ] -[[package]] -name = "image" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif 0.11.4", - "jpeg-decoder 0.1.22", - "num-iter", - "num-rational 0.3.2", - "num-traits", - "png 0.16.8", - "scoped_threadpool", - "tiff 0.6.1", -] - [[package]] name = "image" version = "0.24.6" @@ -2077,13 +2022,13 @@ dependencies = [ "byteorder", "color_quant", "exr", - "gif 0.12.0", - "jpeg-decoder 0.3.0", - "num-rational 0.4.1", + "gif", + "jpeg-decoder", + "num-rational", "num-traits", - "png 0.17.7", + "png", "qoi", - "tiff 0.8.1", + "tiff", ] [[package]] @@ -2205,15 +2150,6 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "47f142fe24a9c9944451e8349de0a56af5f3e7226dc46f3ed4d4ecc0b85af75e" -[[package]] -name = "jpeg-decoder" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" -dependencies = [ - "rayon", -] - [[package]] name = "jpeg-decoder" version = "0.3.0" @@ -2290,31 +2226,20 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.141" +version = "0.2.142" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3304a64d199bb964be99741b7a14d26972741915b3649639149b2479bb46f4b5" +checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" [[package]] name = "libsqlite3-sys" -version = "0.25.2" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29f835d03d717946d28b1d1ed632eb6f0e24a299388ee623d0c23118d3e8a7fa" +checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" dependencies = [ "pkg-config", "vcpkg", ] -[[package]] -name = "libxml" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0f71e821b82fe8ad377edf23ed7a66328df62a49be11377f21230e3955ea1f7" -dependencies = [ - "libc", - "pkg-config", - "vcpkg", -] - [[package]] name = "libxml" version = "0.3.2" @@ -2352,9 +2277,9 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.3.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" +checksum = "b64f40e5e03e0d54f03845c8197d0291253cdbedfb1cb46b13c2c117554a9f4c" [[package]] name = "locale_config" @@ -2411,7 +2336,7 @@ dependencies = [ "libc", "log", "log-mdc", - "parking_lot 0.12.1", + "parking_lot", "serde", "serde-value", "serde_json", @@ -2601,25 +2526,6 @@ dependencies = [ "url", ] -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - [[package]] name = "miniz_oxide" version = "0.6.2" @@ -2629,6 +2535,16 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +dependencies = [ + "adler", + "simd-adler32", +] + [[package]] name = "mio" version = "0.8.6" @@ -2676,13 +2592,13 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "news-flash" -version = "2.2.2" -source = "git+https://gitlab.com/news-flash/news_flash.git#6242fc25cc3ee5e9c02a07ffb491b2d153958ce6" +version = "2.3.0-alpha.0" +source = "git+https://gitlab.com/news-flash/news_flash.git#60eff75c158aa04f67289900c7e7fe958f29f130" dependencies = [ "article_scraper", "async-trait", "base64 0.21.0", - "bitflags 2.1.0", + "bitflags 2.2.1", "bytes", "chrono", "diesel", @@ -2695,8 +2611,8 @@ dependencies = [ "futures", "greader_api", "hex", - "image 0.24.6", - "libxml 0.3.2", + "image", + "libxml", "log", "magic-crypt", "mime", @@ -2707,7 +2623,7 @@ dependencies = [ "obfstr", "once_cell", "opml", - "parking_lot 0.12.1", + "parking_lot", "random_color", "rayon", "regex", @@ -2717,6 +2633,7 @@ dependencies = [ "serde", "serde_json", "thiserror", + "tokio", "url", ] @@ -2749,7 +2666,7 @@ dependencies = [ "num_cpus", "once_cell", "pango", - "parking_lot 0.12.1", + "parking_lot", "percent-encoding", "rc-writer", "regex", @@ -2803,7 +2720,6 @@ dependencies = [ "cfg-if", "libc", "memoffset 0.7.1", - "pin-utils", "static_assertions", ] @@ -2828,28 +2744,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - [[package]] name = "num-rational" version = "0.4.1" @@ -2938,9 +2832,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.49" +version = "0.10.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d2f106ab837a24e03672c59b1239669a0596406ff657c3c0835b6b7f0f35a33" +checksum = "01b8574602df80f7b85fdfc5392fa884a4e3b3f4f35402c070ab34c3d3f78d56" dependencies = [ "bitflags 1.3.2", "cfg-if", @@ -2959,7 +2853,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -2970,9 +2864,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.84" +version = "0.9.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a20eace9dc2d82904039cb76dcf50fb1a0bba071cfd1629720b5d6f1ddba0fa" +checksum = "8e17f59264b2809d77ae94f0e1ebabc434773f370d6ca667bd223ea10e06cc7e" dependencies = [ "cc", "libc", @@ -3042,17 +2936,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" -[[package]] -name = "parking_lot" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] - [[package]] name = "parking_lot" version = "0.12.1" @@ -3060,21 +2943,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -3174,33 +3043,22 @@ checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" [[package]] name = "png" -version = "0.16.8" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags 1.3.2", - "crc32fast", - "deflate", - "miniz_oxide 0.3.7", -] - -[[package]] -name = "png" -version = "0.17.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d708eaf860a19b19ce538740d2b4bdeeb8337fa53f7738455e706623ad5c638" +checksum = "aaeebc51f9e7d2c150d3f3bfeb667f2aa985db5ef1e3d212847bdedb488beeaa" dependencies = [ "bitflags 1.3.2", "crc32fast", + "fdeflate", "flate2", - "miniz_oxide 0.6.2", + "miniz_oxide 0.7.1", ] [[package]] name = "polling" -version = "2.7.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be1c66a6add46bff50935c313dae30a5030cf8385c5206e8a95e9e9def974aa" +checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce" dependencies = [ "autocfg", "bitflags 1.3.2", @@ -3324,7 +3182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93" dependencies = [ "log", - "parking_lot 0.12.1", + "parking_lot", "scheduled-thread-pool", ] @@ -3477,9 +3335,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.3" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d" +checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370" dependencies = [ "aho-corasick", "memchr", @@ -3488,15 +3346,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.29" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" +checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "reqwest" -version = "0.11.16" +version = "0.11.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b71749df584b7f4cac2c426c127a7c785a5106cc98f7a8feb044115f0fa254" +checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" dependencies = [ "async-compression", "base64 0.21.0", @@ -3536,6 +3394,7 @@ dependencies = [ "url", "wasm-bindgen", "wasm-bindgen-futures", + "wasm-streams", "web-sys", "webpki-roots", "winreg", @@ -3603,9 +3462,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4a36c42d1873f9a77c53bde094f9664d9891bc604a45b4798fd2c389ed12e5b" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc_version" @@ -3618,9 +3477,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.11" +version = "0.37.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85597d61f83914ddeba6a47b3b8ffe7365107221c2e557ed94426489fefb5f77" +checksum = "8bbfc1d1c7c40c01715f47d71444744a81669ca84e8b63e25a55e169b1f86433" dependencies = [ "bitflags 1.3.2", "errno", @@ -3681,15 +3540,9 @@ version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19" dependencies = [ - "parking_lot 0.12.1", + "parking_lot", ] -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - [[package]] name = "scopeguard" version = "1.1.0" @@ -3743,9 +3596,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] @@ -3762,20 +3615,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.159" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] name = "serde_json" -version = "1.0.95" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "itoa", "ryu", @@ -3790,7 +3643,7 @@ checksum = "bcec881020c684085e55a25f7fd888954d56609ef363479dc5a1305eb0d40cab" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -3964,7 +3817,7 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot 0.12.1", + "parking_lot", "phf_shared", "precomputed-hash", "serde", @@ -4001,32 +3854,20 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.13" +version = "2.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c9da457c5285ac1f936ebd076af6dac17a61cfe7826f2076b4d015cf47bc8ec" +checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - [[package]] name = "system-deps" -version = "6.0.4" +version = "6.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "555fc8147af6256f3931a36bb83ad0023240ce9cf2b319dec8236fd1f220b05f" +checksum = "d0fe581ad25d11420b873cf9aedaca0419c2b411487b134d4d21065f3d092055" dependencies = [ "cfg-expr", "heck", @@ -4035,6 +3876,12 @@ dependencies = [ "version-compare", ] +[[package]] +name = "target-lexicon" +version = "0.12.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd1ba337640d60c3e96bc6f0638a939b9c9a7f2c316a1598c279828b3d1dc8c5" + [[package]] name = "temp-dir" version = "0.1.11" @@ -4091,7 +3938,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -4105,17 +3952,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "tiff" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" -dependencies = [ - "jpeg-decoder 0.1.22", - "miniz_oxide 0.4.4", - "weezl", -] - [[package]] name = "tiff" version = "0.8.1" @@ -4123,7 +3959,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7449334f9ff2baf290d55d73983a7d6fa15e01198faef72af07e2a8db851e471" dependencies = [ "flate2", - "jpeg-decoder 0.3.0", + "jpeg-decoder", "weezl", ] @@ -4193,9 +4029,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" dependencies = [ "autocfg", "bytes", @@ -4205,18 +4041,18 @@ dependencies = [ "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.45.0", + "windows-sys 0.48.0", ] [[package]] name = "tokio-macros" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.13", + "syn 2.0.15", ] [[package]] @@ -4254,9 +4090,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" dependencies = [ "bytes", "futures-core", @@ -4329,13 +4165,13 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a" +checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.15", ] [[package]] @@ -4383,7 +4219,7 @@ dependencies = [ "ipconfig", "lazy_static", "lru-cache", - "parking_lot 0.12.1", + "parking_lot", "resolv-conf", "smallvec", "thiserror", @@ -4459,12 +4295,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "unsafe-any-ors" version = "1.0.0" @@ -4506,9 +4336,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.3.0" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1674845326ee10d37ca60470760d4288a6f80f304007d92e5c53bab78c9cfd79" +checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" dependencies = [ "getrandom 0.2.9", ] @@ -4651,6 +4481,19 @@ version = "0.2.84" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +[[package]] +name = "wasm-streams" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bbae3363c08332cadccd13b67db371814cd214c2524020932f0804b8cf7c078" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + [[package]] name = "web-sys" version = "0.3.61" @@ -4914,9 +4757,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.1" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +checksum = "5617da7e1f97bf363947d767b91aaf3c2bbc19db7fda9c65af1278713d58e0a2" dependencies = [ "memchr", ] @@ -4930,6 +4773,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "xdg-home" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd" +dependencies = [ + "nix", + "winapi", +] + [[package]] name = "xml-rs" version = "0.8.4" @@ -4973,9 +4826,9 @@ dependencies = [ [[package]] name = "zbus" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dc29e76f558b2cb94190e8605ecfe77dd40f5df8c072951714b4b71a97f5848" +checksum = "29242fa5ec5693629ae74d6eb1f69622a9511f600986d6d9779bccf36ac316e3" dependencies = [ "async-broadcast", "async-executor", @@ -4987,7 +4840,6 @@ dependencies = [ "async-trait", "byteorder", "derivative", - "dirs 4.0.0", "enumflags2", "event-listener", "futures-core", @@ -5005,6 +4857,7 @@ dependencies = [ "tracing", "uds_windows", "winapi", + "xdg-home", "zbus_macros", "zbus_names", "zvariant", @@ -5012,9 +4865,9 @@ dependencies = [ [[package]] name = "zbus_macros" -version = "3.11.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62a80fd82c011cd08459eaaf1fd83d3090c1b61e6d5284360074a7475af3a85d" +checksum = "537793e26e9af85f774801dc52c6f6292352b2b517c5cf0449ffd3735732a53a" dependencies = [ "proc-macro-crate", "proc-macro2", diff --git a/pkgs/applications/networking/feedreaders/newsflash/default.nix b/pkgs/applications/networking/feedreaders/newsflash/default.nix index d1dba70e9044..9af205735ac8 100644 --- a/pkgs/applications/networking/feedreaders/newsflash/default.nix +++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix @@ -22,21 +22,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "unstable-2023-04-11"; + version = "2.3.0"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; - rev = "a7bc8bfdf5e58bd78f0f36516e00be8e1296bc12"; - sha256 = "sha256-VYIHbOcYopzGTVG+fGyPBS5di7aBayhk+jj9FZh5Tms="; + rev = "refs/tags/v.${finalAttrs.version}"; + sha256 = "sha256-sW2yO6aZqhiyrIT4B8iBmum+36vcQMg4NsFxInJm7hM="; }; cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; outputHashes = { "javascriptcore6-0.1.0" = "sha256-7w8CDY13dCRlFc77XxJ2/xZqlKSjqM0eiOvILOrJ4ic="; - "news-flash-2.2.2" = "sha256-LXKhVsmkdTk1MSB0T5MDOgTJF/MXbNZ6T5cC2iZxsPs="; + "news-flash-2.3.0-alpha.0" = "sha256-phoZmTY1YVZIIktqLMnal9H5SMgNWwx7m+7AMtDcFJM="; "newsblur_api-0.2.0" = "sha256-6vnFeJbdFeIau2rpUk9o72DD2ZCqicljmQjFVhY71NI="; + "article_scraper-2.0.0-alpha.0" = "sha256-HPEKZc7O7pbgcwR2l0kD/5442W1hzrfMadc0amrjxwI="; }; }; From f06d24a512ca4a470877938a746cd9af410c5c3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 May 2023 17:17:15 +0000 Subject: [PATCH 243/244] kubernetes: 1.27.0 -> 1.27.1 --- pkgs/applications/networking/cluster/kubernetes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index dd71b53584fc..dff0eb145fdc 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -20,13 +20,13 @@ buildGoModule rec { pname = "kubernetes"; - version = "1.27.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - hash = "sha256-9xRsC6QghmoH/+K6Gs8k4BFHQ8ltCtG8TZpAJGRC2e4="; + hash = "sha256-0Wxj+Qxf9q6pIZiYLdIIhZP7n3MHvCZ560tl5AiO+QE="; }; vendorHash = null; From 4e2bb2c2be03e5efe8a413096c0bd7217daca9c1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 5 May 2023 01:26:48 +0200 Subject: [PATCH 244/244] thunderbird-bin: Set explicit binaryName after betterbird changes The betterbird package introduced the binaryName variable, because it uses a different executable filename. During review the required changes to thunderbird-bin were missed. --- .../networking/mailreaders/thunderbird-bin/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index fb5d66408049..557f7168c591 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -204,6 +204,10 @@ stdenv.mkDerivation { baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; }; + passthru = { + binaryName = "thunderbird"; + }; + meta = with lib; { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "Mozilla Thunderbird, a full-featured email client (binary package)";