From af1e42784b2c98c0de7d46cb64f40e9d5a6b0031 Mon Sep 17 00:00:00 2001 From: Yureka Date: Mon, 18 Jul 2022 09:48:01 +0200 Subject: [PATCH 01/45] unifiedpush-common-proxies: 1.1.1 -> 1.3.0 --- pkgs/servers/unifiedpush-common-proxies/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifiedpush-common-proxies/default.nix b/pkgs/servers/unifiedpush-common-proxies/default.nix index 4c41a7c9fde4..0198c22baba9 100644 --- a/pkgs/servers/unifiedpush-common-proxies/default.nix +++ b/pkgs/servers/unifiedpush-common-proxies/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "unifiedpush-common-proxies"; - version = "1.1.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "unifiedpush"; repo = "common-proxies"; rev = "v${version}"; - sha256 = "0wf6kmj8m2c06864qiphf91j5rpaj3bvjrafdk6lqli14p5gmma2"; + sha256 = "sha256-spOLgSqiEySVc7imeTeg83MO5cw5nea0qD6OV8JRI6Y="; }; vendorSha256 = "13mxdjc9fvajl0w78a5g1cqadgmxsx74zz8npp5h2s68zkl8sjxk"; From 2a6b51e3618a80ea17eec65a9753bb4d50e2d708 Mon Sep 17 00:00:00 2001 From: Vir Chaudhury Date: Wed, 20 Jul 2022 22:35:03 +0800 Subject: [PATCH 02/45] maintainers: add virchau13 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index acc04a533f60..00f0c84e6a13 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13454,6 +13454,12 @@ githubId = 118959; name = "VinyMeuh"; }; + virchau13 = { + email = "virchau13@hexular.net"; + github = "virchau13"; + githubId = 16955157; + name = "Vir Chaudhury"; + }; viraptor = { email = "nix@viraptor.info"; github = "viraptor"; From 62b02108c34fad993b970174b7c80929ad4e5b6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Aug 2022 00:25:54 +0000 Subject: [PATCH 03/45] libmysqlconnectorcpp: 8.0.28 -> 8.0.29 --- pkgs/development/libraries/libmysqlconnectorcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 5303dbed6ca8..73bc19a424fe 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.28"; + version = "8.0.29"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - sha256 = "sha256-yyb+neBaO18e0ioZlCm2eR7OGEM+sEZeKnP89EWGQgs="; + sha256 = "sha256-mmI2oovKM66VHYzKq7j/UaGIhj6FmfkJb0rgodoZ+H8="; }; nativeBuildInputs = [ From c9d011497d900f85e1a304610be4722545f80ecb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Aug 2022 06:34:02 +0000 Subject: [PATCH 04/45] hsqldb: 2.6.1 -> 2.7.0 --- pkgs/development/libraries/java/hsqldb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index ae9df24c55ac..e4041241dcf9 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.6.1"; + version = "2.7.0"; underscoreMajMin = lib.strings.replaceChars ["."] ["_"] (lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "sha256-cixyEwjEt68UOotd1TcJNyVUxTRDx4XyfyYg9k6kRtQ="; + sha256 = "sha256-nLBCigQMPF6QbjrUuSDjP2ir38TmzC5Pa8Rjpk1BkcQ="; }; nativeBuildInputs = [ unzip makeWrapper ]; From 52e86e2b22997bbe98dd654afe9d48fc2905f645 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Aug 2022 12:03:47 +0000 Subject: [PATCH 05/45] python310Packages.pyperf: 2.4.0 -> 2.4.1 --- pkgs/development/python-modules/pyperf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyperf/default.nix b/pkgs/development/python-modules/pyperf/default.nix index c45c437a44ab..3a0f1a53ffd6 100644 --- a/pkgs/development/python-modules/pyperf/default.nix +++ b/pkgs/development/python-modules/pyperf/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyperf"; - version = "2.4.0"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-z85StSr7EJgQr80WePyeOY9wzhWHqwRIWctyKEaTTj0="; + sha256 = "sha256-OM9ekMVvkGqDIM6CpQv6kskCuTr/1y5NyBWAEV81WFM="; }; checkInputs = [ nose psutil ] ++ From 42df18cf76340a657ba54be574e17da243c5c6ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Aug 2022 13:47:56 +0000 Subject: [PATCH 06/45] sentencepiece: 0.1.96 -> 0.1.97 --- 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 0f7450320d6a..cc4dd1268e60 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.96"; + version = "0.1.97"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jo8XlQJsnWpeeezDjNNhh6T473XMqe8fsApUr82Y3BU="; + sha256 = "sha256-T6qQtLmuPKVha0CwX4fBH7IQoAlwVj64X2qDecWd7s8="; }; nativeBuildInputs = [ cmake ]; From a2c041a1d7ba773b0434ead39a85314381982d49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Aug 2022 13:49:10 +0000 Subject: [PATCH 07/45] sentry-native: 0.4.18 -> 0.5.0 --- pkgs/development/libraries/sentry-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index a52751af71de..eafc773ef206 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.4.18"; + version = "0.5.0"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - sha256 = "sha256-2WNmpx6ReVmsRvKHAaZznGuugvmLxK25P1WdmorNj/g="; + sha256 = "sha256-whbzoKIYLwj4yoFaT3frghJd/WzfpolSAuZzQRtnP5E="; }; nativeBuildInputs = [ cmake ]; From 7b77d1a62ece3ab68f08123061b3f1379be18f22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Aug 2022 15:00:25 +0000 Subject: [PATCH 08/45] wesnoth: 1.16.4 -> 1.16.5 --- pkgs/games/wesnoth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix index 5060f2fb4f0a..b6ee5ac7d7b2 100644 --- a/pkgs/games/wesnoth/default.nix +++ b/pkgs/games/wesnoth/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wesnoth"; - version = "1.16.4"; + version = "1.16.5"; src = fetchFromGitHub { rev = version; owner = "wesnoth"; repo = "wesnoth"; - sha256 = "sha256-yb/Y54MVtzIi5+FnQQZTNDNGgkPn0j2n+7cH6qejAO0="; + sha256 = "sha256-U01dMrbPRBliag/RKnwG1G2YEv7fiTh6+S+S5cO1Fx8="; }; nativeBuildInputs = [ cmake pkg-config ]; From f3e806edf4fd27362dad80a02ac96e3f9f485f51 Mon Sep 17 00:00:00 2001 From: tirex Date: Sun, 7 Aug 2022 13:13:59 +0200 Subject: [PATCH 09/45] mysql: 8.0.29 -> 8.0.30 --- pkgs/servers/sql/mysql/8.0.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 25115eafeb8c..a59bd44fb028 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { pname = "mysql"; - version = "8.0.29"; + version = "8.0.30"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${self.mysqlVersion}/${pname}-${version}.tar.gz"; - sha256 = "sha256-USFw+m94ppTW8Y0ZfpmdJxbuaNxUHXZE3ZIqNmNAcmY="; + sha256 = "sha256-yYjVxrqaVmkqbNbpgTRltfyTaO1LRh35cFmi/BYMi4Q="; }; nativeBuildInputs = [ bison cmake pkg-config ] From 7761d8aa56009f01a4ff06782c9ce4ceb3727bec Mon Sep 17 00:00:00 2001 From: Vir Chaudhury Date: Wed, 20 Jul 2022 22:35:35 +0800 Subject: [PATCH 10/45] xp-pen-deco-01-v2-driver: init at 3.2.3.220323-1 --- .../xp-pen-drivers/deco-01-v2/default.nix | 81 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/qt5-packages.nix | 2 + 3 files changed, 85 insertions(+) create mode 100644 pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix diff --git a/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix new file mode 100644 index 000000000000..32804afa9ff2 --- /dev/null +++ b/pkgs/os-specific/linux/xp-pen-drivers/deco-01-v2/default.nix @@ -0,0 +1,81 @@ +{ lib +, stdenv +, fetchzip +, libusb1 +, glibc +, libGL +, xorg +, qtx11extras +, wrapQtAppsHook +, autoPatchelfHook +, libX11 +, libXtst +, libXi +, libXrandr +, libXinerama +}: + +let + dataDir = "var/lib/xppend1v2"; +in +stdenv.mkDerivation rec { + pname = "xp-pen-deco-01-v2-driver"; + version = "3.2.3.220323-1"; + + src = fetchzip { + url = "https://www.xp-pen.com/download/file/id/1936/pid/440/ext/gz.html#.tar.gz"; + name = "xp-pen-deco-01-v2-driver-${version}.tar.gz"; + sha256 = "sha256-n/yutkRsjcIRRhB4q1yqEmaa03/1SO8RigJi/ZkfLbk="; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + autoPatchelfHook + ]; + + dontBuild = true; + + dontWrapQtApps = true; # this is done manually + + buildInputs = [ + libusb1 + libX11 + libXtst + libXi + libXrandr + libXinerama + glibc + libGL + stdenv.cc.cc.lib + qtx11extras + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/{opt,bin} + cp -r App/usr/lib/pentablet/{pentablet,resource.rcc,conf} $out/opt + chmod +x $out/opt/pentablet + cp -r App/lib $out/lib + sed -i 's#usr/lib/pentablet#${dataDir}#g' $out/opt/pentablet + + runHook postInstall + ''; + + postFixup = '' + makeWrapper $out/opt/pentablet $out/bin/xp-pen-deco-01-v2-driver \ + "''${qtWrapperArgs[@]}" \ + --run 'if [ "$EUID" -ne 0 ]; then echo "Please run as root."; exit 1; fi' \ + --run 'if [ ! -d /${dataDir} ]; then mkdir -p /${dataDir}; cp -r '$out'/opt/conf /${dataDir}; chmod u+w -R /${dataDir}; fi' + ''; + + meta = with lib; { + homepage = "https://www.xp-pen.com/product/461.html"; + description = "Drivers for the XP-PEN Deco 01 v2 drawing tablet"; + platforms = [ "x86_64-linux" ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + maintainers = with maintainers; [ virchau13 ]; + license = licenses.unfree; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4221ad132814..6abf23de4dd7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35928,6 +35928,8 @@ with pkgs; bcompare = libsForQt5.callPackage ../applications/version-management/bcompare {}; + xp-pen-deco-01-v2-driver = libsForQt5.xp-pen-deco-01-v2-driver; + pentablet-driver = libsForQt5.callPackage ../misc/drivers/pentablet-driver { }; new-session-manager = callPackage ../applications/audio/new-session-manager { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index d4c155d714ff..677a75affd0f 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -235,5 +235,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea soundkonverter = callPackage ../applications/audio/soundkonverter {}; + xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { }; + yuview = callPackage ../applications/video/yuview { }; }))) From 66327cf6873aa286d1d45c9c05be4d59acd7bfc3 Mon Sep 17 00:00:00 2001 From: Vir Chaudhury Date: Sat, 23 Jul 2022 18:21:10 +0800 Subject: [PATCH 11/45] pentablet-driver: rename to xp-pen-g430-driver --- .../linux/xp-pen-drivers/g430}/default.nix | 2 +- pkgs/top-level/aliases.nix | 3 ++- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/qt5-packages.nix | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) rename pkgs/{misc/drivers/pentablet-driver => os-specific/linux/xp-pen-drivers/g430}/default.nix (96%) diff --git a/pkgs/misc/drivers/pentablet-driver/default.nix b/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix similarity index 96% rename from pkgs/misc/drivers/pentablet-driver/default.nix rename to pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix index a06ae85fb3b3..ad983662109a 100644 --- a/pkgs/misc/drivers/pentablet-driver/default.nix +++ b/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, mkDerivation, fetchzip, autoPatchelfHook, libusb1, libX11, libXtst, qtbase, libglvnd }: mkDerivation rec { - pname = "pentablet-driver"; + pname = "xp-pen-g430-driver"; version = "1.2.13.1"; src = fetchzip { diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index c8f4cdde0daf..fb897983119a 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1021,6 +1021,7 @@ mapAliases ({ pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # Added 2020-11-03 pdfmod = throw "pdfmod has been removed"; # Added 2022-01-15 pdfread = throw "pdfread has been remove because it is unmaintained for years and the sources are no longer available"; # Added 2021-07-22 + pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23 perlXMLParser = throw "'perlXMLParser' has been renamed to/replaced by 'perlPackages.XMLParser'"; # Converted to throw 2022-02-22 perlArchiveCpio = throw "'perlArchiveCpio' has been renamed to/replaced by 'perlPackages.ArchiveCpio'"; # Converted to throw 2022-02-22 pgadmin = pgadmin4; @@ -1509,7 +1510,7 @@ mapAliases ({ xmonad_log_applet_gnome3 = throw "'xmonad_log_applet_gnome3' has been renamed to/replaced by 'xmonad_log_applet'"; # Converted to throw 2022-02-22 xmpp-client = throw "xmpp-client has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-02 xmpppy = throw "xmpppy has been removed from nixpkgs as it is unmaintained and python2-only"; - xp-pen-g430 = pentablet-driver; # Added 2020-05-03 + xp-pen-g430 = throw "xp-pen-g430 has been renamed to xp-pen-g430-driver"; # Converted to throw 2022-06-23 xpf = throw "xpf has been removed: abandoned by upstream"; # Added 2022-04-26 xf86_video_nouveau = throw "'xf86_video_nouveau' has been renamed to/replaced by 'xorg.xf86videonouveau'"; # Converted to throw 2022-02-22 xf86_input_mtrack = throw '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6abf23de4dd7..9fe457cfa642 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35930,7 +35930,7 @@ with pkgs; xp-pen-deco-01-v2-driver = libsForQt5.xp-pen-deco-01-v2-driver; - pentablet-driver = libsForQt5.callPackage ../misc/drivers/pentablet-driver { }; + xp-pen-g430-driver = libsForQt5.xp-pen-g430-driver; new-session-manager = callPackage ../applications/audio/new-session-manager { }; diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 677a75affd0f..c4bd055f5738 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -237,5 +237,7 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { }; + xp-pen-g430-driver = callPackage ../os-specific/linux/xp-pen-drivers/g430 { }; + yuview = callPackage ../applications/video/yuview { }; }))) From 4ffb569d9255ddaa6bb32ab3f5bb7025478364b9 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Fri, 15 Jul 2022 16:53:45 +0200 Subject: [PATCH 12/45] dotnet-sdk: 6.0.301 -> 6.0.302 --- pkgs/development/compilers/dotnet/default.nix | 54 +++++++++---------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 9097604e428e..5c9905367bbd 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -141,69 +141,69 @@ rec { # v6.0 (lts) aspnetcore_6_0 = buildAspNetCore { inherit icu; - version = "6.0.6"; + version = "6.0.7"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/afd5344f-a9e9-45f9-85b5-de4551c53736/c30996daa407f9bb540ebc5edfcf16fc/aspnetcore-runtime-6.0.6-linux-x64.tar.gz"; - sha512 = "1a5c0f85820f0eb589700df94de6dbff45fe4089a37f1cd5b1fac33476a2cbd8d5c6f129e55b3716f5a7a2616f1a5a720c52238f21b28a510a3e5c8bcb8c516c"; + url = "https://download.visualstudio.microsoft.com/download/pr/98271725-1784-407c-841a-64d87c674512/b433af33506c816e3b5838f5c65d990a/aspnetcore-runtime-6.0.7-linux-x64.tar.gz"; + sha512 = "d210e2afd009746d2c4d98c07077b89ce174f462c2bdaae9afea107a5b1c9c4ab63460ae3d9ae38c5388f591c0a95d8712359326013b23325b7be19b51835455"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/94553ccb-ce1a-401c-8840-bdffb4e9d0cb/ab8a0024df90506d953904ac38b5a978/aspnetcore-runtime-6.0.6-linux-arm64.tar.gz"; - sha512 = "a3bd7ce99ffb9b87766c49fcf28d802f4072af1d55f1d53ef4043a1a0b038a0fc8046669bbd82f64fb37e4c73703fa8f54a460caaa473d952baf941d23341c90"; + url = "https://download.visualstudio.microsoft.com/download/pr/b79c5fa9-a08d-4534-9424-4bacfc3cdc3d/449179d6fe8cda05f52b7be0f6828eb0/aspnetcore-runtime-6.0.7-linux-arm64.tar.gz"; + sha512 = "0c7317d2170f2632afd7c7c3e5bd84075071802e901de1ed5e54178f8a56266fe0770ebd84502aff9384b06908d4d5bee9d464d215fb20d841de177174f55f93"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0f5eb01e-6b46-4ef3-8c1c-7b99657a36df/7d4807a527cd5bc5a6a864f1fcd354e7/aspnetcore-runtime-6.0.6-osx-x64.tar.gz"; - sha512 = "d1a469a5d27afd2f035f9865a295b8948bb2fcefd0e734c61ea8d0fe1b272fd1e0ba3aa4ad414aa68491fc611695c8d94064d1bb02d62cf1e7ea071a73a844da"; + url = "https://download.visualstudio.microsoft.com/download/pr/5b4d2b0e-607e-4f9a-944f-0acdefd828d9/79a0271038df505617ef800587a92858/aspnetcore-runtime-6.0.7-osx-x64.tar.gz"; + sha512 = "6c05250d2affb61a1f34ba297e3c9bd0ddc42d64b1580f5e8cfa218a079cc455aa183f683869ba52e7b9ce58fb223dff8ef9776d4b2e2421ed7e2058d4af0750"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/550f6609-521f-42e4-9b53-ff6c88bbe26a/1abbac456fe075a1b6f0f578716e0c4a/aspnetcore-runtime-6.0.6-osx-arm64.tar.gz"; - sha512 = "0d62c151b4d25d606becbc0a99d4ed3988aaae97a95990a8d5b6e0e220bdf661e3f7fad64dad6a479f8c9bbd42971d6e5fab7dca43b74ca7ccbc423fa5b200af"; + url = "https://download.visualstudio.microsoft.com/download/pr/3d952783-f61f-4399-841a-fa5b5aeffded/15580a465dec6a7c67107e3f96d6da13/aspnetcore-runtime-6.0.7-osx-arm64.tar.gz"; + sha512 = "4d9dccaeabc1490fb9261f0be0702c2f5b4e96b840edee94d50f9a4655aa4d85bcf5a16d21d43b0a543e5a90cc631510aba35000df465a4ffc6cca7de37907fc"; }; }; }; runtime_6_0 = buildNetRuntime { inherit icu; - version = "6.0.6"; + version = "6.0.7"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ec4172e3-077a-42c0-859d-349e517d7935/82d945cdc4c33fbe440a86a240a58a41/dotnet-runtime-6.0.6-linux-x64.tar.gz"; - sha512 = "4fe090f934f0ba4e64a63dfccbac97d49b19a913f2a7d73abe85efd604ee5577cefd65d6e0dc02086e9fa28be4ce2bbaecb33ea70d022714138ed54deea58c72"; + url = "https://download.visualstudio.microsoft.com/download/pr/bd828687-1706-4041-a804-5e93631fe256/d4ec75936459a7e8c772c929edcbfeda/dotnet-runtime-6.0.7-linux-x64.tar.gz"; + sha512 = "996bdaf33be0a9c0f1e2d309b997e3a84a31e28d2424853d7fb1600212f4ce600ebe1b9615de5e46c17652f08ad0d7ecd4b3619217c9624b875a26a553f370d8"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/44ed3398-9838-4fd0-b225-60d5aadfb00e/00fd4a320d09a380753b45106e2a8e94/dotnet-runtime-6.0.6-linux-arm64.tar.gz"; - sha512 = "659bf64c5f2e11f2b8cf01dc595a4280d1960bf484fc379d3a382660eea7adb6e69ace49d84522a85920ed53fa2ffb95a3b0ca0ebf63dc909b865028174ed29f"; + url = "https://download.visualstudio.microsoft.com/download/pr/f9706e92-c7a1-4dc8-806a-0e95827c5b02/23be52946e4e2425c798208c5f16bb64/dotnet-runtime-6.0.7-linux-arm64.tar.gz"; + sha512 = "a63e100fe80cb64febfd2920e4065b3cc99f759c3de0897928a42cf14fdc963df324bef1354a7734420078d16e52fd8257dd480da465d865c4349c29cab1ef91"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/30056482-998a-42ed-b3a7-8fc057977e2e/698c75b7f2429e796dd3c13f980e4188/dotnet-runtime-6.0.6-osx-x64.tar.gz"; - sha512 = "efe5b6287c4a62688bc94aae2d4ed8831ca5d62280ba477bb3efa49666c9fdbb9b091980837882b1b52ddfba566a8ab0071746cbfa63efea99a0bb3ebf19a2a1"; + url = "https://download.visualstudio.microsoft.com/download/pr/97def016-12c7-4e24-b924-772485a41faa/e96d9a0502492efa7de3897467f5972c/dotnet-runtime-6.0.7-osx-x64.tar.gz"; + sha512 = "9c53d16971f0366d6d69fbfe37e92eea806faa1c3502cc1050c0e6d2cf394cf886761146e344862a30d0cb131105f387c05d8ea207be8aa87c81cd4c8f962110"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/f91e108d-487b-4a47-b6e9-52bcc56df7ed/d722468512150e73489f2cee0b2d7087/dotnet-runtime-6.0.6-osx-arm64.tar.gz"; - sha512 = "0cb4f3c808ae5476ebdbc18840846fb625a51ac5ce53688e83c3ae22a062095f9012c066dbcce231eca50ca3f057d7a29721d4b9cd04c9891ca26fc0c1c4a481"; + url = "https://download.visualstudio.microsoft.com/download/pr/044c6d0f-0ac2-450f-b621-637ca24ab2fb/5cd0c43804f3fde6d09cacbfd8525868/dotnet-runtime-6.0.7-osx-arm64.tar.gz"; + sha512 = "9f08a535921df7c1ce837ef27478f2381e8132a9ebfec7630465fb3243ef2ec9e982d008faec69e0899675dc3a50b379a96967d1eed3c04dada40cb211489127"; }; }; }; sdk_6_0 = buildNetSdk { inherit icu; - version = "6.0.301"; + version = "6.0.302"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/77d472e5-194c-421e-992d-e4ca1d08e6cc/56c61ac303ddf1b12026151f4f000a2b/dotnet-sdk-6.0.301-linux-x64.tar.gz"; - sha512 = "2f434ea4860ee637e9cf19991a80e1febb1105531dd96b4fbc728d538ca0ab202a0bdff128fd13b269fac3ba3bc9d5f9c49039a6e0d7d32751e8a2bb6d790446"; + url = "https://download.visualstudio.microsoft.com/download/pr/0e83f50a-0619-45e6-8f16-dc4f41d1bb16/e0de908b2f070ef9e7e3b6ddea9d268c/dotnet-sdk-6.0.302-linux-x64.tar.gz"; + sha512 = "ac1d124802ca035aa00806312460b371af8e3a55d85383ddd8bb66f427c4fabae75b8be23c45888344e13b283a4f9c7df228447c06d796a57ffa5bb21992e6a4"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/06c4ee8e-bf2c-4e46-ab1c-e14dd72311c1/f7bc6c9677eaccadd1d0e76c55d361ea/dotnet-sdk-6.0.301-linux-arm64.tar.gz"; - sha512 = "978dd04f78ac3d6b594c47f1482bba0abe93f0b37379c1c46a2b9b33bdf5188576b055250546295de39bb22cba93ea9b31c31bb026a319ad1b3fc507db44481f"; + url = "https://download.visualstudio.microsoft.com/download/pr/33389348-a7d7-41ae-850f-ec46d3ca9612/36bad11f948b05a4fa9faac93c35e574/dotnet-sdk-6.0.302-linux-arm64.tar.gz"; + sha512 = "26e98a63665d707b1a7729f1794077316f9927edd88d12d82d0357fe597096b0d89b64a085fcdf0cf49807a443bbfebb48e10ea91cea890846cf4308e67c4ea5"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/cf3e1c73-a9a9-4e08-8607-8f9edae5f3f2/40a021a98a6b6e430a1f170037735f6f/dotnet-sdk-6.0.301-osx-x64.tar.gz"; - sha512 = "027328a353b65fad0618d1e5abeb973c9f05787d9432631bf9ab5fafe636ea2f494f70c0704e81a1664fe7a3519174bd269dbc795b651b14e9a86c83f8e3adec"; + url = "https://download.visualstudio.microsoft.com/download/pr/60719796-b5c5-46dc-a26a-7e8126a292c8/a7b871d6c46136b61c30403d085ef97c/dotnet-sdk-6.0.302-osx-x64.tar.gz"; + sha512 = "003a06be76bf6228b4c033f34773039d57ebd485cf471a8117f5516f243a47a24d1b485ab9307becc1973107bb1d5b6c3028bbcbb217cbb42f5bee4c6c01c458"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3859fff3-f8a9-4e05-87cd-bd6db75833f5/64ec1099d45f85d14099da3c1f92a5c3/dotnet-sdk-6.0.301-osx-arm64.tar.gz"; - sha512 = "899558be856769ad6ccc4606f3a9f996327a7395a72acb18a5fb0899e0c4c4ba8c90b94f16771439193f87a974e1e884dd55a9fc6649fe929ebe47ef19cb4efc"; + url = "https://download.visualstudio.microsoft.com/download/pr/01a17a2d-6b92-4521-97a2-ad7d845a8064/44aa4e10f71e70a38b5f6f59d211cbab/dotnet-sdk-6.0.302-osx-arm64.tar.gz"; + sha512 = "59caea897a56b785245dcd3a6082247aeb879c39ecfab16db60e9dc3db447ca4e3ebe68e992c0551af886cd81f6f0088cb1433f1be6df865afa357f90f37ccf6"; }; }; }; From e444b88411b378847101ae2b7fc1a10ba3240ff4 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Fri, 15 Jul 2022 16:53:52 +0200 Subject: [PATCH 13/45] dotnet-sdk: split up versions into separate nix files This makes it more readable Also update print-hashes.sh to directly update the files. --- pkgs/development/compilers/dotnet/default.nix | 203 +----------------- .../compilers/dotnet/print-hashes.sh | 24 +-- .../compilers/dotnet/versions/3.1.nix | 61 ++++++ .../compilers/dotnet/versions/5.0.nix | 61 ++++++ .../compilers/dotnet/versions/6.0.nix | 73 +++++++ 5 files changed, 218 insertions(+), 204 deletions(-) create mode 100644 pkgs/development/compilers/dotnet/versions/3.1.nix create mode 100644 pkgs/development/compilers/dotnet/versions/5.0.nix create mode 100644 pkgs/development/compilers/dotnet/versions/6.0.nix diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 5c9905367bbd..05b5c7fc41c6 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -8,9 +8,16 @@ https://dotnet.microsoft.com/download/dotnet { callPackage, icu70, icu }: let buildDotnet = attrs: callPackage (import ./build-dotnet.nix attrs) {}; - buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); - buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); - buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); + buildAttrs = { + buildAspNetCore = attrs: buildDotnet (attrs // { type = "aspnetcore"; }); + buildNetRuntime = attrs: buildDotnet (attrs // { type = "runtime"; }); + buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); + }; + + ## Files in versions/ are generated automatically by print-hashes.sh ## + dotnet_3_1 = (import ./versions/3.1.nix (buildAttrs // { icu = icu70; })); + dotnet_5_0 = (import ./versions/5.0.nix (buildAttrs // { inherit icu; })); + dotnet_6_0 = (import ./versions/6.0.nix (buildAttrs // { inherit icu; })); in rec { combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; @@ -19,192 +26,4 @@ rec { sdk_2_1 = throw "Dotnet SDK 2.1 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; sdk_2_2 = throw "Dotnet SDK 2.2 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; sdk_3_0 = throw "Dotnet SDK 3.0 is EOL, please use 3.1 (LTS), 5.0 (Current) or 6.0 (LTS)"; - - ##### Following attributes with urls and hashes should be auto-generated by print-hashes.sh ##### - - # v3.1 (maintenance) - aspnetcore_3_1 = buildAspNetCore { - icu = icu70; - version = "3.1.26"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6f72adf7-0e78-48ea-85ef-e72a39a1f8a1/1ec0238c236c3757e5628563a329fdc4/aspnetcore-runtime-3.1.26-linux-x64.tar.gz"; - sha512 = "8bbf06012cdd2cff23c592e0d3c49d032d77add4dda8fba1d7ba73e6cc4ae97b1676908b14cdc7fc2fe723302e1efd27a44b48190a91d69c0e41bb5edb47501f"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/6b68a14a-b4dd-4a75-bb32-26c08d19190f/1d6b637e290775f668701f8f6092ab35/aspnetcore-runtime-3.1.26-linux-arm64.tar.gz"; - sha512 = "757ff6cbc31b1c8743077288d7fa621c73fa7f4d155d636ad100cda6e1f601e31d2f842d5cfef3dec5daa4c8c3efbcf76f02afd1c518cae7b67b2a46a9faab08"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/33e8be5c-5e6a-4dc2-9aa8-846aaffa6897/fe9d96af1d75f8d5f4cba4bff95f2fae/aspnetcore-runtime-3.1.26-osx-x64.tar.gz"; - sha512 = "0657d8b11a58357f5374e5d8201b401e55f9f4710794be565f7b9022d10639c2e72aebc6b7433b34fd24a03e8e12541c998fad28b5263de4439b3d31a8252c4c"; - }; - }; - }; - - runtime_3_1 = buildNetRuntime { - icu = icu70; - version = "3.1.26"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a14c8e4d-a22b-47f8-953c-bb4337634513/58017d103d432f7106c44b0891936aba/dotnet-runtime-3.1.26-linux-x64.tar.gz"; - sha512 = "03676885ec4d1f5ba184678a6b774f8e385abfff800a6bcee6f85557b39e9cdde500be49b5d6c956fc95cdfb9f33d31e467548bb498a52bc4fd639b3cb87c8d0"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/cb0e8b4b-7b2b-40cc-b7a6-30f0d4fabe6c/f5cb06cbb1b1b5d198792333b3db235a/dotnet-runtime-3.1.26-linux-arm64.tar.gz"; - sha512 = "574409616f5cbef35a2bd6fd1a2f0bcb3bdaa81457aea3af5e0e237ba768ced5214c51a3045697fe7478e8211e2045fc2072e382d6f456509a8f2923e9b1fc26"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/6bedea65-b104-45b8-abe9-36cefbeedadf/05f4e472ec2395dad7103fda9ed278b2/dotnet-runtime-3.1.26-osx-x64.tar.gz"; - sha512 = "7957b5e697db7548964c399197ae8e61cc31f15374df384b6db9b47472a7d6f1b5b3e256c191e203c4d18c18cc8bdb6c4a331c5875bd37bd6415f3c83b8062da"; - }; - }; - }; - - sdk_3_1 = buildNetSdk { - icu = icu70; - version = "3.1.420"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/5424da8c-ce12-46de-a51a-8fa61aefdde6/52a9d6b5718ea40863db96901c780d4b/dotnet-sdk-3.1.420-linux-x64.tar.gz"; - sha512 = "b3bdd964182f9edc3c2976541e657fcc43b0eaf9bc97197597c7ecb8b784d79e3efb9e0405c84e1dcb434cf4cd38ddc4af628c5df486c3d7ae8a23e5254796e3"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a84bf296-ee6e-4e66-9694-90d3da7af2b4/b00b2efe2432938e5a19c45d3759d80f/dotnet-sdk-3.1.420-linux-arm64.tar.gz"; - sha512 = "ac66b1544fe178153bb85c2e5be584464374ce4c036fc95720547c231c2730312018fbdfc735f9071579749415bc54e1f6b8f080cc2b08d5799a0da941e8a5f5"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/bb0efe58-450c-4e28-81c1-4081acd6ffa4/1d0eaf8b624dff000c8b10ea0497e731/dotnet-sdk-3.1.420-osx-x64.tar.gz"; - sha512 = "370cba4685e07d1cdb5d7f9b754812b237802ace679c9b9985c6e5c4dc09f500580f1413679a288615079bd155b68b362adb00151b2b8f5ca7c3718ab9e16194"; - }; - }; - }; - - # v5.0 (current) - aspnetcore_5_0 = buildAspNetCore { - inherit icu; - version = "5.0.12"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ad0a54ca-4b88-4762-a790-aebeaba6b9e7/0f796fb90696d078046d90d8a05c027e/aspnetcore-runtime-5.0.12-linux-x64.tar.gz"; - sha512 = "0529f23ffa651ac2c2807b70d6e5034f6ae4c88204afdaaa76965ef604d6533f9440d68d9f2cdd3a9f2ca37e9140e6c61a9f9207d430c71140094c7d5c33bf79"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/bfc8ae06-2830-4082-a09e-63b3c7134096/880a4712d4ba3491c88aa566553c4e8a/aspnetcore-runtime-5.0.12-linux-arm64.tar.gz"; - sha512 = "70570177896943613f0cddeb046ffccaafb1c8245c146383e45fbcfb27779c70dff1ab22c2b13a14bf096173c9279e0a386f61665106a3abb5f623b50281a652"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/06d71ed5-0755-40d6-8b8e-14a24b8a9cb7/47a8b4deda0deecf3658716b642c69bf/aspnetcore-runtime-5.0.12-osx-x64.tar.gz"; - sha512 = "bd9e7dd7f48c220121dde85b3acc4ce7eb2a1944d472f9340276718ef72d033f05fd9a62ffb9de93b8e7633843e731ff1cb5e8c836315f7571f519fdb0a119e1"; - }; - }; - }; - - runtime_5_0 = buildNetRuntime { - inherit icu; - version = "5.0.12"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/781b7ae6-166c-4114-97f8-926d2bf74d34/fe51479e3138d672c512ef0322be23d3/dotnet-runtime-5.0.12-linux-x64.tar.gz"; - sha512 = "32b5f86db3b1d4c21e3cf616d22f0e4a7374385dac0cf03cdebf3520dcf846460d9677ec1829a180920740a0237d64f6eaa2421d036a67f4fe9fb15d4f6b1db9"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/7c342ad2-2dae-471b-ae46-c0c820321c1f/a480ad8ca0bc826a48c9b1e56efd972b/dotnet-runtime-5.0.12-linux-arm64.tar.gz"; - sha512 = "a8089fad8d21a4b582aa6c3d7162d56a21fee697fd400f050a772f67c2ace5e4196d1c4261d3e861d6dc2e5439666f112c406104d6271e5ab60cda80ef2ffc64"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8f990fa6-6b13-40ad-95f6-383391ff3d91/7531048d16c01efdf3885da367aa8b89/dotnet-runtime-5.0.12-osx-x64.tar.gz"; - sha512 = "a3160eaec15d0e2b62a4a2cdbb6663ef2e817fd26a3a3b8b3d75c5e3538b2947ff66eaddafb39cc297b9f087794d5fbd5a0e097ec8522ab6fea562f230055264"; - }; - }; - }; - - sdk_5_0 = buildNetSdk { - inherit icu; - version = "5.0.403"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/b77183fa-c045-4058-82c5-d37742ed5f2d/ddaccef3e448a6df348cae4d1d271339/dotnet-sdk-5.0.403-linux-x64.tar.gz"; - sha512 = "7ba5f7f898dba64ea7027dc66184d60ac5ac35fabe750bd509711628442e098413878789fad5766be163fd2867cf22ef482a951e187cf629bbc6f54dd9293a4a"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/91015c72-ce5a-4840-9e87-5bfa4bb80224/b39692ac418d790ff7a2e092eb07de98/dotnet-sdk-5.0.403-linux-arm64.tar.gz"; - sha512 = "6cc705fe45c0d8df6a493eb2923539ef5b62d048d5218859bf3af06fb3934c9c716c16f98ee1a28c818d77adff8430bf39a2ae54a59a1468b704b4ba192234ac"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5ccdb916-531f-4064-84e8-5475b273a4de/80dcfa0c2eb528f8b0e7c313ed36f4f1/dotnet-sdk-5.0.403-osx-x64.tar.gz"; - sha512 = "70beea069db182cca211cf04d7a80f3d6a3987d76cbd2bb60590ee76b93a4041b1b86ad91057cddbbaddd501c72327c1bc0a5fec630f38063f84bd60ba2b4792"; - }; - }; - }; - - # v6.0 (lts) - aspnetcore_6_0 = buildAspNetCore { - inherit icu; - version = "6.0.7"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/98271725-1784-407c-841a-64d87c674512/b433af33506c816e3b5838f5c65d990a/aspnetcore-runtime-6.0.7-linux-x64.tar.gz"; - sha512 = "d210e2afd009746d2c4d98c07077b89ce174f462c2bdaae9afea107a5b1c9c4ab63460ae3d9ae38c5388f591c0a95d8712359326013b23325b7be19b51835455"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/b79c5fa9-a08d-4534-9424-4bacfc3cdc3d/449179d6fe8cda05f52b7be0f6828eb0/aspnetcore-runtime-6.0.7-linux-arm64.tar.gz"; - sha512 = "0c7317d2170f2632afd7c7c3e5bd84075071802e901de1ed5e54178f8a56266fe0770ebd84502aff9384b06908d4d5bee9d464d215fb20d841de177174f55f93"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5b4d2b0e-607e-4f9a-944f-0acdefd828d9/79a0271038df505617ef800587a92858/aspnetcore-runtime-6.0.7-osx-x64.tar.gz"; - sha512 = "6c05250d2affb61a1f34ba297e3c9bd0ddc42d64b1580f5e8cfa218a079cc455aa183f683869ba52e7b9ce58fb223dff8ef9776d4b2e2421ed7e2058d4af0750"; - }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3d952783-f61f-4399-841a-fa5b5aeffded/15580a465dec6a7c67107e3f96d6da13/aspnetcore-runtime-6.0.7-osx-arm64.tar.gz"; - sha512 = "4d9dccaeabc1490fb9261f0be0702c2f5b4e96b840edee94d50f9a4655aa4d85bcf5a16d21d43b0a543e5a90cc631510aba35000df465a4ffc6cca7de37907fc"; - }; - }; - }; - - runtime_6_0 = buildNetRuntime { - inherit icu; - version = "6.0.7"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/bd828687-1706-4041-a804-5e93631fe256/d4ec75936459a7e8c772c929edcbfeda/dotnet-runtime-6.0.7-linux-x64.tar.gz"; - sha512 = "996bdaf33be0a9c0f1e2d309b997e3a84a31e28d2424853d7fb1600212f4ce600ebe1b9615de5e46c17652f08ad0d7ecd4b3619217c9624b875a26a553f370d8"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f9706e92-c7a1-4dc8-806a-0e95827c5b02/23be52946e4e2425c798208c5f16bb64/dotnet-runtime-6.0.7-linux-arm64.tar.gz"; - sha512 = "a63e100fe80cb64febfd2920e4065b3cc99f759c3de0897928a42cf14fdc963df324bef1354a7734420078d16e52fd8257dd480da465d865c4349c29cab1ef91"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/97def016-12c7-4e24-b924-772485a41faa/e96d9a0502492efa7de3897467f5972c/dotnet-runtime-6.0.7-osx-x64.tar.gz"; - sha512 = "9c53d16971f0366d6d69fbfe37e92eea806faa1c3502cc1050c0e6d2cf394cf886761146e344862a30d0cb131105f387c05d8ea207be8aa87c81cd4c8f962110"; - }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/044c6d0f-0ac2-450f-b621-637ca24ab2fb/5cd0c43804f3fde6d09cacbfd8525868/dotnet-runtime-6.0.7-osx-arm64.tar.gz"; - sha512 = "9f08a535921df7c1ce837ef27478f2381e8132a9ebfec7630465fb3243ef2ec9e982d008faec69e0899675dc3a50b379a96967d1eed3c04dada40cb211489127"; - }; - }; - }; - - sdk_6_0 = buildNetSdk { - inherit icu; - version = "6.0.302"; - srcs = { - x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0e83f50a-0619-45e6-8f16-dc4f41d1bb16/e0de908b2f070ef9e7e3b6ddea9d268c/dotnet-sdk-6.0.302-linux-x64.tar.gz"; - sha512 = "ac1d124802ca035aa00806312460b371af8e3a55d85383ddd8bb66f427c4fabae75b8be23c45888344e13b283a4f9c7df228447c06d796a57ffa5bb21992e6a4"; - }; - aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/33389348-a7d7-41ae-850f-ec46d3ca9612/36bad11f948b05a4fa9faac93c35e574/dotnet-sdk-6.0.302-linux-arm64.tar.gz"; - sha512 = "26e98a63665d707b1a7729f1794077316f9927edd88d12d82d0357fe597096b0d89b64a085fcdf0cf49807a443bbfebb48e10ea91cea890846cf4308e67c4ea5"; - }; - x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/60719796-b5c5-46dc-a26a-7e8126a292c8/a7b871d6c46136b61c30403d085ef97c/dotnet-sdk-6.0.302-osx-x64.tar.gz"; - sha512 = "003a06be76bf6228b4c033f34773039d57ebd485cf471a8117f5516f243a47a24d1b485ab9307becc1973107bb1d5b6c3028bbcbb217cbb42f5bee4c6c01c458"; - }; - aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/01a17a2d-6b92-4521-97a2-ad7d845a8064/44aa4e10f71e70a38b5f6f59d211cbab/dotnet-sdk-6.0.302-osx-arm64.tar.gz"; - sha512 = "59caea897a56b785245dcd3a6082247aeb879c39ecfab16db60e9dc3db447ca4e3ebe68e992c0551af886cd81f6f0088cb1433f1be6df865afa357f90f37ccf6"; - }; - }; - }; -} +} // dotnet_3_1 // dotnet_5_0 // dotnet_6_0 diff --git a/pkgs/development/compilers/dotnet/print-hashes.sh b/pkgs/development/compilers/dotnet/print-hashes.sh index 162f1af70ecf..c68fa767e4f9 100755 --- a/pkgs/development/compilers/dotnet/print-hashes.sh +++ b/pkgs/development/compilers/dotnet/print-hashes.sh @@ -46,7 +46,7 @@ platform_sources () { echo " $nix_platform = { url = \"$url\"; sha512 = \"$hash\"; - }; " + };" done echo " };" } @@ -65,6 +65,7 @@ Examples: fi for sem_version in "$@"; do + echo "Generating ./versions/${sem_version}.nix" patch_specified=false if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$ ]]; then patch_specified=true @@ -84,34 +85,33 @@ Examples: aspnetcore_files="$(release_files "$release_content" "aspnetcore-runtime")" runtime_files="$(release_files "$release_content" "runtime")" sdk_files="$(release_files "$release_content" "sdk")" - if [ $major_minor = "3.1" ]; then - icu_attr="icu = icu70;" - else - icu_attr="inherit icu;" - fi major_minor_underscore=${major_minor/./_} channel_version=$(jq -r '."channel-version"' <<< "$content") support_phase=$(jq -r '."support-phase"' <<< "$content") - echo " - # v$channel_version ($support_phase) + echo "{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: + +# v$channel_version ($support_phase) +{ aspnetcore_$major_minor_underscore = buildAspNetCore { - $icu_attr + inherit icu; version = \"${aspnetcore_version}\"; $(platform_sources "$aspnetcore_files") }; runtime_$major_minor_underscore = buildNetRuntime { - $icu_attr + inherit icu; version = \"${runtime_version}\"; $(platform_sources "$runtime_files") }; sdk_$major_minor_underscore = buildNetSdk { - $icu_attr + inherit icu; version = \"${sdk_version}\"; $(platform_sources "$sdk_files") - }; " + }; +}" > "./versions/${sem_version}.nix" + echo "Generated ./versions/${sem_version}.nix" done } diff --git a/pkgs/development/compilers/dotnet/versions/3.1.nix b/pkgs/development/compilers/dotnet/versions/3.1.nix new file mode 100644 index 000000000000..53c78b579d7b --- /dev/null +++ b/pkgs/development/compilers/dotnet/versions/3.1.nix @@ -0,0 +1,61 @@ +{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: + +# v3.1 (maintenance) +{ + aspnetcore_3_1 = buildAspNetCore { + inherit icu; + version = "3.1.26"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/6f72adf7-0e78-48ea-85ef-e72a39a1f8a1/1ec0238c236c3757e5628563a329fdc4/aspnetcore-runtime-3.1.26-linux-x64.tar.gz"; + sha512 = "8bbf06012cdd2cff23c592e0d3c49d032d77add4dda8fba1d7ba73e6cc4ae97b1676908b14cdc7fc2fe723302e1efd27a44b48190a91d69c0e41bb5edb47501f"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/6b68a14a-b4dd-4a75-bb32-26c08d19190f/1d6b637e290775f668701f8f6092ab35/aspnetcore-runtime-3.1.26-linux-arm64.tar.gz"; + sha512 = "757ff6cbc31b1c8743077288d7fa621c73fa7f4d155d636ad100cda6e1f601e31d2f842d5cfef3dec5daa4c8c3efbcf76f02afd1c518cae7b67b2a46a9faab08"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/33e8be5c-5e6a-4dc2-9aa8-846aaffa6897/fe9d96af1d75f8d5f4cba4bff95f2fae/aspnetcore-runtime-3.1.26-osx-x64.tar.gz"; + sha512 = "0657d8b11a58357f5374e5d8201b401e55f9f4710794be565f7b9022d10639c2e72aebc6b7433b34fd24a03e8e12541c998fad28b5263de4439b3d31a8252c4c"; + }; + }; + }; + + runtime_3_1 = buildNetRuntime { + inherit icu; + version = "3.1.26"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/a14c8e4d-a22b-47f8-953c-bb4337634513/58017d103d432f7106c44b0891936aba/dotnet-runtime-3.1.26-linux-x64.tar.gz"; + sha512 = "03676885ec4d1f5ba184678a6b774f8e385abfff800a6bcee6f85557b39e9cdde500be49b5d6c956fc95cdfb9f33d31e467548bb498a52bc4fd639b3cb87c8d0"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/cb0e8b4b-7b2b-40cc-b7a6-30f0d4fabe6c/f5cb06cbb1b1b5d198792333b3db235a/dotnet-runtime-3.1.26-linux-arm64.tar.gz"; + sha512 = "574409616f5cbef35a2bd6fd1a2f0bcb3bdaa81457aea3af5e0e237ba768ced5214c51a3045697fe7478e8211e2045fc2072e382d6f456509a8f2923e9b1fc26"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/6bedea65-b104-45b8-abe9-36cefbeedadf/05f4e472ec2395dad7103fda9ed278b2/dotnet-runtime-3.1.26-osx-x64.tar.gz"; + sha512 = "7957b5e697db7548964c399197ae8e61cc31f15374df384b6db9b47472a7d6f1b5b3e256c191e203c4d18c18cc8bdb6c4a331c5875bd37bd6415f3c83b8062da"; + }; + }; + }; + + sdk_3_1 = buildNetSdk { + inherit icu; + version = "3.1.420"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/5424da8c-ce12-46de-a51a-8fa61aefdde6/52a9d6b5718ea40863db96901c780d4b/dotnet-sdk-3.1.420-linux-x64.tar.gz"; + sha512 = "b3bdd964182f9edc3c2976541e657fcc43b0eaf9bc97197597c7ecb8b784d79e3efb9e0405c84e1dcb434cf4cd38ddc4af628c5df486c3d7ae8a23e5254796e3"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/a84bf296-ee6e-4e66-9694-90d3da7af2b4/b00b2efe2432938e5a19c45d3759d80f/dotnet-sdk-3.1.420-linux-arm64.tar.gz"; + sha512 = "ac66b1544fe178153bb85c2e5be584464374ce4c036fc95720547c231c2730312018fbdfc735f9071579749415bc54e1f6b8f080cc2b08d5799a0da941e8a5f5"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/bb0efe58-450c-4e28-81c1-4081acd6ffa4/1d0eaf8b624dff000c8b10ea0497e731/dotnet-sdk-3.1.420-osx-x64.tar.gz"; + sha512 = "370cba4685e07d1cdb5d7f9b754812b237802ace679c9b9985c6e5c4dc09f500580f1413679a288615079bd155b68b362adb00151b2b8f5ca7c3718ab9e16194"; + }; + }; + }; +} diff --git a/pkgs/development/compilers/dotnet/versions/5.0.nix b/pkgs/development/compilers/dotnet/versions/5.0.nix new file mode 100644 index 000000000000..9e5980569c82 --- /dev/null +++ b/pkgs/development/compilers/dotnet/versions/5.0.nix @@ -0,0 +1,61 @@ +{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: + +# v5.0 (eol) +{ + aspnetcore_5_0 = buildAspNetCore { + inherit icu; + version = "5.0.12"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/ad0a54ca-4b88-4762-a790-aebeaba6b9e7/0f796fb90696d078046d90d8a05c027e/aspnetcore-runtime-5.0.12-linux-x64.tar.gz"; + sha512 = "0529f23ffa651ac2c2807b70d6e5034f6ae4c88204afdaaa76965ef604d6533f9440d68d9f2cdd3a9f2ca37e9140e6c61a9f9207d430c71140094c7d5c33bf79"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/bfc8ae06-2830-4082-a09e-63b3c7134096/880a4712d4ba3491c88aa566553c4e8a/aspnetcore-runtime-5.0.12-linux-arm64.tar.gz"; + sha512 = "70570177896943613f0cddeb046ffccaafb1c8245c146383e45fbcfb27779c70dff1ab22c2b13a14bf096173c9279e0a386f61665106a3abb5f623b50281a652"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/06d71ed5-0755-40d6-8b8e-14a24b8a9cb7/47a8b4deda0deecf3658716b642c69bf/aspnetcore-runtime-5.0.12-osx-x64.tar.gz"; + sha512 = "bd9e7dd7f48c220121dde85b3acc4ce7eb2a1944d472f9340276718ef72d033f05fd9a62ffb9de93b8e7633843e731ff1cb5e8c836315f7571f519fdb0a119e1"; + }; + }; + }; + + runtime_5_0 = buildNetRuntime { + inherit icu; + version = "5.0.12"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/781b7ae6-166c-4114-97f8-926d2bf74d34/fe51479e3138d672c512ef0322be23d3/dotnet-runtime-5.0.12-linux-x64.tar.gz"; + sha512 = "32b5f86db3b1d4c21e3cf616d22f0e4a7374385dac0cf03cdebf3520dcf846460d9677ec1829a180920740a0237d64f6eaa2421d036a67f4fe9fb15d4f6b1db9"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/7c342ad2-2dae-471b-ae46-c0c820321c1f/a480ad8ca0bc826a48c9b1e56efd972b/dotnet-runtime-5.0.12-linux-arm64.tar.gz"; + sha512 = "a8089fad8d21a4b582aa6c3d7162d56a21fee697fd400f050a772f67c2ace5e4196d1c4261d3e861d6dc2e5439666f112c406104d6271e5ab60cda80ef2ffc64"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/8f990fa6-6b13-40ad-95f6-383391ff3d91/7531048d16c01efdf3885da367aa8b89/dotnet-runtime-5.0.12-osx-x64.tar.gz"; + sha512 = "a3160eaec15d0e2b62a4a2cdbb6663ef2e817fd26a3a3b8b3d75c5e3538b2947ff66eaddafb39cc297b9f087794d5fbd5a0e097ec8522ab6fea562f230055264"; + }; + }; + }; + + sdk_5_0 = buildNetSdk { + inherit icu; + version = "5.0.403"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/b77183fa-c045-4058-82c5-d37742ed5f2d/ddaccef3e448a6df348cae4d1d271339/dotnet-sdk-5.0.403-linux-x64.tar.gz"; + sha512 = "7ba5f7f898dba64ea7027dc66184d60ac5ac35fabe750bd509711628442e098413878789fad5766be163fd2867cf22ef482a951e187cf629bbc6f54dd9293a4a"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/91015c72-ce5a-4840-9e87-5bfa4bb80224/b39692ac418d790ff7a2e092eb07de98/dotnet-sdk-5.0.403-linux-arm64.tar.gz"; + sha512 = "6cc705fe45c0d8df6a493eb2923539ef5b62d048d5218859bf3af06fb3934c9c716c16f98ee1a28c818d77adff8430bf39a2ae54a59a1468b704b4ba192234ac"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/5ccdb916-531f-4064-84e8-5475b273a4de/80dcfa0c2eb528f8b0e7c313ed36f4f1/dotnet-sdk-5.0.403-osx-x64.tar.gz"; + sha512 = "70beea069db182cca211cf04d7a80f3d6a3987d76cbd2bb60590ee76b93a4041b1b86ad91057cddbbaddd501c72327c1bc0a5fec630f38063f84bd60ba2b4792"; + }; + }; + }; +} diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix new file mode 100644 index 000000000000..6d156c380006 --- /dev/null +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -0,0 +1,73 @@ +{ buildAspNetCore, buildNetRuntime, buildNetSdk, icu }: + +# v6.0 (lts) +{ + aspnetcore_6_0 = buildAspNetCore { + inherit icu; + version = "6.0.7"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/98271725-1784-407c-841a-64d87c674512/b433af33506c816e3b5838f5c65d990a/aspnetcore-runtime-6.0.7-linux-x64.tar.gz"; + sha512 = "d210e2afd009746d2c4d98c07077b89ce174f462c2bdaae9afea107a5b1c9c4ab63460ae3d9ae38c5388f591c0a95d8712359326013b23325b7be19b51835455"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/b79c5fa9-a08d-4534-9424-4bacfc3cdc3d/449179d6fe8cda05f52b7be0f6828eb0/aspnetcore-runtime-6.0.7-linux-arm64.tar.gz"; + sha512 = "0c7317d2170f2632afd7c7c3e5bd84075071802e901de1ed5e54178f8a56266fe0770ebd84502aff9384b06908d4d5bee9d464d215fb20d841de177174f55f93"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/5b4d2b0e-607e-4f9a-944f-0acdefd828d9/79a0271038df505617ef800587a92858/aspnetcore-runtime-6.0.7-osx-x64.tar.gz"; + sha512 = "6c05250d2affb61a1f34ba297e3c9bd0ddc42d64b1580f5e8cfa218a079cc455aa183f683869ba52e7b9ce58fb223dff8ef9776d4b2e2421ed7e2058d4af0750"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/3d952783-f61f-4399-841a-fa5b5aeffded/15580a465dec6a7c67107e3f96d6da13/aspnetcore-runtime-6.0.7-osx-arm64.tar.gz"; + sha512 = "4d9dccaeabc1490fb9261f0be0702c2f5b4e96b840edee94d50f9a4655aa4d85bcf5a16d21d43b0a543e5a90cc631510aba35000df465a4ffc6cca7de37907fc"; + }; + }; + }; + + runtime_6_0 = buildNetRuntime { + inherit icu; + version = "6.0.7"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/bd828687-1706-4041-a804-5e93631fe256/d4ec75936459a7e8c772c929edcbfeda/dotnet-runtime-6.0.7-linux-x64.tar.gz"; + sha512 = "996bdaf33be0a9c0f1e2d309b997e3a84a31e28d2424853d7fb1600212f4ce600ebe1b9615de5e46c17652f08ad0d7ecd4b3619217c9624b875a26a553f370d8"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/f9706e92-c7a1-4dc8-806a-0e95827c5b02/23be52946e4e2425c798208c5f16bb64/dotnet-runtime-6.0.7-linux-arm64.tar.gz"; + sha512 = "a63e100fe80cb64febfd2920e4065b3cc99f759c3de0897928a42cf14fdc963df324bef1354a7734420078d16e52fd8257dd480da465d865c4349c29cab1ef91"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/97def016-12c7-4e24-b924-772485a41faa/e96d9a0502492efa7de3897467f5972c/dotnet-runtime-6.0.7-osx-x64.tar.gz"; + sha512 = "9c53d16971f0366d6d69fbfe37e92eea806faa1c3502cc1050c0e6d2cf394cf886761146e344862a30d0cb131105f387c05d8ea207be8aa87c81cd4c8f962110"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/044c6d0f-0ac2-450f-b621-637ca24ab2fb/5cd0c43804f3fde6d09cacbfd8525868/dotnet-runtime-6.0.7-osx-arm64.tar.gz"; + sha512 = "9f08a535921df7c1ce837ef27478f2381e8132a9ebfec7630465fb3243ef2ec9e982d008faec69e0899675dc3a50b379a96967d1eed3c04dada40cb211489127"; + }; + }; + }; + + sdk_6_0 = buildNetSdk { + inherit icu; + version = "6.0.302"; + srcs = { + x86_64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/0e83f50a-0619-45e6-8f16-dc4f41d1bb16/e0de908b2f070ef9e7e3b6ddea9d268c/dotnet-sdk-6.0.302-linux-x64.tar.gz"; + sha512 = "ac1d124802ca035aa00806312460b371af8e3a55d85383ddd8bb66f427c4fabae75b8be23c45888344e13b283a4f9c7df228447c06d796a57ffa5bb21992e6a4"; + }; + aarch64-linux = { + url = "https://download.visualstudio.microsoft.com/download/pr/33389348-a7d7-41ae-850f-ec46d3ca9612/36bad11f948b05a4fa9faac93c35e574/dotnet-sdk-6.0.302-linux-arm64.tar.gz"; + sha512 = "26e98a63665d707b1a7729f1794077316f9927edd88d12d82d0357fe597096b0d89b64a085fcdf0cf49807a443bbfebb48e10ea91cea890846cf4308e67c4ea5"; + }; + x86_64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/60719796-b5c5-46dc-a26a-7e8126a292c8/a7b871d6c46136b61c30403d085ef97c/dotnet-sdk-6.0.302-osx-x64.tar.gz"; + sha512 = "003a06be76bf6228b4c033f34773039d57ebd485cf471a8117f5516f243a47a24d1b485ab9307becc1973107bb1d5b6c3028bbcbb217cbb42f5bee4c6c01c458"; + }; + aarch64-darwin = { + url = "https://download.visualstudio.microsoft.com/download/pr/01a17a2d-6b92-4521-97a2-ad7d845a8064/44aa4e10f71e70a38b5f6f59d211cbab/dotnet-sdk-6.0.302-osx-arm64.tar.gz"; + sha512 = "59caea897a56b785245dcd3a6082247aeb879c39ecfab16db60e9dc3db447ca4e3ebe68e992c0551af886cd81f6f0088cb1433f1be6df865afa357f90f37ccf6"; + }; + }; + }; +} From 886280e8a9b84e6ddb45726baff904c4aab676f7 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Fri, 15 Jul 2022 16:53:58 +0200 Subject: [PATCH 14/45] buildDotnetModule: include sdk-specific packages in nuget source Some packages are defined by the build proccess, and change every time the dotnet-sdk package changes. To avoid having to regenerate every dependant packages dependencies every dotnet update, this moves these packages into the `dotnet-sdk` `passthru` attribute, and includes them every time `buildDotnetModule` is used. --- .../dotnet/build-dotnet-module/default.nix | 24 ++- .../compilers/dotnet/build-dotnet.nix | 6 +- pkgs/development/compilers/dotnet/default.nix | 6 +- .../compilers/dotnet/print-hashes.sh | 141 +++++++++++++++++- .../compilers/dotnet/versions/3.1.nix | 3 + .../compilers/dotnet/versions/5.0.nix | 3 + .../compilers/dotnet/versions/6.0.nix | 93 ++++++++++++ 7 files changed, 266 insertions(+), 10 deletions(-) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 339eac16b0b2..22b371a3d9a3 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert, srcOnly }: +{ lib, stdenvNoCC, linkFarmFromDrvs, callPackage, nuget-to-nix, writeScript, makeWrapper, fetchurl, xml2, dotnetCorePackages, dotnetPackages, mkNugetSource, mkNugetDeps, cacert, srcOnly, symlinkJoin }: { name ? "${args.pname}-${args.version}" , pname ? name @@ -84,12 +84,30 @@ let then nugetDeps else mkNugetDeps { inherit name; nugetDeps = import nugetDeps; }; - nuget-source = mkNugetSource { - name = "${name}-nuget-source"; + # contains the actual package dependencies + _dependenciesSource = mkNugetSource { + name = "${name}-dependencies-source"; description = "A Nuget source with the dependencies for ${name}"; deps = [ _nugetDeps ] ++ lib.optional (localDeps != null) localDeps; }; + # this contains all the nuget packages that are implictly referenced by the dotnet + # build system. having them as separate deps allows us to avoid having to regenerate + # a packages dependencies when the dotnet-sdk version changes + _sdkDeps = mkNugetDeps { + name = "dotnet-sdk-${dotnet-sdk.version}-deps"; + nugetDeps = dotnet-sdk.passthru.packages; + }; + + _sdkSource = mkNugetSource { + name = "dotnet-sdk-${dotnet-sdk.version}-source"; + deps = [ _sdkDeps ]; + }; + + nuget-source = symlinkJoin { + name = "${name}-nuget-source"; + paths = [ _dependenciesSource _sdkSource ]; + }; in stdenvNoCC.mkDerivation (args // { nativeBuildInputs = args.nativeBuildInputs or [] ++ [ dotnetConfigureHook diff --git a/pkgs/development/compilers/dotnet/build-dotnet.nix b/pkgs/development/compilers/dotnet/build-dotnet.nix index cadb6fb31d78..f8cf3d302ec4 100644 --- a/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -1,10 +1,12 @@ { type , version , srcs -, icu #passing icu as an argument, because dotnet 3.1 has troubles with icu71 +, icu # passing icu as an argument, because dotnet 3.1 has troubles with icu71 +, packages ? null }: assert builtins.elem type [ "aspnetcore" "runtime" "sdk" ]; +assert if type == "sdk" then packages != null else true; { lib , stdenv @@ -104,7 +106,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit icu; + inherit icu packages; }; meta = with lib; { diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index 05b5c7fc41c6..e2dba31a6f99 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -15,9 +15,9 @@ let }; ## Files in versions/ are generated automatically by print-hashes.sh ## - dotnet_3_1 = (import ./versions/3.1.nix (buildAttrs // { icu = icu70; })); - dotnet_5_0 = (import ./versions/5.0.nix (buildAttrs // { inherit icu; })); - dotnet_6_0 = (import ./versions/6.0.nix (buildAttrs // { inherit icu; })); + dotnet_3_1 = import ./versions/3.1.nix (buildAttrs // { icu = icu70; }); + dotnet_5_0 = import ./versions/5.0.nix (buildAttrs // { inherit icu; }); + dotnet_6_0 = import ./versions/6.0.nix (buildAttrs // { inherit icu; }); in rec { combinePackages = attrs: callPackage (import ./combine-packages.nix attrs) {}; diff --git a/pkgs/development/compilers/dotnet/print-hashes.sh b/pkgs/development/compilers/dotnet/print-hashes.sh index c68fa767e4f9..285117e14e6d 100755 --- a/pkgs/development/compilers/dotnet/print-hashes.sh +++ b/pkgs/development/compilers/dotnet/print-hashes.sh @@ -1,7 +1,7 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq +#!nix-shell -I nixpkgs=../../../../. -i bash -p curl jq nix gnused -set -eu +set -euo pipefail release () { local content="$1" @@ -51,6 +51,134 @@ platform_sources () { echo " };" } +sdk_packages () { + local version=$1 + # These packages are implicitly references by the build process, + # based on the specific project configurations (RIDs, used features, etc.) + # They are always referenced with the same version as the SDK used for building. + # Since we lock nuget dependencies, when these packages are included in the generated + # lock files (deps.nix), every update of SDK required those lock files to be + # updated to reflect the new versions of these packages - otherwise, the build + # would fail due to missing dependencies. + # + # Moving them to a separate list stored alongside the SDK package definitions, + # and implictly including them along in buildDotnetModule allows us + # to make updating .NET SDK packages a lot easier - we now just update + # the versions of these packages in one place, and all packages that + # use buildDotnetModule continue building with the new .NET version without changes. + # + # Keep in mind that there is no canonical list of these implicitly + # referenced packages - this list was created based on looking into + # the deps.nix files of existing packages, and which dependencies required + # updating after a SDK version bump. + # + # Due to this, make sure to check if new SDK versions introduce any new packages. + # This should not happend in minor or bugfix updates, but probably happens + # with every new major .NET release. + local pkgs=( \ + "Microsoft.AspNetCore.App.Ref" \ + "Microsoft.AspNetCore.App.Runtime.linux-arm" \ + "Microsoft.AspNetCore.App.Runtime.linux-arm64" \ + "Microsoft.AspNetCore.App.Runtime.linux-musl-arm" \ + "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" \ + "Microsoft.AspNetCore.App.Runtime.linux-musl-x64" \ + "Microsoft.AspNetCore.App.Runtime.linux-x64" \ + "Microsoft.AspNetCore.App.Runtime.osx-arm64" \ + "Microsoft.AspNetCore.App.Runtime.osx-x64" \ + "Microsoft.AspNetCore.App.Runtime.win-arm" \ + "Microsoft.AspNetCore.App.Runtime.win-arm64" \ + "Microsoft.AspNetCore.App.Runtime.win-x64" \ + "Microsoft.AspNetCore.App.Runtime.win-x86" \ + "Microsoft.NETCore.App.Composite" \ + "Microsoft.NETCore.App.Host.linux-arm" \ + "Microsoft.NETCore.App.Host.linux-arm64" \ + "Microsoft.NETCore.App.Host.linux-musl-arm" \ + "Microsoft.NETCore.App.Host.linux-musl-arm64" \ + "Microsoft.NETCore.App.Host.linux-musl-x64" \ + "Microsoft.NETCore.App.Host.linux-x64" \ + "Microsoft.NETCore.App.Host.osx-arm64" \ + "Microsoft.NETCore.App.Host.osx-x64" \ + "Microsoft.NETCore.App.Host.win-arm" \ + "Microsoft.NETCore.App.Host.win-arm64" \ + "Microsoft.NETCore.App.Host.win-x64" \ + "Microsoft.NETCore.App.Host.win-x86" \ + "Microsoft.NETCore.App.Ref" \ + "Microsoft.NETCore.App.Runtime.linux-arm" \ + "Microsoft.NETCore.App.Runtime.linux-arm64" \ + "Microsoft.NETCore.App.Runtime.linux-musl-arm" \ + "Microsoft.NETCore.App.Runtime.linux-musl-arm64" \ + "Microsoft.NETCore.App.Runtime.linux-musl-x64" \ + "Microsoft.NETCore.App.Runtime.linux-x64" \ + "Microsoft.NETCore.App.Runtime.osx-arm64" \ + "Microsoft.NETCore.App.Runtime.osx-x64" \ + "Microsoft.NETCore.App.Runtime.win-arm" \ + "Microsoft.NETCore.App.Runtime.win-arm64" \ + "Microsoft.NETCore.App.Runtime.win-x64" \ + "Microsoft.NETCore.App.Runtime.win-x86" \ + "Microsoft.NETCore.DotNetAppHost" \ + "Microsoft.NETCore.DotNetHost" \ + "Microsoft.NETCore.DotNetHostPolicy" \ + "Microsoft.NETCore.DotNetHostResolver" \ + "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost" \ + "runtime.linux-arm64.Microsoft.NETCore.DotNetHost" \ + "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver" \ + "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost" \ + "runtime.linux-arm.Microsoft.NETCore.DotNetHost" \ + "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver" \ + "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost" \ + "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost" \ + "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver" \ + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost" \ + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost" \ + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver" \ + "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost" \ + "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost" \ + "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver" \ + "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost" \ + "runtime.linux-x64.Microsoft.NETCore.DotNetHost" \ + "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver" \ + "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost" \ + "runtime.osx-arm64.Microsoft.NETCore.DotNetHost" \ + "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver" \ + "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost" \ + "runtime.osx-x64.Microsoft.NETCore.DotNetHost" \ + "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver" \ + "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" \ + "runtime.win-arm64.Microsoft.NETCore.DotNetHost" \ + "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver" \ + "runtime.win-arm.Microsoft.NETCore.DotNetAppHost" \ + "runtime.win-arm.Microsoft.NETCore.DotNetHost" \ + "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver" \ + "runtime.win-x64.Microsoft.NETCore.DotNetAppHost" \ + "runtime.win-x64.Microsoft.NETCore.DotNetHost" \ + "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver" \ + "runtime.win-x86.Microsoft.NETCore.DotNetAppHost" \ + "runtime.win-x86.Microsoft.NETCore.DotNetHost" \ + "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy" \ + "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver" \ + ) + + local nuget_url="$(curl -f "https://api.nuget.org/v3/index.json" | jq --raw-output '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"')" + + for pkg in "${pkgs[@]}"; do + local url hash + url="${nuget_url}${pkg,,}/${version,,}/${pkg,,}.${version,,}.nupkg" + hash="$(nix-prefetch-url "$url")" + echo " (fetchNuGet { pname = \"${pkg}\"; version = \"${version}\"; sha256 = \"${hash}\"; })" + done +} + main () { pname=$(basename "$0") if [[ ! "$*" =~ ^.*[0-9]{1,}\.[0-9]{1,}.*$ ]]; then @@ -67,12 +195,18 @@ Examples: for sem_version in "$@"; do echo "Generating ./versions/${sem_version}.nix" patch_specified=false + # Check if a patch was specified as an argument. + # If so, generate file for the specific version. + # If only x.y version was provided, get the latest patch + # version of the given x.y version. if [[ "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$ ]]; then patch_specified=true elif [[ ! "$sem_version" =~ ^[0-9]{1,}\.[0-9]{1,}$ ]]; then continue fi + # Make sure the x.y version is properly passed to .NET release metadata url. + # Then get the json file and parse it to find the latest patch release. major_minor=$(sed 's/^\([0-9]*\.[0-9]*\).*$/\1/' <<< "$sem_version") content=$(curl -sL https://dotnetcli.blob.core.windows.net/dotnet/release-metadata/"$major_minor"/releases.json) major_minor_patch=$([ "$patch_specified" == true ] && echo "$sem_version" || jq -r '."latest-release"' <<< "$content") @@ -109,6 +243,9 @@ Examples: inherit icu; version = \"${sdk_version}\"; $(platform_sources "$sdk_files") + packages = { fetchNuGet }: [ +$(sdk_packages "${runtime_version}") + ]; }; }" > "./versions/${sem_version}.nix" echo "Generated ./versions/${sem_version}.nix" diff --git a/pkgs/development/compilers/dotnet/versions/3.1.nix b/pkgs/development/compilers/dotnet/versions/3.1.nix index 53c78b579d7b..f9a34bbb169c 100644 --- a/pkgs/development/compilers/dotnet/versions/3.1.nix +++ b/pkgs/development/compilers/dotnet/versions/3.1.nix @@ -57,5 +57,8 @@ sha512 = "370cba4685e07d1cdb5d7f9b754812b237802ace679c9b9985c6e5c4dc09f500580f1413679a288615079bd155b68b362adb00151b2b8f5ca7c3718ab9e16194"; }; }; + packages = { fetchNuGet }: [ + + ]; }; } diff --git a/pkgs/development/compilers/dotnet/versions/5.0.nix b/pkgs/development/compilers/dotnet/versions/5.0.nix index 9e5980569c82..4a792f59d016 100644 --- a/pkgs/development/compilers/dotnet/versions/5.0.nix +++ b/pkgs/development/compilers/dotnet/versions/5.0.nix @@ -57,5 +57,8 @@ sha512 = "70beea069db182cca211cf04d7a80f3d6a3987d76cbd2bb60590ee76b93a4041b1b86ad91057cddbbaddd501c72327c1bc0a5fec630f38063f84bd60ba2b4792"; }; }; + packages = { fetchNuGet }: [ + + ]; }; } diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index 6d156c380006..00e1ddedd8e5 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -69,5 +69,98 @@ sha512 = "59caea897a56b785245dcd3a6082247aeb879c39ecfab16db60e9dc3db447ca4e3ebe68e992c0551af886cd81f6f0088cb1433f1be6df865afa357f90f37ccf6"; }; }; + packages = { fetchNuGet }: [ + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.7"; sha256 = "028dlrbgs6d9gdvkl48lksm9gagsch5ih974l5wwfpdgx693v4wl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.7"; sha256 = "1y5l528qp08bghm7qdk223g9ki6mv1hhmixhw5zfdzscp0wf11dh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.7"; sha256 = "013xk8m2bkh99s0l5wz8k01pw9r7kwlywsngqciwvqk44vr265ga"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.7"; sha256 = "0pl8lr2chnscrbjckqw2ydck15fgxffsmkm7sqbcg9x9pwc0mkap"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.7"; sha256 = "140333iig3wc0iv76gk97cd6bqsjyhmhkf0myd04m9ds5dcwpxks"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.7"; sha256 = "1qfwhpvj9d3xp53y8mhhsamvnihy0czjhj63zxzc3fa21jpiscyy"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.7"; sha256 = "03i5yqhklgm4p536a3vxwgkbyivwschgvn639xwx846g2ghdqnf2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.7"; sha256 = "01l2wr1lvfa63jn9j3ydgys6j0hcs30w880k0dd50q1jkm24cq4m"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.7"; sha256 = "1kzcw6gxd7ky32zpiwvmzgd5yy6vyjk8p600jwaagz63z36zaa3k"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.7"; sha256 = "1dkc3px04mpzd8zlkxcld63kqlncd8fs1dm3qdfg83sx7nzzf9xl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.7"; sha256 = "1hy3wcy7dsw4pl8bcqy84i8hgxk6b1cm30chj2gjahx5yy1gwzr0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.7"; sha256 = "07h9b4fqna61j206hk5jrf9mrffg63ii2icn9h6x19h4pr9bf340"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.7"; sha256 = "1mjjb8a1g1fsw1qbhixc5hjwnkn35551pmfdl9l702zhd9hwf0s9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.7"; sha256 = "0l6765cbdmdh71raq5snxd56w71clfbm4iwi93y3n67skpjkn6ml"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.7"; sha256 = "1h8ziaf6qdsm14h1cx7573r0nsr3cwv7sczg9j9lqaizwxmqg8dq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.7"; sha256 = "0354iizqhwhnxcgrn5p8gqv50dnyj5vdyrikwqhv6yd178ardw00"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.7"; sha256 = "17bsbx0hdzkl3axxfd4xav7q455mkw1wvr3j1r0q0z2gic0x3p23"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.7"; sha256 = "0lky1ihhlwjsdb0pb77vx663yji53pnkl9ij3z58pxdknldf0ayb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.7"; sha256 = "1gswphp5w6hbz60bymksf9i6iwlqg5hx8w2l3x83cfpw9q0pw5kd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.7"; sha256 = "1i19iqz89fh54k3126daqrdwn0sxp00ziw0d2hd8z6dkf49vbvmx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.7"; sha256 = "059q3gnvhg7ywbdrvnra8zrcwxa5si50fakh71dg0rnwnivpngj9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.7"; sha256 = "0q61220ii4biz02w37jqi84cnzgspzrrfqpg2g3mkhamb0lgq3c6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.7"; sha256 = "0aswrsx45f5ql94mbz6qgj4rcd585mvsmg8lbm9yzqavnkxw37q9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.7"; sha256 = "1ax2cyk9zfav69lr6pr223gm4ydqdwjb13pc2mxzb7j9x2z4dj8q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.7"; sha256 = "0vqng4wqlkl9d3qphh0zzd1k2f53flvwk3k847iaxxdijvlr0b65"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.7"; sha256 = "0xmkfsvzcyk5akaz3k220xx6xli2kimzaqcnfpmyh9l66zkykrym"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.7"; sha256 = "0kgbxc6czq2sz1i7cjlv58jsisvc936m1zzj5f9qfv9c4aka2hig"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.7"; sha256 = "0fm8p7dpq12pv9qar8h7s1rz1dcyki7dh2424xrr49p8d58gmdsf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.7"; sha256 = "1kddakhs8bhrj14qmah78b164ia9277hjdvz8cd61b17f93iz7kd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.7"; sha256 = "0lzp9fc2h4h46ycy1dpbkqdp8qxm7xmfphfc3lgxr6jj9j123qac"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.7"; sha256 = "1hlks5p0i05xixarma211v09rr1n6r5qzmzjy0ca2gvgf9lv5xg1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.7"; sha256 = "04ryakvm54y5a0652hk77f8my3xq7faqn2v50i0w014njq1jyd5a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.7"; sha256 = "0pci9m6phhdvmk698dm7mzgxlmzf7wbk992s705iqzahdl2ra3sr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.7"; sha256 = "0ij8vixb7ymwxa8yxrhizqjkxbh8hkfg47bk9fmkaw9ab94jhj93"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.7"; sha256 = "0xd2vkrav41fcf86p7ddjqiarjchsl5wy1haxiw7nr0bq3hzmirv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.7"; sha256 = "0ks2mslr021rwh3k5x7cd28494q16sjr5fw3wx5ba4bagf56wyyr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.7"; sha256 = "1r1alh763xc40y3iqy2iwb91d273sf1hvgqhvwccyck30m9mqisl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.7"; sha256 = "00ihv8c7h9fkyldwvkqf9wpzi0rr9wrhg7fai374ipmsj9kn6xl0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.7"; sha256 = "1jz71dxps71hb7qay2x93p34bvni7a7dgxk137h162ac4qaa5dn7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "0a2vpn7j4h9phqv7azc9lczrkybln4ddf458j49dkjv3ghrav81z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0j1if6nfi3sn1s8jdp08ks8v8526h275as61zh57kwmss5iczl4i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "19cjlpmg0r6f2b2q1jllivlmjkv47bzl32l5xpq3ppn2l6qxs35x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "11nayi9ai5qd9l944rap6fskzaw3nvmv8wmgf564cv4diphy8995"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "1kdv31lz32gywpffa3qiyrmrvqxgxk0zggr0a2235x33zalw9l27"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0wi08fp0rxif89g0bmyg0ksk5f02xg7hyahignhqh26qpc7d608s"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "0ns8lgqby70cnbij3lprgwzsgqzlv4db98qmcdvlnshv6lqqfd86"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "0x1sjdzvqmvmgg6dsn427r5i3776cphhzpmfjlj4sfilsfpygihp"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "12f24lnzb9m3dl06qklbc08577mf5vc9zibxabdidk83h7k7p0qc"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0garwnx2j86psq11pcd1z8vvnmhyn3x0fss0c4rza9c3bivh70wz"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "18mgsgmdvm38pxy5jr1wglgz0a1fk5gm8awscmy5y5dcx7qghy3s"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "12ksjis47q9dnnibx6snsnbgz07g1a6fsyrmir39b8m1cq5bbg0r"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "1midq986vs6qwz0b34wmrbv5yk4clqmjhnqgkmfd8bxxflzglg9w"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0ba37pr3x44n2mhi5kld0cvh2w81fvgwdfl6g1llr1a9ncl8dbq4"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "01pj41baqhkzk1nbqpy6khwakjrq5741wnnb1ny0j0i4mny7aa3i"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "1g0zmc71rf1c2gfwm5zn7qdhisr726rf1fqs9n9nisz7pj0c719k"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "0jr9ig4hga3iyxfwihlswpdfxlln66b16gfmb70qizn3jigwwvkh"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0wmm9yv20h7wp10xrca6hmv80isjzrw793zkwi591qah99rm7q44"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "0dp94sm7gpzyw882141salqrpk54fp7fgmaqmr5xir2q6r7wxmaf"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "05w0wkin5ydhrgqissdsdzxz39c4fh7msx2h5b50m84ixalqrkgf"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "17anarmiq2n1damyg5yjnm22z4v6fkv30dri6nz1987r0fdn2waf"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "1i9z2xh5r5bfncfd2h469zi46wykkikmbhkf9sys4jpfng78krdn"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "0xm0l5iil6zi6cdnhnnlqzn4bw88gyabajz4wxrklcj7kz8mgm81"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "03bjmb5ad8s7vj5cpbijmpr21z82d565wv0mg0h5iqlk02v5jw9g"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "1wqah3lc8q949w7gi94jmp2hy6ld4s1jxbmm0zj3xjqrq0gmqzqw"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0vpk34xr3i9bvr7cgl22ss3gj2gmsg6drjv9mj1hksnd7fzb9m9r"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "08swlx9khbyc34lxi59dgkc3fhbap2abm565dnpizmg4jqn7zz7s"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "1lkxnbfpf3f8yj0srq8iavy12i14r0nhcpjxff7ypnk2z7xyc098"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "1is814drvhf81xnq04npr5x56f8mxnr92vmc8bv66d8320yp8z1k"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0qqzk3r0mlldfpzm40gzrd0q6danfdd4h6l9fmjwwpmadj18dsg3"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "1x7iqnksx4n4sb2ms5ibygkhfcnxbvkvamkx2s0rrbkghy25zndh"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "04m2asmr63vxapgga4gadbrp18349sxzyn7ryn74lg6sqzdpvdr1"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "0ck53135666f917lib6ahb32nxk78r65755v94hhv4g2xdbk813r"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0mig9c1xn6vdj1xdf20fvy9scw270l52rr2kwfjgppf4px661p77"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "0dwa93brfc4mpjrjrz10jm3ina6kv1v75hdny00m5jfla366k6gj"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "05svx1hz2n9qv6hj4grk0z7rkpw5v3s9059xpkjsb0h0f0y4zx6g"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "0adyh8w348fw9pilj4giiriv4dxxlqgjvrbrcbkc6xdbn9085lav"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "10nq0apr0askhq8z4kmna8gzqiazw4x94nz1c81qm7why0kyv0ws"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "17fxrkxf82jyihp9qkfab6dz8kkz6y437hi123mwyh274qfvcj61"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "0x6h4q5v153z5ym1rjzxgxrm3x87jqpiz52bmsgzv5vb1nkbhcnh"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "09b28pkjxxk1qrij83vjmf16zb8vpipdawzzkk09fw27rspbcckp"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "1r8plgiddlgarij4v60d0dzv5j1jqmnjhwhkaggfkzysgp16yvqi"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "0qzal5v635206c0m4bcm5x29i7ff4y4yg705wv3yqb4b653lxcsy"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "0k9g1n6ansv157jmsfczl2kasnsyvll8ka0yvhzgvwx7rxi7f006"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "0ccahvy9787vb990mn0r2aj3yl8ykzs9wzvh3jk5y7x27zhpsd28"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0vhisvl2w6dyjmgdrkyhccjhnqlnx24drb1vypwhr6xdmx9r6mv1"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "1zv9r7yhhbqa8vpyiw4an2gdai1icp7dshq228lnadgll3slzaj2"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "02ylic2qyy6ayg1d76axhh61jsr64fi0svsnfj2s34iiifq8faah"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "0gfkrvg1c6zq8dzp8pzjv3cbpy79z0gbym340cq8z235z7a2sijm"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "1f0gbq6j5vhqznjgffaxg4pibl33l9k7zldn43wrzdr8ma5c6ily"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "0a00frccimbza86kjrf1397bbsvsiggry1ihb4c4rk4d8qc2maq9"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "0ppvrdwh32xr7rxlhc59lilj220cayk9f44p0qqygp3z20l1gzkl"; }) + ]; }; } From a3fff0c9474440f9ec487a9e9d84a9195ab19d00 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Fri, 15 Jul 2022 16:54:02 +0200 Subject: [PATCH 15/45] buildDotnetModule: exclude sdk-specific packages in fetch-deps result --- pkgs/build-support/dotnet/build-dotnet-module/default.nix | 8 ++++++-- pkgs/build-support/dotnet/nuget-to-nix/default.nix | 2 ++ pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index 22b371a3d9a3..1a5d499929ac 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -134,7 +134,9 @@ in stdenvNoCC.mkDerivation (args // { passthru = { inherit nuget-source; - fetch-deps = writeScript "fetch-${pname}-deps" '' + fetch-deps = let + exclusions = dotnet-sdk.passthru.packages { fetchNuGet = attrs: attrs.pname; }; + in writeScript "fetch-${pname}-deps" '' set -euo pipefail cd "$(dirname "''${BASH_SOURCE[0]}")" @@ -164,8 +166,10 @@ in stdenvNoCC.mkDerivation (args // { ${lib.optionalString (dotnetFlags != []) (builtins.toString dotnetFlags)} done + echo "${lib.concatStringsSep "\n" exclusions}" > "$HOME/package_exclusions" + echo "Writing lockfile..." - ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" > "$deps_file" + ${nuget-to-nix}/bin/nuget-to-nix "$HOME/nuget_pkgs" "$HOME/package_exclusions" > "$deps_file" echo "Succesfully wrote lockfile to: $deps_file" ''; } // args.passthru or {}; diff --git a/pkgs/build-support/dotnet/nuget-to-nix/default.nix b/pkgs/build-support/dotnet/nuget-to-nix/default.nix index 18757692e92d..e3a3e45ac20c 100644 --- a/pkgs/build-support/dotnet/nuget-to-nix/default.nix +++ b/pkgs/build-support/dotnet/nuget-to-nix/default.nix @@ -8,6 +8,7 @@ , gnused , jq , curl +, gnugrep }: runCommandLocal "nuget-to-nix" { @@ -22,6 +23,7 @@ runCommandLocal "nuget-to-nix" { gnused jq curl + gnugrep ]; }; diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh index c8db14a4d918..ad75cf6574b7 100755 --- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh +++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh @@ -5,11 +5,12 @@ set -euo pipefail export PATH="@binPath@" if [ $# -eq 0 ]; then - >&2 echo "Usage: $0 [packages directory] > deps.nix" + >&2 echo "Usage: $0 [path to file with a list of excluded packages] > deps.nix" exit 1 fi pkgs=$1 +exclusions=$2 tmpfile=$(mktemp /tmp/nuget-to-nix.XXXXXX) trap "rm -f ${tmpfile}" EXIT @@ -21,6 +22,11 @@ while read pkg_spec; do { read pkg_name; read pkg_version; } < <( # Build version part should be ignored: `3.0.0-beta2.20059.3+77df2220` -> `3.0.0-beta2.20059.3` sed -nE 's/.*([^<]*).*/\1/p; s/.*([^<+]*).*/\1/p' "$pkg_spec") + + if grep "$pkg_name" "$exclusions" > /dev/null; then + continue + fi + pkg_sha256="$(nix-hash --type sha256 --flat --base32 "$(dirname "$pkg_spec")"/*.nupkg)" pkg_src="$(jq --raw-output '.source' "$(dirname "$pkg_spec")/.nupkg.metadata")" From dc652d46d776ad65efdbd484a41f67addf9609b3 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Fri, 15 Jul 2022 16:54:06 +0200 Subject: [PATCH 16/45] inklecate: use dotnet 3.1 to compile --- pkgs/development/compilers/inklecate/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/inklecate/default.nix b/pkgs/development/compilers/inklecate/default.nix index d8276761f585..101c77a1c965 100644 --- a/pkgs/development/compilers/inklecate/default.nix +++ b/pkgs/development/compilers/inklecate/default.nix @@ -25,6 +25,7 @@ buildDotnetModule rec { executables = [ "inklecate" ]; dotnet-runtime = dotnetCorePackages.runtime_3_1; + dotnet-sdk = dotnetCorePackages.sdk_3_1; meta = with lib; { description = "Compiler for ink, inkle's scripting language"; From d20f69cb272eb5d2d01f9013bbc59cf8db47bbf3 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Fri, 15 Jul 2022 16:54:11 +0200 Subject: [PATCH 17/45] alttpr-opentracker: use dotnet 3.1 to compile --- pkgs/tools/games/opentracker/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/games/opentracker/default.nix b/pkgs/tools/games/opentracker/default.nix index 33dc69ff4e68..8140b34c1e97 100644 --- a/pkgs/tools/games/opentracker/default.nix +++ b/pkgs/tools/games/opentracker/default.nix @@ -25,13 +25,14 @@ buildDotnetModule rec { }; dotnet-runtime = dotnetCorePackages.runtime_3_1; + dotnet-sdk = dotnetCorePackages.sdk_3_1; + nugetDeps = ./deps.nix; projectFile = "OpenTracker.sln"; executables = [ "OpenTracker" ]; doCheck = true; - dotnet-test-sdk = dotnetCorePackages.sdk_3_1; nativeBuildInputs = [ autoPatchelfHook From 0b054bcce374d585cb1cf8ca5cb702fa312a4f3d Mon Sep 17 00:00:00 2001 From: mdarocha Date: Fri, 15 Jul 2022 16:54:14 +0200 Subject: [PATCH 18/45] github-runner: include sdk-specific packages --- .../github-runner/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/github-runner/default.nix b/pkgs/development/tools/continuous-integration/github-runner/default.nix index 1687fb7c52fc..e36c97f72a2d 100644 --- a/pkgs/development/tools/continuous-integration/github-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/github-runner/default.nix @@ -21,14 +21,15 @@ , nuget-to-nix }: let + fetchNuGet = { pname, version, sha256 }: fetchurl { + name = "${pname}.${version}.nupkg"; + url = "https://www.nuget.org/api/v2/package/${pname}/${version}"; + inherit sha256; + }; + nugetSource = linkFarmFromDrvs "nuget-packages" ( - import ./deps.nix { - fetchNuGet = { pname, version, sha256 }: fetchurl { - name = "${pname}.${version}.nupkg"; - url = "https://www.nuget.org/api/v2/package/${pname}/${version}"; - inherit sha256; - }; - } + import ./deps.nix { inherit fetchNuGet; } ++ + dotnetSdk.passthru.packages { inherit fetchNuGet; } ); dotnetSdk = dotnetCorePackages.sdk_6_0; From c3c0fa05fbfa5ab9b7a1cf50b3855faf7d51f135 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Fri, 5 Aug 2022 15:40:43 +0200 Subject: [PATCH 19/45] dotnet-sdk: rename print-hashes.sh to update.sh New name better reflects its functionality --- pkgs/development/compilers/dotnet/default.nix | 2 +- .../development/compilers/dotnet/{print-hashes.sh => update.sh} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/compilers/dotnet/{print-hashes.sh => update.sh} (100%) diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix index e2dba31a6f99..b983481477c8 100644 --- a/pkgs/development/compilers/dotnet/default.nix +++ b/pkgs/development/compilers/dotnet/default.nix @@ -14,7 +14,7 @@ let buildNetSdk = attrs: buildDotnet (attrs // { type = "sdk"; }); }; - ## Files in versions/ are generated automatically by print-hashes.sh ## + ## Files in versions/ are generated automatically by update.sh ## dotnet_3_1 = import ./versions/3.1.nix (buildAttrs // { icu = icu70; }); dotnet_5_0 = import ./versions/5.0.nix (buildAttrs // { inherit icu; }); dotnet_6_0 = import ./versions/6.0.nix (buildAttrs // { inherit icu; }); diff --git a/pkgs/development/compilers/dotnet/print-hashes.sh b/pkgs/development/compilers/dotnet/update.sh similarity index 100% rename from pkgs/development/compilers/dotnet/print-hashes.sh rename to pkgs/development/compilers/dotnet/update.sh From 08ebd9f0dfdb993ed355d75d01d9ed375ae434da Mon Sep 17 00:00:00 2001 From: mdarocha Date: Wed, 10 Aug 2022 16:29:50 +0200 Subject: [PATCH 20/45] dotnet-sdk: 6.0.302 -> 6.0.400 --- .../compilers/dotnet/versions/6.0.nix | 236 +++++++++--------- 1 file changed, 118 insertions(+), 118 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index 00e1ddedd8e5..fd8b838d2ad5 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -4,163 +4,163 @@ { aspnetcore_6_0 = buildAspNetCore { inherit icu; - version = "6.0.7"; + version = "6.0.8"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/98271725-1784-407c-841a-64d87c674512/b433af33506c816e3b5838f5c65d990a/aspnetcore-runtime-6.0.7-linux-x64.tar.gz"; - sha512 = "d210e2afd009746d2c4d98c07077b89ce174f462c2bdaae9afea107a5b1c9c4ab63460ae3d9ae38c5388f591c0a95d8712359326013b23325b7be19b51835455"; + url = "https://download.visualstudio.microsoft.com/download/pr/5cc06c3a-4d8a-4fb2-8f7a-ecd23cd8c4e0/dd386c0e3a41ea54f459907c834acedf/aspnetcore-runtime-6.0.8-linux-x64.tar.gz"; + sha512 = "b74676ca0d2f47a95533739fd36977bb1552890a81820ee51b29b3d6514398f0952362417bbb31fad4bdf031803cb3e8d2aaf065dfb154a78a1b471a536d4abd"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/b79c5fa9-a08d-4534-9424-4bacfc3cdc3d/449179d6fe8cda05f52b7be0f6828eb0/aspnetcore-runtime-6.0.7-linux-arm64.tar.gz"; - sha512 = "0c7317d2170f2632afd7c7c3e5bd84075071802e901de1ed5e54178f8a56266fe0770ebd84502aff9384b06908d4d5bee9d464d215fb20d841de177174f55f93"; + url = "https://download.visualstudio.microsoft.com/download/pr/83695c9b-c954-459e-b9bf-2f1ac269e34e/1316ff4a6fe4c6916e7ecb3623d67cee/aspnetcore-runtime-6.0.8-linux-arm64.tar.gz"; + sha512 = "07babe85c8872ca303a17268b0d23c382a9ac49f8b923c45c496db039f6c01094303cd18cd31f964ba7369bb993c896eeadbb7e458a77d5b86992222b91db52c"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/5b4d2b0e-607e-4f9a-944f-0acdefd828d9/79a0271038df505617ef800587a92858/aspnetcore-runtime-6.0.7-osx-x64.tar.gz"; - sha512 = "6c05250d2affb61a1f34ba297e3c9bd0ddc42d64b1580f5e8cfa218a079cc455aa183f683869ba52e7b9ce58fb223dff8ef9776d4b2e2421ed7e2058d4af0750"; + url = "https://download.visualstudio.microsoft.com/download/pr/0601cae2-aa41-4318-a996-36633cd641f3/ffc290161ae37b28894ff7465dd50c17/aspnetcore-runtime-6.0.8-osx-x64.tar.gz"; + sha512 = "73d3569c13965de927e9d1eb02ce7d31b44643335a351ddc6392be1a693837263287d9bc5e82a89f2456b7a9cf1bd6c217d9f98cf9fa8da1b6c820e9ddf43933"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/3d952783-f61f-4399-841a-fa5b5aeffded/15580a465dec6a7c67107e3f96d6da13/aspnetcore-runtime-6.0.7-osx-arm64.tar.gz"; - sha512 = "4d9dccaeabc1490fb9261f0be0702c2f5b4e96b840edee94d50f9a4655aa4d85bcf5a16d21d43b0a543e5a90cc631510aba35000df465a4ffc6cca7de37907fc"; + url = "https://download.visualstudio.microsoft.com/download/pr/7859a31f-74c9-4756-a9ab-f040550666ac/3c4ad4317e732436f8c092eb9cdb4168/aspnetcore-runtime-6.0.8-osx-arm64.tar.gz"; + sha512 = "a6cabc3b4c7350deb141e122c194c7eefaf99127cee726ee227e4218add7155b8decdb2a5cd217f757410e267f2370a78806c22a0294098f245105cea925a7b2"; }; }; }; runtime_6_0 = buildNetRuntime { inherit icu; - version = "6.0.7"; + version = "6.0.8"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/bd828687-1706-4041-a804-5e93631fe256/d4ec75936459a7e8c772c929edcbfeda/dotnet-runtime-6.0.7-linux-x64.tar.gz"; - sha512 = "996bdaf33be0a9c0f1e2d309b997e3a84a31e28d2424853d7fb1600212f4ce600ebe1b9615de5e46c17652f08ad0d7ecd4b3619217c9624b875a26a553f370d8"; + url = "https://download.visualstudio.microsoft.com/download/pr/5596ef6f-a174-4fba-aef1-99173e3f3c67/77edd755d605688885ca7114bc4f9ae9/dotnet-runtime-6.0.8-linux-x64.tar.gz"; + sha512 = "c776813bf87c25766b31a3a514d124d0526086ceea514a10f104d70ba435c91a6bd3c8bf10c6662b4df2b13ffcdf385518f3418e51d05cccec6a2cf2c26099de"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f9706e92-c7a1-4dc8-806a-0e95827c5b02/23be52946e4e2425c798208c5f16bb64/dotnet-runtime-6.0.7-linux-arm64.tar.gz"; - sha512 = "a63e100fe80cb64febfd2920e4065b3cc99f759c3de0897928a42cf14fdc963df324bef1354a7734420078d16e52fd8257dd480da465d865c4349c29cab1ef91"; + url = "https://download.visualstudio.microsoft.com/download/pr/866ce4df-8aaa-417d-ad81-26131a2b8734/7ba8391188bc194156ee7d82f494ee00/dotnet-runtime-6.0.8-linux-arm64.tar.gz"; + sha512 = "7cd60eda5219a6b882e53e85e2b6543dedc91605503ce8085f447835382fd1b6abd7c8810e0fd865ecaa33167cedf2a33884dd4eb2bdd2857fe69d509cd62a9c"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/97def016-12c7-4e24-b924-772485a41faa/e96d9a0502492efa7de3897467f5972c/dotnet-runtime-6.0.7-osx-x64.tar.gz"; - sha512 = "9c53d16971f0366d6d69fbfe37e92eea806faa1c3502cc1050c0e6d2cf394cf886761146e344862a30d0cb131105f387c05d8ea207be8aa87c81cd4c8f962110"; + url = "https://download.visualstudio.microsoft.com/download/pr/1c11dcab-2b1b-4f89-88a8-32665c56a131/c1654a9f3d01805033b7fd8d505050e8/dotnet-runtime-6.0.8-osx-x64.tar.gz"; + sha512 = "8100003430b073e9f1f16910eef8af5a5ea806754a1818971ba15f4ba44e12455330334bd1488088880f7ed3ff67c2a4c4a3d8037f4202c95e6bc029806c8b15"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/044c6d0f-0ac2-450f-b621-637ca24ab2fb/5cd0c43804f3fde6d09cacbfd8525868/dotnet-runtime-6.0.7-osx-arm64.tar.gz"; - sha512 = "9f08a535921df7c1ce837ef27478f2381e8132a9ebfec7630465fb3243ef2ec9e982d008faec69e0899675dc3a50b379a96967d1eed3c04dada40cb211489127"; + url = "https://download.visualstudio.microsoft.com/download/pr/0b8a7b71-8f77-439b-a4d8-b4fd863466d3/7a852ca4536bdef2e63d9f5e98731777/dotnet-runtime-6.0.8-osx-arm64.tar.gz"; + sha512 = "99264f4e34e2b6e1a82f3716cce5753967f3386348593e7f51085d96dbec4acf1400a451e9320afbfb45a9b777df1f8bbed8e78d7c4810336f3d226bdfd4343f"; }; }; }; sdk_6_0 = buildNetSdk { inherit icu; - version = "6.0.302"; + version = "6.0.400"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/0e83f50a-0619-45e6-8f16-dc4f41d1bb16/e0de908b2f070ef9e7e3b6ddea9d268c/dotnet-sdk-6.0.302-linux-x64.tar.gz"; - sha512 = "ac1d124802ca035aa00806312460b371af8e3a55d85383ddd8bb66f427c4fabae75b8be23c45888344e13b283a4f9c7df228447c06d796a57ffa5bb21992e6a4"; + url = "https://download.visualstudio.microsoft.com/download/pr/cd0d0a4d-2a6a-4d0d-b42e-dfd3b880e222/008a93f83aba6d1acf75ded3d2cfba24/dotnet-sdk-6.0.400-linux-x64.tar.gz"; + sha512 = "8decbba0a6b09501daede52cbb5a9ae9e5f31ade201918c03efcd1b4cc345ec934f88321704ec3beb1f90f2204934be7259c76f66d9204cbdd15933582602763"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/33389348-a7d7-41ae-850f-ec46d3ca9612/36bad11f948b05a4fa9faac93c35e574/dotnet-sdk-6.0.302-linux-arm64.tar.gz"; - sha512 = "26e98a63665d707b1a7729f1794077316f9927edd88d12d82d0357fe597096b0d89b64a085fcdf0cf49807a443bbfebb48e10ea91cea890846cf4308e67c4ea5"; + url = "https://download.visualstudio.microsoft.com/download/pr/901f7928-5479-4d32-a9e5-ba66162ca0e4/d00b935ec4dc79a27f5bde00712ed3d7/dotnet-sdk-6.0.400-linux-arm64.tar.gz"; + sha512 = "a21010f9e0e091bf0a4df9dfc4ec9893c056c2b07b10be093ea392a4fa5c8a38bad9535f66e570b45dc25165b685199fb729434b845bcfb35f8b79cceb22c632"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/60719796-b5c5-46dc-a26a-7e8126a292c8/a7b871d6c46136b61c30403d085ef97c/dotnet-sdk-6.0.302-osx-x64.tar.gz"; - sha512 = "003a06be76bf6228b4c033f34773039d57ebd485cf471a8117f5516f243a47a24d1b485ab9307becc1973107bb1d5b6c3028bbcbb217cbb42f5bee4c6c01c458"; + url = "https://download.visualstudio.microsoft.com/download/pr/f52fb2f4-a0a3-4094-9f75-add72fcbc21e/d46eda7abf39baf278c0b0b040c7b81d/dotnet-sdk-6.0.400-osx-x64.tar.gz"; + sha512 = "35b80347e31baefdbd42e7434ffa0df1069367a4f8deec8b4051a44658b3ed531832f0e92357887a2f5a27c6433304537c846cdd4793aac874bace82a899053e"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/01a17a2d-6b92-4521-97a2-ad7d845a8064/44aa4e10f71e70a38b5f6f59d211cbab/dotnet-sdk-6.0.302-osx-arm64.tar.gz"; - sha512 = "59caea897a56b785245dcd3a6082247aeb879c39ecfab16db60e9dc3db447ca4e3ebe68e992c0551af886cd81f6f0088cb1433f1be6df865afa357f90f37ccf6"; + url = "https://download.visualstudio.microsoft.com/download/pr/0e45597f-a72d-42fa-95c5-85a811a7a8b6/1d77d2eeb8c08815edd1a6e9e9dfda4a/dotnet-sdk-6.0.400-osx-arm64.tar.gz"; + sha512 = "c3b016bc558f42fba29a8aebcc04be7b3aa3b0290755b6ee2fea1f48f921da78b86cb31913c4b7e32c0421b45a617b551ba593f98f349fae43ea1faa38348412"; }; }; packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.7"; sha256 = "028dlrbgs6d9gdvkl48lksm9gagsch5ih974l5wwfpdgx693v4wl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.7"; sha256 = "1y5l528qp08bghm7qdk223g9ki6mv1hhmixhw5zfdzscp0wf11dh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.7"; sha256 = "013xk8m2bkh99s0l5wz8k01pw9r7kwlywsngqciwvqk44vr265ga"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.7"; sha256 = "0pl8lr2chnscrbjckqw2ydck15fgxffsmkm7sqbcg9x9pwc0mkap"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.7"; sha256 = "140333iig3wc0iv76gk97cd6bqsjyhmhkf0myd04m9ds5dcwpxks"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.7"; sha256 = "1qfwhpvj9d3xp53y8mhhsamvnihy0czjhj63zxzc3fa21jpiscyy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.7"; sha256 = "03i5yqhklgm4p536a3vxwgkbyivwschgvn639xwx846g2ghdqnf2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.7"; sha256 = "01l2wr1lvfa63jn9j3ydgys6j0hcs30w880k0dd50q1jkm24cq4m"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.7"; sha256 = "1kzcw6gxd7ky32zpiwvmzgd5yy6vyjk8p600jwaagz63z36zaa3k"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.7"; sha256 = "1dkc3px04mpzd8zlkxcld63kqlncd8fs1dm3qdfg83sx7nzzf9xl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.7"; sha256 = "1hy3wcy7dsw4pl8bcqy84i8hgxk6b1cm30chj2gjahx5yy1gwzr0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.7"; sha256 = "07h9b4fqna61j206hk5jrf9mrffg63ii2icn9h6x19h4pr9bf340"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.7"; sha256 = "1mjjb8a1g1fsw1qbhixc5hjwnkn35551pmfdl9l702zhd9hwf0s9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.7"; sha256 = "0l6765cbdmdh71raq5snxd56w71clfbm4iwi93y3n67skpjkn6ml"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.7"; sha256 = "1h8ziaf6qdsm14h1cx7573r0nsr3cwv7sczg9j9lqaizwxmqg8dq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.7"; sha256 = "0354iizqhwhnxcgrn5p8gqv50dnyj5vdyrikwqhv6yd178ardw00"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.7"; sha256 = "17bsbx0hdzkl3axxfd4xav7q455mkw1wvr3j1r0q0z2gic0x3p23"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.7"; sha256 = "0lky1ihhlwjsdb0pb77vx663yji53pnkl9ij3z58pxdknldf0ayb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.7"; sha256 = "1gswphp5w6hbz60bymksf9i6iwlqg5hx8w2l3x83cfpw9q0pw5kd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.7"; sha256 = "1i19iqz89fh54k3126daqrdwn0sxp00ziw0d2hd8z6dkf49vbvmx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.7"; sha256 = "059q3gnvhg7ywbdrvnra8zrcwxa5si50fakh71dg0rnwnivpngj9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.7"; sha256 = "0q61220ii4biz02w37jqi84cnzgspzrrfqpg2g3mkhamb0lgq3c6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.7"; sha256 = "0aswrsx45f5ql94mbz6qgj4rcd585mvsmg8lbm9yzqavnkxw37q9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.7"; sha256 = "1ax2cyk9zfav69lr6pr223gm4ydqdwjb13pc2mxzb7j9x2z4dj8q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.7"; sha256 = "0vqng4wqlkl9d3qphh0zzd1k2f53flvwk3k847iaxxdijvlr0b65"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.7"; sha256 = "0xmkfsvzcyk5akaz3k220xx6xli2kimzaqcnfpmyh9l66zkykrym"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.7"; sha256 = "0kgbxc6czq2sz1i7cjlv58jsisvc936m1zzj5f9qfv9c4aka2hig"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.7"; sha256 = "0fm8p7dpq12pv9qar8h7s1rz1dcyki7dh2424xrr49p8d58gmdsf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.7"; sha256 = "1kddakhs8bhrj14qmah78b164ia9277hjdvz8cd61b17f93iz7kd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.7"; sha256 = "0lzp9fc2h4h46ycy1dpbkqdp8qxm7xmfphfc3lgxr6jj9j123qac"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.7"; sha256 = "1hlks5p0i05xixarma211v09rr1n6r5qzmzjy0ca2gvgf9lv5xg1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.7"; sha256 = "04ryakvm54y5a0652hk77f8my3xq7faqn2v50i0w014njq1jyd5a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.7"; sha256 = "0pci9m6phhdvmk698dm7mzgxlmzf7wbk992s705iqzahdl2ra3sr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.7"; sha256 = "0ij8vixb7ymwxa8yxrhizqjkxbh8hkfg47bk9fmkaw9ab94jhj93"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.7"; sha256 = "0xd2vkrav41fcf86p7ddjqiarjchsl5wy1haxiw7nr0bq3hzmirv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.7"; sha256 = "0ks2mslr021rwh3k5x7cd28494q16sjr5fw3wx5ba4bagf56wyyr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.7"; sha256 = "1r1alh763xc40y3iqy2iwb91d273sf1hvgqhvwccyck30m9mqisl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.7"; sha256 = "00ihv8c7h9fkyldwvkqf9wpzi0rr9wrhg7fai374ipmsj9kn6xl0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.7"; sha256 = "1jz71dxps71hb7qay2x93p34bvni7a7dgxk137h162ac4qaa5dn7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "0a2vpn7j4h9phqv7azc9lczrkybln4ddf458j49dkjv3ghrav81z"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0j1if6nfi3sn1s8jdp08ks8v8526h275as61zh57kwmss5iczl4i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "19cjlpmg0r6f2b2q1jllivlmjkv47bzl32l5xpq3ppn2l6qxs35x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "11nayi9ai5qd9l944rap6fskzaw3nvmv8wmgf564cv4diphy8995"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "1kdv31lz32gywpffa3qiyrmrvqxgxk0zggr0a2235x33zalw9l27"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0wi08fp0rxif89g0bmyg0ksk5f02xg7hyahignhqh26qpc7d608s"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "0ns8lgqby70cnbij3lprgwzsgqzlv4db98qmcdvlnshv6lqqfd86"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "0x1sjdzvqmvmgg6dsn427r5i3776cphhzpmfjlj4sfilsfpygihp"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "12f24lnzb9m3dl06qklbc08577mf5vc9zibxabdidk83h7k7p0qc"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0garwnx2j86psq11pcd1z8vvnmhyn3x0fss0c4rza9c3bivh70wz"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "18mgsgmdvm38pxy5jr1wglgz0a1fk5gm8awscmy5y5dcx7qghy3s"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "12ksjis47q9dnnibx6snsnbgz07g1a6fsyrmir39b8m1cq5bbg0r"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "1midq986vs6qwz0b34wmrbv5yk4clqmjhnqgkmfd8bxxflzglg9w"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0ba37pr3x44n2mhi5kld0cvh2w81fvgwdfl6g1llr1a9ncl8dbq4"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "01pj41baqhkzk1nbqpy6khwakjrq5741wnnb1ny0j0i4mny7aa3i"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "1g0zmc71rf1c2gfwm5zn7qdhisr726rf1fqs9n9nisz7pj0c719k"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "0jr9ig4hga3iyxfwihlswpdfxlln66b16gfmb70qizn3jigwwvkh"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0wmm9yv20h7wp10xrca6hmv80isjzrw793zkwi591qah99rm7q44"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "0dp94sm7gpzyw882141salqrpk54fp7fgmaqmr5xir2q6r7wxmaf"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "05w0wkin5ydhrgqissdsdzxz39c4fh7msx2h5b50m84ixalqrkgf"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "17anarmiq2n1damyg5yjnm22z4v6fkv30dri6nz1987r0fdn2waf"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "1i9z2xh5r5bfncfd2h469zi46wykkikmbhkf9sys4jpfng78krdn"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "0xm0l5iil6zi6cdnhnnlqzn4bw88gyabajz4wxrklcj7kz8mgm81"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "03bjmb5ad8s7vj5cpbijmpr21z82d565wv0mg0h5iqlk02v5jw9g"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "1wqah3lc8q949w7gi94jmp2hy6ld4s1jxbmm0zj3xjqrq0gmqzqw"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0vpk34xr3i9bvr7cgl22ss3gj2gmsg6drjv9mj1hksnd7fzb9m9r"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "08swlx9khbyc34lxi59dgkc3fhbap2abm565dnpizmg4jqn7zz7s"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "1lkxnbfpf3f8yj0srq8iavy12i14r0nhcpjxff7ypnk2z7xyc098"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "1is814drvhf81xnq04npr5x56f8mxnr92vmc8bv66d8320yp8z1k"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0qqzk3r0mlldfpzm40gzrd0q6danfdd4h6l9fmjwwpmadj18dsg3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "1x7iqnksx4n4sb2ms5ibygkhfcnxbvkvamkx2s0rrbkghy25zndh"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "04m2asmr63vxapgga4gadbrp18349sxzyn7ryn74lg6sqzdpvdr1"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "0ck53135666f917lib6ahb32nxk78r65755v94hhv4g2xdbk813r"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0mig9c1xn6vdj1xdf20fvy9scw270l52rr2kwfjgppf4px661p77"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "0dwa93brfc4mpjrjrz10jm3ina6kv1v75hdny00m5jfla366k6gj"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "05svx1hz2n9qv6hj4grk0z7rkpw5v3s9059xpkjsb0h0f0y4zx6g"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "0adyh8w348fw9pilj4giiriv4dxxlqgjvrbrcbkc6xdbn9085lav"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "10nq0apr0askhq8z4kmna8gzqiazw4x94nz1c81qm7why0kyv0ws"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "17fxrkxf82jyihp9qkfab6dz8kkz6y437hi123mwyh274qfvcj61"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "0x6h4q5v153z5ym1rjzxgxrm3x87jqpiz52bmsgzv5vb1nkbhcnh"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "09b28pkjxxk1qrij83vjmf16zb8vpipdawzzkk09fw27rspbcckp"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "1r8plgiddlgarij4v60d0dzv5j1jqmnjhwhkaggfkzysgp16yvqi"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "0qzal5v635206c0m4bcm5x29i7ff4y4yg705wv3yqb4b653lxcsy"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "0k9g1n6ansv157jmsfczl2kasnsyvll8ka0yvhzgvwx7rxi7f006"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "0ccahvy9787vb990mn0r2aj3yl8ykzs9wzvh3jk5y7x27zhpsd28"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "0vhisvl2w6dyjmgdrkyhccjhnqlnx24drb1vypwhr6xdmx9r6mv1"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "1zv9r7yhhbqa8vpyiw4an2gdai1icp7dshq228lnadgll3slzaj2"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "02ylic2qyy6ayg1d76axhh61jsr64fi0svsnfj2s34iiifq8faah"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.7"; sha256 = "0gfkrvg1c6zq8dzp8pzjv3cbpy79z0gbym340cq8z235z7a2sijm"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.7"; sha256 = "1f0gbq6j5vhqznjgffaxg4pibl33l9k7zldn43wrzdr8ma5c6ily"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.7"; sha256 = "0a00frccimbza86kjrf1397bbsvsiggry1ihb4c4rk4d8qc2maq9"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.7"; sha256 = "0ppvrdwh32xr7rxlhc59lilj220cayk9f44p0qqygp3z20l1gzkl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.8"; sha256 = "1sxl6nsv8magamqbykdr6jnd9q6r1afavc7pzm2jmcqyxv121hv3"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.8"; sha256 = "1qksplqav4nrjbib6hrbdqg8rd8lxr63ljq57p4h7lbgw0wpxa5c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.8"; sha256 = "049s2617s3aqcqxbvb0idrmjw6vnwjjfnqrn7s6hi2w4w5f4z10x"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.8"; sha256 = "0pphpvag4i0zq7c51r72b9zjlj726wv2hn1vxd1mdsj85f2q77zz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.8"; sha256 = "00hhv36d8wjdhnz10jjdv3nikpd4x0sj6v2jfi5p3firl64p5wf2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.8"; sha256 = "1lcvphg7s6iwh3dkl9c2c0h5mx9gsp0aic7v2xaqgaq3sz0jalnk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.8"; sha256 = "1lmcy66m1yrm0ii1agydn8zmvydjf2sdvng5x07vda574shrr39h"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.8"; sha256 = "14q6sjbcs1xvd1lz670bnq4pgi1cgayih2bpsjbv33z6w1wshay5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.8"; sha256 = "14968kh3c0028nyyxivx01wj1k6a6mk2wm4fk0sbh6p2g7wpaqdp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.8"; sha256 = "1dmajf3hqs5njm6yd6g9vy72sndf93g4p6ghsjkxizgz46z3qsxh"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.8"; sha256 = "1cyczl8a4b3plb7f1w0jp06v65yd1fk7mcx2y1jr8qpcmxrad3gl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.8"; sha256 = "1qcg7awjd9xf6bvn5wsbd8kiy3vf6iag8q2myzzzy5jj4azbl2wd"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.8"; sha256 = "1dm953nh7d1k9cpclxxf3831rlx739skrxxw1whqnczffd8rjfmd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.8"; sha256 = "1g21mp68ljpvv6g4xgzihpfn96szchpny1h0g9g71bwbgp93aad8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.8"; sha256 = "0gp93f4ch0h95wl30xbz60xn7i752hvjkiivn3q7wnkary2g8mpr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.8"; sha256 = "1bdfpxs31x0a6cbb911vl3ncy26gsffgba3v598k6ki4662xlawv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.8"; sha256 = "0w5pxahcgxr4826hv6b72aq60gpbbrj6va2hvj4gzi917dkqdb94"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.8"; sha256 = "03x0zz9ig1m78gmf2r8wny1y1ripyzsdxak6cqha1zl8gbf0bcck"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.8"; sha256 = "167kc0766ppkfrv66b0xg844cm7vj7q6p3bm695j8m0gakz71kx3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.8"; sha256 = "0a0zrk6lcmbjyl0wkal9p0xw3n5qzvbc72by492vi3cwl8j6qv6d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.8"; sha256 = "04l1smar1hrg0r5pzqa5580aw17jx4cbk7i2mrgj7yy2m86m3d4s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.8"; sha256 = "0j1qdixwxj2bwgcfxf6fbs2krw6gcm7s9mcx41z9l9q4lq9qh1gc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.8"; sha256 = "17ji5vjqw59dkrjqfrdbmwf318x9f61ch855l6z3099g84bp9nqk"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.8"; sha256 = "0c9pxqsi99m91c25n7j2pq9gmyl88k9bf4a5bisqv7v5w7mi2h9x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.8"; sha256 = "1k8jh8s2rqyp7rr2vdwqfj35zkr77vnba4jnmgx5ank87z24vmhd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.8"; sha256 = "1z5ja82jxmlndivxrm4abapg41zkgs5bjc7ks2azzn8znghksvya"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.8"; sha256 = "1654jcqp80i3gkasf9axnfrjnk8iaxkhgfkbrgv5fi5vz0lbgi2h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.8"; sha256 = "0999pi4dyr4l7grrw47xip8prqsc3inpz9gkxjd34dzi7wcpfy47"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.8"; sha256 = "040c6505idayhym3j90ixw85h4l6m23nlwp5g9zf4p9dl2mfgicv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.8"; sha256 = "0qd9pz33wibc3db2sn452wd5vipzq6kf7gclc6lfzz4cavlzqxc4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.8"; sha256 = "0qzkybsfx4pps97kzyy8325brljdi4h9vqapcgyfb2rmkvvfqsby"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.8"; sha256 = "0fxp7zz6pjxhmasy7xza9gi83zag81b2gpp08cam69kjn1razlq1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.8"; sha256 = "01fci2411qhi6gxp0jddmy4pb248n08ng8wxap37ysh5zc1qmjcm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.8"; sha256 = "06ahjlsr43vx3dnw28fpkk2vmagrrn1m8jds8pdgj44jpn57lc8r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.8"; sha256 = "0bz6qja5lbi1a7iqkbin4p97dinn9iykw0x0nmmjs4ihx33ic1jr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.8"; sha256 = "080jaw5y9zwfsj3b0ziw3s75whankyn99q5sjhq7pmpi6763xw48"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.8"; sha256 = "0wmb4jx6l9dg17ng5cf4k3s54s08lf220gzphdgrcl0w1jihg7n5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.8"; sha256 = "067blnpwccsfp201803yrb4j4gp9vzkppgc4h7s13dxjz78cf7ss"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.8"; sha256 = "1ws1sbsly7n7p6p5k057m063vk5by88fxfkkqw5i61vh6iwkcbnd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "04dknyln95q0qx0h374d3xxs5rwh4sm0j489p370bkv0czl0ha4b"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "1rav7v08nc01b443cy58gk32n6d30zkjx99m8hpsz17vcxw8jiqq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1g03lm7ckqa67m9l701lmw6pwxym8l390zlf8km02gfq0x1g2fyj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1wb9db76nnm9sr2kj8q53j8wamybkrk7x6gwqw17xk6cxq2fgxq4"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "02l7ahcrhq8lnxnf323d6qk3saha73d2sbmgjmp1rcy5q2mqly05"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0cinkimphbrpjmz38acrmjqr9md4vi7ad7r757gm363z0hal2783"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1dr2a2bgia8i5pwk8b8z3jwlbkshh9pb8hhzbkhjmc56sx49h0lx"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1kj8a9l65slgb3r45b8x5qnhcs80bx8437cfisyfbhjkw17i5cgg"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "1v06qri2f6h2ndbaydgsnpas6nfhvi58yx68v3w4gdbdablnycvb"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0vskm16p0aj7jlwsp5mfbilszwvfaglp6p69196v7kdqmskwxw8c"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1j1j81az67rwdnqfapjnvxx35fjr1n035pwb2nlg6kz2r2mfw4ph"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "0sfqc7v6zi3ma446jgrd4bjfjl0d48wpyb40wc1frcsvms9zskwr"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "0sp90fz8qyz7gn2fmgavsq909dpk44ymq3cs1mxdwfp3v9dssmyh"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "08k90llf2p1bg62w1mk7vv5lk8s4ymfq5j6hdl1al5an4gl7niif"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1akvfw5p9s7w9jr09s20ph4x82kfbabsbd5dafpvakd4zw7cawfx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "0r4fbkjqy1g9cmaa55rpbsphslcmlpzmag5w47kmq4hxz0ll68d2"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "015dadmlghkbvxz7d7m3fanrq2lqls094immxdv0laxl3smkg7pw"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0gnnpxv0pnbrsx4zf28agwrgra7y3zm0z4lsr09i0wvrz97n65p7"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "136kjcl98n019764sy3pck9v4pmrz6q68qi8a2cdqm6hw7canc05"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "0ibrah9jzcs7i27z9alllg1d46dx0px0m3mgvnsg34zhbpqfbilp"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "0i4vmdgrvnr9fkmk2h88h1x37m4g4ksz7c24l585q6sg0343p0hp"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0rpb7py9j40jqhi9ndfpvspdkrbl4vwqq8r6hva7kfjva61x9ky2"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "06jf5qv6ldsapbjd8g01pwm0yw20w7slpi9yrgxr8q2y0f9fqnhy"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1mj8gzvnk5f16vchwc94bp6726m6n8j6bi9d3rzbly8k63xdnnv3"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "05491m5xzd6sbbpad6v7z1apkf00ip13sl23d9r2g5hv22i61qr9"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "1wsafi273xsh9q9cbfq123p33k2kgvrqz7hvkj4hlshl0dzlky7z"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1661dn6v40g8yzwxdfskv0llvwf422zs5b5ndrhbs15cihh10axw"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "17dicgyc24x4krjy37j36cln0770cl52ihyyrg40n8l1b6q3hcdx"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "0pjhfxkzbgf0zxibrwrkzjhqz163qhczc476pzvd5fy9cxcdnkl5"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "145zkswksir8q0n83jw1kv2xsg5x4sf6w80hyynfjmpfhv7klmcw"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1r473bl4g9xgn69q9jp1mfxrvllsg7a2z4lan7nv58anwsz1bfyl"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1kcx09jsklbnjl6mhdarg0c2j84553q6zj9bs73n70idczzn6iyp"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "1g7vb2dba007aqw51k1ab962d63xh549zd3j9jsrnrmwpbk7yp58"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0p2rv3n9pkv27q20jmps4xl29dmraqc1wgcyw78wm5pgz1717wr4"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "0153c9n7zx4cpxwa71yddgjpy021c98r7h2w6mxg4fqnb8hrk23b"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "199qscm2is4xrbhnvyjp0lb4wwgw71c436vfxn7g6qmq7c4y1cyz"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "1h5ndqz2djp21d3qj2rqcf41z7y6njb5gjflvhzgjgpqb2xmsqaz"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0d10q75a645gdfk2krcwyhj3ncivmgbdkr1j7p7varl38ml1631i"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1lb78gjg28r3s0wwjsz3hvannlhqafc5jf8aqlyfk6w92c7p9y3z"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "05nay2zf8fp2y2ki232pkgwb29119fkhhg3z5dgbqn44dpsk7x1h"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "14yn29p83il7jympnnl34srqcygvlzn797702vg1qfdjs18iy6j9"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "1d8z4yk06qcqzfhs1424bwvvpy07m4dafilgxl3qlnynfb2i4jzi"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1np746181wn7mzf424qg4j68bs7nwr2iylq18hi1jcl2ysrdcfn3"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1b4qb36sgqbp5mpfni3iz2qs2kvvj341xn6w2rncvjajvgl73mpx"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "19ha49v8wfn48v011jhrg9mlpalmb254rvkv409s4zj089612nfc"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "1g6raxhpx7vlwl68xcw4r0xjra95zcbwifnj95w21wzv0nndna91"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "1imhc4a3yb9q0cslp0mnsvrvjm152kmj8iiw58c9j8g8sypxcw5g"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1ynn1apan8czndb4n8pdvday2jw6jc19zx8nsla8rv6m7q3vc23r"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.8"; sha256 = "03xkg1yg2h4k2y774vc438ahs0mlrbgh0w7nxyzn15pvlp95yyc6"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.8"; sha256 = "0dgcnlsmjhqz8m2y8lpyd0s626pj48whb8fzsxv51l125acinsn7"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.8"; sha256 = "05xisaphkmpfx2w1irb7vhc0f2rfycxkicbyjhgmpqq9cbdxg09l"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.8"; sha256 = "1p5h36si87c461k854ky7hn5h5354mh9cprlkf6k814bhi4hjx7y"; }) ]; }; } From 874c3bba6be7a7cd7ac5884fa8b0938aa7e3113a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Aug 2022 23:22:13 +0000 Subject: [PATCH 21/45] sdbus-cpp: 1.1.0 -> 1.2.0 --- pkgs/development/libraries/sdbus-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix index d665a6d94a5a..e354b3141a78 100644 --- a/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/pkgs/development/libraries/sdbus-cpp/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "sdbus-cpp"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "kistler-group"; repo = "sdbus-cpp"; rev = "v${version}"; - sha256 = "sha256-AjaZ6YmMlnN0jAcUBkft01XHkrze0nSr3dUMechsLrQ="; + sha256 = "sha256-EX/XLgqUwIRosLu3Jgtpp42Yt6Tf22Htj9JULoUL7ao="; }; nativeBuildInputs = [ From bb17d4e059e81679aee6dc3f61a7079848f25f4a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 12 Aug 2022 04:20:00 +0000 Subject: [PATCH 22/45] hyperledger-fabric: 2.4.3 -> 2.4.6 --- pkgs/tools/misc/hyperledger-fabric/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/hyperledger-fabric/default.nix b/pkgs/tools/misc/hyperledger-fabric/default.nix index ba3c9495a43f..15bb67d62842 100644 --- a/pkgs/tools/misc/hyperledger-fabric/default.nix +++ b/pkgs/tools/misc/hyperledger-fabric/default.nix @@ -5,14 +5,13 @@ buildGoModule rec { pname = "hyperledger-fabric"; - version = "2.4.3"; - commit = "9711fb5d0c16297584f5c53123f589110828736f"; + version = "2.4.6"; src = fetchFromGitHub { owner = "hyperledger"; repo = "fabric"; rev = "v${version}"; - sha256 = "sha256-gXVahzpuIUWAHq4gJ1rbq943zIuWrl/ojDMQDFfI14I="; + sha256 = "sha256-Q0qrDPih3M4YCzjhLFBy51qVvoICwwn1LJf63rYiUUg="; }; vendorSha256 = null; @@ -33,11 +32,12 @@ buildGoModule rec { "cmd/peer" ]; - ldflags = lib.mapAttrsToList - (n: v: "github.com/hyperledger/fabric/common/metadata.${n}=${v}") { - Version = version; - CommitSha = commit; - }; + ldflags = [ + "-s" + "-w" + "-X github.com/hyperledger/fabric/common/metadata.Version=${version}" + "-X github.com/hyperledger/fabric/common/metadata.CommitSha=${src.rev}" + ]; meta = with lib; { description = "High-performance, secure, permissioned blockchain network"; From 742a12d9a0cba35aa11448031d6964a014913b2c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Aug 2022 07:08:47 +0000 Subject: [PATCH 23/45] agi: 3.1.0-dev-20220713 -> 3.1.0-dev-20220811 --- pkgs/tools/graphics/agi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/agi/default.nix b/pkgs/tools/graphics/agi/default.nix index 1e5cd1cc1289..c2f3743e02ea 100644 --- a/pkgs/tools/graphics/agi/default.nix +++ b/pkgs/tools/graphics/agi/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "agi"; - version = "3.1.0-dev-20220713"; + version = "3.1.0-dev-20220811"; src = fetchzip { url = "https://github.com/google/agi-dev-releases/releases/download/v${version}/agi-${version}-linux.zip"; - sha256 = "sha256-ch3crmvueXk4xJ4LjG4MrYkaCTd+41INAz+/ClI+Mpw="; + sha256 = "sha256-7lxcyIX3imqsU15HQ2Xc0S8ki6LWMlkM4fdTOCuCti8="; }; nativeBuildInputs = [ From a91b487228dfa29849204b4b1024523f734e6a2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Aug 2022 10:45:23 +0000 Subject: [PATCH 24/45] python310Packages.azure-keyvault-certificates: 4.4.0 -> 4.5.1 --- .../python-modules/azure-keyvault-certificates/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix index 4dba9f408b8d..5079cfa9670c 100644 --- a/pkgs/development/python-modules/azure-keyvault-certificates/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-certificates/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "azure-keyvault-certificates"; - version = "4.4.0"; + version = "4.5.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-DAFU84AbI4Tdf6TtYDZvSwrpERxf/MqHjQU2igBLh88="; + hash = "sha256-4eIIF90ZSajuzlGFrUOQacWR1AdmSP2cY8EeM5McGZA="; }; propagatedBuildInputs = [ From 272c4c9f603507325fc5aff5f6a90b7256427633 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Aug 2022 15:40:37 +0000 Subject: [PATCH 25/45] gretl: 2022a -> 2022b --- pkgs/applications/science/math/gretl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/gretl/default.nix b/pkgs/applications/science/math/gretl/default.nix index b8b600c18748..5e1ac5d17733 100644 --- a/pkgs/applications/science/math/gretl/default.nix +++ b/pkgs/applications/science/math/gretl/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "gretl"; - version = "2022a"; + version = "2022b"; src = fetchurl { url = "mirror://sourceforge/gretl/${pname}-${version}.tar.xz"; - sha256 = "sha256-J+JcuCda2xYJ5aVz6UXR+nWiid6QxpDtt4DXlb6L4UA="; + sha256 = "sha256-A+LyWPSUBBvnnyBrVSAUCiny24UAztUwy1nmRoDaGjI="; }; buildInputs = [ From 3b9cf4174409900c68b3edebb878a0999883c585 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sun, 7 Aug 2022 16:57:42 -0700 Subject: [PATCH 26/45] ryujinx: 1.1.181 -> 1.1.213 --- pkgs/applications/emulators/ryujinx/default.nix | 8 +++++--- pkgs/applications/emulators/ryujinx/deps.nix | 16 +++++++++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 3bc35e6b1065..98f7f902d7f8 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -13,17 +13,18 @@ , gtk3 , gdk-pixbuf , wrapGAppsHook +, vulkan-loader }: buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.181"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.213"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "6eb85e846f25ae36a39685d6ac91025deaea306c"; - sha256 = "0lc8hhcrad26sw2dx0lwml8lk2mxg4db4sgfxnd450xi2qd63kdc"; + rev = "e8f1ca84277240c4d6215eb9cd85713aab73e2f7"; + sha256 = "0ha5wn9h9rqxbkjbz7sm5m8q3rbsiiddh72wx0s3sga5w8054cb3"; }; projectFile = "Ryujinx.sln"; @@ -53,6 +54,7 @@ buildDotnetModule rec { libsoundio sndio pulseaudio + vulkan-loader ]; makeWrapperArgs = [ diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 67e7b0dc7244..e90144cfad71 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -56,7 +56,10 @@ (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "3.1.1"; sha256 = "0qa04dspjl4qk7l8d66wqyrvhp5dxcfn2j4r8mmj362xyrp3r8sh"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.15.0"; sha256 = "0dwx7dk8jr10784nriqbi364qbxzfwq0c6xia0ac5rzrp7179r4d"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.15.0"; sha256 = "0jn9a20a2zixnkm3bmpmvmiv7mk0hqdlnpi0qgjkg1nir87czm19"; }) (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.15.0"; sha256 = "1nbgydr45f7lp980xyrkzpyaw2mkkishjwp3slgxk7f0mz6q8i1v"; }) @@ -93,6 +96,8 @@ (fetchNuGet { pname = "OpenTK.Graphics"; version = "4.7.2"; sha256 = "1wnf9x45ga336vq4px2a2fmma4zc9xrcr4qwrsmsh3l4w0d9s6ps"; }) (fetchNuGet { pname = "OpenTK.Mathematics"; version = "4.7.2"; sha256 = "0ay1a8spmy8pn5nlvvac796smp74hjpxm3swvxdrbqqg4l4xqlfz"; }) (fetchNuGet { pname = "OpenTK.OpenAL"; version = "4.7.2"; sha256 = "1m0wgf4khikyz2pvns5d9ffwm7psxjn9r4h128aqlca1iyay23f6"; }) + (fetchNuGet { pname = "OpenTK.redist.glfw"; version = "3.3.7.25"; sha256 = "0yf84sql0bayndjacr385lzar0vnjaxz5klrsxflfi48mgc8g55s"; }) + (fetchNuGet { pname = "OpenTK.Windowing.GraphicsLibraryFramework"; version = "4.7.2"; sha256 = "14nswj5ws9yq6lkfyjj1y1pd6522rjqascxs5jy9cgnp954lv2hv"; }) (fetchNuGet { pname = "PangoSharp"; version = "3.22.25.128"; sha256 = "0dkl9j0yd65s5ds9xj5z6yb7yca7wlycqz25m8dng20d13sqr1zp"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) @@ -147,8 +152,13 @@ (fetchNuGet { pname = "Ryujinx.Audio.OpenAL.Dependencies"; version = "1.21.0.1"; sha256 = "0z5k42h252nr60d02p2ww9190d7k1kzrb26vil4ydfhxqqqv6w9l"; }) (fetchNuGet { pname = "Ryujinx.Graphics.Nvdec.Dependencies"; version = "5.0.1-build10"; sha256 = "05r3fh92raaydf4vcih77ivymbs97kqwjlgqdpaxa11aqq0hq753"; }) (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.0.22-build20"; sha256 = "03d1rv0rlr2z7ynqixgj9xqlksplk1vsvq5wxjf5c6c6zcknx01r"; }) + (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; }) (fetchNuGet { pname = "SharpZipLib"; version = "1.3.3"; sha256 = "1gij11wfj1mqm10631cjpnhzw882bnzx699jzwhdqakxm1610q8x"; }) (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.14"; sha256 = "0ym0ayik0vq2za9h0kr8mhjd9zk4hx25hrrfyyg9wrc164xa11qb"; }) + (fetchNuGet { pname = "Silk.NET.Core"; version = "2.10.1"; sha256 = "02fabxqhfn2a8kyqmxcmraq09m1pvd8gbw8xad6y9iqyhr0q8s0j"; }) + (fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.10.1"; sha256 = "03aapzb23lkn4qyq71lipcgj8h3ji12jjivrph535v0pwqx9db35"; }) + (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.EXT"; version = "2.10.1"; sha256 = "0d8ml39dhxpj2rql88g7dw3rkcjxl5722rilw1wdnjaki7hqgrz7"; }) + (fetchNuGet { pname = "Silk.NET.Vulkan.Extensions.KHR"; version = "2.10.1"; sha256 = "07zc7bjbg9h71m3l71i9gx5kwx7bhv4l7vha88wpi8h8f86zyvzd"; }) (fetchNuGet { pname = "SixLabors.Fonts"; version = "1.0.0-beta0013"; sha256 = "0r0aw8xxd32rwcawawcz6asiyggz02hnzg5hvz8gimq8hvwx1wql"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "1.0.4"; sha256 = "0fmgn414my76gjgp89qlc210a0lqvnvkvk2fcwnpwxdhqpfvyilr"; }) (fetchNuGet { pname = "SixLabors.ImageSharp.Drawing"; version = "1.0.0-beta11"; sha256 = "0hl0rs3kr1zdnx3gdssxgli6fyvmwzcfp99f4db71s0i8j8b2bp5"; }) @@ -163,7 +173,7 @@ (fetchNuGet { pname = "SkiaSharp.NativeAssets.WebAssembly"; version = "2.88.1-preview.1"; sha256 = "0mwj2yl4gn40lry03yqkj7sbi1drmm672dv88481sgah4c21lzrq"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.0"; sha256 = "135ni4rba4wy4wyzy9ip11f3dwb1ipn38z9ps1p9xhw8jc06y5vp"; }) (fetchNuGet { pname = "SkiaSharp.NativeAssets.Win32"; version = "2.88.1-preview.1"; sha256 = "1k50abd147pif9z9lkckbbk91ga1vv6k4skjz2n7wpll6fn0fvlv"; }) - (fetchNuGet { pname = "SPB"; version = "0.0.4-build17"; sha256 = "0arp7mwdn1w67qx8a0m90xh8waj15154ynswrbsp5w4wmzkcss1i"; }) + (fetchNuGet { pname = "SPB"; version = "0.0.4-build24"; sha256 = "13wfjx5n540mlxlvys39g2rajrqbycdkyci2pcp3wygkqn4d87hm"; }) (fetchNuGet { pname = "Svg.Custom"; version = "0.5.14"; sha256 = "1wjghs2n5hk7zszzk2p2a8m6ga2gc8sfd5mdqi15sbfkmwg2nbw7"; }) (fetchNuGet { pname = "Svg.Model"; version = "0.5.14"; sha256 = "1xilk95bmnsl93sbr7pah0jrjrnccf1ikcn8s7rkm0yjkj382hc8"; }) (fetchNuGet { pname = "Svg.Skia"; version = "0.5.14"; sha256 = "02wv040wi8ijw9mwg3c84f8bfyfv9n99ji8q1v2bs11b463zsyd1"; }) @@ -192,6 +202,7 @@ (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) + (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.Drawing.Common"; version = "6.0.0"; sha256 = "02n8rzm58dac2np8b3xw8ychbvylja4nh6938l5k2fhyn40imlgz"; }) (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) @@ -220,6 +231,7 @@ (fetchNuGet { pname = "System.Net.Http"; version = "4.1.0"; sha256 = "1i5rqij1icg05j8rrkw4gd4pgia1978mqhjzhsjg69lvwcdfg8yb"; }) (fetchNuGet { pname = "System.Net.NameResolution"; version = "4.3.0"; sha256 = "15r75pwc0rm3vvwsn8rvm2krf929mjfwliv0mpicjnii24470rkq"; }) (fetchNuGet { pname = "System.Net.Primitives"; version = "4.0.11"; sha256 = "10xzzaynkzkakp7jai1ik3r805zrqjxiz7vcagchyxs2v26a516r"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) (fetchNuGet { pname = "System.Net.Sockets"; version = "4.1.0"; sha256 = "1385fvh8h29da5hh58jm1v78fzi9fi5vj93vhlm2kvqpfahvpqls"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.3.0"; sha256 = "05kji1mv4sl75iwmc613p873145nynm02xiajx8pn0h2kx53d23s"; }) (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) @@ -284,6 +296,7 @@ (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (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.Text.Json"; version = "4.7.0"; sha256 = "0fp3xrysccm5dkaac4yb51d793vywxks978kkl5x4db9gw29rfdr"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) @@ -306,4 +319,5 @@ (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) + (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.3.4"; sha256 = "0w1bz5sr6y5fhgx1f54xyl8rx7y3kyf1fhacnd6akq8970zjdkdi"; }) ] From 9e690f486befe15acf42d595623474a49d91f079 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Fri, 12 Aug 2022 11:09:12 -0700 Subject: [PATCH 27/45] ryujinx: Add ffmpeg to runtimeDeps Ryujinx has stopped depending on the ffmpeg executable. https://github.com/Ryujinx/Ryujinx/commit/c5bddfeab8a905ce6c306ffafb079d8550f0b027 --- pkgs/applications/emulators/ryujinx/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 98f7f902d7f8..8d77e00e8201 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -55,10 +55,7 @@ buildDotnetModule rec { sndio pulseaudio vulkan-loader - ]; - - makeWrapperArgs = [ - "--suffix PATH : ${lib.getBin ffmpeg}" + ffmpeg ]; patches = [ From ce6202a6b5bfceb469b344fa376ada1dc9d1afea Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 12 Aug 2022 22:33:14 +0100 Subject: [PATCH 28/45] fheroes2: install localization and other port-specific files Without the change the game does not provide prompt for locales as it assumes no locales are available. Let's pull them in by default. --- pkgs/games/fheroes2/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 83c856359af6..454430276b8a 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub -, gettext, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, zlib +, gettext, glibcLocalesUtf8, libpng, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, zlib # updater only , nix-update-script @@ -16,19 +16,29 @@ stdenv.mkDerivation rec { sha256 = "sha256-I79PoNE6GFvYD4jnsxKo7MsoPgVow8b8fTIiClOGnAI="; }; - buildInputs = [ gettext libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; + buildInputs = [ gettext glibcLocalesUtf8 libpng SDL2 SDL2_image SDL2_mixer SDL2_ttf zlib ]; makeFlags = [ "FHEROES2_STRICT_COMPILATION=1" + "FHEROES2_DATA=\"${placeholder "out"}/share/fheroes2\"" ]; enableParallelBuilding = true; + postBuild = '' + # Pick guaranteed to be present UTF-8 locale. + # Otherwise `iconv` calls fail to produce valid translations. + LANG=en_US.UTF_8 make -C files/lang + ''; + installPhase = '' runHook preInstall install -Dm755 $PWD/src/dist/fheroes2 $out/bin/fheroes2 + install -Dm644 -t $out/share/fheroes2/files/lang $PWD/files/lang/*.mo + install -Dm644 -t $out/share/fheroes2/files/data $PWD/files/data/resurrection.h2d + runHook postInstall ''; From d9a9b87d1d11cabddd6bdb59412e1ef4e6bd832b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 05:32:19 +0000 Subject: [PATCH 29/45] crowdin-cli: 3.7.9 -> 3.7.10 --- 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 d76d4e3ac949..d0dada770ee7 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.7.9"; + version = "3.7.10"; src = fetchurl { url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; - sha256 = "sha256-goRqj/3BM7DPWlfJH9kgW9JQP1lGWQod6DO8fmcRPqc="; + sha256 = "sha256-beU4hLW5Dp4xbY0kaxuxLD2XmMXdxWEBbAH/G+B5dHU="; }; nativeBuildInputs = [ installShellFiles makeWrapper unzip ]; From ce940123eca2052148ba1ea7efcb338d29595186 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 08:40:06 +0000 Subject: [PATCH 30/45] brave: 1.41.100 -> 1.42.88 --- 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 2f291266a5ff..67c950f3f9a2 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.41.100"; + version = "1.42.88"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-r5mMI7iLJ+q4dvt/IDcFlHz56sygYXsG8bb29UVxmTI="; + sha256 = "sha256-Or3eTLwap6KFhO7ieLyAXS0NKga5eUbd3KyFq/YNg+c="; }; dontConfigure = true; From de51cc960bedabae579480227f178d1b186acce8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 00:21:13 +0200 Subject: [PATCH 31/45] python310Packages.tabula-py: 2.4.0 -> 2.5.0 --- pkgs/development/python-modules/tabula-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tabula-py/default.nix b/pkgs/development/python-modules/tabula-py/default.nix index 914e053919d5..6e9a32550312 100644 --- a/pkgs/development/python-modules/tabula-py/default.nix +++ b/pkgs/development/python-modules/tabula-py/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "tabula-py"; - version = "2.4.0"; + version = "2.5.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "chezou"; repo = pname; rev = "v${version}"; - hash = "sha256-cVhtFfzDQvVnDaXOU3dx/m3LENMMG3E+RnFVFCZ0AAc="; + hash = "sha256-SYDwMVJMBRAtjkHMZQct17RueMbRZ5aDENDGkkrahrY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 72c4396b4d523ae6499b9d1710e22dd61a67f9bf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 04:01:30 +0000 Subject: [PATCH 32/45] vcluster: 0.7.0 -> 0.11.1 --- pkgs/applications/networking/cluster/vcluster/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/vcluster/default.nix b/pkgs/applications/networking/cluster/vcluster/default.nix index aed84153d2d6..8a477c543e6c 100644 --- a/pkgs/applications/networking/cluster/vcluster/default.nix +++ b/pkgs/applications/networking/cluster/vcluster/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vcluster"; - version = "0.7.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "loft-sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Yf2ZLhB6yfXySvPajI9mvdcYQPPpKI+LZ6+PMvOS4qo="; + sha256 = "sha256-aFTugqWr/9e3wQLL4yre2T8CUKq8P0HZLsES8lFZKHY="; }; vendorSha256 = null; From 8cb3340ffe2d387c15efb400e76d4a87f32da36a Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sun, 14 Aug 2022 10:43:16 +0200 Subject: [PATCH 33/45] yuzu-{ea,mainline}: {2841,1092} -> {2901,1131} This also changes the update script for EA to fetch the two latest releases, filter for tags matching /^EA-[0-9]*/ and pick the latest one. This is required because recently the auto-updater (tag: continuous) is the latest release, which would have been picked by the update script. It also updates the free icons patch, which is needed due to yuzu changing how they track licenses of files to REUSE. The comment is updated to reflect the workflow that is needed to create the patch, because pineapple does not include files beginning with a dot in its source. --- pkgs/applications/emulators/yuzu/default.nix | 8 +- pkgs/applications/emulators/yuzu/generic.nix | 7 +- pkgs/applications/emulators/yuzu/update.sh | 2 +- .../emulators/yuzu/yuzu-free-icons.patch | 950 +++++++++--------- 4 files changed, 482 insertions(+), 485 deletions(-) diff --git a/pkgs/applications/emulators/yuzu/default.nix b/pkgs/applications/emulators/yuzu/default.nix index bc63771494e2..923dc5427997 100644 --- a/pkgs/applications/emulators/yuzu/default.nix +++ b/pkgs/applications/emulators/yuzu/default.nix @@ -15,13 +15,13 @@ let in { mainline = libsForQt5.callPackage ./generic.nix rec { pname = "yuzu-mainline"; - version = "1092"; + version = "1131"; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "1avcq924q0r8pfv1s0a88iyii7yixcxpb3yhlj0xg9zqnwp9r23y"; + sha256 = "0lh8s59hrysfjz69yr0f44s3l4aaznmclq0xfnyblsk0cw9ripf6"; fetchSubmodules = true; }; @@ -30,13 +30,13 @@ in { early-access = libsForQt5.callPackage ./generic.nix rec { pname = "yuzu-ea"; - version = "2841"; + version = "2901"; src = fetchFromGitHub { owner = "pineappleEA"; repo = "pineapple-src"; rev = "EA-${version}"; - sha256 = "16lrq9drv0x7gs1siq37m4zmh6d2g3vhnw9qcqajr9p0vmlpnh6l"; + sha256 = "0jymm9sdsnayjaffmcbpjck4k2yslx8zid2vsm4jfdaajr244q2z"; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/yuzu/generic.nix b/pkgs/applications/emulators/yuzu/generic.nix index f1ef9259031a..9dac4409ce44 100644 --- a/pkgs/applications/emulators/yuzu/generic.nix +++ b/pkgs/applications/emulators/yuzu/generic.nix @@ -47,8 +47,11 @@ stdenv.mkDerivation rec { # Replace icons licensed under CC BY-ND 3.0 with free ones to allow # for binary redistribution: https://github.com/yuzu-emu/yuzu/pull/8104 - # The patch hosted on GitHub has the binary information stripped, so - # it has been regenerated with "git format-patch --text --full-index --binary" + # The patch hosted on GitHub has the binary information in git format, which + # can’t be applied with patch(1), so it has been regenerated with + # "git format-patch --text --full-index --binary". + # Because pineapple strips all files beginning with a dot, the patch needs to + # be edited manually afterwards to remove all changes to those. patches = [ ./yuzu-free-icons.patch ]; nativeBuildInputs = [ diff --git a/pkgs/applications/emulators/yuzu/update.sh b/pkgs/applications/emulators/yuzu/update.sh index 8dedcab02813..4972427627e7 100755 --- a/pkgs/applications/emulators/yuzu/update.sh +++ b/pkgs/applications/emulators/yuzu/update.sh @@ -53,7 +53,7 @@ updateEarlyAccess() { OLD_EA_HASH="$(getLocalHash "yuzu-ea")" NEW_EA_VERSION="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=1" | jq -r '.[0].tag_name' | cut -d"-" -f2 | cut -d" " -f1)" + "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=2" | jq -r '.[].tag_name' | grep '^EA-[0-9]*' | head -n1 | cut -d"-" -f2 | cut -d" " -f1)" if [[ "${OLD_EA_VERSION}" = "${NEW_EA_VERSION}" ]]; then echo "yuzu-ea is already up to date!" diff --git a/pkgs/applications/emulators/yuzu/yuzu-free-icons.patch b/pkgs/applications/emulators/yuzu/yuzu-free-icons.patch index e150a54ee8aa..4332d29e3193 100644 --- a/pkgs/applications/emulators/yuzu/yuzu-free-icons.patch +++ b/pkgs/applications/emulators/yuzu/yuzu-free-icons.patch @@ -1,143 +1,304 @@ -From 23e02aec6ff6b0823c2e66f5cff737e0cd430a22 Mon Sep 17 00:00:00 2001 -From: Kyle K <190571+Docteh@users.noreply.github.com> -Date: Mon, 28 Mar 2022 14:44:12 -0700 -Subject: [PATCH 1/2] Moving Icons away from CC BY-ND 3.0 for FOSS packaging +From 44edc19f8f1ac0046770d6f3587a17bdd0f82d32 Mon Sep 17 00:00:00 2001 +From: Kyle Kienapfel +Date: Tue, 19 Jul 2022 07:08:29 -0700 +Subject: [PATCH] Moving Icons away from CC BY-ND 3.0 for FOSS packaging purposes I've seen some comments stating that sharing pre-compiled packages of yuzu is problematic for linux distributions due to some contents having license of CC BY-ND 3.0 -Sources for the icons have been updated in the dist/license.md document +Better licensed sources of icons have been found for most cases, +see the changes to the .reuse/dep5 file for details. -Also a note has been added to call attention to the two copies of a QT theme -called QDarkStyleSheet +Placeholders for connected/disconnected icons + +At the time of writing I consider these icons to be placeholders, +hence three copies. colorful is grey, default is black, qdarkstyle is white + +connected is gnome/16x16/network-idle.png with no changes +connected_notification is gnome/16x16/network-error.png with changes +disconnected is gnome/16x16/network-offline.png with changes + +Looking at licenses: GNOME icon theme is distributed under the terms of either +GNU LGPL v.3 or Creative Commons BY-SA 3.0 license. + +Debian appears to explicitly state they're licensing under +Creative Commons Attribution-Share Alike 3.0 + +From a tarball at the following link suggests we can just attribute GNOME Project +https://download.gnome.org/sources/gnome-icon-theme/ + +When attributing the artwork, using "GNOME Project" is enough. +Please link to http://www.gnome.org where available. --- - dist/license.md | 63 ++++++++++-------- - dist/qt_themes/colorful/icons/48x48/plus.png | Bin 496 -> 232 bytes - .../colorful/icons/48x48/sd_card.png | Bin 680 -> 760 bytes - dist/qt_themes/colorful/icons/48x48/star.png | Bin 1248 -> 1330 bytes + LICENSES/CC-BY-ND-3.0.txt | 87 ------------------ + LICENSES/CC-BY-SA-3.0.txt | 60 ++++++++++++ + .../colorful/icons/16x16/connected.png | Bin 362 -> 575 bytes + .../icons/16x16/connected_notification.png | Bin 607 -> 760 bytes + .../colorful/icons/16x16/disconnected.png | Bin 784 -> 648 bytes + .../colorful/icons/48x48/list-add.png | Bin 496 -> 204 bytes + .../colorful/icons/48x48/sd_card.png | Bin 680 -> 981 bytes + dist/qt_themes/colorful/icons/48x48/star.png | Bin 1248 -> 1108 bytes + .../icons/16x16/lock.png | Bin 401 -> 0 bytes + .../icons/16x16/view-refresh.png | Bin 362 -> 0 bytes + .../colorful_midnight_blue/style.qrc | 4 +- .../qt_themes/default/icons/16x16/checked.png | Bin 657 -> 414 bytes - dist/qt_themes/default/icons/16x16/failed.png | Bin 524 -> 361 bytes + .../default/icons/16x16/connected.png | Bin 269 -> 575 bytes + .../icons/16x16/connected_notification.png | Bin 517 -> 760 bytes + .../default/icons/16x16/disconnected.png | Bin 306 -> 648 bytes + dist/qt_themes/default/icons/16x16/failed.png | Bin 524 -> 431 bytes dist/qt_themes/default/icons/16x16/lock.png | Bin 279 -> 318 bytes .../default/icons/256x256/plus_folder.png | Bin 3135 -> 3521 bytes .../default/icons/48x48/bad_folder.png | Bin 1088 -> 1007 bytes dist/qt_themes/default/icons/48x48/chip.png | Bin 15070 -> 511 bytes dist/qt_themes/default/icons/48x48/folder.png | Bin 410 -> 535 bytes - dist/qt_themes/default/icons/48x48/plus.png | Bin 316 -> 274 bytes - .../qt_themes/default/icons/48x48/sd_card.png | Bin 614 -> 638 bytes + .../default/icons/48x48/list-add.png | Bin 316 -> 204 bytes + .../default/icons/48x48/no_avatar.png | Bin 588 -> 678 bytes + .../qt_themes/default/icons/48x48/sd_card.png | Bin 614 -> 561 bytes dist/qt_themes/default/icons/48x48/star.png | Bin 686 -> 1029 bytes + .../qdarkstyle/icons/16x16/connected.png | Bin 397 -> 575 bytes + .../icons/16x16/connected_notification.png | Bin 526 -> 760 bytes + .../qdarkstyle/icons/16x16/disconnected.png | Bin 444 -> 648 bytes .../qt_themes/qdarkstyle/icons/16x16/lock.png | Bin 304 -> 343 bytes .../qdarkstyle/icons/256x256/plus_folder.png | Bin 3438 -> 3931 bytes .../qdarkstyle/icons/48x48/bad_folder.png | Bin 1098 -> 1061 bytes .../qt_themes/qdarkstyle/icons/48x48/chip.png | Bin 15120 -> 551 bytes .../qdarkstyle/icons/48x48/folder.png | Bin 542 -> 594 bytes - .../qt_themes/qdarkstyle/icons/48x48/plus.png | Bin 339 -> 297 bytes - .../qdarkstyle/icons/48x48/sd_card.png | Bin 676 -> 679 bytes + .../qdarkstyle/icons/48x48/list-add.png | Bin 339 -> 204 bytes + .../qdarkstyle/icons/48x48/no_avatar.png | Bin 708 -> 763 bytes + .../qdarkstyle/icons/48x48/sd_card.png | Bin 676 -> 587 bytes .../qt_themes/qdarkstyle/icons/48x48/star.png | Bin 725 -> 1055 bytes - .../icons/16x16/lock.png | Bin 304 -> 343 bytes - .../icons/256x256/plus_folder.png | Bin 3438 -> 3931 bytes - .../icons/48x48/bad_folder.png | Bin 1098 -> 1061 bytes - .../icons/48x48/chip.png | Bin 15120 -> 551 bytes - .../icons/48x48/folder.png | Bin 542 -> 594 bytes - .../icons/48x48/plus.png | Bin 339 -> 297 bytes - .../icons/48x48/sd_card.png | Bin 676 -> 679 bytes - .../icons/48x48/star.png | Bin 725 -> 1055 bytes - 30 files changed, 37 insertions(+), 26 deletions(-) + 38 files changed, 103 insertions(+), 103 deletions(-) + delete mode 100644 LICENSES/CC-BY-ND-3.0.txt + create mode 100644 LICENSES/CC-BY-SA-3.0.txt + delete mode 100644 dist/qt_themes/colorful_midnight_blue/icons/16x16/lock.png + delete mode 100644 dist/qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png -diff --git a/dist/license.md b/dist/license.md -index 7bdebfec1fccdf97a4cf24a1eddd94638d510d8b..745256c32947aeb5d77bae10bc3cce666542967e 100644 ---- a/dist/license.md -+++ b/dist/license.md -@@ -2,34 +2,45 @@ The icons in this folder and its subfolders have the following licenses: - - Icon Name | License | Origin/Author - --- | --- | --- --qt_themes/default/icons/16x16/checked.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/default/icons/16x16/failed.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/default/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com -+qt_themes/default/icons/16x16/checked.png |Apache 2.0 | https://github.com/google/material-design-icons/ (modified) -+qt_themes/default/icons/16x16/failed.png | Apache 2.0 | https://github.com/google/material-design-icons/ (modified) -+qt_themes/default/icons/16x16/lock.png | Apache 2.0 | https://github.com/google/material-design-icons/ - qt_themes/default/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io --qt_themes/default/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/default/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/default/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/default/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/default/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team --qt_themes/default/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/default/icons/48x48/star.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/qdarkstyle/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com -+qt_themes/default/icons/256x256/plus_folder.png | MIT | https://github.com/tailwindlabs/heroicons -+qt_themes/default/icons/48x48/bad_folder.png | MIT | https://github.com/tailwindlabs/heroicons -+qt_themes/default/icons/48x48/chip.png | MIT | https://github.com/tailwindlabs/heroicons -+qt_themes/default/icons/48x48/folder.png | MIT | https://github.com/tailwindlabs/heroicons -+qt_themes/default/icons/48x48/plus.png | MIT | https://github.com/tailwindlabs/heroicons -+qt_themes/default/icons/48x48/sd_card.png | CC0 1.0 | SVG Repo https://www.svgrepo.com/svg/70351/sd-card -+qt_themes/default/icons/48x48/star.png | MIT | https://github.com/tailwindlabs/heroicons -+qt_themes/qdarkstyle/icons/16x16/lock.png | Apache 2.0 | https://github.com/google/material-design-icons/ - qt_themes/qdarkstyle/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io --qt_themes/qdarkstyle/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/qdarkstyle/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/qdarkstyle/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/qdarkstyle/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com -+qt_themes/qdarkstyle/icons/256x256/plus_folder.png | MIT | https://github.com/tailwindlabs/heroicons -+qt_themes/qdarkstyle/icons/48x48/bad_folder.png | MIT | https://github.com/tailwindlabs/heroicons -+qt_themes/qdarkstyle/icons/48x48/chip.png | MIT | https://github.com/tailwindlabs/heroicons -+qt_themes/qdarkstyle/icons/48x48/folder.png | MIT | https://github.com/tailwindlabs/heroicons - qt_themes/qdarkstyle/icons/48x48/plus.png | CC0 1.0 | Designed by BreadFish64 from the Citra team --qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/qdarkstyle/icons/48x48/star.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/colorful/icons/16x16/lock.png | CC BY-ND 3.0 | https://icons8.com -+qt_themes/qdarkstyle/icons/48x48/sd_card.png | CC0 1.0 | SVG Repo https://www.svgrepo.com/svg/70351/sd-card -+qt_themes/qdarkstyle/icons/48x48/star.png | MIT | https://github.com/tailwindlabs/heroicons -+qt_themes/qdarkstyle/ | MIT/CC BY 4.0 | Upstream https://github.com/ColinDuquesnoy/QDarkStyleSheet +diff --git a/LICENSES/CC-BY-ND-3.0.txt b/LICENSES/CC-BY-ND-3.0.txt +deleted file mode 100644 +index d9265b9f19e250785f5fc953c73e5f8915fcdd21..0000000000000000000000000000000000000000 +--- a/LICENSES/CC-BY-ND-3.0.txt ++++ /dev/null +@@ -1,87 +0,0 @@ +-Creative Commons Attribution-NoDerivs 3.0 Unported +- +- CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. +- +-License +- +-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. +- +-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. +- +-1. Definitions +- +- a. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. +- +- b. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined above) for the purposes of this License. +- +- c. "Distribute" means to make available to the public the original and copies of the Work through sale or other transfer of ownership. +- +- d. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. +- +- e. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. +- +- f. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. +- +- g. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. +- +- h. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. +- +- i. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. +- +-2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. +- +-3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: +- +- a. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; and, +- +- b. to Distribute and Publicly Perform the Work including as incorporated in Collections. +- +- c. For the avoidance of doubt: +- +- i. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; +- +- ii. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, +- +- iii. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. +- +-The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats, but otherwise you have no rights to make Adaptations. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. +- +-4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: +- +- a. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(b), as requested. +- +- b. If You Distribute, or Publicly Perform the Work or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work. The credit required by this Section 4(b) may be implemented in any reasonable manner; provided, however, that in the case of a Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. +- +- c. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. +- +-5. Representations, Warranties and Disclaimer +- +-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. +- +-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. +- +-7. Termination +- +- a. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. +- +- b. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. +- +-8. Miscellaneous +- +- a. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. +- +- b. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. +- +- c. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. +- +- d. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. +- +- e. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. +- +-Creative Commons Notice +- +-Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. +- +-Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of this License. +- +-Creative Commons may be contacted at http://creativecommons.org/. +diff --git a/LICENSES/CC-BY-SA-3.0.txt b/LICENSES/CC-BY-SA-3.0.txt +new file mode 100644 +index 0000000000000000000000000000000000000000..a29ac86c302d49546b1f854ada7f0c1ca5d7f659 +--- /dev/null ++++ b/LICENSES/CC-BY-SA-3.0.txt +@@ -0,0 +1,60 @@ ++Creative Commons Attribution-ShareAlike 3.0 Unported + -+qt_themes/qdarkstyle_midnight_blue/icons | See above | See the above qt_themes/qdarkstyle/icons entries -+qt_themes/qdarkstyle_midnight_blue/ | MIT/CC BY 4.0 | Upstream https://github.com/ColinDuquesnoy/QDarkStyleSheet ++CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. + -+qt_themes/colorful/icons/16x16/lock.png | MIT | https://github.com/icons8/flat-color-icons - qt_themes/colorful/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io --qt_themes/colorful/icons/256x256/plus_folder.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/colorful/icons/48x48/bad_folder.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/colorful/icons/48x48/chip.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/colorful/icons/48x48/folder.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/colorful/icons/48x48/plus.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/colorful/icons/48x48/sd_card.png | CC BY-ND 3.0 | https://icons8.com --qt_themes/colorful/icons/48x48/star.png | CC BY-ND 3.0 | https://icons8.com -+qt_themes/colorful/icons/256x256/plus_folder.png | MIT | https://github.com/icons8/flat-color-icons (modified) -+qt_themes/colorful/icons/48x48/bad_folder.png | MIT | https://github.com/icons8/flat-color-icons (modified) -+qt_themes/colorful/icons/48x48/chip.png | MIT | https://github.com/icons8/flat-color-icons (modified) -+qt_themes/colorful/icons/48x48/folder.png | MIT | https://github.com/icons8/flat-color-icons -+qt_themes/colorful/icons/48x48/plus.png | Apache 2.0 | https://remixicon.com/ (modified) -+qt_themes/colorful/icons/48x48/sd_card.png | CC0 1.0 | https://www.svgrepo.com/svg/276818/sd-card -+qt_themes/colorful/icons/48x48/star.png | CC0 1.0 | https://www.svgrepo.com/svg/13674/star ++License + -+qt_themes/colorful_dark/icons/16x16/lock.png | MIT | https://github.com/icons8/flat-color-icons (modified) -+qt_themes/colorful_dark/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io ++THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + -+qt_themes/colorful_midnight_blue/icons/16x16/lock.png | MIT | https://github.com/icons8/flat-color-icons (modified) -+qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png | Apache 2.0 | https://material.io - -- ++BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. ++ ++1. Definitions ++a. "Adaptation" means a work based upon the Work, or upon the Work and other pre-existing works, such as a translation, adaptation, derivative work, arrangement of music or other alterations of a literary or artistic work, or phonogram or performance and includes cinematographic adaptations or any other form in which the Work may be recast, transformed, or adapted including in any form recognizably derived from the original, except that a work that constitutes a Collection will not be considered an Adaptation for the purpose of this License. For the avoidance of doubt, where the Work is a musical work, performance or phonogram, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered an Adaptation for the purpose of this License. ++b. "Collection" means a collection of literary or artistic works, such as encyclopedias and anthologies, or performances, phonograms or broadcasts, or other works or subject matter other than works listed in Section 1(f) below, which, by reason of the selection and arrangement of their contents, constitute intellectual creations, in which the Work is included in its entirety in unmodified form along with one or more other contributions, each constituting separate and independent works in themselves, which together are assembled into a collective whole. A work that constitutes a Collection will not be considered an Adaptation (as defined below) for the purposes of this License. ++c. "Creative Commons Compatible License" means a license that is listed at http://creativecommons.org/compatiblelicenses that has been approved by Creative Commons as being essentially equivalent to this License, including, at a minimum, because that license: (i) contains terms that have the same purpose, meaning and effect as the License Elements of this License; and, (ii) explicitly permits the relicensing of adaptations of works made available under that license under this License or a Creative Commons jurisdiction license with the same License Elements as this License. ++d. "Distribute" means to make available to the public the original and copies of the Work or Adaptation, as appropriate, through sale or other transfer of ownership. ++e. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike. ++f. "Licensor" means the individual, individuals, entity or entities that offer(s) the Work under the terms of this License. ++g. "Original Author" means, in the case of a literary or artistic work, the individual, individuals, entity or entities who created the Work or if no individual or entity can be identified, the publisher; and in addition (i) in the case of a performance the actors, singers, musicians, dancers, and other persons who act, sing, deliver, declaim, play in, interpret or otherwise perform literary or artistic works or expressions of folklore; (ii) in the case of a phonogram the producer being the person or legal entity who first fixes the sounds of a performance or other sounds; and, (iii) in the case of broadcasts, the organization that transmits the broadcast. ++h. "Work" means the literary and/or artistic work offered under the terms of this License including without limitation any production in the literary, scientific and artistic domain, whatever may be the mode or form of its expression including digital form, such as a book, pamphlet and other writing; a lecture, address, sermon or other work of the same nature; a dramatic or dramatico-musical work; a choreographic work or entertainment in dumb show; a musical composition with or without words; a cinematographic work to which are assimilated works expressed by a process analogous to cinematography; a work of drawing, painting, architecture, sculpture, engraving or lithography; a photographic work to which are assimilated works expressed by a process analogous to photography; a work of applied art; an illustration, map, plan, sketch or three-dimensional work relative to geography, topography, architecture or science; a performance; a broadcast; a phonogram; a compilation of data to the extent it is protected as a copyrightable work; or a work performed by a variety or circus performer to the extent it is not otherwise considered a literary or artistic work. ++i. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. ++j. "Publicly Perform" means to perform public recitations of the Work and to communicate to the public those public recitations, by any means or process, including by wire or wireless means or public digital performances; to make available to the public Works in such a way that members of the public may access these Works from a place and at a place individually chosen by them; to perform the Work to the public by any means or process and the communication to the public of the performances of the Work, including by public digital performance; to broadcast and rebroadcast the Work by any means including signs, sounds or images. ++k. "Reproduce" means to make copies of the Work by any means including without limitation by sound or visual recordings and the right of fixation and reproducing fixations of the Work, including storage of a protected performance or phonogram in digital form or other electronic medium. ++2. Fair Dealing Rights. Nothing in this License is intended to reduce, limit, or restrict any uses free from copyright or rights arising from limitations or exceptions that are provided for in connection with the copyright protection under copyright law or other applicable laws. ++3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: ++a. to Reproduce the Work, to incorporate the Work into one or more Collections, and to Reproduce the Work as incorporated in the Collections; ++b. to create and Reproduce Adaptations provided that any such Adaptation, including any translation in any medium, takes reasonable steps to clearly label, demarcate or otherwise identify that changes were made to the original Work. For example, a translation could be marked "The original work was translated from English to Spanish," or a modification could indicate "The original work has been modified."; ++c. to Distribute and Publicly Perform the Work including as incorporated in Collections; and, ++d. to Distribute and Publicly Perform Adaptations. ++e. For the avoidance of doubt: ++i. Non-waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme cannot be waived, the Licensor reserves the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; ++ii. Waivable Compulsory License Schemes. In those jurisdictions in which the right to collect royalties through any statutory or compulsory licensing scheme can be waived, the Licensor waives the exclusive right to collect such royalties for any exercise by You of the rights granted under this License; and, ++iii. Voluntary License Schemes. The Licensor waives the right to collect royalties, whether individually or, in the event that the Licensor is a member of a collecting society that administers voluntary licensing schemes, via that society, from any exercise by You of the rights granted under this License. ++The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. Subject to Section 8(f), all rights not expressly granted by Licensor are hereby reserved. ++ ++4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: ++a. You may Distribute or Publicly Perform the Work only under the terms of this License. You must include a copy of, or the Uniform Resource Identifier (URI) for, this License with every copy of the Work You Distribute or Publicly Perform. You may not offer or impose any terms on the Work that restrict the terms of this License or the ability of the recipient of the Work to exercise the rights granted to that recipient under the terms of the License. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties with every copy of the Work You Distribute or Publicly Perform. When You Distribute or Publicly Perform the Work, You may not impose any effective technological measures on the Work that restrict the ability of a recipient of the Work from You to exercise the rights granted to that recipient under the terms of the License. This Section 4(a) applies to the Work as incorporated in a Collection, but this does not require the Collection apart from the Work itself to be made subject to the terms of this License. If You create a Collection, upon notice from any Licensor You must, to the extent practicable, remove from the Collection any credit as required by Section 4(c), as requested. If You create an Adaptation, upon notice from any Licensor You must, to the extent practicable, remove from the Adaptation any credit as required by Section 4(c), as requested. ++b. You may Distribute or Publicly Perform an Adaptation only under the terms of: (i) this License; (ii) a later version of this License with the same License Elements as this License; (iii) a Creative Commons jurisdiction license (either this or a later license version) that contains the same License Elements as this License (e.g., Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible License. If you license the Adaptation under one of the licenses mentioned in (iv), you must comply with the terms of that license. If you license the Adaptation under the terms of any of the licenses mentioned in (i), (ii) or (iii) (the "Applicable License"), you must comply with the terms of the Applicable License generally and the following provisions: (I) You must include a copy of, or the URI for, the Applicable License with every copy of each Adaptation You Distribute or Publicly Perform; (II) You may not offer or impose any terms on the Adaptation that restrict the terms of the Applicable License or the ability of the recipient of the Adaptation to exercise the rights granted to that recipient under the terms of the Applicable License; (III) You must keep intact all notices that refer to the Applicable License and to the disclaimer of warranties with every copy of the Work as included in the Adaptation You Distribute or Publicly Perform; (IV) when You Distribute or Publicly Perform the Adaptation, You may not impose any effective technological measures on the Adaptation that restrict the ability of a recipient of the Adaptation from You to exercise the rights granted to that recipient under the terms of the Applicable License. This Section 4(b) applies to the Adaptation as incorporated in a Collection, but this does not require the Collection apart from the Adaptation itself to be made subject to the terms of the Applicable License. ++c. If You Distribute, or Publicly Perform the Work or any Adaptations or Collections, You must, unless a request has been made pursuant to Section 4(a), keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or if the Original Author and/or Licensor designate another party or parties (e.g., a sponsor institute, publishing entity, journal) for attribution ("Attribution Parties") in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; (ii) the title of the Work if supplied; (iii) to the extent reasonably practicable, the URI, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and (iv), consistent with Section 3(b), in the case of an Adaptation, a credit identifying the use of the Work in the Adaptation (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). The credit required by this Section 4(c) may be implemented in any reasonable manner; provided, however, that in the case of a Adaptation or Collection, at a minimum such credit will appear, if a credit for all contributing authors of the Adaptation or Collection appears, then as part of these credits and in a manner at least as prominent as the credits for the other contributing authors. For the avoidance of doubt, You may only use the credit required by this Section for the purpose of attribution in the manner set out above and, by exercising Your rights under this License, You may not implicitly or explicitly assert or imply any connection with, sponsorship or endorsement by the Original Author, Licensor and/or Attribution Parties, as appropriate, of You or Your use of the Work, without the separate, express prior written permission of the Original Author, Licensor and/or Attribution Parties. ++d. Except as otherwise agreed in writing by the Licensor or as may be otherwise permitted by applicable law, if You Reproduce, Distribute or Publicly Perform the Work either by itself or as part of any Adaptations or Collections, You must not distort, mutilate, modify or take other derogatory action in relation to the Work which would be prejudicial to the Original Author's honor or reputation. Licensor agrees that in those jurisdictions (e.g. Japan), in which any exercise of the right granted in Section 3(b) of this License (the right to make Adaptations) would be deemed to be a distortion, mutilation, modification or other derogatory action prejudicial to the Original Author's honor and reputation, the Licensor will waive or not assert, as appropriate, this Section, to the fullest extent permitted by the applicable national law, to enable You to reasonably exercise Your right under Section 3(b) of this License (right to make Adaptations) but not otherwise. ++5. Representations, Warranties and Disclaimer ++UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. ++ ++6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. ++7. Termination ++a. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Adaptations or Collections from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. ++b. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. ++8. Miscellaneous ++a. Each time You Distribute or Publicly Perform the Work or a Collection, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. ++b. Each time You Distribute or Publicly Perform an Adaptation, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. ++c. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. ++d. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. ++e. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. ++f. The rights granted under, and the subject matter referenced, in this License were drafted utilizing the terminology of the Berne Convention for the Protection of Literary and Artistic Works (as amended on September 28, 1979), the Rome Convention of 1961, the WIPO Copyright Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and the Universal Copyright Convention (as revised on July 24, 1971). These rights and subject matter take effect in the relevant jurisdiction in which the License terms are sought to be enforced according to the corresponding provisions of the implementation of those treaty provisions in the applicable national law. If the standard suite of rights granted under applicable copyright law includes additional rights not granted under this License, such additional rights are deemed to be included in the License; this License is not intended to restrict the license of any rights under applicable law. ++Creative Commons Notice ++ ++Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. ++ ++Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, Creative Commons does not authorize the use by either party of the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. For the avoidance of doubt, this trademark restriction does not form part of the License. ++ ++Creative Commons may be contacted at http://creativecommons.org/. \ No newline at end of file -+ -diff --git a/dist/qt_themes/colorful/icons/48x48/plus.png b/dist/qt_themes/colorful/icons/48x48/plus.png -index bc2c47c91a761228dc4ebdc8df8713119d5fec3a..ff3cf889e467cfa18e1af577ceff6b3931c5290c 100644 ---- a/dist/qt_themes/colorful/icons/48x48/plus.png -+++ b/dist/qt_themes/colorful/icons/48x48/plus.png -@@ -1,3 +1,3 @@ +diff --git a/dist/qt_themes/colorful/icons/16x16/connected.png b/dist/qt_themes/colorful/icons/16x16/connected.png +index d6052f1a09a9a828bf8d43ad1827d4d9d9cbae0f..0afc18cb7a19028fd567a7ca7ced62cd164657de 100644 +--- a/dist/qt_themes/colorful/icons/16x16/connected.png ++++ b/dist/qt_themes/colorful/icons/16x16/connected.png +@@ -1,4 +1,5 @@ + ‰PNG +  +- IHDRóÿasRGB®ÎégAMA± üa pHYsÃÃÇo¨dÿIDAT8Ocz`Â’µ…ý‹×õA¹„Aÿ¢õ¯[5aɺÙ—¬/ÒÿA†@¥qƒ ÜJÇŠÞ™Y@Í?!šÀøê„%kÊ JpƒˆìR©ÜÊUaE5{®¹‚dÀÿþÅkgB•aáEÕ²Á¹U_‚ój +-ƒó*· ôÿR¨Rì`â’uþuSæï É«ú‡aÐ; y¨RLзx­ÌÏuSæíG7&P¥ØÐo˜SÑ … (`¡J±ƒ Kר£èª!ó÷‚Â$¤°Jª 7Å/D#Ô w@é°P%¸’æÂIK×hLXº.´Ñs¨4aJž ÍPî IÀÐÜ\IEND®B`‚ +\ No newline at end of file ++ IHDRóÿaIDATxÚÒ¬QÆñiÔ¶mÛŠ“º]ëYk×ÆCXÛvPÛîÚªm·‹¯÷>OP%ùïOÎ/@i³çÎœožnŒÍ:h&-ôF t4ƒZ½ ++šNIRE &Ý"Ör!êö8ñüÅ3|øð?~|G<Ç—/ŸñæÍ+<~òÁ°N· —¯^€B•e Pk•G‚¨ÙK‚¤ê¤Z½e¨ÞSŒ½%h0 õIUº‹pÏz™9é` P¨²ùP»_2ZOY…n’ £Ü…Fã–cDÎðæÁ”‡P—Ü·Øî -#åßÜje.jö–Â渇¤Té¿»åJ9ªöÁî´@"ýŸ»r7!`…PÌû?÷]«7n]OÀ‰2Y9ðúݨÕW†æ“V wòto@ÁzŒTìÆÌíè—º™åæð¦€ËŸK…¹Lzf ++\;y@†^);1T~r`¤ö†*¢oúntoa¹só#¯`é—ÜÜEØäT½Qh¯Ó?…PJJ&[U³O2ËíðXpêì1ä(²¾0²qôʵ‹¸y÷,;\^/üÁáü¡¼ nwyw!&ó^Ò  Åü¨@Ä_ȥч¨‘Vò0Ë]þãc¨ƒz¨ëO•¸Y¨ƒx¨ë•º¦Bé²úsºÞb¹9NÅ’¿re€HG¹sƒIEND®B`‚ +\ No newline at end of file +diff --git a/dist/qt_themes/colorful/icons/16x16/connected_notification.png b/dist/qt_themes/colorful/icons/16x16/connected_notification.png +index 0dfe032d58160f1a24f54040964b5b5f2e97a724..72466e098e471ae5a97c49a56536dd4bf62b3a08 100644 +--- a/dist/qt_themes/colorful/icons/16x16/connected_notification.png ++++ b/dist/qt_themes/colorful/icons/16x16/connected_notification.png +@@ -1,6 +1,8 @@ + ‰PNG +  +- IHDRóÿasBIT|dˆ pHYsááp.tEXtSoftwarewww.inkscape.org›î<ÜIDAT8Õ’MHTa†Ÿsg¦”bºà„%,ˆ\DV$9åÂ臂 +-²"ŠÀ¨ÅD›JÝED ¥A«¢US»©-Š 'm ÈHbÂ)†þl +-úA­Yé½ßiã§Æ²mg÷Þ÷á|ç;ðßUOüæÑ‹ñÄY_g ôÆ»뢣bdPÑsªrbVÀ®Xç†ÚšEKAÎ+0–Yn«+¶G·ï³f +-ïuVªrðõ»g\Ïdü¾ uj™úbo `Ïñ®êI%‹È€gÜ;Ož -žtÝ¡i‡Ìû+ ¹©iEcCýª—Dä…gôÁÓçiWÕµÖªèÉb¿‹ ×o­¶T¡±ïùd:“Y/Æ´}‰”õ÷9Ž¡…Z”¼¤ø8ã‚V!;<¿µ±¡îò²HY²ï¾³’(Yª–¼Ä®Èi”»ea À¸¤÷µm‡oœ¾çØ·8м`#ÂÕ@  Û ßo,ä=&Ä&„Êßw…²U[‰=×H7Ð0ÁUªÒæ´·Oå…P. ã_§_l(/’ˆµÑSÇöí¼2Õz3µ¥‡xLsy£ŸýÈ°ô3òË/ü©4Êa —5›çòé-¼Îá±]R þ@×Q¡È£$%Å€ŸXÇ­7£t¹CIEND®B`‚ +\ No newline at end of file ++ IHDRóÿasRGB®ÎégAMA± üa pHYsÃÃÇo¨dIDAT8O•S]HQþîìiœÝduKa­Àh‰DûÞ5"ŒJì¡Œ$"ÈŠ’ìêÁ—òÉž„¨-¡Ã~ˆ2_|TŒ ++BTjmkwÝwîÜéθIAùÁá^νç;ß9÷\â8²¸zýòt:ÝƹM=¯8sÏÿ¶£”¶/#8ßzÎj:ÚDóóCÈQs ª*(•aš†g†iÂ\\ÚÇb1ôôC)P²§ŠÛÄÑQÈ"Éƺ:„5?9öæmfpÁ05öÂmvÎNô¡¨º ++|f|jjÉ›Jy«‰ 64tœrÇfñxœ>ï: EQ ÈŠ(C ”tC),ö‚²àÓÓ««¡&„JÄ×ÞÙy·U¼7ÍŽµ÷öšW)°fg¡ÿRàB ++‡a Ub ++'iyiéSâóM\6•.æIDßcCmíÒ Íσ„BÁ\¿!ÒÝ#'OX¨ß¿OÓ‹ôLØo°9ìÆ#P¾ÿ@Á¦d]÷ÍŒF4úÑæ¼’44Œ2Æ ++3!@|Wlÿð [>O"LÂðûm¿iÞŸâf…ãX?P”¹Nÿ\IEND®B`‚ +\ No newline at end of file +diff --git a/dist/qt_themes/colorful/icons/16x16/disconnected.png b/dist/qt_themes/colorful/icons/16x16/disconnected.png +index bacee3aebfe9f9058f7d49bde34d8d6e5963e2bb..7258a8cfe5ab54a3f53252c08520824ed91969a8 100644 +--- a/dist/qt_themes/colorful/icons/16x16/disconnected.png ++++ b/dist/qt_themes/colorful/icons/16x16/disconnected.png +@@ -1,3 +1,4 @@ + ‰PNG +  +- IHDRóÿasBIT|dˆ pHYsÅʼnÖïtEXtSoftwarewww.inkscape.org›î<IDAT8Ò[HSqðï9çÔ­ÍÜÜQX¹¹A”AÊB|ˆ$¢$»‚`d¥)–=D(µ Záƒv£óB…ô`X‘TRh*"mN]ÎËΙSwvζž¶ìᔿ§?¿ßÏÿŸÂ«ú^[nT»CòùÞ }|aL]^pñäþ:j)á›^V˜ÌI—XBX9]®©/‰œ!­ÿÇÀ‰×ê[w²4UlN6g²,aÏœ¿\Ÿz:†2Å#7´äY’MO9ŽKåQEÇ€¢þ짊‰N„ZÑ'MH’ì¡( ^¯ƒ›ç"sB«Ñh·+éÓuâÂŒôz·'‚Ȳ, Ât×_@yÕôð:9së5IódÜ6xÀëõ:@¯Ï{ úý¢Ý1Vv¾p_S¸^ßš½>um{e}KÌ 3}ý9%…ÍöÞRq÷€^§Ã˜Ãù¶ôÈ®Û@"wŠ&g4ËÔqVëªÒªûmÔº¬=åð±ù`‚%Åyê›}æÍt0cKX(ÎW‡s4Ô# ÃAx<ètqƒ!ûÈèÝ’ÃY§*¤ôØ´N«M' ÃÃЈ…Û̓¦iÊlZYTû¸½)~8šŸŸû,˲n0 ­V7/€¦iŠKä«iܬŒ{Í“SS=‹›„¨Õ*é§}¤Ó6âȯ,ÎïVÇ®Èã † NçD—`ØB†H²,9FÇ.”Ý]© —ëšòƒ®ÞçjÓÆÜ(B2DÑßq¶`oÓÿÂð’Óý»£(©¢IEND®B`‚ +\ No newline at end of file ++ IHDRóÿasRGB®ÎégAMA± üa pHYsÃÃÇo¨dIDAT8O•RMkSA=óÞ´ym„Jƒ©ñc£&)ˆè_°ØD7â¢MëB¥XE¤P¿AA4ÄŠQP¤®Åt™.?Ð"”¨qY]Eö}ÍÌëÌô=ÛJ,öÀ…{ç¼{ß9s‡A€W®]ºîyÞ¤œêSÉ)¾UF)½µjÀ…‰óþHa„vw'ÐauÀ²,PÚDZuØŽÇ]ʦ¦^0#ìÕð}Ÿª¦Í=)tumD,fÁ4MÄãHl¶­Û±kG}»÷ȳ8|æÓU8gà‚‡ÕÚ „€3rùêÅÿöÀ@åeµZ fßán±jÛöäz|3Ÿé‘c½¾÷” 9@Z&cgNããg‘ÞÙËÈd2(œ–Ÿ.o*‚R0?ÿCP&epÞúâ†G‡°ß^i«SVcêæÕ¶à,8BÀÐ7/£<×A{{ ¥RIÆ=üjþăûñ¸ü´Âu]ÃXKëzú/ž=}fj)æ pÖl6ñúí¼ŸýˆOss¨}ùŠÏõoð•;*  ÀàFp#¸‘Ü@uÓyÜ·Öl×n/¼<ùê«„×tp]‰Š|Œlý ÝMוƒw¿‘ßÎgM×'{Õ4]6æ_}Xeaƒ,V“XXö6`ÞÔC²XÍâõVìkÀ/8 ‹ÃÁâS&YxŽ]{†ì gö2ŸÄ·É¾…,6x¬'èãê3QÎÉžúÁB¸7\¶@ÖF+€ ÀàFp#¸Án©$lp ZõÀ]%•àø~ù“€*§ÀµÍ6qž8Â|¿Ö0"Â"Š>ŸP}¡ó¼_IEND®B`‚ \ No newline at end of file -+ IHDR00Wù‡sBIT|dˆ pHYs‡‡åñetEXtSoftwarewww.inkscape.org›î<eIDAThíס €0†ÑÂ@(c«b!°Usü!¼çj®ùRsm È™ª/};ïçcÝKîš+†¾I@š€4iÒ¤ ï'ÏݦÚèîôùæ?& M@š€4i€?»òt 6ýºçIEND®B`‚ ++ IHDR00`Ü µsRGB®ÎégAMA± üaPLTE.Ìqg§ªtRNSÿå·0J pHYsÃÃÇo¨dAIDATHKíË1 ++ CÑæþ—V¡P"**:äMò ‹T< ¬ó9Q`|r~ú< ô! ++‚r*È)¨¸ ^[!º3 ++DIEND®B`‚ \ No newline at end of file diff --git a/dist/qt_themes/colorful/icons/48x48/sd_card.png b/dist/qt_themes/colorful/icons/48x48/sd_card.png -index 29be71a0d4307c9653e22a31e77e43e87a907beb..5a81693cb0d95c36b65793a91628867742e27374 100644 +index 29be71a0d4307c9653e22a31e77e43e87a907beb..47e491d32c99fe208c59dae4d4a568e8e7dd6485 100644 --- a/dist/qt_themes/colorful/icons/48x48/sd_card.png +++ b/dist/qt_themes/colorful/icons/48x48/sd_card.png -@@ -1,6 +1,5 @@ +@@ -1,6 +1,7 @@ ‰PNG  - IHDR00Wù‡sBIT|dˆ pHYs££dÜ_‰tEXtSoftwarewww.inkscape.org›î<%IDAThíšAkÔ@†ß™Ù¤Iwci)•R/¢%õ(”¢`QèÙ£‡B©¢`½yðàʶÛEñôôPý Ý-*þ¥¥zÚB©°ºØ6[³™ñ «­8›d›8[™ç–o¾„÷ /$œpH»'ºÅÊm0ú $ˆØá «ùñ¥V­m ŒÌ•o;û¤Ëéhÿ„ €†W«ùÞîâûGWgdm4îuGŠ+ÓÔîN7< ÓÝÓC3Æ wvùŒ¬-çšn±2E,û©y(üY§ÛžÏð雕hYÎéÀ÷®X<–€[ªÜgV®`æúú×çG?àBï`íK“Ë­SF©à’åŠôÉÂw¡Ãóåf9GÂfÒMƒ–Ã¥•{†}jÖÌõþ @@ -145,12 +306,14 @@ index 29be71a0d4307c9653e22a31e77e43e87a907beb..5a81693cb0d95c36b65793a916288677 -Š-ÁåßÔyÀ¹`bS¶. ^7¼½ítbE'¨ïnsA_ÉÖ¥ïò¯¿ð÷kU%ÿ6àïתÜ?x¾ž¿¶%k Ý,à–^Þw!Зlª¼,¬®·ÜìqâùŒÌÑÅ -(IEND®B`‚ \ No newline at end of file -+ IHDR00Wù‡sBIT|dˆ pHYsbb_'ÐStEXtSoftwarewww.inkscape.org›î<uIDAThí˜ËnÔ0†?Û¹M’)#•GºDB¬yX±àX‚`Á Vð*,Ë"ñP1¹eÛ,Zª2´¹Ìà&•òí<žäü¿sdAK¼ùöÜ -+ñ¬ís»ðþáuqÑœló¢.Ä×ÑØ@ÅCC} T‰zë%O^97ÁÛV<ÀÍô«Óq*3°)~›rMe6Ùf…\Óêí#ƒ®iU›|™ßÀZwã&\ØcÜûý¯×½»ó€Ÿ^·‹²#U½P« l³B®ieàÅácW:¶æÊqï Tí¸>~>üP5_i Îý%aª&{Ÿ»·îUÍWØüô‘Þg ŽÞ¨Û½7PÇ` k]3èšÁ@× ê0ÆbLeG¼;]«T¡KÍl¶ Ô)iã>Ú¦?~þWRŠQ„A«8Î20›/1Ö0'ìí%!Èf ÎvfÊS$ñˆ0 ÑÚͬ×E«8Î2`RI<¥HS‰Öš³÷2žRD£€( -+˜N3V«œ ðÇqf ŒB‹%?§RJ‚À'ŠB„œw¹¤”ÄS’²lW/Î ŒF!~à±Î Öë‚Õ*'Ïsö®Mœƒ…š»ÂqRƲl.5q1™ŒIÒk¡X—ç>£µAkƒ§ÚIr’!$eYP”B¤””űpuF`©5«eŽ±–<ÏK…­b92iš0Ÿ/ɲùÉo‚8ŽNŽQ8>jçå!žR$Iت€Áa ø¾Çd2ÆX Æ"”<ÝÞJJö÷'ÿ%Ž3B€rw?6ôB]S¹…ŽŽ¦—¥ck®|~.úó=è`ä<IEND®B`‚ ++ IHDR00Wù‡sRGB®ÎégAMA± üa pHYsEEŸKW¸jIDAThCí™ÏkÔ@Ç_~löG’¶J¥+[)¼ ++Þ­ÞìI/-hA´'zVô Zé¡jÁ“¢'Eð¢ÿ‡zPTÔCÙŠl»íþÌf“‰ofg¥â¦I”l"ì‡ï}'Sv¾÷º³-tˆGÿ8Žpjnù6~çŸ fMô^àª%"þhç懧®ø7ÐæÍSê6ÙÏSWüØ`ó»Õ/ ˆ&Ë“we¾²œ²%™c£Iµ~ñ6°Áæ·§áêÐ ë{Åô1Œ×†¯³yÊô®;lP‚¬ ‚§ÓrÓë7¿WÿÃÚ'–kr…EU.ÿ›ój:¹ÿµAð4àØÉSÆÙópnð!WÑãi n‘ƒÁQxK¼›8æü“%£–ÍÍð¹Üh©ÎVû™þPÜï‹C,²6žW‰ñÙï Š,ïãfF§Y<¿p“Å01-ëÝãÉþQ.[øÞäÃëÜ®¢'°§Ùð,{œ«è‰mâØŽEÞréJl ¨²•¿x4‰KW< 8uë…M춿s ôÞ¤%Or銧'SWˆM~pÙ6WÅ\M¶f¹tÅÓÀÉ»ÙyI’·rÙ6 ++50Œ¬p銧Aˆ¢ q;bÛÄrBÞ6~oé%—®ÄÖ€‚¢0À¥+±5à—Ž¨éˆšŽ¨éˆšÐ 8„@±X†üʬä P*VÀq{V­°¶Vä£ÄÖÕë{”Ð T*X¸©Œš5“³^‡rÙ`Ïl›€eÙô¾²,±¼P(a n"46qØß;Œ„½ LÎ2c»—ÌœªuYª«ؤo—îz4‡Ä¤ËQÄž° û?Ø¿Š•Ië Mu»IEND®B`‚ \ No newline at end of file -+ IHDR00Wù‡sBIT|dˆ pHYs ( (5ÈÍÆtEXtSoftwarewww.inkscape.org›î<¯IDAThí™OlTUÆç¾™©¤ÓR‚H,halbŒáÿØbX) WÆ 7ÄD*hŒ‰ !îHܸ2®º1”R@pi騴´ ¨”aù33ï7‚P˜¾÷è{­ ¿å̹çûÎ|÷ž9÷=ø•1v2Û4v2Û%G,ÊäŽ5Ÿƒ(ðATUâ‰wSVí×:Ís3]ƒQð˜(’X«_à8Ž»3*žH(ä² Vœ3ü»E]DZM³Ó‡ÂæŠÄ+ÎPÖšÈ[ªlÛÁ®”"‘>ëP«8 ØÈ0"Ñ9 LˆÃwºÑ»¾ZL"dÍsC55-?ÞôÀØ -+¦æ>ŒòÀ· þ 0Ñw GTÖÿ9ð]@ðý/"²E  }AVªøïDÞRÚfŸ;肨ìª>7ó;ÙÒ騒)œÜôžª~ ,õÌ 8€·—Dek²p7•|½{ïCñ"h²¥»3ÙòÆ2ÙLü~@Xá[•Ÿ nhÆZÌ7·ïÏܳèÍÎ{~òéÀû‰Âý»"ú•BݳbüÎD¾¶P"&ÍŠŽûTî(ö[liWM€GÒÔYö^íßøà nücE;€äã1åR±ð,À×w¨Š*º7wj[{:‚<Ǻôá¿’­Ý»M•»DÑÝÀ#ãë û+ÀJP¾GlcmKÏÖ #¯ª›ݨmíépI{€A:‘'ò¹öm…\¶!´„(ä² ù\û¶©â›Vü ZÍIŠ(…˜IEND®B`‚ ++ IHDR00Wù‡sRGB®ÎégAMA± üa pHYs ‚ ‚¾úâ¥éIDAThCí™ÏoLQÇÏyS„Š¤¬,èïªjôMKø„¦$66~KÄ®ñ[ˆHX±ÅÆ¢ñ Ì ñ#šÎ´ˆ bA+Ì„j½ã{ßÜ”©óî¸O»˜Osß;çÌûî9çþšW*S¦LxH¬~¹ÄWi5}¦Ãäxû´ ++¬ïÖ‘û äÈ=_aYÉnê®/[&¼ 8t@KDíÑ’uBɀܯ_µÏ^;»q­Y#œ 8t×ÜàˆÊ\°žI4¶’x!þÙ¶ˆËí©Z³‚ý xr×üqh¯–¬a5«m!vA,Ô®`B»Ü‘T²‚Ý °³_]³J^ÝZ¶‚µ H¼± ãç)ÄbAAd)w¤TÝÆbD­ûAÚcÔ²¶/Xɀܫi HäÄ ñˆ¹…Ý~õÂ؉7ÍÇók1jpΩ!áj˜]”~…à¼FIà˜ñœê%º¨Ë—ØÉqÏ%lj׃e+¢[¥MS ¦aôíG“ãs(wÌVF…;Z›zÅi,}Dk>9pÍóªŒtbÈÜÔ¦©ƒÈ-Ê|[Í+Þ~ÕŸüsàÁ²iäe®B\›µL:½~€'wÙ㶇£ô*¹ÒmšDø:9•kòu^QpÝæ.úA¯ú7B¼”µL ++=”™·ÁhŠî"¨“¨;‹ªÛµéÿÀr‘ÚR›™±éý…¢;'rS;áÆmú\ÒyEQ¾mÉ]ÈÇim ++æsä&·é¼" ++åGS»!Õ¦08‰óÑ6?`1> )$^׃¯b•²‰\C€Ök%03ƒpDKö`§¤¾”æ€Ãê`g‘’Ú4B2X=ƒ†+Ò+²kŒa·]hÃ*„y†œz\mw^QA#uZŒ¹Ì‹µdŸÚ.a„0þaÜv)“8Ä ˜·]ŠA£ôSç'U”cŒV!y²¤’F¾†ø7LJ°ž¡Q9Å+S_”¿/f‘—Þ„Ç©Ÿ‚s•­͘>‡[žf´^3µQ'¦Õ‰dp‚‡Û>(g±ô×B…óØÄÆ1[åL'±ŠŽ:)ö’'­89vå{WŽ>{£œGFšq”¸ “:BOäÀH¬á¢ÿï£Pm«ghµL™2E!ú ËA‚Q7ÎnIEND®B`‚ \ No newline at end of file +diff --git a/dist/qt_themes/colorful_midnight_blue/icons/16x16/lock.png b/dist/qt_themes/colorful_midnight_blue/icons/16x16/lock.png +deleted file mode 100644 +index 32c505848ebc0ac4c84f8b544e94d077270297f4..0000000000000000000000000000000000000000 +--- a/dist/qt_themes/colorful_midnight_blue/icons/16x16/lock.png ++++ /dev/null +@@ -1,9 +0,0 @@ +-‰PNG +- +- IHDRóÿasBIT|dˆ pHYsááp.tEXtSoftwarewww.inkscape.org›î<IDAT8¥’1NÃ@Eß`“¤­Ó"ѹ ¸3¢ã!Pî€Äà +-  +-:ãÂ@@Lá {—YÙx-ñ«ÑÌü?fþ ù« ªG"r `Œ¹‰¢è¶­o£-™¦éXcö¬µû"²PÕó^–’$™¨ê*MÓÓ57gªºÊ²,p:ð/A‚Æéz +-L'tüÕÃÍn2¬ÝÀ +-Žm`+– þ;wå˜ `ÇÁò·¹ï;̉/ïÐO«¾Ô{IEND®B`‚ +\ No newline at end of file +diff --git a/dist/qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png b/dist/qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png +deleted file mode 100644 +index d4afd76f949ff5c65e039b69ff999325bff5d7b8..0000000000000000000000000000000000000000 +--- a/dist/qt_themes/colorful_midnight_blue/icons/16x16/view-refresh.png ++++ /dev/null +@@ -1,4 +0,0 @@ +-‰PNG +- +- IHDRóÿasBIT|dˆ pHYs BÅ£tEXtSoftwarewww.inkscape.org›î<çIDAT8ÅÒ1NÃ@ÐY„D•€Pî€à©Qà8©¹ÔQê\€2ˆ +-@JDo+0ÆvÊ|išýþþÙˆu#µ("â("DÄ2¥ôVáú)¥¶Æ}Ìñé%f(0Ť­yˆ§\côrâïÙ°Õ`ž›·¸óJ¢ÿ9^‰q7õ?›ÝADlDÄ¢Ö܈›ˆ8©_7%e÷^ã|«€Aá¸C3¶Ú3ܵ<âpÙ•¢À#ž1A»8Ã=n±³j”aNRÖ郺¾k•qß?³L)½vÞ¼6|EØ ÔÏ noIEND®B`‚ +\ No newline at end of file +diff --git a/dist/qt_themes/colorful_midnight_blue/style.qrc b/dist/qt_themes/colorful_midnight_blue/style.qrc +index 1081d281d8f873e160396a28eac7b470f61c4a9f..b9821c6722cbe91d6bbf185da0a2051f2aa32059 100644 +--- a/dist/qt_themes/colorful_midnight_blue/style.qrc ++++ b/dist/qt_themes/colorful_midnight_blue/style.qrc +@@ -6,8 +6,8 @@ SPDX-License-Identifier: GPL-2.0-or-later + + + icons/index.theme +- icons/16x16/lock.png +- icons/16x16/view-refresh.png ++ ../colorful_dark/icons/16x16/lock.png ++ ../qdarkstyle/icons/16x16/view-refresh.png + ../colorful/icons/48x48/bad_folder.png + ../colorful/icons/48x48/chip.png + ../colorful/icons/48x48/folder.png diff --git a/dist/qt_themes/default/icons/16x16/checked.png b/dist/qt_themes/default/icons/16x16/checked.png index 3e017b715802d120d3c93343e374ef3566c954d3..b9e64e9e083479d3ee98f767e7db0afa918733a4 100644 --- a/dist/qt_themes/default/icons/16x16/checked.png @@ -181,11 +386,57 @@ index 3e017b715802d120d3c93343e374ef3566c954d3..b9e64e9e083479d3ee98f767e7db0afa + IHDRóÿasRGB®ÎégAMA± üa pHYsÃÃÇo¨d3IDAT8O¥“¡NAE§‚C@R@í4˜òH8$ àPÒ?¨B ‹%(!!áœé¾íÒl79·sßtÞ¼í¤m 6¡›)àᱸxO'ú–ã2Ãlü±š>àŽHôš#¨J€yáÖr`¶ž¡O’''9A¹ó~2‡LRøOæÆót +¿1{„>¬‚žÔa÷%Ƙ>ó´4ï‚Ž7_ñ§5/€žž âªÞa nól¢&s¨5}ÂhRmæ,Ø$Ê—.r±&{¡ÕŒF&€M¢ª$\‘Gi3ëD\2ìù\ÊzœÃ!4™Õ›ìG ŽÁæi:)Ç&¹VO®A*{Û©'™¥håü=T·@ÀÞ.à¢&uó-œ¿õÏÏ9¥/¼ÂVõ´â§IEND®B`‚ \ No newline at end of file +diff --git a/dist/qt_themes/default/icons/16x16/connected.png b/dist/qt_themes/default/icons/16x16/connected.png +index afa7973948c2fd69a5b838ebc993a4a618e20e31..0afc18cb7a19028fd567a7ca7ced62cd164657de 100644 +--- a/dist/qt_themes/default/icons/16x16/connected.png ++++ b/dist/qt_themes/default/icons/16x16/connected.png +@@ -1,4 +1,5 @@ + ‰PNG +  +- IHDRóÿaÔIDAT8O’íADßE d@R  "@d@B@B !¨ÞÚÙZk§ÎÝü»~ÛÓÛ ýg šžz‰OÀêÀXăƒ8{€)pì¤Òhë¥x@ ÚÌâ? .À8°vžYŸ´@\@¾³ÖðœŒWé@é> Ë5H +-°h§meç¢``šü<€~Î!s»Ònà꤮)Øaù=wÐV+×éÛ1]+ÚÒöF€\êÙeP@këv±þýOP%ùïOÎ/@i³çÎœožnŒÍ:h&-ôF t4ƒZ½ ++šNIRE &Ý"Ör!êö8ñüÅ3|øð?~|G<Ç—/ŸñæÍ+<~òÁ°N· —¯^€B•e Pk•G‚¨ÙK‚¤ê¤Z½e¨ÞSŒ½%h0 õIUº‹pÏz™9é` P¨²ùP»_2ZOY…n’ £Ü…Fã–cDÎðæÁ”‡P—Ü·Øî -#åßÜje.jö–Â渇¤Té¿»åJ9ªöÁî´@"ýŸ»r7!`…PÌû?÷]«7n]OÀ‰2Y9ðúݨÕW†æ“V wòto@ÁzŒTìÆÌíè—º™åæð¦€ËŸK…¹Lzf ++\;y@†^);1T~r`¤ö†*¢oúntoa¹só#¯`é—ÜÜEØäT½Qh¯Ó?…PJJ&[U³O2ËíðXpêì1ä(²¾0²qôʵ‹¸y÷,;\^/üÁáü¡¼ nwyw!&ó^Ò  Åü¨@Ä_ȥч¨‘Vò0Ë]þãc¨ƒz¨ëO•¸Y¨ƒx¨ë•º¦Bé²úsºÞb¹9NÅ’¿re€HG¹sƒIEND®B`‚ +\ No newline at end of file +diff --git a/dist/qt_themes/default/icons/16x16/connected_notification.png b/dist/qt_themes/default/icons/16x16/connected_notification.png +index e64901378b000db1871d03db88af5f06c454cb01..72466e098e471ae5a97c49a56536dd4bf62b3a08 100644 +--- a/dist/qt_themes/default/icons/16x16/connected_notification.png ++++ b/dist/qt_themes/default/icons/16x16/connected_notification.png +@@ -1,4 +1,8 @@ + ‰PNG +  +- IHDRóÿasBIT|dˆ pHYsááp.tEXtSoftwarewww.inkscape.org›î<‚IDAT8Ó=hTQàïn"® ­ŒØX¨BPbaX]Ô,Øl„€ˆh%i„ˆ`•VA! +-bgaeÔÆ"‹jg¥ÒíV$BòÆb÷™çÃ'’SܹsÎœ¹?¬°´^òy¬`zø?Š÷ãFð»qñ°ŠÔ@ÂÌ S"+±_ñ®D,Æx^\+‘à3n`×?šœ¬ÚHx‹®â[…ƒÙ*™BQW"Ÿp‡ÐÂŽbÇcúsr=œÆ«/í‰VD­‘’e²'£O;ùó &Kdx?Åbw²ñ@¤çIìÙ)‘>tÛgËfq³$p¸Ûn쉈ù¾ßÔLYä:–‡j«ûŠž•È«x²3þŽz–Õ¦Šãú‡—#CˆTÏq Kv®­Õó§|w¬}~bCH‹IÌ»YRÏÛ/‡1{¸„ûÁÅß>Ò[)6ÆRdK?··/t^'ý;žÃ|Ŭ–šÍúÆ‘•k‰c¤ïIöhÛBç1ü÷|ÒP1IEND®B`‚ +\ No newline at end of file ++ IHDRóÿasRGB®ÎégAMA± üa pHYsÃÃÇo¨dIDAT8O•S]HQþîìiœÝduKa­Àh‰DûÞ5"ŒJì¡Œ$"ÈŠ’ìêÁ—òÉž„¨-¡Ã~ˆ2_|TŒ ++BTjmkwÝwîÜéθIAùÁá^νç;ß9÷\â8²¸zýòt:ÝƹM=¯8sÏÿ¶£”¶/#8ßzÎj:ÚDóóCÈQs ª*(•aš†g†iÂ\\ÚÇb1ôôC)P²§ŠÛÄÑQÈ"Éƺ:„5?9öæmfpÁ05öÂmvÎNô¡¨º ++|f|jjÉ›Jy«‰ 64tœrÇfñxœ>ï: EQ ÈŠ(C ”tC),ö‚²àÓÓ««¡&„JÄ×ÞÙy·U¼7ÍŽµ÷öšW)°fg¡ÿRàB ++‡a Ub ++'iyiéSâóM\6•.æIDßcCmíÒ Íσ„BÁ\¿!ÒÝ#'OX¨ß¿OÓ‹ôLØo°9ìÆ#P¾ÿ@Á¦d]÷ÍŒF4úÑæ¼’44Œ2Æ ++3!@|Wlÿð [>O"LÂðûm¿iÞŸâf…ãX?P”¹Nÿ\IEND®B`‚ +\ No newline at end of file +diff --git a/dist/qt_themes/default/icons/16x16/disconnected.png b/dist/qt_themes/default/icons/16x16/disconnected.png +index 835b1f0d6b5ceeb11e9a2b7d68c61521aef7bcb8..7258a8cfe5ab54a3f53252c08520824ed91969a8 100644 +--- a/dist/qt_themes/default/icons/16x16/disconnected.png ++++ b/dist/qt_themes/default/icons/16x16/disconnected.png +@@ -1,6 +1,4 @@ + ‰PNG +  +- IHDRóÿaùIDAT8O“á1W¨€ë@è€ +-ÐN”€ +-P耜̚d&“9‰÷ëîæeó½M®Çÿ5¦¡ý,€]¯²~´ÀÚfÀwËo>oJ€ pï%¤©%pç}!å¼0¦)œ¿«–%€‹¯€=Ž¡ƒ´ÞÀ$8ó=é8‡gAÚ6ƒlG€»½´v“#ð™7ÍÇ(6M`ÌU”ŽbÏ_±ÂÚÈm§I\d|{<:K©¦û +-òåÑ¡8…üqà5 ­_ÚIEND®B`‚ +\ No newline at end of file ++ IHDRóÿasRGB®ÎégAMA± üa pHYsÃÃÇo¨dIDAT8O•RMkSA=óÞ´ym„Jƒ©ñc£&)ˆè_°ØD7â¢MëB¥XE¤P¿AA4ÄŠQP¤®Åt™.?Ð"”¨qY]Eö}ÍÌëÌô=ÛJ,öÀ…{ç¼{ß9s‡A€W®]ºîyÞ¤œêSÉ)¾UF)½µjÀ…‰óþHa„vw'ÐauÀ²,PÚDZuØŽÇ]ʦ¦^0#ìÕð}Ÿª¦Í=)tumD,fÁ4MÄãHl¶­Û±kG}»÷ȳ8|æÓU8gà‚‡ÕÚ „€3rùêÅÿöÀ@åeµZ fßán±jÛöäz|3Ÿé‘c½¾÷” 9@Z&cgNããg‘ÞÙËÈd2(œ–Ÿ.o*‚R0?ÿCP&epÞúâ†G‡°ß^i«SVcêæÕ¶à,8BÀÐ7/£<×A{{ ¥RIÆ=üjþăûñ¸ü´Âu]ÃXKëzú/ž=}fj)æ pÖl6ñúí¼ŸýˆOss¨}ùŠÏõoð®Dem`îS9„KÞ„š¸*b@§Ù… XÆüHëÿû"ª0 -2-øIEND®B`‚ \ No newline at end of file -+ IHDRóÿasRGB®ÎégAMA± üa pHYsÃÃÇo¨dþIDAT8O­“+Â@„·H0¡CÒô¤ÁôÜ€ààXL¹†4\€T¢‹A H3ÛÝRšÝlx|ÉäïþefË>/üR7JäB¤Ö…âJR~ƒòíBëyfçŒÙiZO=Íœw眙sÞwÝæj*1Š‡¸‰ *œã¾d åW1ùÛX—,ëx‚cYQ ’[Y4˜&E,PM~ÄŸÞmßøлý+b{Žä{œÁ |u!ç·pï\‹YÀžƒIô‡ ÜA‹˜¼—¯-â-w¡›I»x…Ë8Œ×¸„g8uä ý²N¥4‡~A_²”·±Œë¾9Ár\PWÀž÷ÑоoÑ!(¨øB“=q+ùU¬sØÆ,°€Oh¯&Ÿâ8z`Üó5t&q¤ããß"îó4zÀÊ|¢‡l>‹RºÁvü™ªEþ#KÆç˜Ã±¿Ø¶AÉå!F‘Ë,ªÇÉ)¥ô üßI¯CòÄIEND®B`‚ \ No newline at end of file diff --git a/dist/qt_themes/default/icons/16x16/lock.png b/dist/qt_themes/default/icons/16x16/lock.png index 496b58078983bc3c4f7dc2808fd02b8deb8b7b67..69d399050804cfa45e00850d4330a5b7cfaa3a43 100644 @@ -460,22 +710,40 @@ index 2e67d8b38fe9219a9bee674472f6a1356cae3698..507337fae59964244795a3b0bc528e07 +:¡$|-¡R¨Pz—ãùí­³;FávïfWæIžìÌÝìÝÿw7w›)x<ž|S£4à4Žb'6b%œá>½1…Wø‘’'ØŒ5aßÑVHkb_ÐV@V=Ä!ÚÞ8M«¢Í©ó€ ¨ô_Q‘*6úzI|ÅkÜÆaüÁš'­cÒñe·0öÁ΢9p“R­rƒK@}¨‰%EÓpOƒ^º,â’J1‡»êDÐ7°Wj&¦ ×p(èý]HG°5è}sŽ=j(€ùé±,¡?š 4ëì¶MŸ,r‡›¥fŒÜ·á1JKžXñ\ã¸ÆpàÀ5>€k|×ø®Q­µ˜ØV­]c«©¨÷¥vŒ¾ð˜%ÂcÝ+Úñ £wû¨µ-‰¸F5,£ö¢5ªæ6 8Àè“ypËôã3ÚfQÕÚ‹1VÐœJYT5ËŠ6&ñm'fA­Îc™ß6ù&P»°ÒM¾´ÐþÀ ãj/Ããñü +…O{pƒ.Ó­óIEND®B`‚ \ No newline at end of file -diff --git a/dist/qt_themes/default/icons/48x48/plus.png b/dist/qt_themes/default/icons/48x48/plus.png -index dbc74687b177ea85ffa48be3864db8a49bed76cb..ba7b62aaf7e681348c0780f96f929425bb75f4c0 100644 ---- a/dist/qt_themes/default/icons/48x48/plus.png -+++ b/dist/qt_themes/default/icons/48x48/plus.png -@@ -1,3 +1,3 @@ +diff --git a/dist/qt_themes/default/icons/48x48/list-add.png b/dist/qt_themes/default/icons/48x48/list-add.png +index dbc74687b177ea85ffa48be3864db8a49bed76cb..fd8a06132ccd4e99b947cecffafa3a593b1cce25 100644 +--- a/dist/qt_themes/default/icons/48x48/list-add.png ++++ b/dist/qt_themes/default/icons/48x48/list-add.png +@@ -1,3 +1,6 @@ ‰PNG  - IHDR00Wù‡sBIT|dˆ pHYsÄÄ•+tEXtSoftwarewww.inkscape.org›î<¹IDAThí™1„0 ÄÓSð š{ZZò® \$q–œv$7)ìÂR¢B&@ÌòY7̶CÍÔDYqX= M±n2o¬Ý°5`#6`#6`#6¿&ìw÷„ó•ØZ%îöK9“éQ ò®`ˆ/Zªx û—;ðižÂŽ)[%®]Å%Ö›˜ØH€ØH€ØH€—@2ž=ÆK`1ž½–î¿Y…è…/ËÇ©?â™ì²IEND®B`‚ \ No newline at end of file -+ IHDR00Wù‡sBIT|dˆ pHYs‡‡åñetEXtSoftwarewww.inkscape.org›î<IDAThíÙÁ €0DÑÑúì¿­#T!V×!ò,xŠ~È!A þj’´ì3™¿%d–Tö™³^2d-¬íÃÓß5f,ú%Üp#À7Üpkçùœ«è:áûÄù<ïžê}¢û-Ôòt ½5Í-ÄÌ7Üp#À7Ü2–Ês7ºÿÅ÷VOsp¿×5²IEND®B`‚ ++ IHDR00`Ü µsRGB®ÎégAMA± üaPLTE¥g¹ÏtRNSÿå·0J pHYsÃÃÇo¨dAIDATHKíË1 ++ CÑæþ—V¡P"**:äMò ‹T< ¬ó9Q`|r~ú< ô! ++‚r*È)¨¸ ^[!º3 ++DIEND®B`‚ +\ No newline at end of file +diff --git a/dist/qt_themes/default/icons/48x48/no_avatar.png b/dist/qt_themes/default/icons/48x48/no_avatar.png +index d4bf82026a63d3498c57615ed744ef6ad1a11db4..76f812349b462cd8b05465d12a7e1a4df6788ea9 100644 +--- a/dist/qt_themes/default/icons/48x48/no_avatar.png ++++ b/dist/qt_themes/default/icons/48x48/no_avatar.png +@@ -1,5 +1,5 @@ + ‰PNG +  +- IHDR00Wù‡sRGB®ÎégAMA± üa pHYsÃÃÇo¨dáIDAThCíØ?HÔaÇñKÃ?A"4j8Õ¢›º8„CC 8$Š m9„ƒ"´¤èfô"B‡]‚¦0¥¡©K±Ò÷wûq|¸{ž»ó¾ñ{ÃkýÝÇóþüî)äååÕ¼vLáÖ±…M,c H²ÌàNKxËHªfl@ Vþà=®#‰f¡†–ó7àÚA ñ®A õWáÖ<Ô°#pkjTŒ{pë-Ô¨ãpk jTŒ;pë)Ô¨½pËnÔ¨P‡h‚[7¡†…rÿhÅ Ô¸ö-îÚc¨a¡ì%Ô·V †Åp½š†ê7\ßÄø 5.ÄÜëÆÔÀRЈ$²C5²”a$SìÚ7\D2]Â.ÔXå’뎡g}„ýŽN²OP£³\oŸËµ 5:+é? ä?pɶ5:ë!’¬¡FgÙ‘ã$Õö +Ï‘Äcò̳ï ;‘¨ûGª0ßÆ;T2¼Øw+a?Ã0ÎáC„ô¿ò¾}Íá~ËÇlÅÃÌb²â-\Ñ›ås·,Ëæ‘è]ZÈZÜ©@<Ì´ÜR-ܪA¾“)‰ÏO/Ô(ßÉùXùq,6 Eì/+?$›pê–ïäaÙ& æh™êuºeº¨ü~4@8Ìw9KŽ¼!êlìoëp0<˜×Àžþ»D³7<×À· ++DbùZäE£˜Wÿ=f^¶Ï(Ęl­¾ÐñÙ#Ì^þ¡2`@‡ßḎ‰ÐÂgåIEND®B`‚ \ No newline at end of file diff --git a/dist/qt_themes/default/icons/48x48/sd_card.png b/dist/qt_themes/default/icons/48x48/sd_card.png -index edacaeeb5629c5cf4a86d24eb35a4d37c45bfa77..8a8682133a1da5bcffa2612334db7badf4c5a6a4 100644 +index edacaeeb5629c5cf4a86d24eb35a4d37c45bfa77..60dfba2693ca39fe823f89fbcbeb25ea274698cd 100644 --- a/dist/qt_themes/default/icons/48x48/sd_card.png +++ b/dist/qt_themes/default/icons/48x48/sd_card.png -@@ -1,6 +1,5 @@ +@@ -1,6 +1,7 @@ ‰PNG  - IHDR00Wù‡sBIT|dˆ pHYsÄÄ•+tEXtSoftwarewww.inkscape.org›î<ãIDAThíÚ1kAÆñ_̱±PKAHª€ •˜ÆF‚_À*½Ø VZªßÀFl¬DPÔ*…ú1…¢‘(ê)B’³È77{{·žÙ›Sæ/ì>÷.ó<·³3Å.㱄çøNCµ‰·¸#cú,ÑÂul7h|P}©¿5¿÷'l<¬÷8›š©i~®0¿hÏð¡8žÅ2¾àqг€y¬b-Зñ íñ @@ -483,9 +751,11 @@ index edacaeeb5629c5cf4a86d24eb35a4d37c45bfa77..8a8682133a1da5bcffa2612334db7bad -°Þ°‘q)½\© -ð¤a#ãRÛ×q½·+ÓRï øÔ`¦(Ä:Nþ‰ù.ó¸c'ý¤¿PÙÄÜÄá*ƒ¿¾3íiSIEND®B`‚ \ No newline at end of file -+ IHDR00Wù‡sBIT|dˆ pHYsÈÈý×;tEXtSoftwarewww.inkscape.org›î<ûIDAThí˜=/AǬ󖸄‚D´¢‰F¼4: -+ÑKT*!Qqß·JDN¡ñ$áP¨t$3’±vìÎÞíÎJæ—LvîÙ™Íÿ¿;Ïs“òÈËÀð|&Ѐù2uR'$Úß>€þ Õ1Å×ÀxÌù¦T#A7jb<¬Ø&”ØP’ýV`Mö À­2n hö€3%¾´Eùìo€nÙoŒ¡õ9àˆßŸx@Ó©Ä}ó_d|Ñ¿’ñ‚/~¢UŽÎ¢¯PHýxO Ÿx—mdTc7<®‹µ­Ú¤ é5¹OÔïDÛ^ÚFñûÓ®DÛ‡Ys€õØNùÀBà§è[gJÔä’Ëç0†zÄþxƒý)²ô}ogÜ]Ö`78 Yú¿EÌj¦–\ÝÀ¥>ŒJ'üÆd„lö@ °,$ÏAQ¿ís Øa©7ßBòÏPC ¶Ÿñþš•?@‰ o‰îË”÷°5Èü`4‚H¸âÃ5"÷Pê73ž¢ö~/ –BÓVBù¬õ^m*?€çÀ=-â…Q Ø l‡à®Ê}<Úpûl§€‹@n!ÓÈÕÚSÂÓy¿A帿h¯ŠÍJThMécX4ø€”ƒÇ¦xüÚЄ3O™oKR¼s!I¢öó"ï¡£¸á¡ÙlN—0¸îA8l1`:…*œ©xªÜ$â;‚Ê*Ý>XÍQˆ5šqïÆ´¶”/]D¦°§ébÎ]&©µÊ}Æe„\ ÍEPæúé çi#æm[?Fà’9Wè]&…LÒéQÿšG +_¸‘Éö‹z”%4ãGMÓt¯‹€ØP/û|b‹ºûÄõ Îz#N=Ð%ÄZ]b²P)¯õÛ1œÒ}­‚³Ë¸kù8;òšp)*ýöÊå_ËŘ"f È‹c{„Ð'ìµuÀwó©2Œ}»L RkL]è"íº=èð0;¨‹[_ÓOº]ôuš6Ÿƒº&±ŠÔkƒQç×Rý·[Læ¨íCdðMðƒÜîœ[juuûòJè6y¹•Ô-8ÿSÆîOaú·.k&êöD{JžJã6VrÖšœ@1ðËC8U®î#”¯cý¸&wàO ç<ÄFP·lé¢Quã<Ý® à$jL¢Rß;@YÎ2à.Ó)ú0p‚˜GËV…9 Q“ñº«Ãæð¿â/×ñé6v•OIEND®B`‚ \ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle/icons/16x16/connected.png b/dist/qt_themes/qdarkstyle/icons/16x16/connected.png +index 90feb372af3e4c1dd9782e075993946c26b1e5b0..0afc18cb7a19028fd567a7ca7ced62cd164657de 100644 +--- a/dist/qt_themes/qdarkstyle/icons/16x16/connected.png ++++ b/dist/qt_themes/qdarkstyle/icons/16x16/connected.png +@@ -1,4 +1,5 @@ + ‰PNG +  +- IHDRVÎŽWsRGB®ÎégAMA± üa pHYsÃÃÇo¨d"IDAT8O¥”=JQ…M‘ÎÂd-BqB:· –Y€eVQl$[¤’2Mˆifò½™“ŸyïÎ#šïqï9‡aò“BžçÍ,Ë^P_£¿£’wô‹.4ŽC¨¹ÃyZ^É¥lq0^¡o +-uÆKðßcú@]´,+ª0’ÝúA3eLرÁ0t%è6VÆn©ˆ †®ŒÑ2æEBXº»y'®™eÌ«ÂÎ}ÄÓÒ¶Å*ãþÆq¬h–g¥-d· -P[±–çÊ™¨dýd©b!,O0Í‹”»•¹'o)ÂÒ}í?‹”óWÔæšrž*‚a÷·ÓC_*˜ ® YëñJ6¿æGºîá_ò/(xFûýŸÔ’$+Ì9F±„êIùIEND®B`‚ +\ No newline at end of file ++ IHDRóÿaIDATxÚÒ¬QÆñiÔ¶mÛŠ“º]ëYk×ÆCXÛvPÛîÚªm·‹¯÷>OP%ùïOÎ/@i³çÎœožnŒÍ:h&-ôF t4ƒZ½ ++šNIRE &Ý"Ör!êö8ñüÅ3|øð?~|G<Ç—/ŸñæÍ+<~òÁ°N· —¯^€B•e Pk•G‚¨ÙK‚¤ê¤Z½e¨ÞSŒ½%h0 õIUº‹pÏz™9é` P¨²ùP»_2ZOY…n’ £Ü…Fã–cDÎðæÁ”‡P—Ü·Øî -#åßÜje.jö–Â渇¤Té¿»åJ9ªöÁî´@"ýŸ»r7!`…PÌû?÷]«7n]OÀ‰2Y9ðúݨÕW†æ“V wòto@ÁzŒTìÆÌíè—º™åæð¦€ËŸK…¹Lzf ++\;y@†^);1T~r`¤ö†*¢oúntoa¹só#¯`é—ÜÜEØäT½Qh¯Ó?…PJJ&[U³O2ËíðXpêì1ä(²¾0²qôʵ‹¸y÷,;\^/üÁáü¡¼ nwyw!&ó^Ò  Åü¨@Ä_ȥч¨‘Vò0Ë]þãc¨ƒz¨ëO•¸Y¨ƒx¨ë•º¦Bé²úsºÞb¹9NÅ’¿re€HG¹sƒIEND®B`‚ +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle/icons/16x16/connected_notification.png b/dist/qt_themes/qdarkstyle/icons/16x16/connected_notification.png +index 7cd8b9d2930d99340778360c68bf28923a66609c..72466e098e471ae5a97c49a56536dd4bf62b3a08 100644 +--- a/dist/qt_themes/qdarkstyle/icons/16x16/connected_notification.png ++++ b/dist/qt_themes/qdarkstyle/icons/16x16/connected_notification.png +@@ -1,5 +1,8 @@ + ‰PNG +  +- IHDRóÿasBIT|dˆ pHYsááp.tEXtSoftwarewww.inkscape.org›î<‹IDAT8=k“a†¯“FŒPAT\ÔE¡XêàG µ).…‚Ú"¢“t*qpUP¨‚¸Iת‹DŠê¨E¤™ª¸ThŸËÁ7ø|‹ôÞçÜ_6 uRíl–|U]S'ªÿq|8 ¯ƒÀ#`*"ž•‘N©¡NN9’:µ‘ã.õ»úÑrŒôî+}äÓÀàp`ƒfÊÜCý ®¨7Õ% fʦ³£õF!²¤^W«Mu_SÍÈCÀ½Lo0 Œo—ÇN6µ2Á*¤.ðµÿ£À@_¨OÌÏ·»­úSŒW‡1]Äø¼Ü:q ²3…cŽzw¬~H ¢É3·ÕÊú‘<ÁË>ò:ð^Ò¥> j)UÆsÀlN€µ,åp +-öÿ©U‹Åà!0 t€&ð Ø"ÑC)P²§ŠÛÄÑQÈ"Éƺ:„5?9öæmfpÁ05öÂmvÎNô¡¨º ++|f|jjÉ›Jy«‰ 64tœrÇfñxœ>ï: EQ ÈŠ(C ”tC),ö‚²àÓÓ««¡&„JÄ×ÞÙy·U¼7ÍŽµ÷öšW)°fg¡ÿRàB ++‡a Ub ++'iyiéSâóM\6•.æIDßcCmíÒ Íσ„BÁ\¿!ÒÝ#'OX¨ß¿OÓ‹ôLØo°9ìÆ#P¾ÿ@Á¦d]÷ÍŒF4úÑæ¼’44Œ2Æ ++3!@|Wlÿð [>O"LÂðûm¿iÞŸâf…ãX?P”¹Nÿ\IEND®B`‚ +\ No newline at end of file +diff --git a/dist/qt_themes/qdarkstyle/icons/16x16/disconnected.png b/dist/qt_themes/qdarkstyle/icons/16x16/disconnected.png +index fc5f23894e4aedae7a49981f68ba017a177b065b..7258a8cfe5ab54a3f53252c08520824ed91969a8 100644 +--- a/dist/qt_themes/qdarkstyle/icons/16x16/disconnected.png ++++ b/dist/qt_themes/qdarkstyle/icons/16x16/disconnected.png +@@ -1,4 +1,4 @@ + ‰PNG +  +- IHDRVÎŽWsRGB®ÎégAMA± üa pHYsÃÃÇo¨dQIDAT8O•”¿JÃ`Å#:‰J§Vé{ˆ"88ù¢ƒQÁݱ ºøŠoà"î[©“è"(Bâï$ÇÈ—~‰íÃýwîÍ—ä&É,Ȳl1MÓmì>\w|¯,ùˆwà3Í9ð¿áü€›–ÅþÑ=<„_ňäÏ,¯¢ 8rOÔ‡–7a¾¹/ +-ê –×QÏúwÛÔÇ–Öãwˆ,ÔÉ&n“Ü©åHÀŽCÅ«öœRn7ï6ˆo1ó. ùG°ë”rkvåç'‚[½Å¶Ë pä«ÃâÂG$-Õ_ZR€„–­ÜüêÉöॖSÚ±Ña¹öclrºbp²FгU´Nb¦aƒ7QÅÔÃÐêáE¿#Ú§†á.»%zFƒ¼«òÚ“6öÛ<Ñ5Ô¯ _=àžà†ËÖÎaù?Á_bÀœÃ)‘$?Äki–ý­ýIEND®B`‚ +\ No newline at end of file ++ IHDRóÿasRGB®ÎégAMA± üa pHYsÃÃÇo¨dIDAT8O•RMkSA=óÞ´ym„Jƒ©ñc£&)ˆè_°ØD7â¢MëB¥XE¤P¿AA4ÄŠQP¤®Åt™.?Ð"”¨qY]Eö}ÍÌëÌô=ÛJ,öÀ…{ç¼{ß9s‡A€W®]ºîyÞ¤œêSÉ)¾UF)½µjÀ…‰óþHa„vw'ÐauÀ²,PÚDZuØŽÇ]ʦ¦^0#ìÕð}Ÿª¦Í=)tumD,fÁ4MÄãHl¶­Û±kG}»÷ȳ8|æÓU8gà‚‡ÕÚ „€3rùêÅÿöÀ@åeµZ fßán±jÛöäz|3Ÿé‘c½¾÷” 9@Z&cgNããg‘ÞÙËÈd2(œ–Ÿ.o*‚R0?ÿCP&epÞúâ†G‡°ß^i«SVcêæÕ¶à,8BÀÐ7/£<×A{{ ¥RIÆ=üjþăûñ¸ü´Âu]ÃXKëzú/ž=}fj)æ pÖl6ñúí¼ŸýˆOss¨}ùŠÏõoðÐ-ÁkÒ(͆žà!Nêeª°qkÙÕ‚ׇ¢L°r`Û°Çú¸×5\:ó”%¼VÂC.ûÛxDõ ÄZJº&ÂB×dà$C=–‰‡8Ñã?Áþ;);8®6´Ž|‘Na·šUy Ç!Y ƒµH¨Ø@?r¡yTùltúÄŽtŽ²ïÎ|$#€æMW/]I +ÐÀ46€ilÓئ±Lc˜Æ0 ` Pt‡>êîZÇ€F=%À»;ö1¬kœÕÕKN~ñ÷â·ú_å³(·DŒ"=à:ЋôÜ£Þg¹ •$NÇY.¡Ü ñ#Þ$Ÿ8A€{ubpGÙ™ÇéqSšw§x'æñ ãŠÜ›Õí*ê.MÕ¹‡ýŸ†=Ü@·êÜÃò yÜ…—ªs70$ +˜?áR©:÷ ÐjTì`Þïÿ“ ù¤†ÙIUù1¹XÁü ©S{X>/kèð÷~ˆý£FÃäÿsñúKÜ@ŽNz˜R•?ðhBäŸQJ33\©Æ/Ȭ­ä0óZãþA&Õ?4Îr©Ð¸©AjïÆ.œý Ñp@ê 9—c,œÙ"U Ä~Ë3Îø{û\ ä~É3–Ðo Éw`XÇùyÆ™ ÜÚ‘»2šñp&zäX¦±0@êÙ7ŠÅáìñÿˆ‰2KŠ~åoÃÌé'nÿ¤²»œ¥oÉI-~:ŽÈ8>ÓŠû%ÑCÜ÷d׬.-ôF}¿’6­, t—Q:H̪û…=ˤQ +-öÐWMÑ¢©v {‰ýcG:¢ŸõUSçöŸ“)¥ƒùSãn`›¤ÿKÅÐux—^i%ƒfÍ> RK3 í”%©edd<r¹k¦7\²É\°YIEND®B`‚ +\ No newline at end of file ++ IHDR00Wù‡sBIT|dˆ pHYsbb_'ÐStEXtSoftwarewww.inkscape.org›î<xIDAThí˜;kA@Ï0â+*(ì¬|‚!Ú$ ++B´°ÁÊR±ó‚¥"Hlô' Šÿ@¢D±0 L!ñ ¾Á'Jr,ö^¹löÆdfïÝ÷À63ûížoçµ3СC¡Ì‡©+cÀQ`'Ð[«z L·ÑÂÏ2ß[ ++êIõ•ÿgZ=Qµï?Ô.uxây®¨ËªöG½!_çBÕòCêlB3ê*O¯3V•|_ òuvÇz¤ ¢Á„Ø<ÑÝ(%è¯VÀžØÀ”V%ÄæY˜’@™«xWl`JÓ ±yžÇ¦$ð4!¶´gEwu Y+¤v%­!„1ÁÑ-Bx Ü‹oàn¬|2ê` ‹ØÁJä’¸™ ?R©|-õY„ü¤º¶jÔ^õñ"䟘MKuzÝì¹3ê5µ§jߦ¨ÛÍ69ê—Ú5¡^T·WíסCŽRþ(ÕM@?ÐW»6€õµ[>Ÿ€·ÀCà0Bx_Æû£PW¨ÇÕ;êŸEL¡3Ò˜zJÞĈ/WϪ#¤›ñ¡öÌå­–?¢N•(žgJ=Ü ++ñ.õ²ig@ eÖl‰Þ¥åå»Õ[mÏ3jj—2ûò7*¯3bÊù©z¾Bù:çæslº¨}À}N Jbè!<*ª,l5W©^2‡áf•Íú×°·%:qô«‡Š*š%pº…2±œ)*œ3̶yï€îV-’_ÀÆ·Æ¢ØÏÒ“XìË%°£õ.ÑìÊ%ð£ "±|Ï^`XÓ£EðØBxÛX8§Bo€²cÃßíq›—ßÀ0—ïСþ+#(q(‰IEND®B`‚ \ No newline at end of file diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png b/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png -index 0291c6542d05a40a350bb5bdbd99a15c01467161..42b9f27738d95d742b4e8380c6450e639630e049 100644 +index 0291c6542d05a40a350bb5bdbd99a15c01467161..87ae5186d95a9aaee49247dea04264aea58a2353 100644 --- a/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png +++ b/dist/qt_themes/qdarkstyle/icons/48x48/sd_card.png -@@ -1,7 +1,5 @@ +@@ -1,7 +1,4 @@ ‰PNG  - IHDR00Wù‡sBIT|dˆ pHYsÄÄ•+tEXtSoftwarewww.inkscape.org›î<!IDAThíš¿kA†ŸÏœžBbc¡–‚˜T +ñMgaku}°¬´Tÿ±I%A­RhÒ @@ -820,9 +1152,8 @@ index 0291c6542d05a40a350bb5bdbd99a15c01467161..42b9f27738d95d742b4e8380c6450e63 -!W¡ÝDî*´ç§P*›T 6©@lRؤ±Ib“ -Ä&ˆM*›T 6©@lþÛjÔ"œœWY5‹T%÷p¥¬À“šEª’ó*ûmô$°ÂðéÊna8efîSâ0³WÀUàkb!¬—}ù±Hš–t_Ò;5ÿ•MIo$Ý‘t´Ìñ7'÷žþªuIEND®B`‚ \ No newline at end of file -+ IHDR00Wù‡sBIT|dˆ pHYsÈÈý×;tEXtSoftwarewww.inkscape.org›î<$IDAThí˜?hÖ@Æç×Ïþ uh¡¸ºXÄIÁED—nvpŠ«à$Ä‚“VquV7ÿt’"íà â*¸ˆV>èÞMÁ¥CN8ÂÝ—\brò[òò¾oŽç¹Ë]B ’†’îHú!é@Í0’´ZGgHü¤¤7 ‰Îs éŒOÇ¡Šâ¯€Ëu&!\ô&bG²â_Wœô`×ÆóÀ=oß¾ÇÀ ðØqòwE`ÛŽý—›À’gbµúÄ%mz–ø¬ÓsÜÉŸËÝ¿oó·rù/6¿‘Ëo9cÝ÷i*ýIOå²÷´A)Vüs`¥Y9ñpf¾sâ¡`Kš ›ù«6õøfãàºHš³ñ¬3„›‡ì4˜Îåö:•Ë Œ?ô,·Y—ú©*z ¢7ñCàZåh ¯I§ÉÎàÎZKcj"´‰gù¶ùLö(ÿ¾úb?%žHzdãÉÂʲfŒÙ×k`¡†˜*ü,jx8I{_œÍ éCËç½Ëù"}eNš½0QÆ@õ×y x÷€¤i` -+8\hUQ$¡Xö÷À\ §üoÛqtÝ@áãÛuë’ö$íJºíkˆþ+‘€cözÔWìú -+ÒHMo 5½ÔôRÓHMo 5½ÔôRÓHMÈÀ¯VU”ë)d`›ìïtWðÖWð0Æ|n£æ4•f¬c>ùŠK ‹~·BµIEND®B`‚ ++ IHDR00Wù‡sRGB®ÎégAMA± üa pHYsÃÃÇo¨dàIDAThCíšÍ+aLJ‰(!)”‹¼DÊˉrÜòÈÉÉU.üþnÎœ”ƒäè*¹;,É[Z’—õùÍ<£i2»Ïîš}fó|êÓóüžÙmæ;3ÏÌîÎVe³Y§’©VmÅRj€qÌ Æ8\Áœ”@6~›ÝÊqî”>Ox…nå8ï(õ³[yÜà½×uyDyÍ—[é s Ç1ƒ>;è/ÛÆ{lTõ< ++)”º_qCÕÕxˆi¬UcK(¬ Ô‘sÂ{^¸P­pŽ(G@:ØÊQzA¿–½}‰·ø& µ…ømãRH€Äm¼  ¼ñËX‡=èŸ*FÐ 0„á=‚r¾¦1xå);:Æ0Q§MB'q#Ø©ÅvÆ6œBa¥žÄ”Ó]8ˆÝ؇òÞ Ôã·kkÈ 3ƒþò3ˆ‰Xî‰âßèUm‹ÒÅØDùPvM2`ŠRN¡z¬ñºæ°“Ø4@çK}?ÎxÝqÀëÆÊ*®yÝÂw6M÷°Ø;±°€á_ R˜ìUÈ46€ilÓئ±Lc˜Æ0 `š@ÿ‘çß“wÝ:NUk‚¼ëÖ pŒ»^·¬á×FwÌá:Ÿ²ÇÅ+ná,~Ê@.ì¿UÌâ8ߊÇMÌdø:ÌIEND®B`‚ \ No newline at end of file diff --git a/dist/qt_themes/qdarkstyle/icons/48x48/star.png b/dist/qt_themes/qdarkstyle/icons/48x48/star.png index 90d423a1d4c1e05ccec0a01fa34abca9fe99676d..546779e2a810e73169f65a79850aa07dffd70267 100644 @@ -841,343 +1172,6 @@ index 90d423a1d4c1e05ccec0a01fa34abca9fe99676d..546779e2a810e73169f65a79850aa07d +Àn ÆHqžÏËü@¢‡F3–â™ €ñªÏ\Så‘ÀJ%ô–ÐE-°øœ`>@'¡å’â…p»ŠY‘Gg”ÈQ[?8cö£}\8Œ4pTµñm~СDš€éÀ“ƒ7€Ñö¹óÄr4©ú ìoBRz¹ûl%º¤BñkO/cëôå–c+Ñ_ÊÛý©‹yÜõÈs`vÏlã‚ælö™@=ð#F8ÀiJøQüÇø€üÀ¸Š6ÕIEND®B`‚ \ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/lock.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/lock.png -index c750a39e855800fe4cde217a1bf28f841030e501..7e63927b2c047718f80ec29512472f1a2d9d357e 100644 ---- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/lock.png -+++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/16x16/lock.png -@@ -1,3 +1,5 @@ - ‰PNG -  -- IHDRóÿabKGDÿÿÿ ½§“ pHYs  šœtIMEâ  -êœIj½IDAT8Ë’Ñ‚0DW†RHRv@Žh”@¶@Út Vðü c8ÝŸ$·—Íæ¤5pç‹PÈ  .ŽÁþµ)8ßPõÖ׺-*Õ Ó9Kh”~"Ü0¹”¤°X/48¦$ 3OKò{MoltñKí<lãœ/ÞMÀã 'é•~ÐàX€¿ý¥v5ö`P`‘gèI³¤ŠYRÅ,©b€T1 @ª˜ UÌ*fHÕ=5B™¹° --xý;ÉÞà/OпñËZඈx°Áñ5"@‡dæ>À%ÀÀë[žîøÁÏïO7ˆï¶<¯ä.@Gdæ2à&à“´¿ø÷ôïdû­Ì\3â¹µ,€Èþí¤odÊ_ --Y --\Ÿ™gΡ!YÝp9pzéûŸÏ̃KÑÜ,€ 7XhW–α‡åÀe¥ChnÀä;8¬tˆi¼?3£tÍΘ|§•0ƒ×+K‡Ðì,€ÉwBé³çlÂè‚å¥ÌâÇJÐì,€Éw@é³XV:€fgH³¤ŠYRÅ,©b€T1 @ª˜ UÌ*fH³¤ŠYRÅ,©b€T1 @ª˜ UÌ*fH³¤ŠYRÅ,©b€T1 @ª˜ UÌ*fH³¤ŠYRÅ,©b‹J˜d™¹?ppp$°¤@ŒÅæÖêÌܧÀ¼O > --Ì?1,€ÈÌ·—gK Çgg>ŠÉÌ€Ï×DÄ–’YÆ‘»ó™ûgæµÀZà\\ü“`%ðÀÆÌ\U:̸±†”™û_ÞS:‹ä5À×2óìÒAƉ0¼«€SK‡Ð^Ùøbf®,d\XCÈÌ“–ΡF|¼tˆqa ç J‡PcÎÊÌ¥CŒ `™ÙÎ*C --ÀcXÃ88¼t5îçJÀÜŽ,@­xméãÀ˜Û¡¥¨‡•0,€¹ù=ê&®øMªfH³¤ŠYRÅ,©b€T1 @ª˜ UÌ*fH³¤ŠYRÅ,©b€T1 @ª˜ UÌ*fH³æ¶³tµbGéãÀ˜Û¥¨›KÀÜ^.BÛP:À8°æOw—ΡÆÝV:À8°†óÅÒԨǀ;J‡Àp> Ìâ‡y\q÷oþyÁ$µëÇï†2¯K§ž|€þf†¤òžÞ \óºÍÿ‚oÙ•™‡¼Ø¡ãHZ°ô¯ßùãˆxf!ìõ=û²à+€÷K÷v–´1ŸÔ1ÛéÍßHÿ¶ýww5µè§ém»3s1p(4À33¶+I’$I’$I’$I’$IÓú™›ÙÌßN>3IEND®B`‚ -\ No newline at end of file -+ IHDR\r¨fsRGB®ÎégAMA± üa pHYs¼<¼<Á¿Š-ðIDATx^íÝyeÆq†¥„PC 0¹J@îÂ¥¢"%*‰àKQ(ÎTòHÉ!D(-)K TY r(p¥DðH¹QQ@¹X€ãóôûn²ÉÙé™î™}ßï§êÉÛÝ»;»éé÷7o÷ôt¯:¨ÛÚ5›ÍÕì¨LV&)•M”u”u•õ•®ý}£Ô»ÊËÊcÊï•ë”EF£© ¶¦ÿ~5ŸQöSöU¦*tðê=¤œ¥"° Ì+TÞÕñwWs¤r¨²—¡+~£¡Bðb˜**êôcÔ|E9MÙÎËÐþ¦ "ðD˜Eî:ZÔñýx3•YŠ÷éÑ{þ¥ì£"ðx˜EÎ:VÔùýJ©²G±½Œ"€Âš±-Í÷”ó5ù€Bç>ªÜ®çm«0‹\µ5д¥šùÊ.ÅŒ6Œ2Wz Îïƒ|Qèü£#Ì•*Ú`¾£Æ¯üã‹Í(k©h#i(s4y±Òöñô Š@¦Z:  Ä߯þHÇ23âWquþÙjèüic$™´A­æ²0‡ 0ÈÄj €:¿òߥ¬U,@.(¶¨óûÃ;R¶( 7Ä y @ßÅá -+…Ο/Ž $n¸ƒ€G(Ÿ“ÈE aƒîèÉö >+› v’4Ôà…Îþ $hÀ@Oð5(c‹ÀÊ $d°À) -+Ca$•FzRý亲ûžÀp $`ÕÀ± -+#ÁH ËGz"}!Ï*üC+ Œbý €¯ÙïKGwÓ Šohá[¼åÒáŠ_…{‹Àn@24oÏÿU^QžWQÑ|VmWõ/Wª9,ÌÕêmåjåÇÊb­6¢ˆCïÛ•^)hÝ«Ê£Š_ôü\Þ¡í¿Öû6@“øÕ·îw,R¾¡ÿ´ßvD‹(ÉyOñeöü‚x•úÅÓ^X¥¾°ƒ_Õ·Nç*³ôŸôýìPE Yî  ÿ:õ‡Žë{À÷ê«Ólý‡N£ó·OëÐßöQ¼Žtø üÊ5ÊúÃ/먾°wlëðsm´gÇitE yWæ)ªì_,é¾]€'Õ|ÌÓóÛŒSµÁ¾fÑIìdÃwz>Qý¨íckj£Y[m]Ÿù÷>?¿"Œ²1]Yª¾û¥0[žw¶ŽmÕüžçUaU¡dc=å—*—(¥ÏÞuÇ÷§ÿê°@ç;q¢dåe‘ŠÀFa¶5.uÝÝÇoi &¬ø½w«ø^-q&+÷`lQŠ@V&*÷¨øƒ«³ü;¶¨Q,{*/ e›)·´2pð»•Ó†øFœDÍ´îÝù}R #ô¹üv¤Ç\– ébw +“”ëUVûî€ 2Áî@V|`ð¼094 -+@fâî€Gô«QÀ!qzP€ qL +—«ø¸À (™bw ë+ç‡É(cw 34 -+ð%ÿ dŽÝl\ "0àzôíx$àk#MS”CÃä -+bØKñµ!¦Ó5 -+Xé¼ -+–‹»;+ݾ<<ª±rp˜ (X‰ŠÀ‹Êg59Cy¨Xˆ”ÛƒRðe§üÉ2¸HY¬øÒñ\ÈutÛ_»+îþ¥™9Jå⯲£Í¿¡l¨ì¤øì¼[•w•n91þiŒ€ªi4ÕT^Pþ \¬øʾ“_"¯/Ž¾¦`tŠÀcŠïïx ò\±°>;hPÜŒt‘ŠÀÍjvSê|ûÕ'Móè2w~ŸYçH ¸è±©ÔuL`'ÿCzDܘæ*ç«Q€3G©äNÀ«X¿ÙlnLzˆFªYæ*7‰ôž_ǶjQ€ÞãÓ®ë0žô4»€5›Í±ÊDe×O_F÷-‹mÕÆQ2¡¾®òMåV;¦<¢x¨éxú5-~ϺšG—4껋öX -+@âÔ™ýjÿ]M>¥\ªì§ v;8/ó×ü=Oùgü³þÒEH˜:°¯‡rR|øc„ü½þ™;âc Q€D©ãn®æ.ebA9þÙÅz¬ a©¡$Hv¼ŸVÚ‰ŽëBrc|L$†¦¹Š/8Ñ)~,?&CHŒ^©=lŸæ:jf|l$„žÓ••®ýÞ!~ÌÓÂ$RAHˆ^¡7V3è=à:ä@ýŽMâ4@H‹¯/WåsêÇ®²À f€´ìÛ*Õñ;P -+@Z¶ˆm•ü¶ AHKçð‹-@HKÏ'ÛLBx2ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ€ŒQ:¬Ùl6”iʅʽÊóÊ;Jåô맅¿¢Rþ¿ÕÁëÌëÎëÐëÒ¿·ŠÛžgÐAÚ@§«YªÜ®¯ì¦l¨ŒQЯ3¯;¯C¯K¯Ó¥q£C( òCÊMšœ¯L)¢ -+^·ó½®½ÎÃ"´ƒÐ&mˆ¾#ï}ŠïÍzx]ß×=Ú@hC|Z¨L( N^ç  ´‡О_(tþîñº÷s€’(%é•Ç£öwßñ¹@ €´Áùí¨Ùa=à,='lË%°ÒÊÙ[™&Ñ&){…I´‚PÎÁ±Eïà9)Pή±EïØ%¶h œ­b‹Þ±ulÑ -+@9ëŽƒç¤ -+@9oŽãÍØ¢€rþ[ôŽçb‹PÊY[ôž“(åü.¶è·Ä- ”sÂq€ÞáçâÚ0‰VPJh4>0/Ì¡Ì‹Ï ZD(ï å•0‰.zUás%QJŠ¯8G‡9tÑ1z.ž‰Óh  Úð¨áÕ§{fë9àzm ´IàÙjNPÞ) ^×'Äu6P:@â…j|I’×ñ´¸ÎÑ& -+@‡hƒ¼GÍöÊ e‘ò®‚Îðºô:õºÝ>®kt€ob1Gí™a¶:zÒ²º©ƒÖ«/V¹£2QñUÆ)Uûª²y˜¬ÌSÊÕa²R¯)Ë”G•´ù¼è…¹Ðöã½Tí, -+@Bô\úæUßè=•ûÄiT¤®À.1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+1 -+@ZÞŒm•Þˆ-@HËK±­Ò˱E(iYÛ*qä„PÒrWl«twl‘ -+@ZîUž “•ðcûw €„4 ßGn˜«ÄÜø; -+@z.Qž“åWÿ*‹ º€½B¿¦æëÊ{Å‚Îðc}Mýj˜E*( RG½Iͬ0׳âc"1€D©Ãž£æt¥‘€öôøXH a±ã¤”9&àŸ9ˆÎŸ6 -+@ââÐ}²r†2’·ý=þÞÉñg‘°F³Ù0V¹È¢fŸˆBñGŒQ^*×ëNeJü3€¬hÛßF¹Ç¡fÏ+Åè¿ø'žû}£§kæsҗ虧ìÕ÷G©ò6®ì­\©Ù?+þlFÝnPŸ/>&¾ü:úƒ>¥ææ0×5¾®ý}ÊcŠOQæݤ`\ÌDegåƒJ7í§°Ðý €_}ŸR|¤@šüVüqÔ¿âzqHàa €t]Ñ×ùm¥Ïèk°©Ÿ¼v±@JÞR&¨<fW¹"¾à«Á\æ$æ§ý;¿ ¸JF>%øel±@ -+ÞV¶VøG˜ ¼í¦oð.Àea@".^µóÛ€€iPç‡TË»öþÞ€k zâ¾ÑïÁŸæŒrÇ ÖùmЀià¯ýJùB±Àht­:ÿ!qz€! €©l æÊ–Å£‰OìÛ^ÀgØjÐ]€>úÁ—Õø#Šÿ+-|ÔÆp߆-¦ð¹ùßRê¸Q€ö¹¯ún΋ÃìÐV[Lt¹ß. -+@ï;U}vD'ô { `UÍfó"5Ç…9=èuþãôjhÐG|¼šSÀó}å¤092-úh$pŒš*-•ð>ÿIz¾ ÌŽ\©`*_Tó3e½b€nð;uG©ó_f[Sº˜ŠÀæj(» Ôé~eº:é»{µ5„×/ö‰Ó”ó¿ï zîk¾¥ÿít~kkПF¾ÞÙ\å€b€*Ü©|[ÿÁ0ÛžŽÄÓô¨šO+‡){€ŽYªÌP¦uªó[ÇFýi4àÂò9e¶òI/PÊå|åJuüŽßÄ·’ПŠÁŽjŽT\½>ìe†å#û7(>›ï6uüÊNï¼ôQ!xŸØ_ÙWÙV©í÷=Ìܯô·)·ºU§¯åx]ë€*©ñîÁdÅ')¾/ú:Š¯Häó 8Ñ)ð%÷}AŽ¾›Ý<§ø˜™¯½éãe÷«Ã¿ Œbk¬ñ*IfÚe”’IEND®B`‚ -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/bad_folder.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/bad_folder.png -index 4a9709623476fcf4070c4e3da2bb17375222082e..245f96c7ba65c9a792abc01a1b76c39accd3ee5e 100644 ---- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/bad_folder.png -+++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/bad_folder.png -@@ -1,8 +1,7 @@ - ‰PNG -  -- IHDR00Wù‡sBIT|dˆ pHYs££dÜ_‰tEXtSoftwarewww.inkscape.org›î<ÇIDAThí™[he†Ÿwvµi¢¶6ZCTTŠÞÔCcÀd#! A›0^(E°°ßÿÿß»ïËìü3Ì@:¡üÂÌÂÀ@3°±@o --˜¦%Í­½0³GÍ,n¥³df‡Í¬1Hó£e÷ó™5a¾· --æ=àXœ³ÿ• ³ŠzMÀíUÔ+ˆÌÌÅ·Uȯdv§j³ü||,) ™¶?¶Þœ†$¼X@æHïX-Àà\ â2`«oìe|»HÒÌúƒpW fvO֣nj?ÀDÐ& af_çù]p|óâª4Îæ}oð¸è¨šz€ ©šz€  mÀ†‡C±¥ÄvHÏ_ûÙñŸJé ühv1þ©ãºß9®~ŒE#¯•Òx€Ä`çc^-x)í¸«Øþ@œjo6sF}ÃrqŽØðp¨@„’FÀšW˜º#¾{¢ÀœÞÙqØÓ«ÍËôjl°ûªB:9Î! ó71ë1£ÍŒ6IOf—lÉ}+´Îçˆ FvÝ^J¹'ZǦ¦[Ǧ¦Ý´~Î-4íŽG»Ú}í¯I¯¨y€¿úú6Éx½ÈåfïØȲOI?o-/¨1K ‹û€kŠnm³ßFñîþ€HÜ×µx¦ŒÖƒ'ïïÞì’þ^„0ëÚÊ»}Ùº!•ÚŸ? é`¢fÑήrû»ÑÈ­¾á=5¹™‹ îh4“ÿŠ›#vžDæ„{Ó*Ï:C.öÐë Hš©ÍݨmÜ Ü°ê¼”Ûï×~P«žX´óáÖÏ”1³4Ë瘤hEf}$îíØ憜ï†ÕÖ˜ô®ºÙ kHžÒ…Æ[ZÆÇÏCÆø™¼Év3ÛR ãéó.k˜H_H½ß:6u´ulꨙŽ¼Þ.YñŠ00<”­¯¦ÍìK ]†ßIq¯ˆE#C‚¾2tÖF¶gvçÝ´|19F€K³Ó7—!;+é©\ÑßßdÌ®ØìÊ„ÍI¿ ô --ÀÌvïáÝ\•ÇÛ’r©ø@ç^¤Å4 --ÎÚòù./¦Ï¤!@Ò‡@0Næ |9ü’!­u"þ×l®Ì~Š2 ³ƒ¹mTÒ$0™}MÚR¬Hæ´Àâ™GõW”¡S --sÿ»Hš~¯TÙq4N»$]W©ÖJNÉxþ_1î{^GIEND®B`‚ -\ No newline at end of file -+ IHDR00Wù‡sRGB®ÎégAMA± üa pHYs"r"rÒm!ºIDAThCí™[HaÇgÖõ†˜´E¨O†‚PYA‘麲•^V -+Q³ ºøR$Foù%EÝ^“^ëQëÉ¢ëC=™Qi±»¥A‘Ùnë|ýÏÌY÷¢Â:óm®°?ø{Îùö›ùΙù曋Jš4i–6*Û„™0» 7TeAfx]VUuÊÿH~'4Éâ”Ç»O.è ¢Q%“ü"0ÀF(@£%‰äßчI.É);] ÅOI¨¢ zA`›<ˆ’•EúõC[x˜hÜÅÓË?›ÛË."Œ]‡f¬ rn #lM¥s¦z¨7ȃ–ýãÐM¡ß¨R<‚­i’XÑí'GE%­°·(ˆ¢ ÜfßØ6ÌIh“Þ°pèFZ -×£oã Š‡ŠJ-4oõÌb)›kú¤8Òã0WŒ(†äðyw•Ã×èêò69OÏÍVùÆ6š|éLÔW.³gÚŸ Uàˆ©Wɧ6þY:Ò Ú3{0kË8¢,‘yšéH-À»Ç]‚¸›Ã°`Ÿò×W—r(¹g êÃßèèuªf[ŸîYZFÆYXéH+Àçqn…i7"e´hàéë»^Ág4‰6Su•áËCJ¸m«Š¦^„~˾“‡}USm—ô¾‘R€ßS³O&NçG(•þFWø,IÁrÝî<#žã0LôQŽ9âBÑúh-c¹€œ¼P7n•%†)÷5ÔVø›]t—M úææ‡èÙH -+– -+ðí­^…=̵Æç ›6¬iâ%ùFS!”ž¯ îB-aí m½˜-„üiÛôö-aº¯Ç¹îQgÕ†%®q8¢“öÁiÌŸa»€¿v#ˆÉ>é.|Ü…"Þss<ØV=Ͼi,L!QÏÎ,°ì¬öz\‡¼M5‡Ñ/þ ”öLc¾UùÉÞ\Øq¥öÃÞÐýy@¡?Ø5é08½\[ùî9¥õû¦±ôNü½®®àOn TÑŒ/ cSEÎTöÇÐPÂg`¾<é‡z¹Œ£;¤ ”“‘Z -4…&Œ.1T°M%6°fœ*[ýÕë‰ðê€è“È¢B9@ )(ÊÙ¡Ï]8ƒ0ôj)1€ë´9\=t=‡ýˆ'HÚŒFôeÎ0L'¢8Å¡PòFÎD4 -+¥*ôun;§«3kýFút½¢ŽÅÙòÉ"}îC÷pä—Â,I“&Mb(Ê?µR{"!IEND®B`‚ -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/chip.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/chip.png -index 973fabd052e389c28ef36c482cf44d764795a3b4..db0cadac1338a971b7b890c33f5920580c1013a5 100644 ---- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/chip.png -+++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/chip.png -@@ -1,165 +1,5 @@ - ‰PNG -  -- IHDR00Wù‡ pHYsÄÄ•+8$iTXtXML:com.adobe.xmp -- -- -- -- Adobe Photoshop CC 2017 (Windows) -- 2018-07-25T21:37:27+08:00 -- 2018-07-25T21:38:09+08:00 -- 2018-07-25T21:38:09+08:00 -- image/png -- 3 -- xmp.iid:d24b6914-04d7-6e40-94e6-a3f5f4d24f35 -- xmp.did:d24b6914-04d7-6e40-94e6-a3f5f4d24f35 -- xmp.did:d24b6914-04d7-6e40-94e6-a3f5f4d24f35 -- -- -- -- created -- xmp.iid:d24b6914-04d7-6e40-94e6-a3f5f4d24f35 -- 2018-07-25T21:37:27+08:00 -- Adobe Photoshop CC 2017 (Windows) -- -- -- -- 1 -- 960000/10000 -- 960000/10000 -- 2 -- 65535 -- 48 -- 48 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --Ú( cHRMz%€ƒùÿ€éu0ê`:˜o’_ÅFfIDATxÚ왿kAÅ7žŠ§‰zI0¦ b!±Hs˜€ ˜J‚¦I© Zè_à4ÿÄÎNT4juD´°ˆ¤V‹ÃF¹Ï³pÆáöfãev—0¾ÕÛ™yogç»3ßI’M¸ ü>£7|~ó7 --4€pÓæ$õù‹ç’v'! ©hÉÀ¼´¸wËâZÀ>‹;% ÀB(cÎ@+ŽÈ†Å5nEÿbÌâÎ9ý.EÛÕ@ ÀèŽ#ò­Å½qÚ.[’jV»ÓŽ I(OÌ M`Âá®Z:®8Ü$Ð4m9\X3Ü:0Ì€¤ --PFRøqIã)æG€º¤J‡v{Y` ‰èüf§Uà{ñ¸´Y$Õ¬èw¦ÿrð[Òp&}À³`ìNóÌWå `BÒ¯>O'õ" 3^}ÀϲÙÎ68äÕL÷$Ý·b˜´>³B ˜±½ú²üÀÒ $[] lÕ8f¸¬JúÐà5p­ ¼ú< éx‘ÌÞª»¾2Žyõ×÷ν*Ñ'äÕ³P4ÐcjI'J²ºëëq3:öêëq;:žÌ²~šr`xœá@z*Yô%’ÚG6»vY†EìÓÓh¡LQ錤³íæ$í)É̫ø”ÒÁP-øL\õêót2W°Y¯>`#…\öl`À«.JZlp²ÖÀgå#fl¯¾,Yè²)÷åõö„(ðKšÎ!Ž†®TïêÆIêû߶ÁËìñž8ÞGñž8Þo»{â?¨‡ÌîH‘IEND®B`‚ -\ No newline at end of file -+ IHDR00Wù‡sBIT|dˆ pHYs‡‡åñetEXtSoftwarewww.inkscape.org›î<¤IDAThí™AR1E;,ô*à‘8†(=§°\ªK)VºáÀ„ýsÁP ™a2!"T^‹Îïî©üɈd2™ €°(>íøèsv̵ã]˜P€=Ac5}ã]tBÿZ7à ˜ëí¨‰k¤!~ L€gà*´1;Iøt§È7ÐÓ*¾sââ·|ÁÿQF Šßò¨ÑÀÔ}nƒ…«yn€W+×DCxe‰Þ)Ô{(W×Êõëãœc »nk综}€WÁ¾uØñ´õN^ñ¶W©àï â…|ã5¦P?ÑX©o`$"ËPá,eSÛÁ«ë÷Øz—· -+¹ÔäRsy àé…jÆ7 Wë…*›Dá7nñ®ÇO½…1æ¾ü…ÆZ$+":^èXïTëm|ãóYjÚ4°._áD¢¤mf9êÛ40³®ÇD8™º"2vä>Jøŵ¶Gd¨ÑÀ5ð“ øw4Ž‹&úlÎ*OY|W¥øR_TOë4XÚxÜùü†&5Ú^¨·ñ çþš5“9sþ -+/º„°M+öIEND®B`‚ -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/folder.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/folder.png -index 0f1e987d6aa24b1d2f26d40181ec05b62c5862da..11a76b5c1256ade016d4e22cf048656cb0788ad3 100644 ---- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/folder.png -+++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/folder.png -@@ -1,3 +1,5 @@ - ‰PNG -  -- IHDR00Wù‡ pHYsÄÄ•+ÐIDAThÞíš1kA…Ï ‘‡¥X[‹ 6!¥Õëì,mS[Z‹? Â?«¤!¤yØh!6‚$i’Çùlva2¼„„·fwe s·ØåÌìwï,3+UU­¥È/€x%¥U7Šˆ.>ŽˆEDüt€l¿²ýÃ6]®ŸÚÞî 9€w¹±²¿f¼?È l?Ïg}l1û;ô§S`v›þ“¤ àB>”ý â»À“[­B¶éù™_%ýþ´Kú;Àû”Ò™$ùôOGŸ)¥ïѲ›×vEÄ…^ÒãoÀÓ¦d¾Õ±¤e¯¬®o¼îg¹ú("^«¨"çÀÜö蘱-`ÞzìôEù¢ì~Û{Ùz^"t2>Éü6M—¼“ùú,ü¦ Iz¥âWƒ.QZÎÒU¥¬<’º*îI–ôkðßúÖ_é>…$Öy#IEND®B`‚ -\ No newline at end of file -+ IHDR00Wù‡sRGB®ÎégAMA± üa pHYs"r"rÒm!çIDAThCí™;KÃP†AŠƒ—Eg'Á (Žâ}ܪTÁAœœü þgqÕQ]DPtrp²Žµx¡õùNNÛ¤íÐÆÄ“Àyàá;'ms¾7MSš¦,K²qt­P*•Ú)‹8ýØA¸Å=Çq -+îô ù|Æ°¸Â´Þ}´°ÐþȪ!}ÃOY-"¢ ÁÎÏÕ2ÑMvÚ‡µ§NWQ>Ð-ÁkÒ(͆žà!Nêeª°qkÙÕ‚ׇ¢L°r`Û°Çú¸×5\:ó”%¼VÂC.ûÛxDõ ÄZJº&ÂB×dà$C=–‰‡8Ñã?Áþ;);8®6´Ž|‘Na·šUy Ç!Y ƒµH¨Ø@?r¡yTùltúÄŽtŽ²ïÎ|$#€æMW/]I -+ÐÀ46€ilÓئ±Lc˜Æ0 ` Pt‡>êîZÇ€F=%À»;ö1¬kœÕÕKN~ñ÷â·ú_å³(·DŒ"=à:ЋôÜ£Þg¹ •$NÇY.¡Ü ñ#Þ$Ÿ8A€{ubpGÙ™ÇéqSšw§x'æñ ãŠÜ›Õí*ê.M‹Î63À4°ô|øèÞMÁ¥CN8ÂÝ—\brò[òò¾oŽç¹Ë]B ’†’îHú!é@Í0’´ZGgHü¤¤7 ‰Îs éŒOÇ¡Šâ¯€Ëu&!\ô&bG²â_Wœô`×ÆóÀ=oß¾ÇÀ ðØqòwE`ÛŽý—›À’gbµúÄ%mz–ø¬ÓsÜÉŸËÝ¿oó·rù/6¿‘Ëo9cÝ÷i*ýIOå²÷´A)Vüs`¥Y9ñpf¾sâ¡`Kš ›ù«6õøfãàºHš³ñ¬3„›‡ì4˜Îåö:•Ë Œ?ô,·Y—ú©*z ¢7ñCàZåh ¯I§ÉÎàÎZKcj"´‰gù¶ùLö(ÿ¾úb?%žHzdãÉÂʲfŒÙ×k`¡†˜*ü,jx8I{_œÍ éCËç½Ëù"}eNš½0QÆ@õ×y x÷€¤i` -+8\hUQ$¡Xö÷À\ §üoÛqtÝ@áãÛuë’ö$íJºíkˆþ+‘€cözÔWìú -+ÒHMo 5½ÔôRÓHMo 5½ÔôRÓHMÈÀ¯VU”ë)d`›ìïtWðÖWð0Æ|n£æ4•f¬c>ùŠK ‹~·BµIEND®B`‚ -\ No newline at end of file -diff --git a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/star.png b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/star.png -index 90d423a1d4c1e05ccec0a01fa34abca9fe99676d..546779e2a810e73169f65a79850aa07dffd70267 100644 ---- a/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/star.png -+++ b/dist/qt_themes/qdarkstyle_midnight_blue/icons/48x48/star.png -@@ -1,4 +1,8 @@ - ‰PNG -  -- IHDR00Wù‡bKGDÿÿÿ ½§“ŠIDAThí™=hA†ß1†‹r(Î…øÓ(ˆÂùS¥ò+­¬ "be›&VÚˆbo§¨•VV*jZ!1ç"sQ“Çâöp¸ÜííLf²"÷ÀÇÞ÷}ï;3»3+uéÒ%@(ç­Ã  øž\ý±ê¬Š•XÒˆ¤br]ŽX'<@¨ð—*З·®ÌXÊù¼uexÛÂÀ{Àä­­#ÀÉâœÈ[_G€ç)žå­/`?°˜b`8²fè×èuIiëÜHº¸f€-À\Êè7¨¥PuCÎÀIYÞõýkÐG}³ÊÊ4°&DíÕž‚û%m“´CRIÒ°¤­)6Kº ¼”T•4)é‹1æ««–%0$i»¤Á&‘ƒ’’{±Ž5IS’*’>Ë2—üž2Æ|j Œ9,ƒ¼¸ikn~ˆ?HZ8¢1˜L½ œ~ä=Ì-ø Œd²frlSÎ9Í°˜ÈY8À7`ØI¼ebx—£ø --pÐK¼ebð*ñãÀÎe‰·L€G+(þ5°)ˆxËDpoÄ?ÖßdäFDñ¯ã«‰ÛÄßÇ£gö=N=ãÒ˜7Æàäkà¨g\G|‚œ§ (Jš•ÔãS0…_’Öcæ\‚|f ¬ðâ%©WÒ!× ^S+w×@`â-fª’.Jº$i:cÌ.B!l€³6¤ŸÀ`WF©Ÿë;q:¦N=ó`wJüÞä?iŒÆ4ð¢MÑqà”CžãÀÇ6¹žÆo¨wG63À5Ày_z“ØÙ9ÃGH¦¿Á¡¿«,"M"2®Džõª|ÉsQD–„Ê­À§ùÛEäž1¦;5X¼£rüF9xGÙ¶JñX˜f~ ð-ƒÀÉþS¹¿£“Ø›Qà.P—À?¸—QcO˜S¿“Uù¹ˆÜ͸_D侈\5ÆdŒù4‹Èr™'"#Kàn‘†½ªl{€#@m B^ÔZíåé@R§Ü/Úc`Ê?4?Åjjü&¥u^g5º€ÍÿÀüf¢[ðÀüÚRIæ/$ }e= -+œ‹Ñlæ—KXœ!lx4?‡èV<À…Ll -+âßÀæ·à~ï -+À¦¬üHðÐ!Ò,Igˆå]Ft•Áj5¤3”'V vê½~9œ·r˜<—m¢GÄ7¸ôž«´U&„J¶ÓTùCÞ§p§¢’Ö¨rÅSÈÑ7ߣ&žèÄ\øô¬[”à«„Øz`©}êâ^)Ζ|ÜÅÎ+±CŽ˜`; -+Àn ÆHqžÏËü@¢‡F3–â™ €ñªÏ\Så‘ÀJ%ô–ÐE-°øœ`>@'¡å’â…p»ŠY‘Gg”ÈQ[?8cö£}\8Œ4pTµñm~СDš€éÀ“ƒ7€Ñö¹óÄr4©ú ìoBRz¹ûl%º¤BñkO/cëôå–c+Ñ_ÊÛý©‹yÜõÈs`vÏlã‚ælö™@=ð#F8ÀiJøQüÇø€üÀ¸Š6ÕIEND®B`‚ -\ No newline at end of file -- 2.36.0 From 2934fa32ea200b45e80da5c2fdc87ee4500cc4cf Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Aug 2022 12:43:43 +0300 Subject: [PATCH 34/45] kde-frameworks: 5.96 -> 5.97 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../libraries/kde-frameworks/srcs.nix | 664 +++++++++--------- 2 files changed, 333 insertions(+), 333 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index d839e142cf6b..c677884c01fb 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/frameworks/5.96/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/frameworks/5.97/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index d707ffdf0d3e..eb49fa51b862 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,667 +4,667 @@ { attica = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/attica-5.96.0.tar.xz"; - sha256 = "1xlg2sbfd45p9dw0sprpk0fancasp4idxacsf5xksf2ddn2crzp7"; - name = "attica-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/attica-5.97.0.tar.xz"; + sha256 = "0ciq7dbr027g8dgkfs4l3ys9fdhxlgkr0hd1mip3fngwcjn2my65"; + name = "attica-5.97.0.tar.xz"; }; }; baloo = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/baloo-5.96.0.tar.xz"; - sha256 = "1icpxmmxhvgdr6zxpz0wybc82nyy595cmr09067i82kh7v5dj66l"; - name = "baloo-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/baloo-5.97.0.tar.xz"; + sha256 = "0s2rpaz5dk0zixm6x51h6h9g4997g3sjj6mmqjx2fnyaxh79r1hz"; + name = "baloo-5.97.0.tar.xz"; }; }; bluez-qt = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/bluez-qt-5.96.0.tar.xz"; - sha256 = "0yc7mq9bnanp5dfv43vp8wpqw5l8qh4aahqpi9sid7jmd6sbywl2"; - name = "bluez-qt-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/bluez-qt-5.97.0.tar.xz"; + sha256 = "16gawrq75008r70hjf38fk7w9y1ns2x9vrxs953gbg58ygaryfh3"; + name = "bluez-qt-5.97.0.tar.xz"; }; }; breeze-icons = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/breeze-icons-5.96.0.tar.xz"; - sha256 = "1ij723qy6xfkys8a9vp2ll2z2yp7667hfw559gi8cxn825hjx823"; - name = "breeze-icons-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/breeze-icons-5.97.0.tar.xz"; + sha256 = "18vij7ihdyd6mar971yci2925c2j5l9q0479931h563ph8i49bkf"; + name = "breeze-icons-5.97.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/extra-cmake-modules-5.96.0.tar.xz"; - sha256 = "1ngxjvf584zgfb93s5sbr5f5nyw0sqc5i0jlbcgbrjg2n83l9ddx"; - name = "extra-cmake-modules-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/extra-cmake-modules-5.97.0.tar.xz"; + sha256 = "02n5xywig2pksbkxfckd0dn97mdn6qjv3shyqryscayqvbrkblly"; + name = "extra-cmake-modules-5.97.0.tar.xz"; }; }; frameworkintegration = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/frameworkintegration-5.96.0.tar.xz"; - sha256 = "19piq6h51qh64nbkqnpy6jg91vbl67vg2sh4hlwzsb2lcrmwxgk9"; - name = "frameworkintegration-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/frameworkintegration-5.97.0.tar.xz"; + sha256 = "1srj8gnvb3mhppiiy2p489vwj0rcq0j91h4q4halmbl3hd9j4s1v"; + name = "frameworkintegration-5.97.0.tar.xz"; }; }; kactivities = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kactivities-5.96.0.tar.xz"; - sha256 = "0g16k3v6i20rc6h0js4pk00d6yg236bs0kxj88q21d5c934hbksk"; - name = "kactivities-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kactivities-5.97.0.tar.xz"; + sha256 = "0dyg0rd8cwc3vyb7p3d1n5c670d4f87s09q017ml88pndxpbnbfi"; + name = "kactivities-5.97.0.tar.xz"; }; }; kactivities-stats = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kactivities-stats-5.96.0.tar.xz"; - sha256 = "0lfanv55b7zx5s0a7gh4r41w9yb641j1zjjcvdjfrj7pdh52576s"; - name = "kactivities-stats-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kactivities-stats-5.97.0.tar.xz"; + sha256 = "1nwbp36p8hk6wwyf4mq4ijy57ig6lass8kyla31dkhy95nqc79p8"; + name = "kactivities-stats-5.97.0.tar.xz"; }; }; kapidox = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kapidox-5.96.0.tar.xz"; - sha256 = "1w5h4xwscix0yjn8d0rcjd7hlmrnbmkjg20diqjabb5wcxsrjiwi"; - name = "kapidox-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kapidox-5.97.0.tar.xz"; + sha256 = "0rg91cv60r4my7cvj9kjrp06jghgk5kwslqi8b5s9hjh2c0w73wx"; + name = "kapidox-5.97.0.tar.xz"; }; }; karchive = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/karchive-5.96.0.tar.xz"; - sha256 = "1bra1q225xhh8dilwmzc0jgnj5m3dmi4nkz4y8f42si97b4xxxf5"; - name = "karchive-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/karchive-5.97.0.tar.xz"; + sha256 = "14ldrbkzlm59sjysirvj8yhihgyy4x85w54ydj8khnmvvm4q5zqv"; + name = "karchive-5.97.0.tar.xz"; }; }; kauth = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kauth-5.96.0.tar.xz"; - sha256 = "1hi36504bbr0266wl08kqiq61xysl3dw3kpgjfbgx169m0m3gmx9"; - name = "kauth-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kauth-5.97.0.tar.xz"; + sha256 = "1xa2r9qwi0h3740f07dj4qxzvr9qgaqjjwbf3lj5g1k2nd9wakfp"; + name = "kauth-5.97.0.tar.xz"; }; }; kbookmarks = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kbookmarks-5.96.0.tar.xz"; - sha256 = "131yng8wmxrnf3x1i6gg60q3rrya19yk4jnzi5ylafvaw7q2r8b4"; - name = "kbookmarks-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kbookmarks-5.97.0.tar.xz"; + sha256 = "0skbw5m3ihg8v4g46gfvbvgrhdfav6sx26l9jcjx0pfi85ksqvbp"; + name = "kbookmarks-5.97.0.tar.xz"; }; }; kcalendarcore = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kcalendarcore-5.96.0.tar.xz"; - sha256 = "181yif830v4gg7nw9s15pvgfm98rmm6xwi2xxy3nxg7nkp14vs5k"; - name = "kcalendarcore-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcalendarcore-5.97.0.tar.xz"; + sha256 = "1476yjbww2cwxnc84nmdgc3r7wi50hj2jjmh6qgfa8067w2sx9yq"; + name = "kcalendarcore-5.97.0.tar.xz"; }; }; kcmutils = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kcmutils-5.96.0.tar.xz"; - sha256 = "0vff93kja9dq8rf1aapxpfgjxsinm75f5nydxqcihskp8girz0c8"; - name = "kcmutils-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcmutils-5.97.0.tar.xz"; + sha256 = "0xasda9bi455fmmqdhmapdm6n7sg5m1kgvzh5zx7r43s6jshf6dd"; + name = "kcmutils-5.97.0.tar.xz"; }; }; kcodecs = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kcodecs-5.96.0.tar.xz"; - sha256 = "05266wjxmzf3qpb2xwlm40cr9h266l5r9dqww81m8bq856pf8ivi"; - name = "kcodecs-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcodecs-5.97.0.tar.xz"; + sha256 = "0w16il3gqy76x4l7135jgi1sfxz4yl9zss2r53mgm583m0bybrk3"; + name = "kcodecs-5.97.0.tar.xz"; }; }; kcompletion = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kcompletion-5.96.0.tar.xz"; - sha256 = "1jmrd2mfz27qfn6dq1mk6bcqlagmifbf9vnayi1mkqa9jsj4dwdj"; - name = "kcompletion-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcompletion-5.97.0.tar.xz"; + sha256 = "19lygg1x12yx41rrh1fklzhrg86nbhg6cji2i25g50ycsd7f1cba"; + name = "kcompletion-5.97.0.tar.xz"; }; }; kconfig = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kconfig-5.96.0.tar.xz"; - sha256 = "1xa8xxm2x9783fqb26wyvg1mp6ybjikngznqdhsk9slhaca73yhz"; - name = "kconfig-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kconfig-5.97.0.tar.xz"; + sha256 = "0bgnagh8kljakvx9rg461fvispf1f37pcd8z9qxr6flwgw67gzlh"; + name = "kconfig-5.97.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kconfigwidgets-5.96.0.tar.xz"; - sha256 = "045j6gkp5sf1lc12zwlkr1dz0fd89yrg5b31j4ybk3dyc8jz90hl"; - name = "kconfigwidgets-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kconfigwidgets-5.97.0.tar.xz"; + sha256 = "0a44qp3c3isi7xgjcqhs0npiisgf379nxlswmyblmlm00rn03ii0"; + name = "kconfigwidgets-5.97.0.tar.xz"; }; }; kcontacts = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kcontacts-5.96.0.tar.xz"; - sha256 = "075mw7clqf7qycngly21q3m0js3g8pcgqc2x3alp28f4zq3c8m21"; - name = "kcontacts-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcontacts-5.97.0.tar.xz"; + sha256 = "026rjgmi6lgvm30799klkbcmwfhzlixsbdqyjvzcpsszxh0nj6dq"; + name = "kcontacts-5.97.0.tar.xz"; }; }; kcoreaddons = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kcoreaddons-5.96.0.tar.xz"; - sha256 = "1n5mzj02si8allg907l6vn77c2i95qdgfvn48gsqgalwlyd4q6nj"; - name = "kcoreaddons-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcoreaddons-5.97.0.tar.xz"; + sha256 = "1ah28900l7j8nb3v3q7xsmmvrq6cv63b8gyisbcw6kryhw9kah09"; + name = "kcoreaddons-5.97.0.tar.xz"; }; }; kcrash = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kcrash-5.96.0.tar.xz"; - sha256 = "05sw3lh4lw5jgl7gvxvpyl6nims9j4b1hjsn365fa2p48qmsx6v5"; - name = "kcrash-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kcrash-5.97.0.tar.xz"; + sha256 = "1ipmm012v9zvxf7fxcl811xzxw9h6a6d6lzmnn589h9h3n6j8wgg"; + name = "kcrash-5.97.0.tar.xz"; }; }; kdav = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kdav-5.96.0.tar.xz"; - sha256 = "1zqib8km4fg9aj4gmhx4hm7n7bbrz62l41qb48nz1pc3qia2x1wl"; - name = "kdav-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kdav-5.97.0.tar.xz"; + sha256 = "1nx5zks5svxszhnm4732w9kh17p20bh66z90gl77zxgixqsq93fm"; + name = "kdav-5.97.0.tar.xz"; }; }; kdbusaddons = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kdbusaddons-5.96.0.tar.xz"; - sha256 = "1y0fd0a1nwgchsk3vx8hvvkw96f0l0533g57xakq4j4xkvxd8l3y"; - name = "kdbusaddons-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kdbusaddons-5.97.0.tar.xz"; + sha256 = "0b8j2bj4zn7a9yhba44almsvq1s6vg7s3s5gr97mj7mz2hlyiiqk"; + name = "kdbusaddons-5.97.0.tar.xz"; }; }; kdeclarative = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kdeclarative-5.96.0.tar.xz"; - sha256 = "1x4r231g0l5im4ala21m5fz5q6nixbx0z6lfia5zjinzlp7x5534"; - name = "kdeclarative-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kdeclarative-5.97.0.tar.xz"; + sha256 = "0w2s3139xz7001awzs9wpjd23qp5hxzw0k3sgljnwqa36scd4s5y"; + name = "kdeclarative-5.97.0.tar.xz"; }; }; kded = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kded-5.96.0.tar.xz"; - sha256 = "0x40yvcx2gjb4pngyk2vfrn3z7dbyvksbj1h3ck04fyyma8z3gb3"; - name = "kded-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kded-5.97.0.tar.xz"; + sha256 = "19znbzhifix0r2wzsr5f7fj839ymlpjwlpagpkwsx57pg21k9p2b"; + name = "kded-5.97.0.tar.xz"; }; }; kdelibs4support = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/portingAids/kdelibs4support-5.96.0.tar.xz"; - sha256 = "18f99g1g1z1mrkgq3l8kgxjxi60a632p0sg8d46r67b9n008w9m7"; - name = "kdelibs4support-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kdelibs4support-5.97.0.tar.xz"; + sha256 = "04a14i0g59wj54lzq34s8av9mxkfw8jcvlgv3pg87l8xwq4xvpqs"; + name = "kdelibs4support-5.97.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/portingAids/kdesignerplugin-5.96.0.tar.xz"; - sha256 = "0cddad1rdi06l28iiwizfds78dplbvv7j40vphww0ix7cmsh3rh9"; - name = "kdesignerplugin-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kdesignerplugin-5.97.0.tar.xz"; + sha256 = "087xycnizfw7psnha2f9v16nxphvdnly3ymqywcjwv213cd7y1r8"; + name = "kdesignerplugin-5.97.0.tar.xz"; }; }; kdesu = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kdesu-5.96.0.tar.xz"; - sha256 = "1wjjjwpfjr7sx10x0236zqjx3jrw6mz60724s5qg269dwfbpahvj"; - name = "kdesu-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kdesu-5.97.0.tar.xz"; + sha256 = "1csgsrj1jld4p9rqpda4c9wckk224m6zyhhybfqh0mhz78pvcbk5"; + name = "kdesu-5.97.0.tar.xz"; }; }; kdewebkit = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/portingAids/kdewebkit-5.96.0.tar.xz"; - sha256 = "0l8nnar4s84igxih5w0fhwd9nvccp7zm53jy2gk6lfbj6gqarfbf"; - name = "kdewebkit-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kdewebkit-5.97.0.tar.xz"; + sha256 = "1dijacbg76mn9l13fk8cl0kgj98g8wkky3z1210x65gjgqgzl97f"; + name = "kdewebkit-5.97.0.tar.xz"; }; }; kdnssd = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kdnssd-5.96.0.tar.xz"; - sha256 = "1d3jq64gyj3bc3sf46gnpbmjrm809hva47z7fkwkk9i2lmnmy70w"; - name = "kdnssd-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kdnssd-5.97.0.tar.xz"; + sha256 = "0lmlwb4b06fy8myvai76srx4i1w60vw58mn14sy7l88kr28xc12d"; + name = "kdnssd-5.97.0.tar.xz"; }; }; kdoctools = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kdoctools-5.96.0.tar.xz"; - sha256 = "04nk87dbmnf9840401s40mxlsfh9is1l1mqky9xi5mcghbp0308b"; - name = "kdoctools-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kdoctools-5.97.0.tar.xz"; + sha256 = "1xha2l0sqf4zyqbwglfc946pw483fcl9g43vlmnxrk9qsfr75b31"; + name = "kdoctools-5.97.0.tar.xz"; }; }; kemoticons = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kemoticons-5.96.0.tar.xz"; - sha256 = "03b5axwvd6ayw1kbl1jv6h04cihp1y1pa835gs3m1qx2ivgj7f75"; - name = "kemoticons-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kemoticons-5.97.0.tar.xz"; + sha256 = "02ii85h7l508xhf9f05pfw0c4vldr102v7lbygk5mlrcpgmgqnp2"; + name = "kemoticons-5.97.0.tar.xz"; }; }; kfilemetadata = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kfilemetadata-5.96.0.tar.xz"; - sha256 = "0sh3malq6007fp5m4hica20ha8z5abqzq5ifcmrpm8zqmm5aa2bq"; - name = "kfilemetadata-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kfilemetadata-5.97.0.tar.xz"; + sha256 = "08bhs3nq5q362qfqhz3z4znm0svbjy8blcdgy3l0smfpfr8xhbrz"; + name = "kfilemetadata-5.97.0.tar.xz"; }; }; kglobalaccel = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kglobalaccel-5.96.0.tar.xz"; - sha256 = "1sx4fmy8xy22im0i3dw0xdmxrgw2jhnk2wsfy2xw74dsj3adg2iq"; - name = "kglobalaccel-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kglobalaccel-5.97.0.tar.xz"; + sha256 = "0cdbwyckad5a7rlv1kcmpp51q32clbi86cbggap9l9r8h99x7i75"; + name = "kglobalaccel-5.97.0.tar.xz"; }; }; kguiaddons = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kguiaddons-5.96.0.tar.xz"; - sha256 = "028kn9lcvzv8f8b17a3clki7013dmhhcp1l9svvf6hydv97vkfbv"; - name = "kguiaddons-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kguiaddons-5.97.0.tar.xz"; + sha256 = "10kmjq38ykbxhp5vr797vmgcv8jf28g2nrkx0j3myhwq1xgmjy7v"; + name = "kguiaddons-5.97.0.tar.xz"; }; }; kholidays = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kholidays-5.96.0.tar.xz"; - sha256 = "0rcd8k2x1w6jszxj18pkzimn5q4v2k7zs9x1pfwszn7xl59b3n4k"; - name = "kholidays-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kholidays-5.97.0.tar.xz"; + sha256 = "0b5qr7vmrshp5hghxbab0q26i01aafw2za4qmj779cj9givpm3vj"; + name = "kholidays-5.97.0.tar.xz"; }; }; khtml = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/portingAids/khtml-5.96.0.tar.xz"; - sha256 = "0lc933z4568962xj7grzy44aj97h76s5vvv1cnj351dzwr5qahpx"; - name = "khtml-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/khtml-5.97.0.tar.xz"; + sha256 = "14dv3734z0m53rc1clx4qdm020pwc251ac9dvmpvg2x294vlj5kc"; + name = "khtml-5.97.0.tar.xz"; }; }; ki18n = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/ki18n-5.96.0.tar.xz"; - sha256 = "1jry8bdjgxkcqln7awkj3k8996lh76vya2mf5kwpyxagk6vmr0gy"; - name = "ki18n-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/ki18n-5.97.0.tar.xz"; + sha256 = "07hyz3vaqwd12g92gwrmzd3p2wx3qksfnnd560kan5f8g1pnsbq3"; + name = "ki18n-5.97.0.tar.xz"; }; }; kiconthemes = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kiconthemes-5.96.0.tar.xz"; - sha256 = "0w9m956xfpfxp7a63a5v2y10lb9zp2gqfjyfvq3ksxfl961g4hsg"; - name = "kiconthemes-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kiconthemes-5.97.0.tar.xz"; + sha256 = "04csm9hb6inp1v0471xsqgxim5748s2k1fxl5lzmpzmbmslcdwcl"; + name = "kiconthemes-5.97.0.tar.xz"; }; }; kidletime = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kidletime-5.96.0.tar.xz"; - sha256 = "13piv607n9hmlbd7kkhl7b1wcxj1jq2b5386c6pxrz5caxjwgnmd"; - name = "kidletime-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kidletime-5.97.0.tar.xz"; + sha256 = "0aq4qpplafzsipflfjf463xp5p68gpcfssdr8lpkx84lqqa0k89m"; + name = "kidletime-5.97.0.tar.xz"; }; }; kimageformats = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kimageformats-5.96.0.tar.xz"; - sha256 = "0dbl2varirp5f1bd8173jlhmkc3ql16yg0d6w04nc56hy973bkm5"; - name = "kimageformats-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kimageformats-5.97.0.tar.xz"; + sha256 = "04ajq25xh4iyxfnm658h6fd9z8ipn5dgwd640ax9walbp4pkd0zb"; + name = "kimageformats-5.97.0.tar.xz"; }; }; kinit = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kinit-5.96.0.tar.xz"; - sha256 = "1y7x80icm2jv9c8917481w1hs1vm2rvvvnc9drw4q7vrjzfx73dq"; - name = "kinit-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kinit-5.97.0.tar.xz"; + sha256 = "19ac8i0dvh6q2sqrgk3rjg231x5n4k6d4hd0vgjycyxjmi3aqmjq"; + name = "kinit-5.97.0.tar.xz"; }; }; kio = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kio-5.96.0.tar.xz"; - sha256 = "0xmvgq7cp1kkicmngxjj4cmijaah91jmfqdzzxziphq1rl23k64m"; - name = "kio-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kio-5.97.0.tar.xz"; + sha256 = "11sqcy0m3867ss9hgs5n7jmwck0rmdql2b1mp5q99d4fg98816yc"; + name = "kio-5.97.0.tar.xz"; }; }; kirigami2 = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kirigami2-5.96.0.tar.xz"; - sha256 = "12ir4q9njl60b242j9raj1xsjs0cizsk7bixwb1hssfn6fzpzqkv"; - name = "kirigami2-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kirigami2-5.97.0.tar.xz"; + sha256 = "016ny2pf34cll4zwxxfj0r4fjkvbm0mmac5z7d22dq6cgqrdz7j4"; + name = "kirigami2-5.97.0.tar.xz"; }; }; kitemmodels = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kitemmodels-5.96.0.tar.xz"; - sha256 = "1j6kffvgbd07zzzv0kab8mbwa69fmw4b8jczd0wzvmp56idsfc2v"; - name = "kitemmodels-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kitemmodels-5.97.0.tar.xz"; + sha256 = "0vxlajl8lvddxrwnq3zdcm4sj36r6nyczplwk97xsr5q52minpbw"; + name = "kitemmodels-5.97.0.tar.xz"; }; }; kitemviews = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kitemviews-5.96.0.tar.xz"; - sha256 = "1wr62z6jwlg40m8kl9bpiyzkyjmsqx0fhgwc01192k58nl2696lb"; - name = "kitemviews-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kitemviews-5.97.0.tar.xz"; + sha256 = "1ggv3lf1z5986g837kq0dw2pkwd032zzdx2c9zs5zal1y7aid6f5"; + name = "kitemviews-5.97.0.tar.xz"; }; }; kjobwidgets = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kjobwidgets-5.96.0.tar.xz"; - sha256 = "1w1h9vnlq1j72812558cl5dlq7f80nnh5i30qmkpbvv49xhhq2dl"; - name = "kjobwidgets-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kjobwidgets-5.97.0.tar.xz"; + sha256 = "16s2rjbmxz6x1kmnx9mg8sa42p65ps5jk074s86vg9qnhk0jxkf9"; + name = "kjobwidgets-5.97.0.tar.xz"; }; }; kjs = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/portingAids/kjs-5.96.0.tar.xz"; - sha256 = "0jhfjjpv5hzbib3p30ngn6ic023fnrvnr8jrbjdzyacjywj69vvp"; - name = "kjs-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kjs-5.97.0.tar.xz"; + sha256 = "1y6wgfc85smlp3kqxyma0h0nnn5z5hzszy0xdvbl76c1azby2n8f"; + name = "kjs-5.97.0.tar.xz"; }; }; kjsembed = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/portingAids/kjsembed-5.96.0.tar.xz"; - sha256 = "1z8h0n4v1qgs2lsxflrzhdfb91jna3y2dxal1qz7i3szjvrf63h0"; - name = "kjsembed-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kjsembed-5.97.0.tar.xz"; + sha256 = "07s0xpcvxslnyk6z6ilz2h57in5g4a1xa6yi896isqwihqc28kxx"; + name = "kjsembed-5.97.0.tar.xz"; }; }; kmediaplayer = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/portingAids/kmediaplayer-5.96.0.tar.xz"; - sha256 = "0qqlah4zi0b7b6yb4009kkjqw7fkp1lgvp2mcpxs8vbbshs3376c"; - name = "kmediaplayer-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kmediaplayer-5.97.0.tar.xz"; + sha256 = "14hc5kz98smihlnnf5lg5i6mw8xnblix7jaql2x1ym6vj7vbnjks"; + name = "kmediaplayer-5.97.0.tar.xz"; }; }; knewstuff = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/knewstuff-5.96.0.tar.xz"; - sha256 = "0kls40wlqkqirfjhf8kn83saxwahlh4rkm7iypqd81h93gi81fgc"; - name = "knewstuff-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/knewstuff-5.97.0.tar.xz"; + sha256 = "0k49zbypxw0b79nbmhc59q2bz4h0whaq72if5nfa4jdxrvfvn9yp"; + name = "knewstuff-5.97.0.tar.xz"; }; }; knotifications = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/knotifications-5.96.0.tar.xz"; - sha256 = "11fbqylchzvm0pfw8bvy03px5zcg4jbch39vzcvnl6si7vikm4qj"; - name = "knotifications-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/knotifications-5.97.0.tar.xz"; + sha256 = "07ylq0ynb66cp5v7p26j49w65kadza8zkww3wl32nnvi3qa68qz3"; + name = "knotifications-5.97.0.tar.xz"; }; }; knotifyconfig = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/knotifyconfig-5.96.0.tar.xz"; - sha256 = "09bcw47zp6rsnk7f83gkmlpylg428a7phn7bbi9mpkdpzc6zvfd2"; - name = "knotifyconfig-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/knotifyconfig-5.97.0.tar.xz"; + sha256 = "1yldfc44k1z7s1f3yqzdm0dgg84xlzqddllkrxc60cf6aaq7pnhv"; + name = "knotifyconfig-5.97.0.tar.xz"; }; }; kpackage = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kpackage-5.96.0.tar.xz"; - sha256 = "0gsxizpqa47apbvchga3f0w86v4jh8z1vyf0kifipz17fay4ws8d"; - name = "kpackage-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kpackage-5.97.0.tar.xz"; + sha256 = "03j184bnv7lnbx2srqxhv9q5klgr0dvrfdwhx1b56jpmxjrdf79c"; + name = "kpackage-5.97.0.tar.xz"; }; }; kparts = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kparts-5.96.0.tar.xz"; - sha256 = "0b68kyi7l3ndw798sll2hrzf6qq6w875n48sc11q6882xilzinh2"; - name = "kparts-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kparts-5.97.0.tar.xz"; + sha256 = "0l95af7c9m79z1pwyzzhdihd2wksjxy0vnl6h4a5qi35a553v0zg"; + name = "kparts-5.97.0.tar.xz"; }; }; kpeople = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kpeople-5.96.0.tar.xz"; - sha256 = "0q3c0ghxa9km5xcq6h0cwa7swfd18h491jpfafy4qgq3nwp0115b"; - name = "kpeople-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kpeople-5.97.0.tar.xz"; + sha256 = "1fy2dpfbhcmi0v08ik6pbb31z29m1g91l14p98ny3g6sy6r1l83v"; + name = "kpeople-5.97.0.tar.xz"; }; }; kplotting = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kplotting-5.96.0.tar.xz"; - sha256 = "1yqx260r3dzcinp8s685yzp5f2ihc0s1csckb9zv7z1bzljkn3h9"; - name = "kplotting-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kplotting-5.97.0.tar.xz"; + sha256 = "03pa2qbpm6qsc9v6i6wqr15jwjkgywzdwy7jl6cxrh9acdmy3ljy"; + name = "kplotting-5.97.0.tar.xz"; }; }; kpty = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kpty-5.96.0.tar.xz"; - sha256 = "15swvv6qhvc654wyvxzbjbnzrd2vwn0mr4lby1x6x5f4c9br0cip"; - name = "kpty-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kpty-5.97.0.tar.xz"; + sha256 = "1i0a53l1ik44blxy7xg3lf2l2x2idxfrxn1rnjdgm119klysdic7"; + name = "kpty-5.97.0.tar.xz"; }; }; kquickcharts = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kquickcharts-5.96.0.tar.xz"; - sha256 = "1sd9mfxk72xfa1kz77s7z312scfm0vwvvgmyi4pypb9cs7d9dq3j"; - name = "kquickcharts-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kquickcharts-5.97.0.tar.xz"; + sha256 = "1v2zky53hvwbqnbh0wj8n6rp0lp59qii4k5gm3j2pfcjzrdj8an1"; + name = "kquickcharts-5.97.0.tar.xz"; }; }; kross = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/portingAids/kross-5.96.0.tar.xz"; - sha256 = "03dvg2jh9587kcp2f9nir727z0qvkcywrgxfi1p1hxq1bx6y8fm2"; - name = "kross-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kross-5.97.0.tar.xz"; + sha256 = "0143l7nxq0j207cjvs0srcllvfyzpwrzxmcrdl22hrj951j1aq5s"; + name = "kross-5.97.0.tar.xz"; }; }; krunner = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/krunner-5.96.0.tar.xz"; - sha256 = "0wd2nmhw9mb09mm88cnkmirwgxdnvkrkyjvaiqh9k74xqsggnplk"; - name = "krunner-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/krunner-5.97.0.tar.xz"; + sha256 = "0addv0whngqzfvsi1gcsiissin3sa7gg8n5kd3nnp03w7kqbapr9"; + name = "krunner-5.97.0.tar.xz"; }; }; kservice = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kservice-5.96.0.tar.xz"; - sha256 = "1zg3a35my8ba5ikmlg9s3wc9r0s5a2x0rggiiv9znhfi3snvi6gd"; - name = "kservice-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kservice-5.97.0.tar.xz"; + sha256 = "0bi07qdnl99g4kwxikh5nb4n6ihnn5hg8g1sl64jkggd06l1c03d"; + name = "kservice-5.97.0.tar.xz"; }; }; ktexteditor = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/ktexteditor-5.96.0.tar.xz"; - sha256 = "071jx26ycyk31bh167cq5fwx8xkr4ldjg8zlhn9dh7wa3rjpp183"; - name = "ktexteditor-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/ktexteditor-5.97.0.tar.xz"; + sha256 = "02hwh736zlb98vkd83sz8a2ywqcv3wbik2pscdg746ff2pvqnwlb"; + name = "ktexteditor-5.97.0.tar.xz"; }; }; ktextwidgets = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/ktextwidgets-5.96.0.tar.xz"; - sha256 = "1vab4qmqq9268bwzx6xia2bcz8rdmiwlgjkbkk8nci2pnmhjrzpj"; - name = "ktextwidgets-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/ktextwidgets-5.97.0.tar.xz"; + sha256 = "1kwa52f1nyidxjkcipp5r3p1cp5m4xdm57cr77vv9krzhcaznhmx"; + name = "ktextwidgets-5.97.0.tar.xz"; }; }; kunitconversion = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kunitconversion-5.96.0.tar.xz"; - sha256 = "1qls3319gwn1nzaq04wrqjhbchk0s0pfx97m4za63yzvapvym73g"; - name = "kunitconversion-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kunitconversion-5.97.0.tar.xz"; + sha256 = "1pspm7ka6yvy7pbdsfliyzr0xi20m8krd4qvy24jy4rn0wa5xy6v"; + name = "kunitconversion-5.97.0.tar.xz"; }; }; kwallet = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kwallet-5.96.0.tar.xz"; - sha256 = "0rj610c7i66fbv1x0i0sfn9mac8fkqir4vwgaq1ad5i9ca36h1jq"; - name = "kwallet-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kwallet-5.97.0.tar.xz"; + sha256 = "08fqjxsnqiifp5knsb0w5ajx5713c1z4p5s7cbg6395bqsq7i6xb"; + name = "kwallet-5.97.0.tar.xz"; }; }; kwayland = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kwayland-5.96.0.tar.xz"; - sha256 = "0dcnsiippwxvwvf1gvp75lx97c4nydzn3x1l8lfy86w9lfslw7zb"; - name = "kwayland-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kwayland-5.97.0.tar.xz"; + sha256 = "0g6a618kdgsra0b7mkg3hyvxm3lzwnmz5j2mlkhmmkfci5n02wg5"; + name = "kwayland-5.97.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kwidgetsaddons-5.96.0.tar.xz"; - sha256 = "1igbkrn8qaalan0lyn8r2gqv5v3rwbmb3xv3w26yw77vwp0n789r"; - name = "kwidgetsaddons-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kwidgetsaddons-5.97.0.tar.xz"; + sha256 = "05xcnrv27m7xfhgkfmgrbrfg6m6bb3p65iqb8gxjjs0357jcgh3s"; + name = "kwidgetsaddons-5.97.0.tar.xz"; }; }; kwindowsystem = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kwindowsystem-5.96.0.tar.xz"; - sha256 = "1ilb3zl3mlndfrqz6gi28x6qqqs45l65d0wmy3lk07lppcw3wxzx"; - name = "kwindowsystem-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kwindowsystem-5.97.0.tar.xz"; + sha256 = "1wgybsf3n16q66pkgcg3hjypmfl9cam69bcz98xf074s6ybaf8mq"; + name = "kwindowsystem-5.97.0.tar.xz"; }; }; kxmlgui = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/kxmlgui-5.96.0.tar.xz"; - sha256 = "1hiz2fgwpc4mgh2zzir0qi18pjsc3052lf888rc1pgql90faxb1k"; - name = "kxmlgui-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/kxmlgui-5.97.0.tar.xz"; + sha256 = "1xdd30r9a3f611h8kmk53mybyil870159b7qr7v13g5asqlpkwds"; + name = "kxmlgui-5.97.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/portingAids/kxmlrpcclient-5.96.0.tar.xz"; - sha256 = "1jrmrzcvnnw7q7pxgfpcz8608jmxqxf89habmgwv71b8kjz3vgaw"; - name = "kxmlrpcclient-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/portingAids/kxmlrpcclient-5.97.0.tar.xz"; + sha256 = "02fkzf9z983r2mfyjwyhpzf9b3qpk8bavh1pixbvwd6iddmqhnj9"; + name = "kxmlrpcclient-5.97.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/modemmanager-qt-5.96.0.tar.xz"; - sha256 = "1rbiqh1sj328cy7flz9pw6vbvgiy3vyv6xp3fk4xv91sxviz1mhd"; - name = "modemmanager-qt-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/modemmanager-qt-5.97.0.tar.xz"; + sha256 = "0qg56r4j3mlyp27zjdrhwckw4a10zfp4bpzwr35m37ccsb80304k"; + name = "modemmanager-qt-5.97.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/networkmanager-qt-5.96.0.tar.xz"; - sha256 = "1gyvgy0wl00asg9bkhjgvqnz32xmazvazcarh3p0640jy2fjrzfz"; - name = "networkmanager-qt-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/networkmanager-qt-5.97.0.tar.xz"; + sha256 = "10bczach9x3az29h32rn6h0gnz4ghj8dn8ynm93jkkjmw87asml5"; + name = "networkmanager-qt-5.97.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/oxygen-icons5-5.96.0.tar.xz"; - sha256 = "1f3fj6zr5iygb3s6f8vq2ayy749gxlx5j9h6v2zmkbf4m96sfmq5"; - name = "oxygen-icons5-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/oxygen-icons5-5.97.0.tar.xz"; + sha256 = "1ypr4l1205jzc9cpdin64a2rk0bz4x0wjy7k87lswm2643w6sjsm"; + name = "oxygen-icons5-5.97.0.tar.xz"; }; }; plasma-framework = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/plasma-framework-5.96.0.tar.xz"; - sha256 = "14myvv70pixygb20c136sk7prv5f5dca53fgc74dk6c28hwyldh2"; - name = "plasma-framework-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/plasma-framework-5.97.0.tar.xz"; + sha256 = "09xmjmv9l26dpyngwks66lb48clfwfagpndavf2djcfjid4pv63k"; + name = "plasma-framework-5.97.0.tar.xz"; }; }; prison = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/prison-5.96.0.tar.xz"; - sha256 = "1kzl8rbyj9ik83p1qb8jl32vr06vkzzvr1hpasj50sg3ajq8a9xs"; - name = "prison-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/prison-5.97.0.tar.xz"; + sha256 = "06skmwxb1hkg2h1q2fhgkbbsdnvhg6l930533n446g42p7qlzw56"; + name = "prison-5.97.0.tar.xz"; }; }; purpose = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/purpose-5.96.0.tar.xz"; - sha256 = "0gji3dsccbii1gm83dpwry02cqmjrimhj8gnkb6nzvzrnq5xfh3r"; - name = "purpose-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/purpose-5.97.0.tar.xz"; + sha256 = "17sih5a5v28qpwrvc1jq3b2hhi7qrbwaw14swg0iz89icbaxizl3"; + name = "purpose-5.97.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/qqc2-desktop-style-5.96.0.tar.xz"; - sha256 = "0ff9vd34wss9na2m3gzm8wc2bwq0flda6bv6yqygv5iallw2lz88"; - name = "qqc2-desktop-style-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/qqc2-desktop-style-5.97.0.tar.xz"; + sha256 = "19ily5hn1hmyqw9d2qwm7440zzr3kjdz1qf2n073w2miqgp6fsa6"; + name = "qqc2-desktop-style-5.97.0.tar.xz"; }; }; solid = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/solid-5.96.0.tar.xz"; - sha256 = "0j64glc1g7mwy2ysaj09w5f7sd2992h91ncknk9gpfsrxhpm814i"; - name = "solid-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/solid-5.97.0.tar.xz"; + sha256 = "17aclbb8jwdj4hd6kz3svgla5i5rm03xj7cavdinbvy2g13avh44"; + name = "solid-5.97.0.tar.xz"; }; }; sonnet = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/sonnet-5.96.0.tar.xz"; - sha256 = "0i0gksdkfyl8hfbqgrgklqanbvfm3h9gjnv42p2qq40b0zjj0sh4"; - name = "sonnet-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/sonnet-5.97.0.tar.xz"; + sha256 = "14qijjhm0ar14nw03dp192gnmlx13xgybw2iv71nrxg7cybp74m3"; + name = "sonnet-5.97.0.tar.xz"; }; }; syndication = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/syndication-5.96.0.tar.xz"; - sha256 = "1q60dznlkbncqqgjnp3lq3x0f6r7wvz141ajkymmxlgfq3wdpcd4"; - name = "syndication-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/syndication-5.97.0.tar.xz"; + sha256 = "0qcxmsirzqbycndw4grvpcmvyfz01crj7cdlazj92a5gckz640jn"; + name = "syndication-5.97.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/syntax-highlighting-5.96.0.tar.xz"; - sha256 = "176prghxfrb7i68jacmq9vkl7j9arsn6gnkzyc2hlkph35js3zqs"; - name = "syntax-highlighting-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/syntax-highlighting-5.97.0.tar.xz"; + sha256 = "17d9a2mr0g3l62nqvrsmwkhraxjc26bw8hxf27xwpngazy8rd2z8"; + name = "syntax-highlighting-5.97.0.tar.xz"; }; }; threadweaver = { - version = "5.96.0"; + version = "5.97.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.96/threadweaver-5.96.0.tar.xz"; - sha256 = "0ljjnbwmc2zz4q0q1njqny43cj6xdf976vrvijcsqdsril5wzdbq"; - name = "threadweaver-5.96.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.97/threadweaver-5.97.0.tar.xz"; + sha256 = "13s0zjmjwqpzxv14h7x8d12av4icgdnhgzb9qcdc82gazq1mv5s6"; + name = "threadweaver-5.97.0.tar.xz"; }; }; } From 937ede3b165bb7c515122fd743f9e55c20332b8d Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Aug 2022 13:20:17 +0300 Subject: [PATCH 35/45] kconfigwidgets: drop merged patch --- .../libraries/kde-frameworks/default.nix | 2 +- .../default.nix => kconfigwidgets.nix} | 1 - .../0001-QDirIterator-follow-symlinks.patch | 25 ------------------- 3 files changed, 1 insertion(+), 27 deletions(-) rename pkgs/development/libraries/kde-frameworks/{kconfigwidgets/default.nix => kconfigwidgets.nix} (89%) delete mode 100644 pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-QDirIterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 9732fcb663df..21e815090f8a 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -153,7 +153,7 @@ let baloo = callPackage ./baloo.nix {}; kbookmarks = callPackage ./kbookmarks.nix {}; kcmutils = callPackage ./kcmutils {}; - kconfigwidgets = callPackage ./kconfigwidgets {}; + kconfigwidgets = callPackage ./kconfigwidgets.nix {}; kdav = callPackage ./kdav.nix {}; kdeclarative = callPackage ./kdeclarative.nix {}; kded = callPackage ./kded.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets.nix similarity index 89% rename from pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix rename to pkgs/development/libraries/kde-frameworks/kconfigwidgets.nix index e9b283ebc318..4b20daf052a0 100644 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets.nix @@ -8,7 +8,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kguiaddons ki18n qtbase qttools ]; propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ]; - patches = [ ./0001-QDirIterator-follow-symlinks.patch ]; outputs = [ "out" "dev" ]; outputBin = "dev"; postInstall = '' diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-QDirIterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-QDirIterator-follow-symlinks.patch deleted file mode 100644 index 30cfafafab97..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-QDirIterator-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 05c0eb5d803ac52c0dd97a98f6d2821650c3c14c Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Sun, 28 Mar 2021 06:09:47 -0500 -Subject: [PATCH] QDirIterator follow symlinks - ---- - src/khelpclient.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp -index a053cd7..787d375 100644 ---- a/src/khelpclient.cpp -+++ b/src/khelpclient.cpp -@@ -34,7 +34,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname) - QString docPath; - const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); - for (const QString &dir : desktopDirs) { -- QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - const QString desktopPath(it.next()); - KDesktopFile desktopFile(desktopPath); --- -2.30.1 - From 8716fe21bd356d189c1f222cd09fae8221ea5277 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Aug 2022 13:26:11 +0300 Subject: [PATCH 36/45] kwallet: add missing dependency --- pkgs/development/libraries/kde-frameworks/kwallet.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index e2a54a03f6e6..01ad788ba112 100644 --- a/pkgs/development/libraries/kde-frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, ki18n, kiconthemes, knotifications, kservice, kwidgetsaddons, kwindowsystem, - libgcrypt, qgpgme, qtbase, + libgcrypt, qgpgme, qtbase, qca-qt5 }: mkDerivation { @@ -11,7 +11,8 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes - knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme + knotifications kservice kwidgetsaddons kwindowsystem + libgcrypt qgpgme qca-qt5 ]; propagatedBuildInputs = [ qtbase ]; } From 6bc94305f71701d70c5dd918e328fb2be7ec5344 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 10:31:29 +0000 Subject: [PATCH 37/45] ghorg: 1.8.3 -> 1.8.5 --- .../version-management/git-and-tools/ghorg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix index a595a78b9806..175a9ece1695 100644 --- a/pkgs/applications/version-management/git-and-tools/ghorg/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghorg/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ghorg"; - version = "1.8.3"; + version = "1.8.5"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-O5+OKY0o9vIO0uQGDlA0PMugfLAf45B/iHrrC2p0G+4="; + sha256 = "sha256-r+w3r1owvAb8KTha5DcolMJ/jKue+7lAHKxLWe+YllE="; }; doCheck = false; From f3a8a894a6f9fa7b1f83ce0da27001a00b574ea7 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 14 Aug 2022 13:32:26 +0300 Subject: [PATCH 38/45] kcmutils: drop merged patch --- .../libraries/kde-frameworks/default.nix | 2 +- .../{kcmutils/default.nix => kcmutils.nix} | 3 --- .../0001-kcmutils-follow-symlinks.patch | 25 ------------------- 3 files changed, 1 insertion(+), 29 deletions(-) rename pkgs/development/libraries/kde-frameworks/{kcmutils/default.nix => kcmutils.nix} (87%) delete mode 100644 pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 21e815090f8a..e9a333c98a19 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -152,7 +152,7 @@ let # TIER 3 baloo = callPackage ./baloo.nix {}; kbookmarks = callPackage ./kbookmarks.nix {}; - kcmutils = callPackage ./kcmutils {}; + kcmutils = callPackage ./kcmutils.nix {}; kconfigwidgets = callPackage ./kconfigwidgets.nix {}; kdav = callPackage ./kdav.nix {}; kdeclarative = callPackage ./kdeclarative.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils.nix similarity index 87% rename from pkgs/development/libraries/kde-frameworks/kcmutils/default.nix rename to pkgs/development/libraries/kde-frameworks/kcmutils.nix index f965256ce3d4..a275e7175713 100644 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kcmutils.nix @@ -13,7 +13,4 @@ mkDerivation { qtdeclarative ]; propagatedBuildInputs = [ kconfigwidgets kservice ]; - patches = [ - ./0001-kcmutils-follow-symlinks.patch - ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch deleted file mode 100644 index 32adca6d2e05..000000000000 --- a/pkgs/development/libraries/kde-frameworks/kcmutils/0001-kcmutils-follow-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4d5dcc309fba688aa1db8dd915a0abdf07f61e81 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 13 Jul 2020 11:23:36 -0500 -Subject: [PATCH] kcmutils follow symlinks - ---- - src/kpluginselector.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp -index 46deef5..2eacb9f 100644 ---- a/src/kpluginselector.cpp -+++ b/src/kpluginselector.cpp -@@ -309,7 +309,7 @@ void KPluginSelector::addPlugins(const QString &componentName, - QStringList desktopFileNames; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory); - for (const QString &dir : dirs) { -- QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories); -+ QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (it.hasNext()) { - desktopFileNames.append(it.next()); - } --- -2.25.4 - From 08b729e2a24d54f64095b71abf74bb5268c0aee2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 10:44:15 +0000 Subject: [PATCH 39/45] google-drive-ocamlfuse: 0.7.28 -> 0.7.30 --- .../networking/google-drive-ocamlfuse/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index eb677eb00ded..612bb0eaf160 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -6,13 +6,13 @@ buildDunePackage rec { pname = "google-drive-ocamlfuse"; - version = "0.7.28"; + version = "0.7.30"; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; rev = "v${version}"; - sha256 = "sha256:1layxqz5iz6wnvk83579m1im9vzq608h7n1h04znpkan0fls6nad"; + sha256 = "sha256-DWG0nBiqeVHaYQfGzU43gGwL4m8X61x5/RT5jD4AwYA="; }; doCheck = true; From e3f61ba99275acab18d716f3b39119a24c92a549 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 14 Aug 2022 12:42:49 +0100 Subject: [PATCH 40/45] strace: 5.18 -> 5.19 While at it added trivial updater. Changes: https://github.com/strace/strace/releases/tag/v5.19 --- pkgs/development/tools/misc/strace/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index bee5d227f4d6..63a24bac8354 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, perl, libunwind, buildPackages }: +{ lib, stdenv, fetchurl, perl, libunwind, buildPackages, gitUpdater }: stdenv.mkDerivation rec { pname = "strace"; - version = "5.18"; + version = "5.19"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-YCk+p5rJJT1gDNyb4HetKYjKIihKQ5yeZr5RUNs9EYc="; + sha256 = "sha256-qj3ByOYOT2/z05ZRSqJH88e/cZ2KjcTdT6eTvnhr7KM="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -18,6 +18,13 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-mpers=check" ]; + passthru.updateScript = gitUpdater { + inherit pname version; + # No nicer place to find latest release. + url = "https://github.com/strace/strace.git"; + rev-prefix = "v"; + }; + meta = with lib; { homepage = "https://strace.io/"; description = "A system call tracer for Linux"; From 82a99f1ff5e023ecb6225ce5021eb3cbb9240813 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 12:53:38 +0000 Subject: [PATCH 41/45] libnats-c: 3.2.0 -> 3.3.0 --- pkgs/development/libraries/libnats-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnats-c/default.nix b/pkgs/development/libraries/libnats-c/default.nix index 7913515df66c..7c72b6774994 100644 --- a/pkgs/development/libraries/libnats-c/default.nix +++ b/pkgs/development/libraries/libnats-c/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "libnats"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats.c"; rev = "v${version}"; - sha256 = "1ngji3sa44y27lnq4x5dzbd117s9psx4w0j50b4c2b72cf2z139q"; + sha256 = "sha256-2z+r0OIVYE7NPQQAd5vOK8KkFo4Zzi2pPcwPByJTyPc="; }; nativeBuildInputs = [ cmake ]; From 95d5e3eb62947613c2a6d5bd98f3f9601fa4e49d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 14 Aug 2022 06:53:33 -0700 Subject: [PATCH 42/45] matrix-alertmanager: update lockfile with sha512 hashes (#186659) --- .../monitoring/matrix-alertmanager/yarn-hash | 2 +- .../monitoring/matrix-alertmanager/yarn.lock | 230 +++++++++--------- 2 files changed, 116 insertions(+), 116 deletions(-) diff --git a/pkgs/servers/monitoring/matrix-alertmanager/yarn-hash b/pkgs/servers/monitoring/matrix-alertmanager/yarn-hash index 9b8af4dbb9db..5364539124d3 100644 --- a/pkgs/servers/monitoring/matrix-alertmanager/yarn-hash +++ b/pkgs/servers/monitoring/matrix-alertmanager/yarn-hash @@ -1 +1 @@ -1vjg0rapdj88ygc00j60w4h5wkaf6jycmlx3fz13xar74ikwrifa +03a217ppbscz4fqc10c829p5frbs7j9qli5126cibz2b3pk2mi66 diff --git a/pkgs/servers/monitoring/matrix-alertmanager/yarn.lock b/pkgs/servers/monitoring/matrix-alertmanager/yarn.lock index 036469dd85cd..ee0f16e36f1f 100644 --- a/pkgs/servers/monitoring/matrix-alertmanager/yarn.lock +++ b/pkgs/servers/monitoring/matrix-alertmanager/yarn.lock @@ -270,7 +270,7 @@ ajv@^8.0.1: another-json@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/another-json/-/another-json-0.2.0.tgz#b5f4019c973b6dd5c6506a2d93469cb6d32aeedc" - integrity sha1-tfQBnJc7bdXGUGotk0acttMq7tw= + integrity sha512-/Ndrl68UQLhnCdsAzEXLMFuOR546o2qbYRqCglaNHbjXrwG1ayTcdwr3zkSGOGtGXDyR5X9nCFfnyG2AFJIsqg== ansi-align@^3.0.0: version "3.0.0" @@ -287,12 +287,12 @@ ansi-colors@4.1.1, ansi-colors@^4.1.1: ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" - integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8= + integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA== ansi-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" - integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= + integrity sha512-wFUFA5bg5dviipbQQ32yOQhl6gcJaJXiHE7dvR8VYPG97+J/GNC5FKGepKdEDUFeXRzDxPF1X/Btc8L+v7oqIQ== ansi-regex@^4.1.0: version "4.1.0" @@ -354,7 +354,7 @@ argparse@^2.0.1: array-flatten@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" - integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg== array-union@^2.1.0: version "2.1.0" @@ -371,7 +371,7 @@ asn1@~0.2.3: assert-plus@1.0.0, assert-plus@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= + integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== assertion-error@^1.1.0: version "1.1.0" @@ -386,12 +386,12 @@ astral-regex@^2.0.0: asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= + integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q== aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= + integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA== aws4@^1.8.0: version "1.11.0" @@ -413,7 +413,7 @@ base-x@^3.0.2: bcrypt-pbkdf@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= + integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w== dependencies: tweetnacl "^0.14.3" @@ -484,7 +484,7 @@ braces@^3.0.1, braces@~3.0.2: browser-request@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/browser-request/-/browser-request-0.3.3.tgz#9ece5b5aca89a29932242e18bf933def9876cc17" - integrity sha1-ns5bWsqJopkyJC4Yv5M975h2zBc= + integrity sha512-YyNI4qJJ+piQG6MMEuo7J3Bzaqssufx04zpEKYfSrl/1Op59HWali9zMtBpXnkmqMcOuWJPZvudrm9wISmnCbg== browser-stdout@1.3.1: version "1.3.1" @@ -494,14 +494,14 @@ browser-stdout@1.3.1: bs58@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a" - integrity sha1-vhYedsNU9veIrkBx9j806MTwpCo= + integrity sha512-Ok3Wdf5vOIlBrgCvTq96gBkJw+JUEzdBgyaza5HLtPm7yTHkjRy8+JzNyHF7BHa0bNWOQIp3m5YF0nnFcOIKLw== dependencies: base-x "^3.0.2" builtins@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88" - integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og= + integrity sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ== bytes@3.1.0: version "3.1.0" @@ -571,7 +571,7 @@ camelcase@^6.0.0, camelcase@^6.2.0: caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= + integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== chai@^4.3.4: version "4.3.4" @@ -613,7 +613,7 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2: check-error@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/check-error/-/check-error-1.0.2.tgz#574d312edd88bb5dd8912e9286dd6c0aed4aac82" - integrity sha1-V00xLt2Iu13YkS6Sht1sCu1KrII= + integrity sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA== chokidar@3.5.2, chokidar@^3.2.2: version "3.5.2" @@ -643,7 +643,7 @@ ci-info@^2.0.0: cint@^8.2.1: version "8.2.1" resolved "https://registry.yarnpkg.com/cint/-/cint-8.2.1.tgz#70386b1b48e2773d0d63166a55aff94ef4456a12" - integrity sha1-cDhrG0jidz0NYxZqVa/5TvRFahI= + integrity sha512-gyWqJHXgDFPNx7PEyFJotutav+al92TTC3dWlMFyTETlOyKBQMZb7Cetqmj3GlrnSILHwSJRwf4mIGzc7C5lXw== clean-stack@^2.0.0: version "2.2.0" @@ -674,14 +674,14 @@ cliui@^7.0.2: clone-response@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b" - integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws= + integrity sha512-yjLXh88P599UOyPTFX0POsd7WxnbsVsGohcwzHOLspIhhpalPw1BcqED8NblyZLKcGrL8dTgMlcaZxV2jAD41Q== dependencies: mimic-response "^1.0.0" code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= + integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== color-convert@^1.9.0: version "1.9.3" @@ -700,7 +700,7 @@ color-convert@^2.0.1: color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= + integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== color-name@~1.1.4: version "1.1.4" @@ -710,7 +710,7 @@ color-name@~1.1.4: colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" - integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs= + integrity sha512-pFGrxThWcWQ2MsAz6RtgeWe4NK2kUE1WfsrvvlctdII745EW9I0yflqhe7++M5LEc7bV2c/9/5zc8sFcpL0Drw== combined-stream@^1.0.6, combined-stream@~1.0.6: version "1.0.8" @@ -727,7 +727,7 @@ commander@^6.2.1: concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= + integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== configstore@^5.0.1: version "5.0.1" @@ -744,7 +744,7 @@ configstore@^5.0.1: console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" - integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4= + integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ== content-disposition@0.5.3: version "0.5.3" @@ -761,7 +761,7 @@ content-type@^1.0.4, content-type@~1.0.4: cookie-signature@1.0.6: version "1.0.6" resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" - integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ== cookie@0.4.0: version "0.4.0" @@ -771,7 +771,7 @@ cookie@0.4.0: core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== cross-spawn@^7.0.2: version "7.0.3" @@ -790,7 +790,7 @@ crypto-random-string@^2.0.0: dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= + integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g== dependencies: assert-plus "^1.0.0" @@ -830,7 +830,7 @@ decamelize@^4.0.0: decompress-response@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3" - integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M= + integrity sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA== dependencies: mimic-response "^1.0.0" @@ -859,22 +859,22 @@ defer-to-connect@^1.0.1: delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= + integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ== delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" - integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= + integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ== depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= + integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ== destroy@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" - integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg== diff@5.0.0, diff@^5.0.0: version "5.0.0" @@ -910,12 +910,12 @@ dotenv@^10.0.0: duplexer3@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2" - integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI= + integrity sha512-CEj8FwwNA4cVH2uFCoHUrmojhYh1vmCdOaneKJXwkeY1i9jnlslVo9dx+hQ5Hl9GnH/Bwy/IjxAyOePyPKYnzA== ecc-jsbn@~0.1.1: version "0.1.2" resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= + integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw== dependencies: jsbn "~0.1.0" safer-buffer "^2.1.0" @@ -923,7 +923,7 @@ ecc-jsbn@~0.1.1: ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" - integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow== emoji-regex@^7.0.1: version "7.0.3" @@ -938,7 +938,7 @@ emoji-regex@^8.0.0: encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" - integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w== encoding@^0.1.12: version "0.1.13" @@ -984,7 +984,7 @@ escape-goat@^2.0.0: escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" - integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow== escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: version "4.0.0" @@ -994,7 +994,7 @@ escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= + integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg== eslint-scope@^5.1.1: version "5.1.1" @@ -1113,7 +1113,7 @@ esutils@^2.0.2: etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" - integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg== express@^4.17.1: version "4.17.1" @@ -1159,7 +1159,7 @@ extend@~3.0.2: extsprintf@1.3.0, extsprintf@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= + integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g== fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" @@ -1185,7 +1185,7 @@ fast-json-stable-stringify@^2.0.0: fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= + integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw== fast-memoize@^2.5.2: version "2.5.2" @@ -1267,7 +1267,7 @@ flatted@^3.1.0: forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= + integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== form-data@~2.3.2: version "2.3.3" @@ -1281,7 +1281,7 @@ form-data@~2.3.2: forwarded@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= + integrity sha512-Ua9xNhH0b8pwE3yRbFfXJvfdWF0UHNCdeyb2sbi9Ul/M+r3PTdrz7Cv4SCfZRMjmzEM9PhraqfZFbGTIg3OMyA== fp-and-or@^0.1.3: version "0.1.3" @@ -1291,7 +1291,7 @@ fp-and-or@^0.1.3: fresh@0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" - integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== fs-minipass@^2.0.0, fs-minipass@^2.1.0: version "2.1.0" @@ -1303,7 +1303,7 @@ fs-minipass@^2.0.0, fs-minipass@^2.1.0: fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= + integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw== fsevents@~2.3.2: version "2.3.2" @@ -1318,12 +1318,12 @@ function-bind@^1.1.1: functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== gauge@~2.7.3: version "2.7.4" resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7" - integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c= + integrity sha512-14x4kjc6lkD3ltw589k0NrPD6cCNTD6CWoVUNpB85+DrtONoZn+Rug6xZU5RvSC4+TZPxA5AnBibQYAvZn41Hg== dependencies: aproba "^1.0.3" console-control-strings "^1.0.0" @@ -1342,7 +1342,7 @@ get-caller-file@^2.0.5: get-func-name@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41" - integrity sha1-6td0q+5y4gQJQzoGY2YCPdaIekE= + integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig== get-intrinsic@^1.0.2: version "1.1.1" @@ -1375,7 +1375,7 @@ get-stream@^5.1.0: getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= + integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng== dependencies: assert-plus "^1.0.0" @@ -1473,7 +1473,7 @@ growl@1.10.5: har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= + integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q== har-validator@~5.1.3: version "5.1.5" @@ -1486,7 +1486,7 @@ har-validator@~5.1.3: has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= + integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw== has-flag@^4.0.0: version "4.0.0" @@ -1501,7 +1501,7 @@ has-symbols@^1.0.1: has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" - integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk= + integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ== has-yarn@^2.1.0: version "2.1.0" @@ -1555,7 +1555,7 @@ http-proxy-agent@^4.0.1: http-signature@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= + integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ== dependencies: assert-plus "^1.0.0" jsprim "^1.2.2" @@ -1572,7 +1572,7 @@ https-proxy-agent@^5.0.0: humanize-ms@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed" - integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0= + integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ== dependencies: ms "^2.0.0" @@ -1593,7 +1593,7 @@ iconv-lite@^0.6.2: ignore-by-default@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09" - integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk= + integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA== ignore-walk@^3.0.3: version "3.0.4" @@ -1623,12 +1623,12 @@ import-fresh@^3.0.0, import-fresh@^3.2.1: import-lazy@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" - integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM= + integrity sha512-m7ZEHgtw69qOGw+jwxXkHlrlIPdTGkyh66zXZ1ajZbxkDBNjSY/LGbmjc7h0s2ELsUDTAhFr55TrPSSqJGPG0A== imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= + integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA== indent-string@^4.0.0: version "4.0.0" @@ -1643,7 +1643,7 @@ infer-owner@^1.0.4: inflight@^1.0.4: version "1.0.6" resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= + integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA== dependencies: once "^1.3.0" wrappy "1" @@ -1651,7 +1651,7 @@ inflight@^1.0.4: inherits@2, inherits@2.0.3, inherits@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de" - integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4= + integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw== ini@1.3.7, ini@^1.3.5, ini@~1.3.0: version "1.3.7" @@ -1666,7 +1666,7 @@ ini@2.0.0: ip@^1.1.5: version "1.1.5" resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= + integrity sha512-rBtCAQAJm8A110nbwn6YdveUnuZH3WrC36IwkRXxDnq53JvXA2NVQvB7IHyKomxK1MJ4VDNw3UtFDdXQ+AvLYA== ipaddr.js@1.9.1: version "1.9.1" @@ -1690,19 +1690,19 @@ is-ci@^2.0.0: is-extglob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs= + integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw== dependencies: number-is-nan "^1.0.0" is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= + integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w== is-fullwidth-code-point@^3.0.0: version "3.0.0" @@ -1735,7 +1735,7 @@ is-installed-globally@^0.4.0: is-lambda@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5" - integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU= + integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ== is-npm@^4.0.0: version "4.0.0" @@ -1770,7 +1770,7 @@ is-plain-obj@^2.1.0: is-typedarray@^1.0.0, is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= + integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== is-unicode-supported@^0.1.0: version "0.1.0" @@ -1785,27 +1785,27 @@ is-yarn-global@^0.3.0: isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" - integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8= + integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ== isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw== isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= + integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g== jju@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a" - integrity sha1-o6vicYryQaKykE+EpiWXDzia4yo= + integrity sha512-8wb9Yw966OSxApiCt0K3yNJL8pnNeIv+OEq2YMidz4FKP6nonSRoOXc80iXY4JaN2FC11B9qsNmDsm+ZOfMROA== js-tokens@^4.0.0: version "4.0.0" @@ -1830,12 +1830,12 @@ js-yaml@^3.13.1: jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= + integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== json-buffer@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" - integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg= + integrity sha512-CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ== json-parse-even-better-errors@^2.3.0: version "2.3.1" @@ -1845,7 +1845,7 @@ json-parse-even-better-errors@^2.3.0: json-parse-helpfulerror@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz#13f14ce02eed4e981297b64eb9e3b932e2dd13dc" - integrity sha1-E/FM4C7tTpgSl7ZOueO5MuLdE9w= + integrity sha512-XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg== dependencies: jju "^1.1.0" @@ -1862,17 +1862,17 @@ json-schema-traverse@^1.0.0: json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= + integrity sha512-a3xHnILGMtk+hDOqNwHzF6e2fNbiMrXZvxKQiEv2MlgQP+pjIOzqAmKYD2mDpXYE/44M7g+n9p2bKkYWDUcXCQ== json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw== json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= + integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== json5@^2.1.2: version "2.2.0" @@ -1884,17 +1884,17 @@ json5@^2.1.2: jsonlines@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/jsonlines/-/jsonlines-0.1.1.tgz#4fcd246dc5d0e38691907c44ab002f782d1d94cc" - integrity sha1-T80kbcXQ44aRkHxEqwAveC0dlMw= + integrity sha512-ekDrAGso79Cvf+dtm+mL8OBI2bmAOt3gssYs833De/C9NmIpWDWyUO4zPgB5x2/OhY366dkhgfPMYfwZF7yOZA== jsonparse@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" - integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= + integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= + integrity sha512-4Dj8Rf+fQ+/Pn7C5qeEX02op1WfOss3PKTE9Nsop3Dx+6UPxlm1dr/og7o2cRa5hNN07CACr4NFzRLtj/rjWog== dependencies: assert-plus "1.0.0" extsprintf "1.3.0" @@ -1960,12 +1960,12 @@ locate-path@^6.0.0: lodash.clonedeep@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + integrity sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ== lodash.get@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99" - integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk= + integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ== lodash.merge@^4.6.2: version "4.6.2" @@ -1975,7 +1975,7 @@ lodash.merge@^4.6.2: lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" - integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw== lodash@^4.17.21: version "4.17.21" @@ -2060,12 +2060,12 @@ matrix-js-sdk@^12.5.0: media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" - integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g= + integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ== merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" - integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w== merge2@^1.3.0: version "1.4.1" @@ -2075,7 +2075,7 @@ merge2@^1.3.0: methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" - integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= + integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w== micromatch@^4.0.4: version "4.0.4" @@ -2220,7 +2220,7 @@ mocha@^9.1.1: ms@2.0.0, ms@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= + integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A== ms@2.1.1: version "2.1.1" @@ -2245,7 +2245,7 @@ nanoid@3.1.23: natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw== negotiator@0.6.2, negotiator@^0.6.2: version "0.6.2" @@ -2305,7 +2305,7 @@ nopt@^5.0.0: nopt@~1.0.10: version "1.0.10" resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee" - integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4= + integrity sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg== dependencies: abbrev "1" @@ -2425,7 +2425,7 @@ npmlog@^4.1.2: number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0= + integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== oauth-sign@~0.9.0: version "0.9.0" @@ -2435,7 +2435,7 @@ oauth-sign@~0.9.0: object-assign@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= + integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg== object-inspect@^1.9.0: version "1.11.0" @@ -2445,14 +2445,14 @@ object-inspect@^1.9.0: on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" - integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww== dependencies: ee-first "1.1.1" once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= + integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w== dependencies: wrappy "1" @@ -2576,7 +2576,7 @@ parseurl@~1.3.3: path-exists@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= + integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ== path-exists@^4.0.0: version "4.0.0" @@ -2586,7 +2586,7 @@ path-exists@^4.0.0: path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= + integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== path-key@^3.1.0: version "3.1.1" @@ -2596,7 +2596,7 @@ path-key@^3.1.0: path-to-regexp@0.1.7: version "0.1.7" resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" - integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ== path-to-regexp@^1.7.0: version "1.8.0" @@ -2618,7 +2618,7 @@ pathval@^1.1.1: performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= + integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3: version "2.3.0" @@ -2633,7 +2633,7 @@ prelude-ls@^1.2.1: prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" - integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc= + integrity sha512-ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA== process-nextick-args@~2.0.0: version "2.0.1" @@ -2648,7 +2648,7 @@ progress@^2.0.0, progress@^2.0.3: promise-inflight@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" - integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM= + integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g== promise-retry@^2.0.1: version "2.0.1" @@ -2854,7 +2854,7 @@ request@^2.88.2: require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= + integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q== require-from-string@^2.0.2: version "2.0.2" @@ -2869,14 +2869,14 @@ resolve-from@^4.0.0: responselike@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7" - integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec= + integrity sha512-/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ== dependencies: lowercase-keys "^1.0.0" retry@^0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b" - integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs= + integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow== retry@^0.13.1: version "0.13.1" @@ -2980,7 +2980,7 @@ serve-static@1.14.1: set-blocking@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= + integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw== setprototypeof@1.1.1: version "1.1.1" @@ -3074,7 +3074,7 @@ spawn-please@^1.0.0: sprintf-js@~1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== sshpk@^1.7.0: version "1.16.1" @@ -3101,12 +3101,12 @@ ssri@^8.0.0, ssri@^8.0.1: "statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" - integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= + integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA== string-width@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M= + integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw== dependencies: code-point-at "^1.0.0" is-fullwidth-code-point "^1.0.0" @@ -3148,14 +3148,14 @@ string_decoder@~1.1.1: strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" - integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= + integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== dependencies: ansi-regex "^2.0.0" strip-ansi@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" - integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= + integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow== dependencies: ansi-regex "^3.0.0" @@ -3181,7 +3181,7 @@ strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1. strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" - integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= + integrity sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ== striptags@^3.2.0: version "3.2.0" @@ -3241,7 +3241,7 @@ term-size@^2.1.0: text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== to-readable-stream@^1.0.0: version "1.0.0" @@ -3278,14 +3278,14 @@ tough-cookie@~2.5.0: tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= + integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w== dependencies: safe-buffer "^5.0.1" tweetnacl@^0.14.3, tweetnacl@~0.14.0: version "0.14.5" resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= + integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" @@ -3360,7 +3360,7 @@ unique-string@^2.0.0: unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" - integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ== update-notifier@^4.1.0: version "4.1.3" @@ -3411,19 +3411,19 @@ uri-js@^4.2.2: url-parse-lax@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c" - integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww= + integrity sha512-NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ== dependencies: prepend-http "^2.0.0" util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" - integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA== uuid@^3.3.2: version "3.4.0" @@ -3438,19 +3438,19 @@ v8-compile-cache@^2.0.3: validate-npm-package-name@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e" - integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34= + integrity sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw== dependencies: builtins "^1.0.3" vary@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" - integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== verror@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= + integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw== dependencies: assert-plus "^1.0.0" core-util-is "1.0.2" @@ -3499,7 +3499,7 @@ wrap-ansi@^7.0.0: wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= + integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ== write-file-atomic@^3.0.0: version "3.0.3" From 82640adbf00f9ebb5da9c6c47d0b8d242755946e Mon Sep 17 00:00:00 2001 From: Justin Restivo Date: Sun, 31 Jul 2022 19:02:42 -0400 Subject: [PATCH 43/45] nixos/security: add size option to /run/wrappers --- nixos/modules/security/wrappers/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 169ef7442626..dfc98ddb9096 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -188,6 +188,16 @@ in ''; }; + security.wrapperDirSize = lib.mkOption { + default = "50%"; + example = "10G"; + type = lib.types.str; + description = '' + Size limit for the /run/wrappers tmpfs. Look at mount(8), tmpfs size option, + for the accepted syntax. WARNING: don't set to less than 64MB. + ''; + }; + security.wrapperDir = lib.mkOption { type = lib.types.path; default = "/run/wrappers/bin"; @@ -230,7 +240,7 @@ in boot.specialFileSystems.${parentWrapperDir} = { fsType = "tmpfs"; - options = [ "nodev" "mode=755" ]; + options = [ "nodev" "mode=755" "size=${config.security.wrapperDirSize}" ]; }; # Make sure our wrapperDir exports to the PATH env variable when From 6b6e2ee00feaf41dfcb6f62766b470a51674ffb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 22:15:49 +0000 Subject: [PATCH 44/45] gnome.eog: 42.2 -> 42.3 --- pkgs/desktops/gnome/core/eog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/eog/default.nix b/pkgs/desktops/gnome/core/eog/default.nix index b15c8e557cd1..3f9333aeb584 100644 --- a/pkgs/desktops/gnome/core/eog/default.nix +++ b/pkgs/desktops/gnome/core/eog/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "eog"; - version = "42.2"; + version = "42.3"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-Dk1Kai7hokCui1hEnwK6LGS3+ZSQ0LiRXX9SyQpYBF4="; + sha256 = "sha256-MMGzwovG3ChU2Hjr0xoi6qFb+VnBNCBqKhkEGT5H9Do="; }; patches = [ From 986a5d59113a2107ec7dac5de93bf44991eedd49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 23:17:16 +0000 Subject: [PATCH 45/45] python310Packages.miniaudio: 1.51 -> 1.52 --- pkgs/development/python-modules/miniaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index 328dcd93ad48..d3d370d40cfc 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "miniaudio"; - version = "1.51"; + version = "1.52"; disabled = pythonOlder "3.6"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "irmen"; repo = "pyminiaudio"; rev = "refs/tags/v${version}"; - sha256 = "sha256-nWx/1+b28/pvyTe8jSAOmw+vfzjuD7FFmVVUzH8DAyw="; + sha256 = "sha256-qy2FKzg02M1MwUwuPKmK8uGhCrR19Hyzg2YRmlHl67s="; }; buildInputs = lib.optionals stdenv.isDarwin [