From cc9442089c595dae400fafbff4d64a4ad5d04112 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sat, 18 May 2024 02:25:08 -0300 Subject: [PATCH 001/219] stress-ng: add missing dependencies for --gpu flag support --- pkgs/tools/system/stress-ng/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index 0e87cbffd050..c75b8290f43c 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -1,5 +1,6 @@ { lib, stdenv, fetchFromGitHub , attr, judy, keyutils, libaio, libapparmor, libbsd, libcap, libgcrypt, lksctp-tools, zlib +, libglvnd, mesa }: stdenv.mkDerivation rec { @@ -20,7 +21,7 @@ stdenv.mkDerivation rec { # All platforms inputs then Linux-only ones buildInputs = [ judy libbsd libgcrypt zlib ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - attr keyutils libaio libapparmor libcap lksctp-tools + attr keyutils libaio libapparmor libcap lksctp-tools libglvnd mesa ]; makeFlags = [ From 62a02b41d4552542ceef3ceb363ab3f176ed0b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 19 May 2024 18:49:03 +0200 Subject: [PATCH 002/219] neovide: remove unsupported x86_64-darwin --- pkgs/by-name/ne/neovide/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/neovide/package.nix b/pkgs/by-name/ne/neovide/package.nix index a4c8791c5aa6..0dfbc1f7ce7f 100644 --- a/pkgs/by-name/ne/neovide/package.nix +++ b/pkgs/by-name/ne/neovide/package.nix @@ -114,6 +114,6 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } rec { changelog = "https://github.com/neovide/neovide/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ ck3d ]; - platforms = platforms.all; + platforms = platforms.linux ++ [ "aarch64-darwin" ]; }; } From 06157e52f9083757c0e8d7c1a92cae7f6f5a1ab2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 21 May 2024 19:07:20 +0000 Subject: [PATCH 003/219] nixdoc: 3.0.2 -> 3.0.5 --- pkgs/tools/nix/nixdoc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/nixdoc/default.nix b/pkgs/tools/nix/nixdoc/default.nix index 54d0c1be4ce6..29be34098181 100644 --- a/pkgs/tools/nix/nixdoc/default.nix +++ b/pkgs/tools/nix/nixdoc/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixdoc"; - version = "3.0.2"; + version = "3.0.5"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; rev = "v${version}"; - sha256 = "sha256-V3MAvbdYk3DL064UYcJE9HmwfQBwpMxVXWiAKX6honA="; + sha256 = "sha256-6aPfpkcUoAYaGYqBPFJJQvQ9dMGne9TWJ2HAx95JujY="; }; - cargoHash = "sha256-RFxTjLiJCEc42Mb8rcayOFHkYk2GfpgsO3+hAaRwHgs="; + cargoHash = "sha256-5bWP8dhApnQyK/gQNkPrLeqFvRVbSlVNRG6pRDb/fdk="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.Security ]; From ba7ff4a26b2f505e45216cccd2fb62c85eddb72b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 25 May 2024 04:34:44 +0000 Subject: [PATCH 004/219] highlight: 4.11 -> 4.12 --- pkgs/tools/text/highlight/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix index d26d4fcc8423..312c84921499 100644 --- a/pkgs/tools/text/highlight/default.nix +++ b/pkgs/tools/text/highlight/default.nix @@ -3,13 +3,13 @@ let self = stdenv.mkDerivation rec { pname = "highlight"; - version = "4.11"; + version = "4.12"; src = fetchFromGitLab { owner = "saalen"; repo = "highlight"; rev = "v${version}"; - sha256 = "sha256-8QWcpSYkzw62XFyIqisM2x1AOqzVUPUYgs5bPA4liSw="; + sha256 = "sha256-TFMU9owxBGrrbatk7Jj9xP8OEJNjXnjbwnW6Xq34awI="; }; enableParallelBuilding = true; From bb460d640464e048846129ba6765ef257b7b79ec Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Thu, 11 Apr 2024 17:06:41 +0200 Subject: [PATCH 005/219] open62541: move to by-name --- .../open62541/default.nix => by-name/op/open62541/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/libraries/open62541/default.nix => by-name/op/open62541/package.nix} (100%) diff --git a/pkgs/development/libraries/open62541/default.nix b/pkgs/by-name/op/open62541/package.nix similarity index 100% rename from pkgs/development/libraries/open62541/default.nix rename to pkgs/by-name/op/open62541/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b7444e309a67..a1a7b32ab9d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23575,8 +23575,6 @@ with pkgs; ookla-speedtest = callPackage ../tools/networking/ookla-speedtest { }; - open62541 = callPackage ../development/libraries/open62541 { }; - openalSoft = callPackage ../development/libraries/openal-soft { inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox; }; From ef5ff2a075d8a9af793b524cbe69962963264a34 Mon Sep 17 00:00:00 2001 From: fuggy <45698918+nonetrix@users.noreply.github.com> Date: Sat, 25 May 2024 17:26:15 -0500 Subject: [PATCH 006/219] nixos/xdg/portal: Fix typo There was a typo that misspelled /etc/ as /etx/ --- nixos/modules/config/xdg/portal.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 2c4d07c4953c..2368ca04a49e 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -96,7 +96,7 @@ in Sets which portal backend should be used to provide the implementation for the requested interface. For details check {manpage}`portals.conf(5)`. - Configs will be linked to `/etx/xdg/xdg-desktop-portal/` with the name `$desktop-portals.conf` + Configs will be linked to `/etc/xdg/xdg-desktop-portal/` with the name `$desktop-portals.conf` for `xdg.portal.config.$desktop` and `portals.conf` for `xdg.portal.config.common` as an exception. ''; From 08a65c6e9611eac18256618d96d388ff7752101b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 May 2024 06:20:46 +0000 Subject: [PATCH 007/219] python311Packages.oracledb: 2.2.0 -> 2.2.1 --- pkgs/development/python-modules/oracledb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oracledb/default.nix b/pkgs/development/python-modules/oracledb/default.nix index 356883e2c56e..c1989cbe33b7 100644 --- a/pkgs/development/python-modules/oracledb/default.nix +++ b/pkgs/development/python-modules/oracledb/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "oracledb"; - version = "2.2.0"; + version = "2.2.1"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-9Sx984sTJDtc5YNFe4B0ijRoK5u4Nw2iSXhotxl2eYs="; + hash = "sha256-hGTG8ClfMxja9sLHLIPC3Lw34T+P1E4+Of+GZfRC1rY="; }; build-system = [ From f507e32abe74dbfc85b613788fd89df824e7cc4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 May 2024 08:10:29 +0000 Subject: [PATCH 008/219] touchosc: 1.3.1.204 -> 1.3.3.207 --- pkgs/applications/audio/touchosc/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/touchosc/default.nix b/pkgs/applications/audio/touchosc/default.nix index 23d254efc0b5..bc53b296357b 100644 --- a/pkgs/applications/audio/touchosc/default.nix +++ b/pkgs/applications/audio/touchosc/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "touchosc"; - version = "1.3.1.204"; + version = "1.3.3.207"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-uSXCgwJUEQZDKPAHDT4kKcvkBg9c+T0nrpvYW8jG8Kg="; - armv7l-linux = "sha256-dG5BF8n66YCYCZzc1pLf2qpMLmbv6lfVZYfgry25jQ0="; - x86_64-linux = "sha256-R07kTuwsfe6WhGpHeyZS/HydDUSH6AByx0pJu/i40xE="; + aarch64-linux = "sha256-peEO5haVHXvCT+F48UiKdgwuccqBuZACEXnepB4dcvY="; + armv7l-linux = "sha256-uQNoEye/Jd3T6pLJY2sN7hkTQl3AAilG5Vr9G61vFRM="; + x86_64-linux = "sha256-+/r9gRK8HyynlJ1syC2VQ6VboPEzsVNqEVrQfNLeEv0="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From c8e6c3c21ed81d1b458e7d1dd13c9aa93293c8a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 May 2024 11:12:45 +0000 Subject: [PATCH 009/219] marcel: 0.27.2 -> 0.28 --- pkgs/by-name/ma/marcel/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/marcel/package.nix b/pkgs/by-name/ma/marcel/package.nix index 9c91553fdf3a..9e4cd3f11b90 100644 --- a/pkgs/by-name/ma/marcel/package.nix +++ b/pkgs/by-name/ma/marcel/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication rec { pname = "marcel"; - version = "0.27.2"; + version = "0.28"; pyproject = true; src = fetchFromGitHub { owner = "geophile"; repo = "marcel"; rev = "refs/tags/v${version}"; - hash = "sha256-jzb4kSrcN+pLFkWYy0hc7NCCextWgZQuf3P+kiouEfY="; + hash = "sha256-aJq8FAW1/Vo2x3st+/cxAzo4jHYPBDx/2i/2h1GVnrs="; }; nativeBuildInputs = with python3Packages; [ From 89914ad41b55754e243487efa30e8b5dcf390ea5 Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Tue, 28 May 2024 15:12:49 +0200 Subject: [PATCH 010/219] legba: 0.8.0 -> 0.9.0 --- pkgs/by-name/le/legba/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/le/legba/package.nix b/pkgs/by-name/le/legba/package.nix index 01586e05723a..b46c1c4da6ab 100644 --- a/pkgs/by-name/le/legba/package.nix +++ b/pkgs/by-name/le/legba/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "legba"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "evilsocket"; repo = "legba"; rev = "v${version}"; - hash = "sha256-yevQEbDuVaSsSfA3ug9rDeWtGjMvS+uD7qHguRVt4sg="; + hash = "sha256-emj2N3S26Nm0UiHGZIraCJN07rJNOMvdWRoUbHneknY="; }; - cargoHash = "sha256-UBt4FP5zW+dijneHNaFJ80Ui5R+m+8aSwHTcqKDeEVg="; + cargoHash = "sha256-viDfJ214Zf5segjrLSTbHav5T5e219NAF+MvuPow+JQ="; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ openssl.dev samba ]; From 16bf0beed823b8cea7658589327cfb0b767425cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 May 2024 14:54:47 +0000 Subject: [PATCH 011/219] kubevirt: 1.2.0 -> 1.2.1 --- pkgs/tools/virtualization/kubevirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/tools/virtualization/kubevirt/default.nix index d20168fc7cba..53c280206843 100644 --- a/pkgs/tools/virtualization/kubevirt/default.nix +++ b/pkgs/tools/virtualization/kubevirt/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "kubevirt"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${version}"; - hash = "sha256-GQhynbGu3pEYYKOib0l/TfXrrLQ7TkjacWVdwFrlzEo="; + hash = "sha256-N7To46D8a64/fVDHOuRWt8xQduh/Lvi5C3/N9FhujmI="; }; vendorHash = null; From 75219f7f8c75b1c46e0fed84de905b910e8b0324 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 28 May 2024 16:09:26 +0000 Subject: [PATCH 012/219] tanka: 0.26.0 -> 0.27.1 --- pkgs/applications/networking/cluster/tanka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/tanka/default.nix b/pkgs/applications/networking/cluster/tanka/default.nix index 61f56f425216..536dee55f2de 100644 --- a/pkgs/applications/networking/cluster/tanka/default.nix +++ b/pkgs/applications/networking/cluster/tanka/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tanka"; - version = "0.26.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - sha256 = "sha256-xKB/SKiw3cKqdpl869Bs/NO1Jbrla8Un0hH4kIGqAPs="; + sha256 = "sha256-4ChTYwRp9R8U97hH1Bgrxr5a/5IoWRAmFgJbD7oJpO4="; }; - vendorHash = "sha256-+BCUQ+czqWkxbDoSvCaAxewTN0SuI+hCHEQpLOvNGj4="; + vendorHash = "sha256-u2l3cX8PKHUCPkHuCOyED2LLWygYCDJEhfTjycEBzHI="; doCheck = false; From 52eff50ea50166f26fe0332d4bface4d9b5b51ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 00:37:59 +0000 Subject: [PATCH 013/219] cdxgen: 10.5.1 -> 10.5.2 --- pkgs/tools/security/cdxgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/cdxgen/default.nix b/pkgs/tools/security/cdxgen/default.nix index 1742e47f1d84..a71b6ba5fef2 100644 --- a/pkgs/tools/security/cdxgen/default.nix +++ b/pkgs/tools/security/cdxgen/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "cdxgen"; - version = "10.5.1"; + version = "10.5.2"; src = fetchFromGitHub { owner = "AppThreat"; repo = pname; rev = "v${version}"; - sha256 = "sha256-sGFKmO3nsu5xvli6uGcRAc6CRJgQEvb6avShh2Z0kYg="; + sha256 = "sha256-CmX19UdmXTbmO+6nFzsFbZspmIWYFtcUVaA0j8iU7GI="; }; - npmDepsHash = "sha256-1dKy9/cDr29RrVorpEdNNxPGGX12d/JXAU2g7IAdV/8="; + npmDepsHash = "sha256-Vd+zRExQFmmv9f8uWQFE/nWRs6y86nLFu5HrM6iCf7U="; dontNpmBuild = true; From f69f5c20bf8ce5f5c98d85773f072ee1dedb2c6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 00:38:48 +0000 Subject: [PATCH 014/219] bitcoin-abc: 0.29.4 -> 0.29.5 --- pkgs/applications/blockchains/bitcoin-abc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-abc/default.nix b/pkgs/applications/blockchains/bitcoin-abc/default.nix index 7a41062d6bf1..f866800a9145 100644 --- a/pkgs/applications/blockchains/bitcoin-abc/default.nix +++ b/pkgs/applications/blockchains/bitcoin-abc/default.nix @@ -25,13 +25,13 @@ mkDerivation rec { pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; - version = "0.29.4"; + version = "0.29.5"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - hash = "sha256-RT9sdwwF39arW2AnoQ9KnRzYqhnQhpjWU1eykTiKWSo="; + hash = "sha256-1gw8VgAVflFjYq3/Rd+GgvCmpG2fjtpPvKU2TtxubWs="; }; nativeBuildInputs = [ pkg-config cmake ]; From c2d5cda80c963d54a3d3b660ae624517253c736c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 02:17:10 +0000 Subject: [PATCH 015/219] junicode: 2.206 -> 2.207 --- pkgs/data/fonts/junicode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/junicode/default.nix b/pkgs/data/fonts/junicode/default.nix index 1bc12ad70abb..6c8b095d1cc2 100644 --- a/pkgs/data/fonts/junicode/default.nix +++ b/pkgs/data/fonts/junicode/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "junicode"; - version = "2.206"; + version = "2.207"; src = fetchzip { url = "https://github.com/psb1558/Junicode-font/releases/download/v${version}/Junicode_${version}.zip"; - hash = "sha256-oOKg85Yz5/2/pvwjVqeQXE8xE7X+QJvPYwYN+E18oEc="; + hash = "sha256-R+EQdVklxL8VW9omvADeIdYwr868R19o/1MZYKBIfSA="; }; outputs = [ "out" "doc" "tex" ]; From 6af616875ffee16d76f811ebeb6b454d4232d6b4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 02:54:38 +0000 Subject: [PATCH 016/219] melange: 0.8.0 -> 0.8.1 --- pkgs/development/tools/melange/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/melange/default.nix b/pkgs/development/tools/melange/default.nix index d013f88086e1..330735b47fb3 100644 --- a/pkgs/development/tools/melange/default.nix +++ b/pkgs/development/tools/melange/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "melange"; - version = "0.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = pname; rev = "v${version}"; - hash = "sha256-l2KVy3E1JkVPmRPLNSagjlWpkW3wTF4NylWrSwUW/fQ="; + hash = "sha256-P5PnferNVBLx5MVVo2dpEWl1ggH6bgtdRZ8So02K5G0="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; From 8702b84107e07d7bc57a7decd5a6e3b4acf9a39a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 03:13:50 +0000 Subject: [PATCH 017/219] nix-index-unwrapped: 0.1.7 -> 0.1.8 --- pkgs/tools/package-management/nix-index/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix-index/default.nix b/pkgs/tools/package-management/nix-index/default.nix index 35df4f9674d6..ac48401e7970 100644 --- a/pkgs/tools/package-management/nix-index/default.nix +++ b/pkgs/tools/package-management/nix-index/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-index"; - version = "0.1.7"; + version = "0.1.8"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-index"; rev = "v${version}"; - hash = "sha256-WPWd2aMuP4L17UDFz7SI6lqyrCzrPV8c88vGyO6r6jk="; + hash = "sha256-r3Vg9ox953HdUp5Csxd2DYUyBe9u61fmA94PpcAZRqo="; }; - cargoHash = "sha256-zZhQ3pOid7BCGzcyCrl6sDm0q6IEVKF7K+d6nVs9flk="; + cargoHash = "sha256-c1Ivsj9of/cjEKU0lo4I9BfIUQZ3pPf2QF9fAlZTQn0="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl curl sqlite ] From 3120e82ad8a881b7143f0de209d66608826f7972 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 03:23:53 +0000 Subject: [PATCH 018/219] atmos: 1.73.0 -> 1.76.0 --- pkgs/applications/networking/cluster/atmos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/atmos/default.nix b/pkgs/applications/networking/cluster/atmos/default.nix index 9e5dc34dcef3..469a6a6fcd97 100644 --- a/pkgs/applications/networking/cluster/atmos/default.nix +++ b/pkgs/applications/networking/cluster/atmos/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "atmos"; - version = "1.73.0"; + version = "1.76.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rJGhDFVvlVtQboqts8+c6JYTRHC0IwrOm5BYVA20yrY="; + sha256 = "sha256-NKORuhX9PBNtyLz+teDHKAKR8T6V6QMPQI/oiXPU96Y="; }; - vendorHash = "sha256-11r4ph0i05lHXKNy8iMNKqCVzeQbPtHwNPiQU7759rQ="; + vendorHash = "sha256-puodXLDfTh4KO39F5nfeLqadOvVGf7krsw1JK1fkMCY="; ldflags = [ "-s" "-w" "-X github.com/cloudposse/atmos/cmd.Version=v${version}" ]; From 934604b31b22db2cee55d50ccfe4c2ea13930d8d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 05:30:17 +0000 Subject: [PATCH 019/219] saml2aws: 2.36.15 -> 2.36.16 --- pkgs/tools/security/saml2aws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 7c61095cc3a9..dfc2e6f9ce9a 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.36.15"; + version = "2.36.16"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-lfA+D3NsrnYwqX1hfC3TOQKEBW/65QGUjzYxe2RVVSM="; + sha256 = "sha256-qe4a8dmanXRji7hLtlTYrIOuZ8lHwJtDI6dSFVYwcIo="; }; - vendorHash = "sha256-3jne2an651tlyXgmmQ28R/bwsfaQzI4rC+4WJhyDA2E="; + vendorHash = "sha256-OdkgTBsoBjLajx/ueII3o1ldU7+fysTbdTp7tG9eMng="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; From 9048353e3c3382d5738b27e98a00c63f835e1095 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 07:46:36 +0000 Subject: [PATCH 020/219] vivaldi: 6.7.3329.31 -> 6.7.3329.35 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 3fa1db171d4b..0e7be253a32e 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.7.3329.31"; + version = "6.7.3329.35"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-TxfsI4XMZM3QvyxV48CrOltnRt0LUwZc2auppTvI+0w="; - x86_64-linux = "sha256-NRGELYgcJVL+mLdaWmDZCImCX8w9L+9ecGYQgIB1dq4="; + aarch64-linux = "sha256-myKcYbLJgbjs0o/VWHbupO0JT38qrmayQ5EiQWCzNHc="; + x86_64-linux = "sha256-NFvHSmMGrhvFWMR1onwkcSYUCWe11+CO1jmOlMv9p18="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From 4d3ad26b0401c2f19545128d007408e53c46c8ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 08:16:22 +0000 Subject: [PATCH 021/219] python311Packages.azure-mgmt-network: 25.3.0 -> 25.4.0 --- .../development/python-modules/azure-mgmt-network/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-network/default.nix b/pkgs/development/python-modules/azure-mgmt-network/default.nix index 7fe9320abaab..9df7aa588c35 100644 --- a/pkgs/development/python-modules/azure-mgmt-network/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-network/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "azure-mgmt-network"; - version = "25.3.0"; + version = "25.4.0"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-3OLK+xrg5WPgte/FN9yYp8Ctgk1CYeZL7XX3iBlt1cY="; + hash = "sha256-ozjmLYH9vwUPgCFDwoy5ZbB+3UOADvBQTN+muIVNdVQ="; }; nativeBuildInputs = [ setuptools ]; From 30ebc6ab7cacc5ad57c78df5070e6c59a0a70aba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 09:04:22 +0000 Subject: [PATCH 022/219] elvis-erlang: 3.0.1 -> 3.1.0 --- .../beam-modules/elvis-erlang/default.nix | 4 +-- .../beam-modules/elvis-erlang/rebar-deps.nix | 30 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/development/beam-modules/elvis-erlang/default.nix b/pkgs/development/beam-modules/elvis-erlang/default.nix index ee850580a53c..4dff6a21ed84 100644 --- a/pkgs/development/beam-modules/elvis-erlang/default.nix +++ b/pkgs/development/beam-modules/elvis-erlang/default.nix @@ -8,10 +8,10 @@ in rebar3Relx rec { releaseType = "escript"; # The package name "elvis" is already taken pname = "elvis-erlang"; - version = "3.0.1"; + version = "3.1.0"; src = fetchFromGitHub { inherit owner repo; - sha256 = "vXCsGLTpqoKBAN2K35Zl9W82uKbZAFFFzpXh+HTEAwA="; + sha256 = "u1KDoLLFQ+HdrLqUAbAFYOZhfpO0j/DfEQ7/ZD5RBDM="; rev = version; }; beamDeps = builtins.attrValues (import ./rebar-deps.nix { diff --git a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix index 708fd6c15645..a71d0e5d7714 100644 --- a/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix +++ b/pkgs/development/beam-modules/elvis-erlang/rebar-deps.nix @@ -26,21 +26,21 @@ let }; parse_trans = builder { name = "parse_trans"; - version = "3.4.1"; + version = "3.4.2"; src = fetchHex { pkg = "parse_trans"; - version = "3.4.1"; - sha256 = "sha256-YgpAbOddragnuC5FPBnPBndr4mb1pnz/NOHvLLtg5Jo="; + version = "3.4.2"; + sha256 = "sha256-TCU0feO3w1cy0y5pq0PRzu4L6uPzs63htZy9PdIk2co="; }; beamDeps = [ ]; }; mimerl = builder { name = "mimerl"; - version = "1.2.0"; + version = "1.3.0"; src = fetchHex { pkg = "mimerl"; - version = "1.2.0"; - sha256 = "sha256-8nhYVlCqWBmGJkY46/aY+LsZ3yl/Zq2RsYkQ38bhkyM="; + version = "1.3.0"; + sha256 = "sha256-oeFaUNGIchfelfC5sHk+MoU/fCWKXNInZQiJs4g5/p0="; }; beamDeps = [ ]; }; @@ -66,11 +66,11 @@ let }; certifi = builder { name = "certifi"; - version = "2.11.0"; + version = "2.13.0"; src = fetchHex { pkg = "certifi"; - version = "2.11.0"; - sha256 = "sha256-njfgVC7D+rqhmgc0s5ANwJV5f6xIxAoql0HYrV48m7c="; + version = "2.13.0"; + sha256 = "sha256-jz2VM6DwYHCv39XVlrMuIcZYBmekkokYUbDic3vFB6E="; }; beamDeps = [ ]; }; @@ -96,11 +96,11 @@ let }; katana_code = builder { name = "katana_code"; - version = "2.0.2"; + version = "2.1.0"; src = fetchHex { pkg = "katana_code"; - version = "2.0.2"; - sha256 = "sha256-Plf+1jXgsWpfvazNyHLsU96yHtn8bn65tkFf8Zm3sTg="; + version = "2.1.0"; + sha256 = "sha256-rju6yhh1EViPaWlan/IiUcssxnL9zMGAKJd5vdJRde8="; }; beamDeps = [ ]; }; @@ -146,11 +146,11 @@ let }; elvis_core = builder { name = "elvis_core"; - version = "3.0.1"; + version = "3.2.3"; src = fetchHex { pkg = "elvis_core"; - version = "3.0.1"; - sha256 = "sha256-TPc1QB50ZcEIUcYkXB4+jnZJhNjAtZSdVpexS1+urUk="; + version = "3.2.3"; + sha256 = "sha256-oPDWgczZNVoWXDWXNnVVHxAhaHz5kvFcW/9mtmZO3gQ="; }; beamDeps = [ katana_code zipper ]; }; From 2a41818f80cdec16786c3a001ca4471b12154240 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 10:32:07 +0000 Subject: [PATCH 023/219] gcsfuse: 2.1.0 -> 2.2.0 --- pkgs/tools/filesystems/gcsfuse/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/gcsfuse/default.nix b/pkgs/tools/filesystems/gcsfuse/default.nix index 8ad145254281..35c445ef1541 100644 --- a/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/pkgs/tools/filesystems/gcsfuse/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gcsfuse"; - version = "2.1.0"; + version = "2.2.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${version}"; - hash = "sha256-1SKTwHvSCkkYhPY2yVTIRVsddW/Gt8Vke6W+a4VO6fc="; + hash = "sha256-ecTwC0FHg0MHBkrsydTam4UfylldZQp06t/1BYUwgUI="; }; - vendorHash = "sha256-7IEF11gqou3Dk+CdU1HKPV7MyksldMmciQ74I9MEtuo="; + vendorHash = "sha256-GmLyYtgiUBd09mUktjNhbPN5QCUb9VNUzA0xT5mzQ0Q="; subPackages = [ "." "tools/mount_gcsfuse" ]; From dcbb4588c27ca9dce620f169fbb5e84083a35ac4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 12:58:34 +0000 Subject: [PATCH 024/219] flowblade: 2.14.0.2 -> 2.16 --- pkgs/applications/video/flowblade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/flowblade/default.nix b/pkgs/applications/video/flowblade/default.nix index fff387881cca..4c301b395744 100644 --- a/pkgs/applications/video/flowblade/default.nix +++ b/pkgs/applications/video/flowblade/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "flowblade"; - version = "2.14.0.2"; + version = "2.16"; src = fetchFromGitHub { owner = "jliljebl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M+M6qkgYD5zM8IOFwQsuQlK7qQsvmSjR+CXVpTW+O8k="; + sha256 = "sha256-+vXljhtGcsS50/J52mJGazZX7oWB/RATvv6nzaLeV0Q="; }; buildInputs = [ From 2957fb0426e31e9d5b3c1cd346e535b7aa2a431e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 12:59:57 +0000 Subject: [PATCH 025/219] flow: 0.236.0 -> 0.237.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 3f50cd0df3e9..aa241737c6a5 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.236.0"; + version = "0.237.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - hash = "sha256-W0JLnX+IGFMjIi6EkHRzvB3jSl/8/+3iuc9dwlXB2Po="; + hash = "sha256-VXjWaxQUtkGpxGD70muoEfasfruSA50obr8CQvLRiyM="; }; postPatch = '' From 1959e590cbe6afa60e8398fc8521590bb0101103 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 13:17:35 +0000 Subject: [PATCH 026/219] go-libp2p-daemon: 0.6.1 -> 0.8.0 --- pkgs/servers/go-libp2p-daemon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/go-libp2p-daemon/default.nix b/pkgs/servers/go-libp2p-daemon/default.nix index d28a1858a49e..e85f8ceedfff 100644 --- a/pkgs/servers/go-libp2p-daemon/default.nix +++ b/pkgs/servers/go-libp2p-daemon/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-libp2p-daemon"; - version = "0.6.1"; + version = "0.8.0"; src = fetchFromGitHub { owner = "libp2p"; repo = "go-libp2p-daemon"; rev = "v${version}"; - hash = "sha256-XXg1qIACAHgK1/PltwuoNVYrsntfzo71g1dlq9V/FS4="; + hash = "sha256-xKipt+nh7hFJHb9EmI0JZjBTuewfs82vOk1FC97sbAw="; }; - vendorHash = "sha256-Kdxo0QsS7o9BjSG6qFrlCnqyZXhX6NkT/aUznGrm3xo="; + vendorHash = "sha256-60+JcyVV0uW+T0JZ/keyeYJNWrR3BhLInIgwbpoAe/Q="; doCheck = false; From 636e5933e5ac6114d0f58d236728a041f0a50e4c Mon Sep 17 00:00:00 2001 From: Hraban Luyat Date: Wed, 29 May 2024 09:06:28 -0400 Subject: [PATCH 027/219] sbcl: configuration check: GC requires threads https://sourceforge.net/p/sbcl/mailman/message/58776519/ --- pkgs/development/compilers/sbcl/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 75ead6184aa8..a6b679b05a1a 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -7,7 +7,7 @@ # to get rid of ${glibc} dependency. , purgeNixReferences ? false , coreCompression ? true -, markRegionGC ? true +, markRegionGC ? threadSupport , version # Set this to a lisp binary to use a custom bootstrap lisp compiler for SBCL. # Leave as null to use the default. This is useful for local development of @@ -157,6 +157,7 @@ stdenv.mkDerivation (self: rec { ''; enableFeatures = with lib; + assert assertMsg (markRegionGC -> threadSupport) "SBCL mark region GC requires thread support"; optional threadSupport "sb-thread" ++ optional linkableRuntime "sb-linkable-runtime" ++ optional coreCompression "sb-core-compression" ++ From 0a3596c690badc7b8079d6015255de76dbec0a0c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 14:55:16 +0000 Subject: [PATCH 028/219] shairport-sync: 4.3.2 -> 4.3.3 --- pkgs/servers/shairport-sync/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/shairport-sync/default.nix b/pkgs/servers/shairport-sync/default.nix index 7e034c17f55e..3d4d433bcd40 100644 --- a/pkgs/servers/shairport-sync/default.nix +++ b/pkgs/servers/shairport-sync/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation rec { pname = "shairport-sync"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { repo = "shairport-sync"; owner = "mikebrady"; rev = "refs/tags/${version}"; - hash = "sha256-M7bJO8KVxP2H27aB0qJcsaN9uHADWeOYPdNo8Xfg9gc="; + hash = "sha256-sxYzFmI1Geoqckw+7XMXyvkizNVSlfvpWI7vMbCPT0U="; }; nativeBuildInputs = [ From ee5090d33eec205e949d194eddc36af78765c65d Mon Sep 17 00:00:00 2001 From: Avery Date: Wed, 29 May 2024 11:29:35 -0400 Subject: [PATCH 029/219] delfin: 0.4.4 -> 0.4.5 --- pkgs/by-name/de/delfin/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/de/delfin/package.nix b/pkgs/by-name/de/delfin/package.nix index eaf775ef9434..d5eaa8beb93e 100644 --- a/pkgs/by-name/de/delfin/package.nix +++ b/pkgs/by-name/de/delfin/package.nix @@ -21,20 +21,20 @@ stdenv.mkDerivation rec { pname = "delfin"; - version = "0.4.4"; + version = "0.4.5"; src = fetchFromGitea { domain = "codeberg.org"; owner = "avery42"; repo = "delfin"; rev = "v${version}"; - hash = "sha256-qbl0PvGKI3S845xLr0aXf/uk2uuOXMjvu9S3BOPzxa0="; + hash = "sha256-iqibdVMf4RBl/EuFvE6tEPDliYmRtIYCW/mO+nNKcWU="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Js1mIotSOayYDjDVQMqXwaeSC2a1g1DeqD6QmeWwztk="; + hash = "sha256-2V2jx78S0Gj4/w3oduH/s7Pd6XG/GCs4lwhFCdGVdd8="; }; nativeBuildInputs = [ From e3eb571efc73126b82600164969b77dce8630713 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 16:37:20 +0000 Subject: [PATCH 030/219] cloudlog: 2.6.13 -> 2.6.14 --- pkgs/applications/radio/cloudlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 76ed366bce64..9c131e34bc25 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.6.13"; + version = "2.6.14"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-jhg6Rdd/QhsKZHaeE/2Rh0o0uLD5Jd+3mfXmkpbFcEM="; + hash = "sha256-nsn/pvlFRDGUnm/X5pyzlKWgP6OlfVn3Mdj6vOJZMWQ="; }; postPatch = '' From b389e85bd2a531217e544c3bed4182e698d10ac9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 18:22:51 +0000 Subject: [PATCH 031/219] sommelier: 124.0 -> 125.0 --- pkgs/applications/window-managers/sommelier/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/sommelier/default.nix b/pkgs/applications/window-managers/sommelier/default.nix index 6c3a04915fe6..a5b0398d4442 100644 --- a/pkgs/applications/window-managers/sommelier/default.nix +++ b/pkgs/applications/window-managers/sommelier/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation { pname = "sommelier"; - version = "124.0"; + version = "125.0"; src = fetchzip rec { url = "https://chromium.googlesource.com/chromiumos/platform2/+archive/${passthru.rev}/vm_tools/sommelier.tar.gz"; - passthru.rev = "0ced021a6b362f35592cca5a3915d0ed784615f2"; + passthru.rev = "4445ac169a9e043fd260a835384aaa49c457c358"; stripRoot = false; - sha256 = "zSiGhF4FhLUavC7YEOGGq4NE2hxK4YNXF3CpLptoZbM="; + sha256 = "1PofODGZDknZpzXI1d3JcoNYz3IGfw32nm+SmUpeqb8="; }; nativeBuildInputs = [ From 23041e593123b9b2d9cce4550eb67159a6a06055 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 29 May 2024 22:37:21 +0000 Subject: [PATCH 032/219] treesheets: 0-unstable-2024-05-20 -> 0-unstable-2024-05-29 --- pkgs/applications/office/treesheets/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/treesheets/default.nix b/pkgs/applications/office/treesheets/default.nix index 1af2bbe23c35..a3b7bc51f2b6 100644 --- a/pkgs/applications/office/treesheets/default.nix +++ b/pkgs/applications/office/treesheets/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "treesheets"; - version = "0-unstable-2024-05-20"; + version = "0-unstable-2024-05-29"; src = fetchFromGitHub { owner = "aardappel"; repo = "treesheets"; - rev = "149d3377692cf5c585522f9245d9eb5dd7ddb742"; - hash = "sha256-qqeK13EazfdQteYcBMgWQ/0F4sBaOYCUpw7BMwfoe7k="; + rev = "23654b9be71b59bbffd156ecedc663bd152d123c"; + hash = "sha256-ZTLMqDAmyojvET6qp1ziMNQgk2c+45z2UB3yFMhTmUQ="; }; nativeBuildInputs = [ From 99bccbc5a55e906d23dcc457de11861ac3119d1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 May 2024 01:44:51 +0000 Subject: [PATCH 033/219] hpx: 1.9.1 -> 1.10.0 --- pkgs/development/libraries/hpx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/hpx/default.nix b/pkgs/development/libraries/hpx/default.nix index bcaf1233d300..cef877d286a6 100644 --- a/pkgs/development/libraries/hpx/default.nix +++ b/pkgs/development/libraries/hpx/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "hpx"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "STEllAR-GROUP"; repo = "hpx"; rev = "v${version}"; - hash = "sha256-1gLDwgCqv+3+rOSG7a3fFsnjqfKpnPpWnBmrW+z+jWw="; + hash = "sha256-yrKG0n5BhrUNXjFWZRpb38/GYQlvMr0PSqUbhmZlgm0="; }; propagatedBuildInputs = [ hwloc ]; From 0553e5416563118896983c199f1639fc3ca2e981 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 May 2024 01:47:06 +0000 Subject: [PATCH 034/219] libtransmission_4: 4.0.5 -> 4.0.6 --- pkgs/applications/networking/p2p/transmission/4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix index ebd8260776b9..8cb9724626fe 100644 --- a/pkgs/applications/networking/p2p/transmission/4.nix +++ b/pkgs/applications/networking/p2p/transmission/4.nix @@ -59,13 +59,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "transmission"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { owner = "transmission"; repo = "transmission"; rev = finalAttrs.version; - hash = "sha256-gd1LGAhMuSyC/19wxkoE2mqVozjGPfupIPGojKY0Hn4="; + hash = "sha256-KBXvBFgrJ3njIoXrxHbHHLsiocwfd7Eba/GNI8uZA38="; fetchSubmodules = true; }; From 221aa4628fcceda371a1650ab104b3522cc13857 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 May 2024 02:22:15 +0000 Subject: [PATCH 035/219] tulip: 5.7.3 -> 5.7.4 --- pkgs/applications/science/misc/tulip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 02b5ad0c0458..474df80ace03 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "tulip"; - version = "5.7.3"; + version = "5.7.4"; src = fetchurl { url = "mirror://sourceforge/auber/tulip-${version}_src.tar.gz"; - hash = "sha256-arpC+FsDYGMf47phtSzyjjvDg/UYZS+akOe5CYfajdU="; + hash = "sha256-7z21WkPi1v2AGishDmXZPAedMjgXPRnpUiHTzEnc5LY="; }; nativeBuildInputs = [ cmake wrapQtAppsHook ] From d2ebb454b6b7ad68b81ac47b6e892590901c3c88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 May 2024 02:57:27 +0000 Subject: [PATCH 036/219] helio-workstation: 3.12 -> 3.13 --- pkgs/applications/audio/helio-workstation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/helio-workstation/default.nix b/pkgs/applications/audio/helio-workstation/default.nix index eaaa197a9c6a..dc4bf6333d38 100644 --- a/pkgs/applications/audio/helio-workstation/default.nix +++ b/pkgs/applications/audio/helio-workstation/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { pname = "helio-workstation"; - version = "3.12"; + version = "3.13"; src = fetchFromGitHub { owner = "helio-fm"; repo = pname; rev = version; fetchSubmodules = true; - sha256 = "sha256-U5F78RlM6+R+Ms00Z3aTh3npkbgL+FhhFtc9OpGvbdY="; + sha256 = "sha256-esCulHphPD0gr0dsVBnRTvsGp56vHZmzdbz99mWq9R4="; }; buildInputs = [ From 2837822c4a1530bd41b7449635de49ea0af78eed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 May 2024 03:45:15 +0000 Subject: [PATCH 037/219] dprint: 0.45.1 -> 0.46.1 --- pkgs/development/tools/dprint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dprint/default.nix b/pkgs/development/tools/dprint/default.nix index f762a1e9afe4..54a6f172271d 100644 --- a/pkgs/development/tools/dprint/default.nix +++ b/pkgs/development/tools/dprint/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "dprint"; - version = "0.45.1"; + version = "0.46.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-dVtUUQ9AUQ85vsFwDb3xnR3UWxvSDMosC8QPW8AGHf4="; + sha256 = "sha256-3YD6X/I1x+7hDENS/pBMbaepL9SGkmJfWCmtHBKO+wg="; }; - cargoHash = "sha256-NXofEGJ1Sn7xnn8xxD9ZXBjoG/ZJgWvP0vCAJiwxK38="; + cargoHash = "sha256-vFhDoQYv+OGOgSWALYbY4hl4QQGjvikAkCsDh0utpts="; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; From e4661e18b2c0594804f7ff8346b92bd6c97e3c27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 May 2024 03:51:54 +0000 Subject: [PATCH 038/219] glab: 1.40.0 -> 1.41.0 --- pkgs/applications/version-management/glab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/glab/default.nix b/pkgs/applications/version-management/glab/default.nix index 2d704143bfda..9f3e08464dd3 100644 --- a/pkgs/applications/version-management/glab/default.nix +++ b/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.40.0"; + version = "1.41.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-setvszKdG2EQUlVJNbo7gPKE4b7lfdGT30MC82Kk2/s="; + hash = "sha256-DvIp7eMBWKWQ5VW9MW391xnUz8o1KNz1mkJtu7YVILo="; }; - vendorHash = "sha256-vx4dNFM0PfapRQxz9ef1vNs4RiZlZDNhcKlo87gjGTs="; + vendorHash = "sha256-WM19Kx2b31e4/iA92U9FUuF8R1DMvbKotE2D9HpLQpQ="; ldflags = [ "-s" From ae509d3c59a6d021509e6b61ac96d435191e3735 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 May 2024 04:31:48 +0000 Subject: [PATCH 039/219] flat-remix-gnome: 20240503 -> 20240526 --- pkgs/data/themes/flat-remix-gnome/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/themes/flat-remix-gnome/default.nix b/pkgs/data/themes/flat-remix-gnome/default.nix index 3cd6710e5b93..2afd405f40c8 100644 --- a/pkgs/data/themes/flat-remix-gnome/default.nix +++ b/pkgs/data/themes/flat-remix-gnome/default.nix @@ -7,25 +7,25 @@ let # make install will use dconf to find desktop background file uri. # consider adding an args to allow specify pictures manually. - # https://github.com/daniruiz/flat-remix-gnome/blob/20240503/Makefile#L38 + # https://github.com/daniruiz/flat-remix-gnome/blob/20240526/Makefile#L38 fake-dconf = writeScriptBin "dconf" "echo -n"; in stdenv.mkDerivation rec { pname = "flat-remix-gnome"; - version = "20240503"; + version = "20240526"; src = fetchFromGitHub { owner = "daniruiz"; repo = pname; rev = version; - hash = "sha256-02hYxgq8Go++oYT8r86wA7HVXQJeUZ0JpwIu3VWfjQE="; + hash = "sha256-Z4ba+DB4a9cHT+r+UbsGKG46hcqbM8CZHiI36D60/aY="; }; nativeBuildInputs = [ glib fake-dconf ]; makeFlags = [ "PREFIX=$(out)" ]; # make install will back up this file, it will fail if the file doesn't exist. - # https://github.com/daniruiz/flat-remix-gnome/blob/20240503/Makefile#L56 + # https://github.com/daniruiz/flat-remix-gnome/blob/20240526/Makefile#L56 preInstall = '' mkdir -p $out/share/gnome-shell/ touch $out/share/gnome-shell/gnome-shell-theme.gresource From 774c00e4b9c14d5682202efe21f106aef129aa79 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 May 2024 04:44:43 +0000 Subject: [PATCH 040/219] timeular: 6.7.8 -> 6.7.9 --- pkgs/applications/office/timeular/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/timeular/default.nix b/pkgs/applications/office/timeular/default.nix index 247b9f7caea4..84cb01832b6b 100644 --- a/pkgs/applications/office/timeular/default.nix +++ b/pkgs/applications/office/timeular/default.nix @@ -4,12 +4,12 @@ }: let - version = "6.7.8"; + version = "6.7.9"; pname = "timeular"; src = fetchurl { url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; - hash = "sha256-nMvbr2PQBWyrhY3mv/4wsdWPhNx5hLFaAp0Ey3nvp7g="; + hash = "sha256-UaoIYJxVfQZujf03Swup+zQwb7RWRXuElcswf+MXXQ4="; }; appimageContents = appimageTools.extractType2 { From 34a2673edf0cb0948facd1867ee5f1693814df2f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 May 2024 04:56:48 +0000 Subject: [PATCH 041/219] normaliz: 3.10.2 -> 3.10.3 --- pkgs/by-name/no/normaliz/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/normaliz/package.nix b/pkgs/by-name/no/normaliz/package.nix index 69755e56b8fa..3fb9ef716fdf 100644 --- a/pkgs/by-name/no/normaliz/package.nix +++ b/pkgs/by-name/no/normaliz/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "normaliz"; - version = "3.10.2"; + version = "3.10.3"; src = fetchFromGitHub { owner = "normaliz"; repo = "normaliz"; rev = "v${finalAttrs.version}"; - hash = "sha256-Q4OktVvFobP25fYggIqBGtSJu2HsYz9Tm+QbEAz0fMg="; + hash = "sha256-9jN3EbYfWmir+pa4XuJpeT7CnQdhVU9pP8G11npIG00="; }; buildInputs = [ From 35899e7573c5c50a986f8030986af8392c8c4d6d Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Thu, 30 May 2024 14:54:51 +0200 Subject: [PATCH 042/219] changedetection-io: 0.45.22 -> 0.45.23 --- pkgs/servers/web-apps/changedetection-io/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index 4aa7455aa209..a04165a5aa36 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -5,19 +5,19 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.45.22"; + version = "0.45.23"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; rev = "refs/tags/${version}"; - hash = "sha256-q8Cflu5rYmV//l0MGM4LOep5v/tEHYm2u0A1E5k9kLk="; + hash = "sha256-EamTErJfa6mQCem4DWKC53ydupXP+6jrj9tGPlwehLc="; }; postPatch = '' substituteInPlace requirements.txt \ - --replace "apprise~=1.7.4" "apprise" \ + --replace "apprise~=1.8.0" "apprise" \ --replace "cryptography~=3.4" "cryptography" \ --replace "dnspython~=2.4" "dnspython" \ --replace "pytest ~=7.2" "" \ From e124b02edd3f2a7ce8149e5b9cbdc577234eafaf Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 30 May 2024 18:09:46 +0300 Subject: [PATCH 043/219] nixosTests.nix-misc: Split from `nixosTests.misc` Bit weird to have nix tests in misc Add `artturin` to maintainers --- nixos/tests/all-tests.nix | 1 + nixos/tests/nix/misc.nix | 64 ++++++++++++++++++++ pkgs/tools/package-management/lix/common.nix | 2 +- 3 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 nixos/tests/nix/misc.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index a2408a43ecc9..5c0aea1bb939 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -643,6 +643,7 @@ in { nitter = handleTest ./nitter.nix {}; nix-config = handleTest ./nix-config.nix {}; nix-ld = handleTest ./nix-ld.nix {}; + nix-misc = handleTest ./nix/misc.nix {}; nix-serve = handleTest ./nix-serve.nix {}; nix-serve-ssh = handleTest ./nix-serve-ssh.nix {}; nixops = handleTest ./nixops/default.nix {}; diff --git a/nixos/tests/nix/misc.nix b/nixos/tests/nix/misc.nix new file mode 100644 index 000000000000..6a22ffe0d901 --- /dev/null +++ b/nixos/tests/nix/misc.nix @@ -0,0 +1,64 @@ +# Miscellaneous small tests that don't warrant their own VM run. +{ pkgs, ... }: + +let + inherit (pkgs) lib; + tests = { + default = testsForPackage { nixPackage = pkgs.nix; }; + lix = testsForPackage { nixPackage = pkgs.lix; }; + }; + + testsForPackage = args: lib.recurseIntoAttrs { + # If the attribute is not named 'test' + # You will break all the universe on the release-*.nix side of things. + # `discoverTests` relies on `test` existence to perform a `callTest`. + test = testMiscFeatures args; + passthru.override = args': testsForPackage (args // args'); + }; + + testMiscFeatures = { nixPackage, ... }: pkgs.testers.nixosTest ( + let + foo = pkgs.writeText "foo" "Hello World"; + in { + name = "${nixPackage.pname}-misc"; + meta.maintainers = with lib.maintainers; [ raitobezarius artturin ]; + + nodes.machine = + { lib, ... }: + { + system.extraDependencies = [ foo ]; + + nix.package = nixPackage; + }; + + testScript = + '' + import json + + def get_path_info(path): + result = machine.succeed(f"nix --option experimental-features nix-command path-info --json {path}") + parsed = json.loads(result) + return parsed + + with subtest("nix-db"): + out = "${foo}" + info = get_path_info(out) + print(info) + + pathinfo = info[0] if isinstance(info, list) else info[out] + + if ( + pathinfo["narHash"] + != "sha256-BdMdnb/0eWy3EddjE83rdgzWWpQjfWPAj3zDIFMD3Ck=" + ): + raise Exception("narHash not set") + + if pathinfo["narSize"] != 128: + raise Exception("narSize not set") + + with subtest("nix-db"): + machine.succeed("nix-store -qR /run/current-system | grep nixos-") + ''; + }); + in + tests diff --git a/pkgs/tools/package-management/lix/common.nix b/pkgs/tools/package-management/lix/common.nix index fe77830d56f1..7154dd49c5f6 100644 --- a/pkgs/tools/package-management/lix/common.nix +++ b/pkgs/tools/package-management/lix/common.nix @@ -260,7 +260,7 @@ let passthru = { inherit aws-sdk-cpp boehmgc; tests = { - misc = nixosTests.misc.lix.passthru.override { nixPackage = self; }; + misc = nixosTests.nix-misc.lix.passthru.override { nixPackage = self; }; }; }; From 53a221591772ba4ae1b0627686615751f5ab3bac Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 30 May 2024 18:19:57 +0300 Subject: [PATCH 044/219] nixosTests.misc: Revert nix changes nix tests now moved to `nixosTests.nix-misc` Revert "nixos/tests/misc: support old and new path-info output structure" This reverts commit 903f315fe520023066de2bcf992404fd5e244ec3. Revert "nixos/tests/misc: call the tester `test` to be `callTest`-ed" This reverts commit b35ccb7fda289490130aa0372af05629174c2c11. Revert "nixos/tests/misc: rework and take ownership" This reverts commit 81854ca60475872c7946f0b70789260fb9c99460. --- nixos/tests/misc.nix | 290 ++++++++++++++++++++----------------------- 1 file changed, 133 insertions(+), 157 deletions(-) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 451bd8d4e319..e7842debba7a 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -1,188 +1,164 @@ # Miscellaneous small tests that don't warrant their own VM run. -{ pkgs, ... }: -let - inherit (pkgs) lib; - tests = { - default = testsForPackage { nixPackage = pkgs.nix; }; - lix = testsForPackage { nixPackage = pkgs.lix; }; - }; +import ./make-test-python.nix ({ lib, pkgs, ...} : let + foo = pkgs.writeText "foo" "Hello World"; +in { + name = "misc"; + meta.maintainers = with lib.maintainers; [ eelco ]; - testsForPackage = args: lib.recurseIntoAttrs { - # If the attribute is not named 'test' - # You will break all the universe on the release-*.nix side of things. - # `discoverTests` relies on `test` existence to perform a `callTest`. - test = testMiscFeatures args; - passthru.override = args': testsForPackage (args // args'); - }; - - testMiscFeatures = { nixPackage, ... }: pkgs.testers.nixosTest ( - let - foo = pkgs.writeText "foo" "Hello World"; - in { - name = "misc"; - meta.maintainers = with lib.maintainers; [ raitobezarius ]; - - nodes.machine = - { lib, ... }: - { swapDevices = lib.mkOverride 0 - [ { device = "/root/swapfile"; size = 128; } ]; - environment.variables.EDITOR = lib.mkOverride 0 "emacs"; - documentation.nixos.enable = lib.mkOverride 0 true; - systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ]; - systemd.tmpfiles.settings."10-test"."/tmp/somefile".d = {}; - virtualisation.fileSystems = { "/tmp2" = - { fsType = "tmpfs"; - options = [ "mode=1777" "noauto" ]; - }; - # Tests https://discourse.nixos.org/t/how-to-make-a-derivations-executables-have-the-s-permission/8555 - "/user-mount/point" = { - device = "/user-mount/source"; - fsType = "none"; - options = [ "bind" "rw" "user" "noauto" ]; - }; - "/user-mount/denied-point" = { - device = "/user-mount/denied-source"; - fsType = "none"; - options = [ "bind" "rw" "noauto" ]; - }; + nodes.machine = + { lib, ... }: + { swapDevices = lib.mkOverride 0 + [ { device = "/root/swapfile"; size = 128; } ]; + environment.variables.EDITOR = lib.mkOverride 0 "emacs"; + documentation.nixos.enable = lib.mkOverride 0 true; + systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ]; + systemd.tmpfiles.settings."10-test"."/tmp/somefile".d = {}; + virtualisation.fileSystems = { "/tmp2" = + { fsType = "tmpfs"; + options = [ "mode=1777" "noauto" ]; + }; + # Tests https://discourse.nixos.org/t/how-to-make-a-derivations-executables-have-the-s-permission/8555 + "/user-mount/point" = { + device = "/user-mount/source"; + fsType = "none"; + options = [ "bind" "rw" "user" "noauto" ]; + }; + "/user-mount/denied-point" = { + device = "/user-mount/denied-source"; + fsType = "none"; + options = [ "bind" "rw" "noauto" ]; }; - systemd.automounts = lib.singleton - { wantedBy = [ "multi-user.target" ]; - where = "/tmp2"; - }; - users.users.sybil = { isNormalUser = true; group = "wheel"; }; - users.users.alice = { isNormalUser = true; }; - security.sudo = { enable = true; wheelNeedsPassword = false; }; - boot.kernel.sysctl."vm.swappiness" = 1; - boot.kernelParams = [ "vsyscall=emulate" ]; - system.extraDependencies = [ foo ]; - - nix.package = nixPackage; }; + systemd.automounts = lib.singleton + { wantedBy = [ "multi-user.target" ]; + where = "/tmp2"; + }; + users.users.sybil = { isNormalUser = true; group = "wheel"; }; + users.users.alice = { isNormalUser = true; }; + security.sudo = { enable = true; wheelNeedsPassword = false; }; + boot.kernel.sysctl."vm.swappiness" = 1; + boot.kernelParams = [ "vsyscall=emulate" ]; + system.extraDependencies = [ foo ]; + }; - testScript = - '' - import json + testScript = + '' + import json - def get_path_info(path): - result = machine.succeed(f"nix --option experimental-features nix-command path-info --json {path}") - parsed = json.loads(result) - return parsed + def get_path_info(path): + result = machine.succeed(f"nix --option experimental-features nix-command path-info --json {path}") + parsed = json.loads(result) + return parsed - with subtest("nix-db"): - out = "${foo}" - info = get_path_info(out) - print(info) + with subtest("nix-db"): + info = get_path_info("${foo}") + print(info) - pathinfo = info[0] if isinstance(info, list) else info[out] + if ( + info[0]["narHash"] + != "sha256-BdMdnb/0eWy3EddjE83rdgzWWpQjfWPAj3zDIFMD3Ck=" + ): + raise Exception("narHash not set") - if ( - pathinfo["narHash"] - != "sha256-BdMdnb/0eWy3EddjE83rdgzWWpQjfWPAj3zDIFMD3Ck=" - ): - raise Exception("narHash not set") + if info[0]["narSize"] != 128: + raise Exception("narSize not set") - if pathinfo["narSize"] != 128: - raise Exception("narSize not set") + with subtest("nixos-version"): + machine.succeed("[ `nixos-version | wc -w` = 2 ]") - with subtest("nixos-version"): - machine.succeed("[ `nixos-version | wc -w` = 2 ]") + with subtest("nixos-rebuild"): + assert "NixOS module" in machine.succeed("nixos-rebuild --help") - with subtest("nixos-rebuild"): - assert "NixOS module" in machine.succeed("nixos-rebuild --help") + with subtest("Sanity check for uid/gid assignment"): + assert "4" == machine.succeed("id -u messagebus").strip() + assert "4" == machine.succeed("id -g messagebus").strip() + assert "users:x:100:" == machine.succeed("getent group users").strip() - with subtest("Sanity check for uid/gid assignment"): - assert "4" == machine.succeed("id -u messagebus").strip() - assert "4" == machine.succeed("id -g messagebus").strip() - assert "users:x:100:" == machine.succeed("getent group users").strip() + with subtest("Regression test for GMP aborts on QEMU."): + machine.succeed("expr 1 + 2") - with subtest("Regression test for GMP aborts on QEMU."): - machine.succeed("expr 1 + 2") + with subtest("the swap file got created"): + machine.wait_for_unit("root-swapfile.swap") + machine.succeed("ls -l /root/swapfile | grep 134217728") - with subtest("the swap file got created"): - machine.wait_for_unit("root-swapfile.swap") - machine.succeed("ls -l /root/swapfile | grep 134217728") + with subtest("whether kernel.poweroff_cmd is set"): + machine.succeed('[ -x "$(cat /proc/sys/kernel/poweroff_cmd)" ]') - with subtest("whether kernel.poweroff_cmd is set"): - machine.succeed('[ -x "$(cat /proc/sys/kernel/poweroff_cmd)" ]') + with subtest("whether the io cgroupv2 controller is properly enabled"): + machine.succeed("grep -q '\\bio\\b' /sys/fs/cgroup/cgroup.controllers") - with subtest("whether the io cgroupv2 controller is properly enabled"): - machine.succeed("grep -q '\\bio\\b' /sys/fs/cgroup/cgroup.controllers") + with subtest("whether we have a reboot record in wtmp"): + machine.shutdown + machine.wait_for_unit("multi-user.target") + machine.succeed("last | grep reboot >&2") - with subtest("whether we have a reboot record in wtmp"): - machine.shutdown - machine.wait_for_unit("multi-user.target") - machine.succeed("last | grep reboot >&2") + with subtest("whether we can override environment variables"): + machine.succeed('[ "$EDITOR" = emacs ]') - with subtest("whether we can override environment variables"): - machine.succeed('[ "$EDITOR" = emacs ]') + with subtest("whether hostname (and by extension nss_myhostname) works"): + assert "machine" == machine.succeed("hostname").strip() + assert "machine" == machine.succeed("hostname -s").strip() - with subtest("whether hostname (and by extension nss_myhostname) works"): - assert "machine" == machine.succeed("hostname").strip() - assert "machine" == machine.succeed("hostname -s").strip() + with subtest("whether systemd-udevd automatically loads modules for our hardware"): + machine.succeed("systemctl start systemd-udev-settle.service") + machine.wait_for_unit("systemd-udev-settle.service") + assert "mousedev" in machine.succeed("lsmod") - with subtest("whether systemd-udevd automatically loads modules for our hardware"): - machine.succeed("systemctl start systemd-udev-settle.service") - machine.wait_for_unit("systemd-udev-settle.service") - assert "mousedev" in machine.succeed("lsmod") + with subtest("whether systemd-tmpfiles-clean works"): + machine.succeed( + "touch /tmp/foo", "systemctl start systemd-tmpfiles-clean", "[ -e /tmp/foo ]" + ) + # move into the future + machine.succeed( + 'date -s "@$(($(date +%s) + 1000000))"', + "systemctl start systemd-tmpfiles-clean", + ) + machine.fail("[ -e /tmp/foo ]") - with subtest("whether systemd-tmpfiles-clean works"): - machine.succeed( - "touch /tmp/foo", "systemctl start systemd-tmpfiles-clean", "[ -e /tmp/foo ]" - ) - # move into the future - machine.succeed( - 'date -s "@$(($(date +%s) + 1000000))"', - "systemctl start systemd-tmpfiles-clean", - ) - machine.fail("[ -e /tmp/foo ]") + with subtest("whether systemd-tmpfiles settings works"): + machine.succeed("[ -e /tmp/somefile ]") - with subtest("whether systemd-tmpfiles settings works"): - machine.succeed("[ -e /tmp/somefile ]") + with subtest("whether automounting works"): + machine.fail("grep '/tmp2 tmpfs' /proc/mounts") + machine.succeed("touch /tmp2/x") + machine.succeed("grep '/tmp2 tmpfs' /proc/mounts") - with subtest("whether automounting works"): - machine.fail("grep '/tmp2 tmpfs' /proc/mounts") - machine.succeed("touch /tmp2/x") - machine.succeed("grep '/tmp2 tmpfs' /proc/mounts") + with subtest( + "Whether mounting by a user is possible with the `user` option in fstab (#95444)" + ): + machine.succeed("mkdir -p /user-mount/source") + machine.succeed("touch /user-mount/source/file") + machine.succeed("chmod -R a+Xr /user-mount/source") + machine.succeed("mkdir /user-mount/point") + machine.succeed("chown alice:users /user-mount/point") + machine.succeed("su - alice -c 'mount /user-mount/point'") + machine.succeed("su - alice -c 'ls /user-mount/point/file'") + with subtest( + "Whether mounting by a user is denied without the `user` option in fstab" + ): + machine.succeed("mkdir -p /user-mount/denied-source") + machine.succeed("touch /user-mount/denied-source/file") + machine.succeed("chmod -R a+Xr /user-mount/denied-source") + machine.succeed("mkdir /user-mount/denied-point") + machine.succeed("chown alice:users /user-mount/denied-point") + machine.fail("su - alice -c 'mount /user-mount/denied-point'") - with subtest( - "Whether mounting by a user is possible with the `user` option in fstab (#95444)" - ): - machine.succeed("mkdir -p /user-mount/source") - machine.succeed("touch /user-mount/source/file") - machine.succeed("chmod -R a+Xr /user-mount/source") - machine.succeed("mkdir /user-mount/point") - machine.succeed("chown alice:users /user-mount/point") - machine.succeed("su - alice -c 'mount /user-mount/point'") - machine.succeed("su - alice -c 'ls /user-mount/point/file'") - with subtest( - "Whether mounting by a user is denied without the `user` option in fstab" - ): - machine.succeed("mkdir -p /user-mount/denied-source") - machine.succeed("touch /user-mount/denied-source/file") - machine.succeed("chmod -R a+Xr /user-mount/denied-source") - machine.succeed("mkdir /user-mount/denied-point") - machine.succeed("chown alice:users /user-mount/denied-point") - machine.fail("su - alice -c 'mount /user-mount/denied-point'") + with subtest("shell-vars"): + machine.succeed('[ -n "$NIX_PATH" ]') - with subtest("shell-vars"): - machine.succeed('[ -n "$NIX_PATH" ]') + with subtest("nix-db"): + machine.succeed("nix-store -qR /run/current-system | grep nixos-") - with subtest("nix-db"): - machine.succeed("nix-store -qR /run/current-system | grep nixos-") + with subtest("Test sysctl"): + machine.wait_for_unit("systemd-sysctl.service") + assert "1" == machine.succeed("sysctl -ne vm.swappiness").strip() + machine.execute("sysctl vm.swappiness=60") + assert "60" == machine.succeed("sysctl -ne vm.swappiness").strip() - with subtest("Test sysctl"): - machine.wait_for_unit("systemd-sysctl.service") - assert "1" == machine.succeed("sysctl -ne vm.swappiness").strip() - machine.execute("sysctl vm.swappiness=60") - assert "60" == machine.succeed("sysctl -ne vm.swappiness").strip() - - with subtest("Test boot parameters"): - assert "vsyscall=emulate" in machine.succeed("cat /proc/cmdline") - ''; - }); - in - tests + with subtest("Test boot parameters"): + assert "vsyscall=emulate" in machine.succeed("cat /proc/cmdline") + ''; +}) From e60c483eb9de378593218c23142cb19ddbc199f3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 30 May 2024 18:39:17 +0300 Subject: [PATCH 045/219] nixosTests.misc: Remove nix tests Moved to `nixosTests.nix-misc` --- nixos/tests/misc.nix | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index e7842debba7a..33b3ca2c11c2 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -44,28 +44,6 @@ in { testScript = '' - import json - - - def get_path_info(path): - result = machine.succeed(f"nix --option experimental-features nix-command path-info --json {path}") - parsed = json.loads(result) - return parsed - - - with subtest("nix-db"): - info = get_path_info("${foo}") - print(info) - - if ( - info[0]["narHash"] - != "sha256-BdMdnb/0eWy3EddjE83rdgzWWpQjfWPAj3zDIFMD3Ck=" - ): - raise Exception("narHash not set") - - if info[0]["narSize"] != 128: - raise Exception("narSize not set") - with subtest("nixos-version"): machine.succeed("[ `nixos-version | wc -w` = 2 ]") @@ -149,9 +127,6 @@ in { with subtest("shell-vars"): machine.succeed('[ -n "$NIX_PATH" ]') - with subtest("nix-db"): - machine.succeed("nix-store -qR /run/current-system | grep nixos-") - with subtest("Test sysctl"): machine.wait_for_unit("systemd-sysctl.service") assert "1" == machine.succeed("sysctl -ne vm.swappiness").strip() From 4c289e941b2fd97ad82194e8229418b30ce1e85f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Thu, 30 May 2024 14:32:30 +0200 Subject: [PATCH 046/219] nixVersions.stable: reference nix-misc in tests This is a regression test for nix. --- pkgs/tools/package-management/nix/common.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 9005cd594dbe..94ec74a6a0c8 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -62,6 +62,7 @@ in , mdbook , mdbook-linkcheck , nlohmann_json +, nixosTests , openssl , perl , pkg-config @@ -251,6 +252,9 @@ self = stdenv.mkDerivation { tests = { nixi686 = pkgsi686Linux.nixVersions.${self_attribute_name}; + # Basic smoke test that needs to pass when upgrading nix. + # Note that this test does only test the nixVersions.stable attribute. + misc = nixosTests.nix-misc.default; }; }; From 413707f484902c7b42329faea6c5b9037c13b902 Mon Sep 17 00:00:00 2001 From: Artturin Date: Thu, 30 May 2024 21:00:12 +0300 Subject: [PATCH 047/219] nixos/release-combined: add `nixosTests.nix-misc` to blockers --- nixos/release-combined.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 10834da35207..7c4d89f28af7 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -102,6 +102,7 @@ in rec { (onSystems ["x86_64-linux"] "nixos.tests.installer.swraid") (onSystems ["x86_64-linux"] "nixos.tests.installer.zfsroot") (onSystems ["x86_64-linux"] "nixos.tests.nixos-rebuild-specialisations") + (onFullSupported "nixos.tests.nix-misc.default") (onFullSupported "nixos.tests.ipv6") (onFullSupported "nixos.tests.keymap.azerty") (onFullSupported "nixos.tests.keymap.colemak") From dff9ba604a7a2e24ecc988cb99af5d9b6f36a318 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 May 2024 19:12:33 +0000 Subject: [PATCH 048/219] moon: 1.24.6 -> 1.25.1 --- pkgs/development/tools/build-managers/moon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix index e9b5052ad1eb..9814edd43cc1 100644 --- a/pkgs/development/tools/build-managers/moon/default.nix +++ b/pkgs/development/tools/build-managers/moon/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "moon"; - version = "1.24.6"; + version = "1.25.1"; src = fetchFromGitHub { owner = "moonrepo"; repo = pname; rev = "v${version}"; - hash = "sha256-5K4eKkRL1vUdrTes00WQLzO0BEjK7wWIO6kTwiwuDBk="; + hash = "sha256-LPQuP2OsR1TYnt7Qm8XRO0Ne7xliglJgQrMHNWnsYhM="; }; - cargoHash = "sha256-LSzaY520eltBZxek1RNEk5bMljac4BpH8ggny/fos7Y="; + cargoHash = "sha256-EWwUlKxsf0rZegxk1m11ZPIcfjwZKQ7C95l5UyGVFD0="; env = { RUSTFLAGS = "-C strip=symbols"; From 62942da8548170c1d78e1799558a1e3ccb1f2672 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 30 May 2024 19:34:14 +0000 Subject: [PATCH 049/219] morgen: 3.4.3 -> 3.4.4 --- pkgs/applications/office/morgen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/morgen/default.nix b/pkgs/applications/office/morgen/default.nix index 4bd45374ece2..d14fd28d9db1 100644 --- a/pkgs/applications/office/morgen/default.nix +++ b/pkgs/applications/office/morgen/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "morgen"; - version = "3.4.3"; + version = "3.4.4"; src = fetchurl { url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb"; - hash = "sha256-QxbvD18yoIidiDoU7FsCpdgYZolp8LRx93d1GTjtnfA="; + hash = "sha256-l4wHCapIvD3kZk1DqLNWDLjwg6j7g0+qMB/KuMzH+pQ="; }; nativeBuildInputs = [ From a5fb12f29612eee52921b5cf6a558d5ff569f16f Mon Sep 17 00:00:00 2001 From: Isa Date: Sun, 23 Apr 2023 13:02:47 +0200 Subject: [PATCH 050/219] iodine: unstable-2019-09-27 -> 0.8.0 Co-authored-by: Nicolas Benes --- pkgs/tools/networking/iodine/default.nix | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/networking/iodine/default.nix b/pkgs/tools/networking/iodine/default.nix index a684f3a580f5..328d1354ede3 100644 --- a/pkgs/tools/networking/iodine/default.nix +++ b/pkgs/tools/networking/iodine/default.nix @@ -1,21 +1,27 @@ -{ lib, stdenv, fetchFromGitHub, zlib, nettools, nixosTests }: +{ lib +, stdenv +, fetchFromGitHub +, zlib +, nettools +, nixosTests +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iodine"; - version = "unstable-2019-09-27"; + version = "0.8.0"; src = fetchFromGitHub { owner = "yarrick"; repo = "iodine"; - rev = "8e14f18"; - sha256 = "0k8m99qfjd5n6n56jnq85y7q8h2i2b8yw6ba0kxsz4jyx97lavg3"; + rev = "v${finalAttrs.version}"; + hash = "sha256-0vDl/F/57puugrEdOtdlpNPMF9ugO7TP3KLWo/7bP2k="; }; buildInputs = [ zlib ]; patchPhase = ''sed -i "s,/sbin/route,${nettools}/bin/route," src/tun.c''; - env.NIX_CFLAGS_COMPILE = "-DIFCONFIGPATH=\"${nettools}/bin/\""; + env.NIX_CFLAGS_COMPILE = ''-DIFCONFIGPATH="${nettools}/bin/" -DROUTEPATH="${nettools}/bin/"''; installFlags = [ "prefix=\${out}" ]; @@ -29,4 +35,4 @@ stdenv.mkDerivation rec { license = lib.licenses.isc; platforms = lib.platforms.unix; }; -} +}) From dddd08d188e219f6cae33a509a2c3f5911a66a99 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 30 May 2024 23:38:55 +0200 Subject: [PATCH 051/219] nixos/nextcloud: make memory_limit of nextcloud-cron configurable The memory limit is equal to what's configured in php-fpm. Given that we run in a different environment, it seems reasonable to allow different memory contraints here. --- nixos/modules/services/web-apps/nextcloud.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 91d03dc16077..d7eb2c6cb734 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -793,6 +793,16 @@ in { ''; }; }; + + cron.memoryLimit = mkOption { + type = types.nullOr types.str; + default = null; + example = "1G"; + description = '' + The `memory_limit` of PHP is equal to [](#opt-services.nextcloud.maxUploadSize). + The value can be customized for `nextcloud-cron.service` using this option. + ''; + }; }; config = mkIf cfg.enable (mkMerge [ @@ -1001,7 +1011,13 @@ in { Type = "exec"; User = "nextcloud"; ExecCondition = "${lib.getExe phpPackage} -f ${webroot}/occ status -e"; - ExecStart = "${lib.getExe phpPackage} -f ${webroot}/cron.php"; + ExecStart = lib.concatStringsSep " " ([ + (lib.getExe phpPackage) + ] ++ optional (cfg.cron.memoryLimit != null) "-dmemory_limit=${cfg.cron.memoryLimit}" + ++ [ + "-f" + "${webroot}/cron.php" + ]); KillMode = "process"; }; }; From 7aa5c903320737ecf424832c0ba447eba3d561fc Mon Sep 17 00:00:00 2001 From: WWeapn Date: Thu, 30 May 2024 23:41:01 +0200 Subject: [PATCH 052/219] fanficfare: 4.33.0 -> 4.34.0 --- pkgs/tools/text/fanficfare/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/fanficfare/default.nix b/pkgs/tools/text/fanficfare/default.nix index f4cf0f68b45b..df0c9d2ca6f7 100644 --- a/pkgs/tools/text/fanficfare/default.nix +++ b/pkgs/tools/text/fanficfare/default.nix @@ -1,13 +1,13 @@ { lib, python3Packages, fetchPypi }: python3Packages.buildPythonApplication rec { - pname = "FanFicFare"; - version = "4.33.0"; + pname = "fanficfare"; + version = "4.34.0"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1s3YeI4deej+lkDXtFzfBOtATY+jx+KB7JAnLUDZK8w="; + hash = "sha256-aYXTu/sYBqI45BcCIsC4Fdi+nnvK3eqDqvpsV1wNdXc="; }; nativeBuildInputs = with python3Packages; [ From 63d29606ad7660098549b9e63601f33344402583 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 31 May 2024 04:01:35 +0000 Subject: [PATCH 053/219] python311Packages.ufo2ft: 3.2.2 -> 3.2.4 --- pkgs/development/python-modules/ufo2ft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix index 8eca7124349c..af40d6be2503 100644 --- a/pkgs/development/python-modules/ufo2ft/default.nix +++ b/pkgs/development/python-modules/ufo2ft/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "ufo2ft"; - version = "3.2.2"; + version = "3.2.4"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5HWhRxKs4KQdC1v0LaLgndgMwtcGKLVz9tYtesdJ8Oo="; + hash = "sha256-LkrYKERPJrKsWAYnlJJlybNy93J+uStaHv35jcZpTrU="; }; nativeBuildInputs = [ From dfd0d14efc14c5673be1ce76753ea4e8140868bc Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 31 May 2024 09:40:13 -0400 Subject: [PATCH 054/219] lxd-virtual-machine-image: install initial configuration read-write --- nixos/maintainers/scripts/lxd/lxd-container-image.nix | 2 +- nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image.nix b/nixos/maintainers/scripts/lxd/lxd-container-image.nix index 930ab34af385..8c0e75e84f75 100644 --- a/nixos/maintainers/scripts/lxd/lxd-container-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-container-image.nix @@ -20,7 +20,7 @@ }; in '' if [ ! -e /etc/nixos/configuration.nix ]; then - install -m 644 -D ${config} /etc/nixos/configuration.nix + install -m 0644 -D ${config} /etc/nixos/configuration.nix fi ''; diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix index bbbdd1f3fa17..8a1c9b0d634c 100644 --- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix +++ b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix @@ -20,8 +20,7 @@ }; in '' if [ ! -e /etc/nixos/configuration.nix ]; then - mkdir -p /etc/nixos - cp ${config} /etc/nixos/configuration.nix + install -m 0644 -D ${config} /etc/nixos/configuration.nix fi ''; From e251d46be5d1e400dc0701d2fb62a369dd5d4e3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jun 2024 04:30:36 +0000 Subject: [PATCH 055/219] reindeer: 2024.05.20.00 -> 2024.05.27.00 --- pkgs/development/tools/reindeer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/reindeer/default.nix b/pkgs/development/tools/reindeer/default.nix index b90ff1b1912c..18d907ab65d2 100644 --- a/pkgs/development/tools/reindeer/default.nix +++ b/pkgs/development/tools/reindeer/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { pname = "reindeer"; - version = "2024.05.20.00"; + version = "2024.05.27.00"; src = fetchFromGitHub { owner = "facebookincubator"; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { hash = "sha256-yXHBcb4/IsT39x4J5baJ8JdgG+riJACr8DKpDdi6ARw="; }; - cargoHash = "sha256-8+3sjN0v/XfDlVu8vvi2DoyrECaR9SA6XeKb6AZ+6XQ="; + cargoHash = "sha256-ujyhlMmojBDev45ZHIzTiEj1Zed4chN4u676XJqJAcY="; nativeBuildInputs = [ pkg-config ]; buildInputs = From 76244576357193ac27ef61f091933235ea63f721 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 1 Jun 2024 09:16:09 +0000 Subject: [PATCH 056/219] kodiPackages.youtube: 7.0.6.3 -> 7.0.7 --- pkgs/applications/video/kodi/addons/youtube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 23c59d702e4d..dc8ecfc06197 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -3,13 +3,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.0.6.3"; + version = "7.0.7"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-MhVxaI/kZ/CCAcf6Mo4DXmXpCLpxxpBFGwmTBp3rKkI="; + hash = "sha256-i21BCkW4WpnQY1j9Wyn3/26GaAjWNXDb+lOVpmXlNKM="; }; propagatedBuildInputs = [ From 195626dfe43a99ba498faa8724a60befa5ab0311 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 Jun 2024 08:12:39 +0000 Subject: [PATCH 057/219] =?UTF-8?q?epiphany:=2046.0=20=E2=86=92=2046.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/epiphany/-/compare/46.0...46.1 --- pkgs/desktops/gnome/core/epiphany/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/gnome/core/epiphany/default.nix b/pkgs/desktops/gnome/core/epiphany/default.nix index ab1c4d6b1051..c4edd298aff7 100644 --- a/pkgs/desktops/gnome/core/epiphany/default.nix +++ b/pkgs/desktops/gnome/core/epiphany/default.nix @@ -34,13 +34,13 @@ , pantheon }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "epiphany"; - version = "46.0"; + version = "46.1"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - hash = "sha256-9DSPLPUcB8DBBtEwFy1NI/LNQGh3Hh3gB7dYyireVmA="; + url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz"; + hash = "sha256-Jg+BRp7WR0bCsRQ/Lzi+3NloR3hlZ7CX2fcv072dsUI="; }; nativeBuildInputs = [ @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome.updateScript { - packageName = pname; + packageName = "epiphany"; }; }; @@ -106,4 +106,4 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.linux; }; -} +}) From c4f8dbd24525678a67e2f92ba0caa536dc1f848f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 Jun 2024 08:13:16 +0000 Subject: [PATCH 058/219] =?UTF-8?q?gnome.gdm:=2046.0=20=E2=86=92=2046.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gdm/-/compare/46.0...46.2 --- pkgs/desktops/gnome/core/gdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gdm/default.nix b/pkgs/desktops/gnome/core/gdm/default.nix index bbbe4fbb25b3..c0e7a35d4ed9 100644 --- a/pkgs/desktops/gnome/core/gdm/default.nix +++ b/pkgs/desktops/gnome/core/gdm/default.nix @@ -43,13 +43,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gdm"; - version = "46.0"; + version = "46.2"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-jWy1IXbspItrvxz+L9rgjZZ3taDyvKYA3uRgTeDdHvw="; + hash = "sha256-TuNFQioWU3FQzYQkUM2lKyyoaYS8Ue4gzcAl3PS9Jos="; }; mesonFlags = [ From 4655367aee141847887ce018cc1710e93a207b22 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 Jun 2024 08:13:33 +0000 Subject: [PATCH 059/219] =?UTF-8?q?gnome.gnome-control-center:=2046.1=20?= =?UTF-8?q?=E2=86=92=2046.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gnome-control-center/-/compare/46.1...46.2 --- pkgs/desktops/gnome/core/gnome-control-center/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome/core/gnome-control-center/default.nix b/pkgs/desktops/gnome/core/gnome-control-center/default.nix index 338fa59a2a80..6602a3795834 100644 --- a/pkgs/desktops/gnome/core/gnome-control-center/default.nix +++ b/pkgs/desktops/gnome/core/gnome-control-center/default.nix @@ -73,11 +73,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "46.1"; + version = "46.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-gXkkIwGd7aHSoHTB7Pan5u8xcsCcvm9NeZWktd6igxI="; + hash = "sha256-YzXGy4Fk5XTbUh//Yc+j36pV8dtmrjvKAnUKGT4cTz0="; }; patches = [ From 89aa8a7078caaf2398bfdce63923309b1b001aa7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 Jun 2024 08:15:03 +0000 Subject: [PATCH 060/219] =?UTF-8?q?gtksourceview5:=205.12.0=20=E2=86=92=20?= =?UTF-8?q?5.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/gtksourceview/-/compare/5.12.0...5.12.1 --- pkgs/development/libraries/gtksourceview/5.x.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix index 4b5f52c22b77..d4ac1e9bb09f 100644 --- a/pkgs/development/libraries/gtksourceview/5.x.nix +++ b/pkgs/development/libraries/gtksourceview/5.x.nix @@ -24,15 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gtksourceview"; - version = "5.12.0"; + version = "5.12.1"; outputs = [ "out" "dev" "devdoc" ]; - src = let - inherit (finalAttrs) pname version; - in fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-2vMv9dMVDWOFkX01A6hbngR7oViysDB5MUycAIE/oB8="; + src = fetchurl { + url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor finalAttrs.version}/gtksourceview-${finalAttrs.version}.tar.xz"; + hash = "sha256-hMgqrZhcWq2ufOp4BJBKdjQeyCsmjUZZTBpHjzm0LB8="; }; patches = [ From 053ce2dfe9379d8541ef617303842669c0d2f0c1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 1 Jun 2024 08:15:18 +0000 Subject: [PATCH 061/219] =?UTF-8?q?libdex:=200.6.0=20=E2=86=92=200.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://gitlab.gnome.org/GNOME/libdex/-/compare/0.6.0...0.6.1 --- pkgs/development/libraries/libdex/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libdex/default.nix b/pkgs/development/libraries/libdex/default.nix index a81cc2669529..373fae4876b1 100644 --- a/pkgs/development/libraries/libdex/default.nix +++ b/pkgs/development/libraries/libdex/default.nix @@ -12,15 +12,15 @@ , gnome }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libdex"; - version = "0.6.0"; + version = "0.6.1"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - hash = "sha256-HojSsAYo5Ya3I7f7pRXM6XUvrxISLN5aPA1biDmYUio="; + url = "mirror://gnome/sources/libdex/${lib.versions.majorMinor finalAttrs.version}/libdex-${finalAttrs.version}.tar.xz"; + hash = "sha256-0XbeZXhXHjKowLYDtqWhP6X4f7a1RCV1s47FrxaxepI="; }; nativeBuildInputs = [ @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { description = "Library supporting deferred execution for GNOME and GTK"; homepage = "https://gitlab.gnome.org/GNOME/libdex"; maintainers = teams.gnome.members; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; license = licenses.lgpl21Plus; }; -} +}) From f5bef14d31ed42376b9fe6e4a94d3af8ef5ebcdc Mon Sep 17 00:00:00 2001 From: DCsunset Date: Thu, 16 May 2024 18:36:44 -0400 Subject: [PATCH 062/219] highlight-pointer: init at 1.1.3 --- pkgs/by-name/hi/highlight-pointer/package.nix | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 pkgs/by-name/hi/highlight-pointer/package.nix diff --git a/pkgs/by-name/hi/highlight-pointer/package.nix b/pkgs/by-name/hi/highlight-pointer/package.nix new file mode 100644 index 000000000000..614ce434ef79 --- /dev/null +++ b/pkgs/by-name/hi/highlight-pointer/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + libX11, + xorg, + libXext, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "highlight-pointer"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "swillner"; + repo = "highlight-pointer"; + rev = "refs/tags/v${finalAttrs.version}"; + hash = "sha256-mz9gXAtrtSV0Lapx8xBOPljuF+HRgDaF2DKCDrHXQa8="; + }; + + buildInputs = [ + libX11 + libXext + xorg.libXi + xorg.libXfixes + ]; + + installPhase = '' + runHook preInstall + + install -m 555 -D highlight-pointer $out/bin/highlight-pointer + + runHook postInstall + ''; + + meta = with lib; { + description = "Highlight mouse pointer/cursor using a dot"; + homepage = "https://github.com/swillner/highlight-pointer"; + changelog = "https://github.com/swillner/highlight-pointer/releases/tag/v${finalAttrs.version}"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ DCsunset ]; + mainProgram = "highlight-pointer"; + }; +}) From f54bdb97fda75a59901a1cff0a207639cfe0bf27 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Jun 2024 14:44:11 +0000 Subject: [PATCH 063/219] python311Packages.plugwise: 0.37.9 -> 0.38.0 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 9c1aa683003b..c7edc0b692e4 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.37.9"; + version = "0.38.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "plugwise"; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - hash = "sha256-8o2cTGkoYLrHQsAWnTg7cj9bJ+Wv1/lbHJiZ50jjFxo="; + hash = "sha256-IearyHkIH3iJyIGqdJetg3cu0kvEpZLgI0sotxpQWyw="; }; postPatch = '' From 4f8f18d4fc8ab50f0c4491856aab45fa4bb4db3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Jun 2024 14:44:50 +0000 Subject: [PATCH 064/219] okteto: 2.27.2 -> 2.27.4 --- pkgs/development/tools/okteto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index be53e197bd9b..e8aca09b1829 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.27.2"; + version = "2.27.4"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - hash = "sha256-aackeTtByetowH0SVk4/+Pwyeywe6Vpb/mRHudhzLao="; + hash = "sha256-FctWmYGOdmGqjHGlsi3k+RUmU35ufzpMh7Eh88GZiUc="; }; vendorHash = "sha256-RpkKWz/cJ1StbpVydqpSfA6uwIYgKa1YOCJVXZRer6k="; From 30849a39590932e89a2f91b740efe15a8eb98a91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Jun 2024 16:04:33 +0000 Subject: [PATCH 065/219] emacsPackages.lsp-bridge: 20240520.1548 -> 20240601.1149 --- .../elisp-packages/manual-packages/lsp-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix index 808b9c8123f3..db27cad1efba 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix @@ -16,7 +16,7 @@ }: let - rev = "14180dcfa42a50e5365175a1bf5dc9dd8db196eb"; + rev = "f48de0896d3af80f5e15aef512b7485eb46df9f6"; python = python3.withPackages (ps: with ps; [ epc orjson @@ -28,13 +28,13 @@ let in melpaBuild { pname = "lsp-bridge"; - version = "20240520.1548"; + version = "20240601.1149"; src = fetchFromGitHub { owner = "manateelazycat"; repo = "lsp-bridge"; inherit rev; - hash = "sha256-HIOIHvcazCeyAlMoVSPl8uVXh5zI+UuoNNJgIhFO6BY="; + hash = "sha256-ocKNRSt5RVKGnxd0odI43jdr27oYrRLdnABh6x63CfM="; }; commit = rev; From 5b588a2e9f41181ade56bc66a6b06645b75df5eb Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Sun, 2 Jun 2024 19:01:02 +0200 Subject: [PATCH 066/219] stirling-pdf: 0.24.6 -> 0.25.1 --- pkgs/by-name/st/stirling-pdf/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stirling-pdf/package.nix b/pkgs/by-name/st/stirling-pdf/package.nix index 9a7ef232c01f..9f61ab27f40e 100644 --- a/pkgs/by-name/st/stirling-pdf/package.nix +++ b/pkgs/by-name/st/stirling-pdf/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "stirling-pdf"; - version = "0.24.6"; + version = "0.25.1"; src = fetchFromGitHub { owner = "Stirling-Tools"; repo = "Stirling-PDF"; rev = "v${finalAttrs.version}"; - hash = "sha256-QYoQaRerXLjF3D4S+HSTeaLz12Kxo2emBxSEpWVXUS0="; + hash = "sha256-DgQLn4+uBAF8/c3G6ckkq/0gtJEE9GPHd1d/xB6omlA="; }; patches = [ @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-w1H1YgMyVjd/9lSRt8zZCRgcYDXarr/C+KBrsjI/jYY="; + outputHash = "sha256-JaTL6/DyBAqXkIQOkbi8MYoIZrhWqc3MpJ7DDB4h+ok="; }; nativeBuildInputs = [ From cd31ffccf73cf708f0a6059bee63f90213986773 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Sun, 2 Jun 2024 18:10:48 +0100 Subject: [PATCH 067/219] megacmd: 1.6.3 -> 1.7.0 --- pkgs/applications/misc/megacmd/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/megacmd/default.nix b/pkgs/applications/misc/megacmd/default.nix index 4a4d9a70fdab..07cc3eb0df1a 100644 --- a/pkgs/applications/misc/megacmd/default.nix +++ b/pkgs/applications/misc/megacmd/default.nix @@ -9,6 +9,7 @@ # to be re-enabled when patch available # , ffmpeg , gcc-unwrapped +, icu , libmediainfo , libraw , libsodium @@ -22,13 +23,13 @@ stdenv.mkDerivation rec { pname = "megacmd"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAcmd"; rev = "${version}_Linux"; - sha256 = "sha256-JnxfFbM+NyeUrEMok62zlsQIxjrUvLLg4tUTiKPDZFc="; + sha256 = "sha256-UlSqwM8GQKeG8/K0t5DbM034NQOeBg+ujNi/MMsVCuM="; fetchSubmodules = true; }; @@ -40,6 +41,7 @@ stdenv.mkDerivation rec { cryptopp curl # ffmpeg + icu gcc-unwrapped libmediainfo libraw @@ -59,6 +61,7 @@ stdenv.mkDerivation rec { "--with-curl" # "--with-ffmpeg" "--without-freeimage" # disabled as freeimage is insecure + "--with-icu" "--with-libmediainfo" "--with-libuv" "--with-libzen" From 7ebcae230b5d4ae6c55564886a5d0dcd5d8fdd02 Mon Sep 17 00:00:00 2001 From: lelgenio Date: Sun, 2 Jun 2024 01:58:30 -0300 Subject: [PATCH 068/219] irust: init at 1.71.23 --- pkgs/by-name/ir/irust/package.nix | 56 +++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 pkgs/by-name/ir/irust/package.nix diff --git a/pkgs/by-name/ir/irust/package.nix b/pkgs/by-name/ir/irust/package.nix new file mode 100644 index 000000000000..f2e4b2f5103c --- /dev/null +++ b/pkgs/by-name/ir/irust/package.nix @@ -0,0 +1,56 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + makeWrapper, + cargo, + rustfmt, + cargo-show-asm, + cargo-expand, + clang, + # Workaround to allow easily overriding runtime inputs + runtimeInputs ? [ + cargo + rustfmt + cargo-show-asm + cargo-expand + clang + ], + nix-update-script, +}: + +rustPlatform.buildRustPackage rec { + pname = "irust"; + version = "1.71.23"; + + src = fetchFromGitHub { + owner = "sigmaSd"; + repo = "IRust"; + rev = "irust@${version}"; + hash = "sha256-+kl22m2Is8CdLlqGSFOglw4/fM1exayaMH05YSuTsbw="; + }; + + cargoHash = "sha256-4aQ1IOTcUAkgiQucUG8cg9pVShtlu2IJeqNCGO+6VYY="; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/irust \ + --suffix PATH : ${lib.makeBinPath runtimeInputs} + ''; + + checkFlags = [ + "--skip=repl" + "--skip=printer::tests" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = with lib; { + description = "Cross Platform Rust Repl"; + homepage = "https://github.com/sigmaSd/IRust"; + license = licenses.mit; + maintainers = with maintainers; [ lelgenio ]; + mainProgram = "irust"; + }; +} From 01eb221ace7b7d5f11f0ef39221892b847c8f569 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 29 May 2024 14:27:09 -0300 Subject: [PATCH 069/219] dotnetCorePackages.sdk_6_0: 6.0.30 -> 6.0.31 --- .../compilers/dotnet/versions/6.0.nix | 288 +++++++++--------- 1 file changed, 144 insertions(+), 144 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/6.0.nix b/pkgs/development/compilers/dotnet/versions/6.0.nix index 3e0694666f08..56320767e7c7 100644 --- a/pkgs/development/compilers/dotnet/versions/6.0.nix +++ b/pkgs/development/compilers/dotnet/versions/6.0.nix @@ -4,202 +4,202 @@ let packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.30"; sha256 = "00h28rynbg62abjgknxlq79b48qnjjjclib638wpxjaz96wih96n"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.30"; sha256 = "1n4v5przbrjhzj01b6qijpdc2jbsxr66ijvd0483qxh4s0b4jppr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.30"; sha256 = "13cyagv2gxzdssy4kch80jalax0d905sqglibnp9ncswv5yv7af5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.30"; sha256 = "01n58418vmvz3bxm3b175irfidp42vg71m5b7v0bf5mhifi40ji8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.30"; sha256 = "18v0l07q74m5xxaf6y6dkmr6and8ivya0nslffnr4djrxcbiygdr"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.30"; sha256 = "009srl8vazkjnd93xr6k1m353spbki9gn1yzp4zgazgbrini6rqc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.30"; sha256 = "105zskdc8d7papsi5b8pf76335j4slkm77jd6k5ha0mp6n39a1m2"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.30"; sha256 = "1ppl5zc8j6z3yfhq9wkcmjaa0yajjy4d4iiykh8yqsjypxg5pq95"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.30"; sha256 = "07yaxq68gjnc512nwvzj3h6xk3w1bj9gl25k0qpljnxfv1nmba8y"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.30"; sha256 = "07jhykr9q5akxy2vcsp6w8646j78p636cn13qcbybcxapz7s0iji"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.30"; sha256 = "17k3l8xd5bsyk69bm5q4nxbpb4i0izw1kzmzi7j3p8pmm9prgrpy"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.30"; sha256 = "05ffs63h5f8qhxzrkhq0fwy40q88nf6672xgx5q1zm3pa0a4zpdz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.30"; sha256 = "0p53lyqmr5n2ym202pbgmsd9b9aa6jar7ic04dcq86h2g77r5jqk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.30"; sha256 = "0nzgcfvzxkkf9qgy18svjgwsfhhpv9zz44kcyv5qqv3hjnn59n77"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.30"; sha256 = "0l3gjhmnjd5n67w83smqyhmfcwzszafjgcbq8kdwxiwwh2m6nh2i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.30"; sha256 = "08xwqfqhazjy1gwj2j060vcn1x429b37db1h20mjcszmr6j55bb8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.30"; sha256 = "0kgpximwlw0ypjnpdvnrvgi3k72r032c44ik1vamka6ilir5gcsj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.30"; sha256 = "0ss3108c2h7afypvliyqixv4dll60sq9iwqy90k1p132znpszrmb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.30"; sha256 = "02x38c68xan8hlr59mindcl4rcx49bbh4bibh6fw1l4rrijb38lw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.30"; sha256 = "0qmma776whn57fnjqkpacj03vx6brcx6j51mh200v9gx8hm9h1gz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.30"; sha256 = "1000y4ap0k0iaidl8bqdais3dpcnccd7f4mp219qfcsbn7ma1g5m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.30"; sha256 = "0dcmanh6bpkiix9nm516ybfd3jijr5f4m4pj2b0f4lzdhgnrg5bj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.30"; sha256 = "1aj6dljgqh7ivbbzzqisycklc3ffy5hav6rr78pi20kqr60hgv2d"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.30"; sha256 = "0xfhcig3gj3986rxp3dhnd8hvnj4nvyhz1fz7kpx342d3g53wb37"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.30"; sha256 = "11c5cirdzcmv1h88frjpdzknsafmpzxz6k3k5viqs8dj0pkrx9w4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.30"; sha256 = "0yc0kx6nlfq2hj6392m8jq0gkkc8ayp6pndidwpdyrgxr6dcgx5p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.30"; sha256 = "1s81sj8lnb8szqawxh3vc8wi815ln12cyhrl3f7hwcpay57xgswx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.30"; sha256 = "0xybqg2wd240r1nm2vrbn2qbfqfnqsmxn1012zzwjn17wa2si9a1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.30"; sha256 = "1f8jid6hzbgc69i3mrhr75g4yb8mxky1xddzsq6vm5bhzdi9x9dq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.30"; sha256 = "1iv7mxzyma90s2w6pgcr9gb4b0yab0qgd43ljbr776r45jfmhfgy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.30"; sha256 = "0h63xlks92kmgmzi5vcciw46h9i982shqjsy5w64hxb2m28rrali"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.30"; sha256 = "1nmcfcrhlvyyxgsiaa91ssp691yl3y4p87azsnmvy3p97xppn89w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.30"; sha256 = "1dl58ci5xl0np15mbya16zaipscmvhm3914l2f0pfv1k530c9j7m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.30"; sha256 = "1ik2aarvg0r7k5mm47y7z9lq1csx84k5sd55nrkl2bil0x2pwbzq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.30"; sha256 = "1n711qbd40468l74fr5yjl92n38fsvcdxcl5i3vrqxxqw24rk2v6"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.30"; sha256 = "141ik8krp675ra085b7w4kwslwxdfhpbgkwjwix0l3idkbbqx61x"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.30"; sha256 = "1xj1g4j7khd54lk04wdii1mam6iwa61aijr43bwfrl3cwjlyk0s4"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.30"; sha256 = "0h419n0wzpl7g19g4vwf9s3c3n7vpshyqzfb28w7hy9jk7svvhs1"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.30"; sha256 = "0d9g5yimjmvqgfm5ndyzb7v5xwi0ix0dq6wxinlfcv9jk933bxis"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.30"; sha256 = "0v059yadlahda6ifb84rhpdf5lwd27pkgwfyqdgmqbvc55mvxbpj"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.30"; sha256 = "048nxp4xckb367b016r0avzwkfc6acvw1y454466p9ib29kahc9i"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.30"; sha256 = "0ah5lzn0al0p73mv2ifaqfal38pq7v7cgjsh2byqpylg4fj00lgw"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.30"; sha256 = "1d7vxq3cbqv36mpl1lv9xj6v6gg5x1brr2z0v16zb1sgc20c1py0"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.30"; sha256 = "0im0444rnfdjb088mkgj5nwmlh4qqi7cg29dp7c7490h9b4si6sc"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.30"; sha256 = "0zl6h8nq6c5jnm2a4sn39wsqy05iv1s8cwwxck1xxhc6xhvm7ssz"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.30"; sha256 = "1b8h3clg8fhx2lg1znlidawlr6y230rh7fswz459p3y9a5m2g5rv"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.30"; sha256 = "00zc5ym89ps8f000j3h7d7fqcsk8bs30hx91yd3q8aqcacwp5qwf"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.30"; sha256 = "068y16a9966g5r6syznpi445z753h15dngw9dr5z8dr2rpzvjmdm"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.30"; sha256 = "04i97cy9x3z0cs738li44s7zf73vspjmqiw70vi7bi6lsnf1n393"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.30"; sha256 = "0ra00mpz0m4wchxxay0mzk0r4dslkkjbkxfwv3agfldyl20hdh8v"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.30"; sha256 = "1dmqagg5ygg6w2lmg5rh165chb06q5lalyz0aggd7d10dqyjqdys"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.30"; sha256 = "01naz5yn790qd96pq00pb17s0cgl82ai9l4p0psgcj9hdazhh5d9"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.30"; sha256 = "1pfl0sc6z14imjlxdmacs6yb9mfgf2pb0jqxiwsdxrc9yhvkcy4x"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.30"; sha256 = "08vdq131yc70hb72dh9ira28c894b0fwg71ap8bkdwv3nlj92xcp"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.30"; sha256 = "1b2nwjw1q8696j63rfr6b9v3czprj3vnydw5sb1c4dy8rmi037g1"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.30"; sha256 = "1v4rc0zxiznmg3xzk0f9v780nzrycp7gcj10jpc5f1w7rw9007ch"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.30"; sha256 = "01r6w4j991lzirvb9nznsjq0825j5pa6mfjvacy6izjqbivwcf53"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.30"; sha256 = "060xdk3fazza196zgg5q3r10p7h9nna90zc0kffdabg6j2msr8rm"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.30"; sha256 = "0z350zy4c4xz42ysac40sacvky7lp0n7lyl1kh393v0bnzqad5zm"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.30"; sha256 = "0h7c58nx1l77n1s28ysqbsij9408g2vmyacxryp56k1l30aspnri"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.30"; sha256 = "1nf8p7a8qghpgpyh5hq8f75w78vqy9airb3nkhp600ln0h3rzwsp"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.30"; sha256 = "0579hnk8xiclfzkfdb64628h0r49l8sac3mnv5yrq8sp3kkf8f4d"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.30"; sha256 = "0flcc2vmy9sj40cc6igmb26zflsabp6vx9gzabhyns1lwnkwbljw"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.30"; sha256 = "0zcsj0zqr2mf5134v74xwvsikxsr4g44qkh16qxkhdai1fi9z78n"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.30"; sha256 = "0zwqi277hfiqj0yinmvakw6dvb4njj35yi618s96h94c4dz5f64y"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.30"; sha256 = "0bifshrxl0g2q3xby4vy4bfgjbhy28r1jcvfr7y2vl1ci0a7l7q6"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.30"; sha256 = "17nj6zp7z65p1gbd0rpz0fgiwgh3sikd1b0lvj006gz9njldbkki"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.30"; sha256 = "0yzrn1261ypm7y8l3klpyswkav8qxhnlxsv083nrw1z83sbs6a5f"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.30"; sha256 = "0q5i9nzwjdl733vqx3rp5k9favjz83yrvpwr953wm0jmcddk8gz4"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.30"; sha256 = "1dhd1zczam6s5r0lwdanm3mvvjrwi6l81izb5v2aq4h28g67ciz6"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.30"; sha256 = "11lqxmcmlhxgj1d4ki1rng3ivs2fx8ny984vwzlmcyhc2y5rz63w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.30"; sha256 = "0ljzirp7nx1xmglz9arfggjaxysg0iaqajck045z31s5dr7p70a5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.30"; sha256 = "08k5v35mvcs712kb0vcfjd1dsas5rgwrmv8rn87mzjb2p6ajl3n3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.30"; sha256 = "0p9qybbi7m797svki92ahsyxchd3ic6xw5dbd6h7j2zacgwwkdr7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.30"; sha256 = "0s71k92daakzwish65gmn4nniy6bf2hv34c0sb6m1hv3criqxmp4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.30"; sha256 = "1wqqjhhlqz4dmijcx3kg3hnwq0s0jzqsddaksskzhq8avr4ziy18"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.30"; sha256 = "1zgspjf5qsl6nki9flfm5askgs2ryz6n3b5vz0sh0cygjk93mifr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.30"; sha256 = "03gi4ckn2926am1m5i4pimxlwzb47s5bvqcarw8gchiw6ids27a8"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.30"; sha256 = "1vp1r5jsphj322dh441fs0723riijdqcai595xf7fgdlhr8kqgqj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.30"; sha256 = "1snjxdqm7bn9p87m8hbv125qbz2sgdy59cz5icld9qgyvx6c65p2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.30"; sha256 = "1pdwyi7p71h8418qcjypl5fzvdj22grxiq9yjpnw1qma7d1251ny"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.30"; sha256 = "125qdpv0j0my2m47cdhqacdx3jnpm0f7xgyi60x539iadg9w5n17"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.30"; sha256 = "187nbyjgpj64ap3kql0msynrfrjkfxi7flap67nn3ly844l08h1x"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.30"; sha256 = "0j8rqm3rfl3x7azpkp3l651v4hdd3rchfm40vd291pcc90qicqd8"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.30"; sha256 = "0c3iglyq21mwwlwjd942z2jxaxgh39lxnqkyna0wf4a895g2v4ia"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.30"; sha256 = "0frimj5r3c2dzk3a0z8h80jlsyvckw57nzm2rj85x8c3ym7cfp7g"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.30"; sha256 = "1viylidv5j5h6acikm02v3zrbjbqy78f5a9b5rm5hc74q9hajngw"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.30"; sha256 = "1929s1w81h0y51r2qcywbm4zp700l75yswp5ii68k401861b8pmb"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.30"; sha256 = "13kgffl4jhbq0dn7lx3hhd36r0vi0s3s8dhjq85lq3hrm8454p8r"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.30"; sha256 = "10lny4j9yyla16bwpzvnr15gkf5d4n4la5smk4v8ncfxbj7lgbrm"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.30"; sha256 = "0kmxfvb10gfp4870mcrzgvymgzyb3l4yljnj105y8hr80jya2z2l"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.30"; sha256 = "0passlm8ajlarnvvrczgxp0brgnbk4n8fig9xmangzsz43bys5dc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.30"; sha256 = "1cxd3hshcb5m5651324svwqxfsimkz35kr9lx0m9s0h7r7hnrcck"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.30"; sha256 = "1adhb5qj1rz68l4dg87d2j1mbl263lvfry200fag6sfydb305kqh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.30"; sha256 = "0f8w8fjaigd2pj0gzc0h5qqm3j24mibprirx0iqaj1l7shgpi40n"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.30"; sha256 = "0iirjhd26am5kczss9z1jv0v9qjafassvqdm19jdlwrbfn3nzqvf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.30"; sha256 = "0pvwpdjf5vnyx3kjq9p67hyzqbfq3yri2alxh2i93xjmdc8rmryv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.30"; sha256 = "0bkh3haf5ll5l0iiafv9ihzxqh2jqsqqi5325mkzq192lfkh3nrl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.30"; sha256 = "1dfc7zdjb8m2ziy8rxwismfp6wjs32m4piqxw5w65sc2ryaf2gvq"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.30"; sha256 = "0f01cs742z821m1jds7p05jc085aryj7mjpdd04pwv1ql8axmyhw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.30"; sha256 = "0ns1zscka2fs0zdizir5malhxhgqryd5id87gjqa6y9k8vc6d0h3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.30"; sha256 = "0pd1bwq2nzd705c65ckwxnayjlj7ahj2n5hwfnglmjvhi8dyzr15"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.30"; sha256 = "06nrnbbaykg2w35bldyzyp9qxs8y7aa1mp4j3lswdjcly06rgvbm"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.30"; sha256 = "1h05dhpvycxjs17y3r7y929r07dswv7iq9lmwas1kjxhnzhbs6x2"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.30"; sha256 = "0jj3nxpbyb3vxh2jsa3qwwy46l6yls1z2n93mq2kyr3yi7lnghmg"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.30"; sha256 = "0sbi0b0kck61fq99ipw6jrjrj378kzmk30z0czkj5cn3m59v3dgj"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.30"; sha256 = "166xfyap4mgv5y6qa5bzq1r7rd8n2fy1f3gcy16i1fhlf52db5v8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "6.0.31"; sha256 = "16xd2i3rzvvkdqswmr4i132s7a71m0i2iml8zbxb81vj0qj99nmi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "6.0.31"; sha256 = "0blf8hl2irl9r9x6f7cih87ps21rcs3b8r09z5wp7jcb5j1cv8fg"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "6.0.31"; sha256 = "13765sv4fi9sr0cq4d1lif461xmaxdm4rlnk9gg01g1wgfjaci9v"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "6.0.31"; sha256 = "1nyk0bggmwggw06dm5py4qz2f8b4mzc1c0zvqb3zigsrn37mp44s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "050dzfy49c4jwcm8dfrz2lqbbyhmgnq485zdhpcnc3w08z0ppbs6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "6.0.31"; sha256 = "13kww7x35926wik32z8cnvzhpqp3dwhazkzb569v87x8yww56n3k"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "6.0.31"; sha256 = "07hjgb341356qz440i7agz0zmy0267s1ab09n26nmmclmwi33b6c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "6.0.31"; sha256 = "15zi7yfc862ckv67w69linqnnckb57v2c8xfkd8sc583b55wj65c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "6.0.31"; sha256 = "0b7k2rhhffg36bsqwdbz4sqfn5frahclfhl4g67f8kdz3xjqnv6s"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "6.0.31"; sha256 = "1wablrn1g5z4b995zan397iayxilriapcycmd7fd2rlqamay639p"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "6.0.31"; sha256 = "0hki4z9x60vzcg53s8cxnig4g1xnpqcj629r2cg5q1xw0sknfp5d"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "6.0.31"; sha256 = "1yf6wkmf0dvifphgai72ik09mxvzqdmwg9bgw76d7lwrjq1i0ij8"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "6.0.31"; sha256 = "0w4sab66rjjyar9z139ls6rx29gvgj3rp3cbrsc8z00y9mw2sl22"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "6.0.31"; sha256 = "0g76dzpmpffgv2a10znz0fcqkbms2l3br49f45fa72l6ap4dsm0i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "6.0.31"; sha256 = "05s1c6bd4592xhy0y3w0cjckg11hb4pci729v59k3i3hl0hbad4s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "6.0.31"; sha256 = "10cjff8ddjykawlacjv5zqgdax8vc6g8kdqz9xyk557xi1p1bai9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "6.0.31"; sha256 = "1cqkvmasyh53nlj9vciyfpvv2mhv9jnvnfh5w5sm98cqc49dkmkm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "6.0.31"; sha256 = "10s0p30qzfn9zibp1ldnqar87hqs47ni3rwqpvwx4jn3589cl9sn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "6.0.31"; sha256 = "0k16h1fwnvhw1gcx8ib01bidhrls5m56fiy6wldk3ajgs5dif8i6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "6.0.31"; sha256 = "1rrgp98ssg6xvq4m12hk4wzdrcrc9ks1pbjdvacv7a68zhq9c2ds"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "6.0.31"; sha256 = "0d9lbwlq4xf31lfrkmyv4wsdz39fhha8ink02hkah2yawr4pfbza"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "6.0.31"; sha256 = "127jg9md1xriaj00bh0vqx426y0kiq5l2r9vkd78cihzyfv0asd2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "6.0.31"; sha256 = "0p9z0mx8fmj908nn4ckj78phdwjlwlkd3fy8g04nsgds54wzznnm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "6.0.31"; sha256 = "1wmlwzy9bc1fs38r0vpn3ragp8pkimcq6sicj978yhk7brn52z1p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "6.0.31"; sha256 = "0jr9llhmdjzv4z813m8g1carsj7fqbsjc2r2315qkicvisjf82yg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "6.0.31"; sha256 = "13wfhnjqvk6h9d6s8jvm81fscsc6am3vixpqags8fc38449852v7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "6.0.31"; sha256 = "0pw2n3j6vbmbghda1cvkhi3c39a49xk0a4w059mfya017adl6kac"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "6.0.31"; sha256 = "1cl561dgdk4mj48zw5xwg7a0cafkx8j2wjd4nlv0x3di300k75k5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "6.0.31"; sha256 = "14pbbp2mmnrx42a3zzwavbfshpp4hp04lmpayw3d2fm9nbrzjzlf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "6.0.31"; sha256 = "105f5iq1r1j7fb1nkvls7hdm864pk7l04w0drqj1msml7ja4fdw5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "6.0.31"; sha256 = "0ln0hj3xgr4xlghfna43rr68gclhp6dnqnhn4sfwh82z9i2593nr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0cwzp2ym7d6kyp3sf21v7ixfdjcprpw27qv6x1j7h7bp9jfk8cj2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "1dcj6cclv3j3xmhhvk46kak1afp04mamli0j0n9c4pf3ri4p02h0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "1ld8jxpiapa3zmvikd0r200nx1cwlmm50rl4dyxm3m1xn6hvxkaa"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0mr4x1x42srl363f7v5zdn1l973rfw247vf20i5wrv5hv0qci2pa"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0i2q45z8qkp0pz44rcsljzxrk25xq62z7i4rnq16mcpiq4ycacd8"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "16z8z85bn2zd5r4jjbz5f1sjadj8s3fv3l42xfqka9wj3362rrsr"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0svd4zv4ah95n5cw7z2p8ndfvvvk29qyyd1cpw2qkkghj21lqzk5"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0sr995kaxlnzzgdlgdfnw0zf6qi06f54xga6a80sr69qxacg1n7f"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0ds6i8lcswa8fgbljs1hx3fq0x1h8h9ahb190y751kx53gda4q7j"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "0v3wc81wlsp97a0ab3kqbf2la8j5d66sdzhjs5fagcmlzhgjybvb"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "06a8zdvyr004lhs0pdsin3v8ylmlyqapa5wvyh7q0l4ds9f13h9l"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0k1zsaaj5r91n9iqfdwww0s3kq5ak254brfyhq018jzfgsmwsv1r"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "1smij7fblrcbdn6960snvb5yz0ylk31ixha26bx4pw1qzdq25dda"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "17fb7lnzcna3vjmkkf64l6x67vsc9lkk318bydn0rd8xmsvcarlh"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0z94wlfc7y356m6xbh4yn4f7349dxv3340mmiz3k9m39mcibvh5c"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0d7fpy0ycqigdr79p4ii8hd2d0pgc70rmn67h6y3hvcqxn4569x8"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0vx2caca3rs34hhbci4m8sdrapbph1ry6mj5mjymzqgdvl21zgxl"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "0hhflm634mqdr3q9qjc701yjfammc10hch334zs42758nzbpi4f7"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0l5861rmfqqsqr53d2jnal7nggc6mlvy7hj9ln4b5nbk8w2qmsfs"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "12dj9crj57k905q2i0r6ragmf6n85q4p1ayf00vfjr5wqylfmm18"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0aslfapafa9mp3k09yjy6ay4lclb5kmkiic660xqjqw0gk851skb"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "12w425dbggb34knqxqfqrp6hzyi2d427anmrjqmipsi8hnivnrpd"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0zqfg5g06aqyypk0ka21jzsrb1v38yrgqcsll3ps7xsjd3swx8pp"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "07wpsqknjimf0k9gxz49n69jhybj6h1yap4lsyhaclw4nxmhi2vc"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0akikavmdma4p2fh96i91xfxk8a3dmcm6j0pc0az321fi22g9k1m"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "11knfd86jpmpnhn2vkqn0rkl7yg8ndfva07j90lm27zznz0fzhbd"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0qg7qi7x98szsi1n0gmjv5nplpnkwhli3jrf64wc9jpf3mv2wd6n"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0rv4fwgqr26s1n1qqkzsp1ghn5m5zimllfh5ydn2rd4z9gvg0ivy"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "1w71y8yffaljg96sy7lqfjpxk0mxbh5k1m9mik2nps1cs4f71l5g"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "19xb50y6jcn9yj1yblyd5c7gdcj09xvz0lna329a3gm55144pfgq"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "1qgfxnvlhbr1y9r89srljdmgnyvjqh8knyhcgpakh3g4bi6j61s3"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "1141m8s0q7d73hicr9fgrgc4623rvz6a8mcf70zdq5hrf718nim5"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "1691jld833fyjyy3ahw4hq6k7rlwx6nzz74qf97s5nadbzdqa6b7"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "0b1i3mgnnp3h13p94n14xfvz28lsqmadqiyc5ib44yb28w72zwrm"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0clgs6fs1gz2rld92hcmf4dksw62xb948l1a8zrsdyir40j0l33s"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "1p0cnnvb9i9x2yivvzj3lawy2fdrx2lw934q309anipfsxdzgx13"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "1qy3bgvr9bqi35ncq6f11ihdrbv63vzhs72pl1s56f7wsqx7wpba"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "06bjzlw0gskrgzrp344nq5qz95rkmqf56zcj1dip1107pzhiz4x7"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0d6cdb1nsiqidwy5sgwq5iznb75cqkjffvyqlw9r7i9knj24yp30"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0srvnrvgn48jjwmxrsqqafz9xvvgc3vc24yfibjcj0aa20mr0zjp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "6.0.31"; sha256 = "1dmadshsp686r44sm1l72jkjlym0hbvpycv1vvaivrgrkjsy22yv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "6.0.31"; sha256 = "0sah1gf2lccc93n3lmkgiahlz4jwr02cw20bvcwqyikpldy2awds"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "6.0.31"; sha256 = "1rinf7daaphinmjfcp1v28gm88wcpjvi59a3an76vvjjgpwcms23"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "6.0.31"; sha256 = "115c220p0mbk30biaw0sfqprnaghks7lcvvz6n5rsg0kn4fvy7qs"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "6.0.31"; sha256 = "19a4ainxj8jxij7ckglbmlnvrjxp72xfgx0r6lbglzh9dhsakwm7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "6.0.31"; sha256 = "1y1sdabrcxswlwwlh5a493chxfsfpxrhvs2bkhqpw6bm712df6y4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "6.0.31"; sha256 = "06hcajknx5f3q4hl4950p3wpqylwkrbkady2qyrjil9d9i2nh7dr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "6.0.31"; sha256 = "1ybchvd2n4n57sn0ycd4rw5fhlhyc9w66anffdzmzxk0m2nj1ll4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "6.0.31"; sha256 = "1glgiqxkppk99h5q7hii1d0zx160qxmmna3qjfvk0yp62cx51nam"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "6.0.31"; sha256 = "07wdnlh41x3mblxi8wr5f6n0p9m7j76a6zda5snq25lfsvv75qr7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "6.0.31"; sha256 = "1q56hjpxpda23qn678cm11s0klf7259wbiw4js0yrjhzv0bwy2gf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "6.0.31"; sha256 = "17yzgzbadg8cxrfp9y9lil346jj6lk1ba96pmwcglprmqlf2747s"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "6.0.31"; sha256 = "0j2bachvygz0cnyx1gdj64czsbxypzqhfm3x302jq1lq5mc7g94h"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0ypldja725nxa9h3ddn352lm2c6f07vs1485mqgh10ymnv6a4m65"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "0my18xrinvnb66vm3ni1l6d18l381fd8rpxbjwmcsdznv8p8brg7"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "1i2dyhifzawlsyygykl1rw9y0ybkn8jagklvnvk94mswh55df8k9"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "0lr7qhhgdn20xap6jrsqm444vycmhyjway0g417wk2bp9v22wgf4"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "0gscb2py8shgnsqk4rm1wr29b0g9bk2sxfwlva2vy82i3msx9zcm"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "0rwg0dbd9bfyhs5n2bwr6pz1ygklhgsx1kfjinyl6prgpz8sghgb"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0wwkhq5lahhxz24ihh16ybzkajgzbncfl8mykndphlgq2y0qznay"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "1hdz6j2i206gshm01zrijsgflgab937h8b5idxamdk4rnq9jzhg2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "6.0.31"; sha256 = "03q5qamv7yw6gc975i8fccms5d9wlq8zn7kzaimnzykh470adnz7"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "6.0.31"; sha256 = "0zp62hsaf6nfg28wc6inraqwihbbcd2mcjjkl5g8dfhfd62wqryq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "6.0.31"; sha256 = "08dydwm0sq3hr6bak3p11c9i66jg1prcb75nvdrrx01jsv9gcmab"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "6.0.31"; sha256 = "16xjxz2y3s6lagfmyhzqwwddbs678nfrwz6ja56sxjkwicisq5qm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "6.0.31"; sha256 = "1kqqij06k5mcjphcnwikyjs02b2z0fdccsmbfa7diw5wmci4hr9n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "6.0.31"; sha256 = "0n7cddp4pq5dr7b38mar64cnb3apf6ib9p9wi506shisy8xh7fni"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "6.0.31"; sha256 = "02x1i47syzjm6j7wi1ldzgh4gpz866qcygr4z0b16qsl36qvzb55"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "6.0.31"; sha256 = "1xab7dmxks7kqqnraivgwg4qyvcp11zz7vj1qbryxj6qv7wkv0bg"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "6.0.31"; sha256 = "0z0isj1zsknp81wdf09qf1f1p1vk3v92f9jbkzx9pnqvfdk3s4wb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "6.0.31"; sha256 = "02bi7qlc5d9iz82ld6z6ycczlj3s6c2fy7zi9f917z7v6b278n76"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "6.0.31"; sha256 = "1s889d0rri4xjjk1w47f04jnn1awyxgwa9j01dn0n98qhhl8h8jm"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "6.0.31"; sha256 = "0c9rx3g3j7jrcbly8482xvjhyf16vns95zs466yj17jm9wnq0gcb"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "6.0.31"; sha256 = "0szi3vbsj7gnbf3nq5q0xbf5p4581bglcz3mclwi8z0x2d607c23"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "6.0.31"; sha256 = "07nxbwjjdzxviyrr4f13bfrbs33kz3bf53lk470r5jchi7msv8l2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "6.0.31"; sha256 = "17zn4r2nqkqb4cl0mn1mkd0v11j1j4gwxzcas38ss0snidqddkqj"; }) ]; in rec { - release_6_0 = "6.0.30"; + release_6_0 = "6.0.31"; aspnetcore_6_0 = buildAspNetCore { - version = "6.0.30"; + version = "6.0.31"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/03d1bc71-2ad1-41b4-aa2f-9e4ef6d5c6ed/29b655655d626c590cb216e0c30bccb3/aspnetcore-runtime-6.0.30-linux-x64.tar.gz"; - sha512 = "757d017db28b8e34c4b242c082aa51eb85bce8fca16af37a0beabedb271c9bd13e1631868faa131745d7784db48974567f82275da09041ba434dcb7abe821a2d"; + url = "https://download.visualstudio.microsoft.com/download/pr/c8c7ccb6-b0f8-4448-a542-ed153838cac3/f104b5cc6c11109c0b48e2bb8f5b6cef/aspnetcore-runtime-6.0.31-linux-x64.tar.gz"; + sha512 = "ebb20a3461bf9d1e3a5c91761452f5ef2e60873826ad3158493768a18d207319bccc40d6c1a64fd61dd8c22bad51c26689394b0e6a40c4bfe4cca00ce4c00db1"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a4c8e994-c595-4698-8cfc-cf3ac166bbbf/9e6b514da011de5191d148d95601a7ec/aspnetcore-runtime-6.0.30-linux-arm64.tar.gz"; - sha512 = "de0921903ba55e21195107b126e271457550543fd6a9698ab3c2b1e2b95f7fe2d6fb2f067e08ed10c9e56940c247733dd9a2f9775e7993e033a945899461e130"; + url = "https://download.visualstudio.microsoft.com/download/pr/088b0ba5-2eaa-4815-a5c2-3517b99d059c/f6d18014064903be5fa2f654f51f5ce0/aspnetcore-runtime-6.0.31-linux-arm64.tar.gz"; + sha512 = "5d395554520a62c81e01f045245749d771d728a353631879462ac499e78658377e475bca756668eeafdd65ac55ad55f244f778809c127a553c5c330b76ef9dd8"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/15ab71c2-9230-4afb-87c5-36328af745ed/b859c077ed4d8c00985a2ee87009b6f1/aspnetcore-runtime-6.0.30-osx-x64.tar.gz"; - sha512 = "0a0c4c9255ed29db1c1911fa0fc6c8a9083f777c04a3939b2087d80bba21fbd864e6c92c62aa566a930a2b30024b1fdbfdcf34d034e2734c0a9b3d45f7c63445"; + url = "https://download.visualstudio.microsoft.com/download/pr/9b9addf2-5f49-4d1d-8272-bc348c9d93e4/a4dc2cdc0dcf8215a1c7e436a4c854cc/aspnetcore-runtime-6.0.31-osx-x64.tar.gz"; + sha512 = "79ced204af5aff757fc7680298121269bdc770b62411750f913d3129dad79c8b2eabd54b2986073c219b3aaa4b49f7188ab7694b99361fb725bff8e32db07dc3"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0a61c065-2196-4a9f-a34a-9517b3ec9336/538e1624926840a66ef6963f57d44aa0/aspnetcore-runtime-6.0.30-osx-arm64.tar.gz"; - sha512 = "a74d44c399e06c9ce19ec10d4be53444bf18d981fe7ede62a69efc24a5af5898d4ee63542ffbedc3b906cf1ac3f7101ecdb69e45dc0fbb1336bf151940fc2204"; + url = "https://download.visualstudio.microsoft.com/download/pr/299cb3a7-badd-474f-9906-33d744bd77e7/cfb103fc34184ce82a012c5a1046292a/aspnetcore-runtime-6.0.31-osx-arm64.tar.gz"; + sha512 = "f19e54b4a4e42db7aae880b86a6dde57dc988aebf852008b70ae56f89ad130e0aba73903357f4e97ead10d013ae3fa7fd28d197ef88f0742391f601ff136951b"; }; }; }; runtime_6_0 = buildNetRuntime { - version = "6.0.30"; + version = "6.0.31"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/a80ab89d-9f64-47b9-bba5-907a4cdaf457/c5714a6e605ef86293a5145d8ea72f39/dotnet-runtime-6.0.30-linux-x64.tar.gz"; - sha512 = "b43200ec3a8c74475f396becd21d22c6a78a6713585837707c2a84bbb869c7e551a05c4c1c1cdba8083baebdd09bc356de5d5a833b8bc84b83421d3ecfac71ca"; + url = "https://download.visualstudio.microsoft.com/download/pr/d67d6174-70c0-4256-b4f3-1f06cb5e8499/4bb51048eee17bda6b0ab7887c227206/dotnet-runtime-6.0.31-linux-x64.tar.gz"; + sha512 = "8df8d8bfe24104f41cc9715bb04fdc1811426c4d16f29336607c68a30d245fb8f36577d639e7da4865204fa85280fb5cdcf47e93183afe6b9e946e0c53df32c8"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/27a21bdd-cad5-4f5a-b7a3-86942632a745/3d7aba7c0cfe0c28342a8f83b65e72b9/dotnet-runtime-6.0.30-linux-arm64.tar.gz"; - sha512 = "75fa6de07e5d8e5485af910de522c1d0afed0532008ded1e80ec3f576c9a78c6e5759dd4d1331159263c02121a4d8f1e532f0533c11524c2d782cf861be13c09"; + url = "https://download.visualstudio.microsoft.com/download/pr/34215580-c4c9-49ee-a9a1-e9cb1a25646b/9ac060d3bd7eaf550d11acd60bd2841a/dotnet-runtime-6.0.31-linux-arm64.tar.gz"; + sha512 = "022c7fc8878544f8abde8cf13ef661327238381c8f4731b4975be294616fda00a4b093036a896baef99eb58b881890d3fa951cc51b0212e766a8a7ce95d2c440"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/aee516fe-b6d8-40db-b284-1a287f7cd5ce/c217b7cdbcac883886169b82bcc2b7d8/dotnet-runtime-6.0.30-osx-x64.tar.gz"; - sha512 = "8cffba5feca56bf11b38318564c45ae18a58ec48223963ee46105f71bc07661457e562d51ea0e8b626eb69b7635565244a5cd1575b6fbac52b776145c533e784"; + url = "https://download.visualstudio.microsoft.com/download/pr/e06ea94c-e84e-48c3-9bcb-5fc65db7701b/22612902257c79e6483990c0d9bf02b5/dotnet-runtime-6.0.31-osx-x64.tar.gz"; + sha512 = "fb6ae3a5f5f31078cbc98d06101ed53b6a23e9a5582c3d660850e7315fe21d776ad2c3ec716ce27cc0ac87c37d99c6dd9bc864d9410917aa4c73cd885010980a"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e78e6379-e47a-4e24-ac6b-1c3182f1d664/b8f47b2f04b15c78ac24a8bc88000131/dotnet-runtime-6.0.30-osx-arm64.tar.gz"; - sha512 = "b33a38f4e41455cd88e23f6c0fa76797e05af25bcd94d500557fdd5ce10071ac16789ddef98ec9abef113f2aa487fc7d5c22f329b8a7941a79d7768ca176975d"; + url = "https://download.visualstudio.microsoft.com/download/pr/d82928b9-3ce6-4060-bdd5-159afb165b37/002421f6104e66b92b7abb31abe7ffed/dotnet-runtime-6.0.31-osx-arm64.tar.gz"; + sha512 = "57d89d189fd7c33ae9627a06dd543d4783c1e04376173e4a2868a342ca864323e41d5a4050dd82fbd9d7947ca1ea12185e80294c70857b97e3d32eace15940cc"; }; }; }; sdk_6_0_4xx = buildNetSdk { - version = "6.0.422"; + version = "6.0.423"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/316ad9ae-22cb-478b-b51e-47667f1e7027/7a13422c0951e9235b7692c610b83442/dotnet-sdk-6.0.422-linux-x64.tar.gz"; - sha512 = "e0e6ea234a5aef29c2571784c22396115db292fae8f859f4642f80f873807140bb7bbc009be568e8e34288b46b2e3e7732115b5f02bbc8ca0aa723e183bc084a"; + url = "https://download.visualstudio.microsoft.com/download/pr/111a63f5-e1d4-4d07-b8b2-98642b5fcc59/389661b982fa5b83b09a1f50b9da247a/dotnet-sdk-6.0.423-linux-x64.tar.gz"; + sha512 = "4b4a0e66634211ae04fa030e18ae9e22640f5828307ba85c4bae596ab2d31260519197828dae3b2ec73d6772635e0b375536ea6591b03c67c2b7a5566f016952"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/9f8f2c2c-e531-4a5d-b7ed-1e7e4b8bbc29/12e87ade15ce29558b40099d6c152b10/dotnet-sdk-6.0.422-linux-arm64.tar.gz"; - sha512 = "c03c3708061f266a3d7fb5bf2240f5bdd00be4d877dc3dc62b95a857f2ad62c80dd4c54f5257737ef7bad3cb458685d7f2bcfe71c3562075ac3aed660df8ae41"; + url = "https://download.visualstudio.microsoft.com/download/pr/f60a9d6c-1df8-4b84-af48-1961ed476a38/32f60a0f291dce64fb33a502e69e78bf/dotnet-sdk-6.0.423-linux-arm64.tar.gz"; + sha512 = "42f5e89d6d9a9923bbc20398a6272290b5f693cc767aa540233630f849779daa8cc7d8ac87655f6b2c8e0250bf5be986a8e8ae502b6f33c0b3e474d041b77625"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/818b0c97-95cc-4da8-b5af-05f6854c5e89/200ee246643a1d6a0436ad967ae705f1/dotnet-sdk-6.0.422-osx-x64.tar.gz"; - sha512 = "a301982e64a18cf06577463fc3e2e179c06a31597b1b32127b1196dba755bcc3323edb618f6000c9f4f9ed902c671377a459e9ac90da2c761744fc1d57e220cf"; + url = "https://download.visualstudio.microsoft.com/download/pr/8e5dec4f-d683-4ffa-9704-f4af023d5383/483bb54f830379d5eedd21c47ccaf47b/dotnet-sdk-6.0.423-osx-x64.tar.gz"; + sha512 = "31d8f5aa5b0fc5de1c6f809920cc8ffa0415059daa12ed21888795e600b528376d7b14da5b946ae5493af7214543e6494d9afc8ca017d05ee56dbfd10e2fade0"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/2f0c0bae-a26c-44c1-bd9e-9fcd42548066/c88dc835e8ac824d992696122c10d959/dotnet-sdk-6.0.422-osx-arm64.tar.gz"; - sha512 = "7bb885b605f51cffcb235a6bb6f0eccef7a211e67480fa6243b0cb8899dfd60c4c0501579c0c1dc7fb267aea5db5a6d35cf9e2a35903772797a66360fa171b3b"; + url = "https://download.visualstudio.microsoft.com/download/pr/c53f9a57-8f7c-4d78-a2a5-32ddcf142cbb/312e8c418f6dd2372dd0e9174b10e6dc/dotnet-sdk-6.0.423-osx-arm64.tar.gz"; + sha512 = "fb31894ae43764c518d7909859a2b598134bc03bbb7996ad0badc1088cfcf4d666f25746f77cfef1aa042c2f9fdb348e6975e1c4a98ff93c1b206a4a0429f995"; }; }; inherit packages; }; sdk_6_0_1xx = buildNetSdk { - version = "6.0.130"; + version = "6.0.131"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/3d0d3892-fec9-4764-8638-b579b1b9e222/dd4c14a3c27929671362c89fe3378677/dotnet-sdk-6.0.130-linux-x64.tar.gz"; - sha512 = "dd4e3e5e24c0bc387dc6ed3fa833236d3f444efc0b12a256dcd73f5f4431488b516143d63019c6e9430173adebb07406b52e78a102f9e143a7e3f16361228b32"; + url = "https://download.visualstudio.microsoft.com/download/pr/439c6d52-892d-4aa6-a6c8-e2f9bcda7121/1fab8b4544b64a5c74fd0277d9115292/dotnet-sdk-6.0.131-linux-x64.tar.gz"; + sha512 = "3df39fbce2d549a258163588a7205bed73dd39a69c6ba7fee785bd8a663e679a4194cb7e20a2e0c289539e1e412ab3a7ac019cd92cac13d219dfb50cd25740a4"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/b7e1a062-bd07-4aab-90c8-0d91994ce0c5/1d399c3f9cc73c767e6927ad4f60c5c5/dotnet-sdk-6.0.130-linux-arm64.tar.gz"; - sha512 = "95767eb4da8e3fb50992ec48df178fba9e2a7beaae26c5fdd8ecd4dae605ec048b83180a2bcb72c836468a99607179f9193ce0e1980bc95484865f559cc91789"; + url = "https://download.visualstudio.microsoft.com/download/pr/9402bde0-16de-4696-973f-2a9667ce34a9/81b5e2ffa23e29e10a473cdff7dc7c7e/dotnet-sdk-6.0.131-linux-arm64.tar.gz"; + sha512 = "5815bc11dbab9c8be4c9b0d20903d3b6df2e825bbb2789f2d90d1b7d7fc3f4de28a450f5906d82675e8f67d34da8b28526bfbd5dfefa109bd895d2ac03f08cd3"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fa013cb2-8b3c-4986-8863-dd526d13503e/ac0c886e8c9837784ff02db082ac4a53/dotnet-sdk-6.0.130-osx-x64.tar.gz"; - sha512 = "8102f1432343538f45d0d49e518edb7ba0000d1ae7f7306611d2e17a205baa4215281250b45cf11900f45db0622fd190bf7d57f2b63cc8b1b4bd106128564522"; + url = "https://download.visualstudio.microsoft.com/download/pr/6667b054-8dd2-42bd-b769-521b5e3c95b7/f8a8a2c8c5f57f81e2b3b1581faaf84d/dotnet-sdk-6.0.131-osx-x64.tar.gz"; + sha512 = "eaf8323e2ebadbeb30bf610700b46814bb42efe17cbf7d0ee7322e7cf089a41cbf87e184226536ac580dd60f04009e3dda5878427df788727d065ae3e9f908ff"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8c72ae1a-38b3-4a30-81d5-408073f96d64/2e3493ea5498d598193746232d4be684/dotnet-sdk-6.0.130-osx-arm64.tar.gz"; - sha512 = "9d8273f73e842a3a1a71a2ba5c2f0dce74821e1302ef34843817a3f5c49df83d662bf6c7031dba7a8362903a870f759c7976176209781a3c4ade6c66e6824c41"; + url = "https://download.visualstudio.microsoft.com/download/pr/512b8abb-992c-4af5-b308-9733d072c2d1/ce40f01dea24d4fd4849bb952c9fdb32/dotnet-sdk-6.0.131-osx-arm64.tar.gz"; + sha512 = "ad4563ada153b3d9f11bec8514f97999b31772089150856e46278638caebcf84b51f1413e49cce2c1e4aff266b91a72c1685b6df6546b9a8a2a415e78046587c"; }; }; inherit packages; From 6113a9f660144427e7e79e868825611384a2f852 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 29 May 2024 14:27:45 -0300 Subject: [PATCH 070/219] dotnetCorePackages.sdk_7_0: 7.0.19 -> 7.0.20 --- .../compilers/dotnet/versions/7.0.nix | 322 +++++++++--------- 1 file changed, 161 insertions(+), 161 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/7.0.nix b/pkgs/development/compilers/dotnet/versions/7.0.nix index dc2e5d704a33..fac65c6b2dd0 100644 --- a/pkgs/development/compilers/dotnet/versions/7.0.nix +++ b/pkgs/development/compilers/dotnet/versions/7.0.nix @@ -1,235 +1,235 @@ { buildAspNetCore, buildNetRuntime, buildNetSdk }: -# v7.0 (maintenance) +# v7.0 (eol) let packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.19"; sha256 = "0da47yabymn7q9viymv9g3apmmaibfddnlix67qpxwn9cikbq459"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.19"; sha256 = "0i8mhcy09lmjqhzqmwvp0n5qkizdqin3vap206b2ad28yl6963wz"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.19"; sha256 = "0gqwm6as0lyjawwvq7cgks0ji7cfld495h7hcl553f1vpy3wsn2q"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.19"; sha256 = "099yl2cpqmajdlax174z4bxzw2m4ry5abfx8s10q7h6d95fcnmrp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.19"; sha256 = "1zypq8jgk9z3kn3mmkdijvc9h65iyy7gaif9p0vhnylmvvm89jzp"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.19"; sha256 = "1jmg7sxjnsmaa7ag6bgyhndlhvibswcmnrw0n6sr6crw2y0in2a3"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.19"; sha256 = "0dyk2x5jc3vdpfyl8q6q6wqz8hwzsgvyrjd3956mvs3mrp00brp6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.19"; sha256 = "1g941bzffbdlqlxpgq356mv6n6g72d2yn0rhv0ix53834369367i"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.19"; sha256 = "0xz2lacyda09kxs2d7hasvh51dw6pa6xs7k0q809ni247v7bnab0"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.19"; sha256 = "1kkkajxxdbcy1kgh80183l8v00fv1l81kx5wmxgypz15lqnpmv2l"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.19"; sha256 = "19pjhnx49srxp1qwknc390gapc44019wy4adz9caxpryw0ch4l1x"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.19"; sha256 = "184fjnln6bzg55xz1xc3bmgaanlrh7jxn48fccks163gnir0frjc"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.19"; sha256 = "1dqilsqwwymy7fq2pnvjggn5mfvizqsisla0c36w53mg6xx7vn78"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.19"; sha256 = "1pld28mqy2gy5rsy688y0n5lhzrqzhv1pszqq4bx2ki2rcqka4y6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.19"; sha256 = "1dv4vk07a7kj53sk1nf63h51swzk9yl4j7jdvkc5w2v0z5a186hm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.19"; sha256 = "03766ks38fir978qm6s958zzywvqlnfqsj4mq14ifq36dphmkp4a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.19"; sha256 = "034v4p5w946yvfialqszaywjncqixv9bpc3x8v87wyr95pa3b7bv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.19"; sha256 = "0jcfmaq4ckcpywwxm1ack9xa001aic8pn85ggglidxgcfdr6mpzd"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.19"; sha256 = "1srx048x6nv88s308bfn2vsg9gyqvzmgn4xlzknm9yr89c5pm96q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.19"; sha256 = "14l69l4fnvykmyq48i60xaipc7n72l5acjwvbvm2hg5sx848mnsv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.19"; sha256 = "0zs1jpj64wrjwkw3yqs3ryl08m9qlk3ksv74cy21g6bgx3xaq05y"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.19"; sha256 = "05x34bg48y4aas3yv88ksd84vjz2jj1y7hjkwddmcpd4ni90ixmh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.19"; sha256 = "1d84xdva4av8mv2msbi759fb13sxig0qzdr6a9pmlq8gb8hf7zma"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.19"; sha256 = "0m30aykrzl48i8589qn8z89hm9p1yl71cdigv1f09fmwb7c6jfm3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.19"; sha256 = "0akwsg0q1498ribamba3qkabp0rgn941dsrswb29sbpwfyyqmmgg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.19"; sha256 = "06xcc29albls44invg5dfyjf3qzcn991h7sdlbhvc5v0xyk72fhx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.19"; sha256 = "12zgh8pvbdl99zs0rq5ajbl91r976i47hdrrvxl2hbsxl2ws3brs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.19"; sha256 = "1lwnwxscza5m7pk83fwjz5r9kms3ybag2rl07f3gqp3b203iyyxx"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.19"; sha256 = "1kgz4594742cd72vh23ra5gr4b9sgxfim2b608z9bmp0slnr08k1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.19"; sha256 = "0njfv091dlc7aff6nj0v7g2b583ns14lkmjf93z184sgav37ynvp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.19"; sha256 = "0hssqp21mjsacxf53g7jjc6ss3689199rxymlzp1sswjhhz8w9ci"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.19"; sha256 = "1pja0r3p7n41hm0bjcdvmi4ymsd2jr7m2pcky4107dz8lf2l0axb"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.19"; sha256 = "1yfy711lpgngy8qmzywjmc7bv0q9j1dz4c6g23vd7q25nw05jrr4"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.19"; sha256 = "0ab5phjb7vs9rc2cynsn5wgxfdh4lnz97whw9n63dyqmi1zp6y7w"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.19"; sha256 = "01v9j3j54m2ff7qdfvm5gk77vggjyfy42fjn8lcgz38gi6z57742"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.19"; sha256 = "059qxvvyyqihxfmg21c3v6ykb0yf6ay88pc9r1dv27say4glr28q"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.19"; sha256 = "09ra2dm7zqjm000rpz2l6jqsf05f97kkkd754djf337h0kskwfkg"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.19"; sha256 = "1dbzmscgp2drqijl1rl8jkyn1bawfyzq0xlndk1knh7lwq1qhrwz"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.19"; sha256 = "0w2gvwg8mipvvp9q88asvpaxg96v7k52c535sd70b2lxmwgaf5aw"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.19"; sha256 = "10xjjhbivxb37yq7a417r3hmp5vvk75800jwlysfa241yq2x3ysk"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.19"; sha256 = "0frf9xf70fh595m6hg9h5wivhvm229dd9w1zij4jwsl532n9s80i"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.19"; sha256 = "1agbxkypvhcdwf2w3zfnsx7ncfi5nzhnays7b8ciawnjr3jp10gh"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.19"; sha256 = "056v3fyc0bqad3kixcggzvjrvflxhiiivy90s1rd9gbcm79zyg0x"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.19"; sha256 = "1zya7f9gp3rr31kshw3c53wmqz5f8qdr511wf2vyi2854b1gm96v"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.19"; sha256 = "156zby9bxx1mcfnxjvgbcmlxx5zi5l3dys8kgb1wfy9ipbhcjh16"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.19"; sha256 = "03z39bbpq5h9rvs9ixcrhvf18s3hsfap5zsi0j3yrkf8v5zqziil"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.19"; sha256 = "0agdz3g1v33d8bxm7fk1c0mvlkyh5hvr17f0d5g3yzrzlnrxlc8s"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.19"; sha256 = "0nkmj3hl0w5b8ndx0yb86dddq6w5qcknw0xvr40d6rlafsgbfdq2"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.19"; sha256 = "0fkkcm9bd7kv87bwfi434ikh0an2n6g340vr3pdz8f292r9kq4d7"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.19"; sha256 = "11sa38y72qi8v5pncw8j2ql89q3rl27nvmh1bpq4rbvnspl4pvqs"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.19"; sha256 = "1hrd03lbk63p91fn0rf0fybqwqk2mv57q2g82qns0991cl61fvi8"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.19"; sha256 = "0b4kq7c2rcngksq0xf12ijhjx9hch90hwrzw5icffqzhqys40v4f"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.19"; sha256 = "0j1giclx2kn3mjwm8kbw1jsv0vhnd65jk692y1y1xvzz9jbqfs5b"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.19"; sha256 = "143j9g5k661dqx9lwsgia215lr7rqz04xk2rk8g3vxckbnk7rzx5"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.19"; sha256 = "0lf7i88b9mdb72dgzc9zk478gwws4saij721v2n6z5xx9ggn5hyp"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.19"; sha256 = "012h4pb369y2wrb8rmvvklndsgphh6a6gd1gxqzl6bqfpl716njz"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.19"; sha256 = "01d9xrh0wczpdyzm6zqym9w73his56lq455hc8nkz9ga5a2s058h"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.19"; sha256 = "02wvkzmmnfj55vzanll95hl2pgg1ihfzarcwkhgnrxyx4j6qrh40"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.19"; sha256 = "0kgd9xl4r39pr4kcpfxgc8s13gpjjzamrkiwhnsj5mqyphslgfp5"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.19"; sha256 = "066wx7m5vj841xqqbdw4qshsjxzf0g6n7msgxjyqn2aw58w7kk9b"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.19"; sha256 = "08h5fybyn1dfpsr5gqz7xkafavgaacbf6cijq1hiynvjw89cm7ch"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.19"; sha256 = "1wvp2xlzh4arsnj7fz7p4714af8j19h7b847kzvafg31ns02ws5h"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.19"; sha256 = "17dr9r8j5kqgkbpnj5j4s2hikk0aiv61xvqchr3vp1pjrpzfi231"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.19"; sha256 = "14q5q312nz1i8q8ffiz4v0rp9fd52n3pv2p4vn71lavcplh3sfq1"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.19"; sha256 = "1hfb76mkxkqc88km752irifbxjd745lncvy0a0zxxahq0hacj425"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.19"; sha256 = "143abqzcq2s22gz32lj6z363fw6hll6mgm6kh530qr437rb8fvqh"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.19"; sha256 = "01pxl7n3iygdnzj1b08vz87d43ysc5yqzy8yifriy96yf7c9syb2"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.19"; sha256 = "15gr2dknc4g0dcg6zkml0f87i4hx7hjz7glmknkpy3bsbadlc075"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.19"; sha256 = "1mfk457maqrmxi0rwj4fhchbj0yj65zsr072374idf61q9fp01wc"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.19"; sha256 = "0qcsddvh4cjn8fkk8d8ndlxhlx7xs1799kqap192m5diip4ik0j0"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.19"; sha256 = "1wkvap3pm7fa02agg9dbnr4xq60rd5hrcjizr4acn8xrljyxbli7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.19"; sha256 = "0afrmsv8qk0p8b5964fz38m07v0h89j16x5mlll3pm0a1ih3cshz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.19"; sha256 = "0xyc0mdd7nnmc9wjzq8nxwrqagmiqxds8qwghr2rgxw55b9slc33"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.19"; sha256 = "1ssgnfhgkly0h8dc5h9c8iyb3n75d7dgc4cxgxnslydwv3ygyh32"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.19"; sha256 = "08gs703rz3agmisy3vsdnyv5lyc32qb8kvfljzszbyqlaf5cxhd1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.19"; sha256 = "1z9zfzccqn6yh9mcqrkiidjagzmnk4blrralzb8q0b7mnf1b1ww9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.19"; sha256 = "10i3rr8hig3cnnd1wf9isxgmbj6hn59ndsywbif5yhyflgw3fvqm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.19"; sha256 = "1rby657hwrw4a26fljbxq7lanl4rhv7sijxcw746lifxx7mzfj6a"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.19"; sha256 = "0gg1rj848cfiyx9cvvddangww9h37586dr15d7l1c2zmk9nlisd7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.19"; sha256 = "1gvbnqayjc2nkb42f35d5gxc6ffszwg698z4dy8b75838jjqnwdl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.19"; sha256 = "0xm8l6wbyx55p75wgpckmsn9brrymslgsr7rm2q1a8z003m86kx7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.19"; sha256 = "061lhndg6m4infwhnrb243sz3a8hvwvck6hpl106annxms760mq7"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.19"; sha256 = "1cm56g54fa18p9hvbmnkiwn7jf4f6bbcny3zd4vsqm9y348dag1i"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.19"; sha256 = "01391xxjmgcfgflc4fvrx74a8nr3y48db5m3r9qnj0m49rh60rxs"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.19"; sha256 = "0my6x223z6mpwvw6614xzly6haxamnhn9w4a3q91l3ayq4q9crgg"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.19"; sha256 = "1cklsjdk7rvnc2h9pfyq04asjpair2nsnbb002flwyq4nhh35af5"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.19"; sha256 = "1awcriq95alz79xzd3g669l1wf23bs362z23xkyxmafiyn0h9jvj"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.19"; sha256 = "1xbwsxaxq55azpj49jal50w8a2awd6aa5q5qbxhwv84rqlv8ixd0"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.19"; sha256 = "1xb37xfkblby3gi0rg0hhmy66pcvsm9q0x6ypi0z9lbl64h7r919"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.19"; sha256 = "0270v287dq263a4p34qxk8g09af4nr9sxn8m4jd192zfm9cggvw6"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.19"; sha256 = "12wkp5y27ih8d5k4xrlbi4jd8wg7si9lw03bp2bvmp7grslqdnfp"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.19"; sha256 = "1mz2y7s9gxj0jkrf8xyi9q2h5xaqily3vzd9b5bpmx69nbi1adip"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.19"; sha256 = "0anfp4mdsnkkjj398vnqjs5k07z6niriyqz10ccxjzzmkxaq5kb0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.19"; sha256 = "0wj5p8hi9jqr9qn4gl0v367kv43vdh21p1kxsja49vvq98y6c7h9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.19"; sha256 = "0izy5gvkwa5a71aq8q9nsbwmy22sghk9x1b42lw97vn4h5ghwcnr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.19"; sha256 = "1dsj2nhd8wa8m3w69cs4i89kd1b5812qbdjx14nagwgdazvvakbf"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.19"; sha256 = "1c9rzh8va957xvfb4w07409ncv8zps8692yp5dl7xh643djsgpwv"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.19"; sha256 = "01slq8bk8mk0a59abf6mcs4m39mqzvhb003w4abvqr9vghq8fzbr"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.19"; sha256 = "088yv3n9qghnw8fgbrkc90xnb0dlrr13j60wj6qhd8rsk53cvxig"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.19"; sha256 = "158pibija2rfnmxsrynypslknlr76h2vgpq4p0n9bfy79pb7krda"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.19"; sha256 = "0qldfcpjid7a05b0sk7zznfz6xvpaz74hkyqs6ybs7ac1mkb5d3m"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.19"; sha256 = "01rbx0phr7apkdkflsmbbzjzfzxl2ls3q6a00bqijabzb9brmfaf"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.19"; sha256 = "1s1x47nkaxk4mg2k4a81g6c3i2lf6lzzqn5rhs67fsp2p7gam03x"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.19"; sha256 = "0m9s3fgmlcy1r5knfgm1qm4s9gskjvnpnscsv88hkczw8m4v8if2"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.19"; sha256 = "02sq95zkgqlksa47n7mgqkrbk44v20fc8k7slsyk3faplg0bzf60"; }) - (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.19"; sha256 = "1pk7afp09ilzlinpbqjnbjnww6i7iykrhg822x8ggrmqm0bmxvyn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.19"; sha256 = "0mar4ls20prrj2b8vb2yaqgfz46gqsjll5amyacv92vgnyixhv9n"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.19"; sha256 = "1934pv8q3jdnsj94lid10wc6xmicmqvg82cv480898hfcvwp25zb"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.19"; sha256 = "0w0j7pmdm0x49yv4z96d6phmwqfj2sjm3aaa5k856g08b38kviyi"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.19"; sha256 = "116yy1k23jhaibhqr2jjjxd0pbw3n6ps3y8mx6i7s6k2mdglys5y"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.19"; sha256 = "14p7d7gb4bxi7vdzs0jajcblb3zbp8bg2168yl09jmqwyp3qwrrb"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.19"; sha256 = "15k2sn69mph4cfrr90rpa803z1jx9bzjccn5z5q5cc7ywnrm8xcr"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.19"; sha256 = "1gzmw2mp0pb9jj81784xfazxk6i4l9mgffd5k1ljbq4kp8i40wiq"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.19"; sha256 = "1lx6qydgvip8i7f3v93yn9ibdyl384hblbsk0hc384jai62hs444"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "7.0.20"; sha256 = "0ab1l6r77a11sk450jhhi9flvsn8gp4fz2il2a0vk1lw5rw23047"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "7.0.20"; sha256 = "050wdpwp7hjk5c9xyx0vj1cmslcdl9acldhxs6al3nx83vssa1kv"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; sha256 = "0wi679cxlfx8s5nl3iqgma9nmxzbi73wamxshgpaaj2dg3z5xrqz"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; sha256 = "0bgi8rx7dam9727v936h5ap81fx4k9n708002raw9v69p8yva5v6"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "7.0.20"; sha256 = "0h6f18k05w66797yyj7yqbf6jv5k3c5r089mkw43y4gbqz27vbmy"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "7.0.20"; sha256 = "1xlqjar4j0g1a7wf8ixjpnn6i19zxr3c7pwr6jdn06yzbi20ri7q"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "7.0.20"; sha256 = "0l2md2g657arlf703vf9y8x1k0zx50zf4wy4f96m6qgs9jx8s6py"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "7.0.20"; sha256 = "1r2nxc0nm2n5dc7laf65yqbjv23g9fzwcvv8vhrnvir6j3lgxfcl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "7.0.20"; sha256 = "1n0dz6k338wmadkgb7x0jywz2qxf3427wkjw8xn2zdz4m1fcj58c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm"; version = "7.0.20"; sha256 = "05srdy7bvgasr0yx1mxkilbkls14k0dmp4mzc7jiqv7xspc4jwwn"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "7.0.20"; sha256 = "00npza90sgnvls4k1k95mhgiw5fpxcrxf60fi17k871m6igdfh1q"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; sha256 = "1q86xz3v8p24728bl7sw0flhzk042ygxa23k0qyhxdn0qwzzq6bw"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "7.0.20"; sha256 = "1jjb4jsnm0f1q0s8199nympm9vifaa129l0bj4j1z94i1g85nw1w"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "7.0.20"; sha256 = "0cn8j76jbbp6vpf00kr1wwr4z1ij0sgdymawff32qvj44wfmhpnl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "7.0.20"; sha256 = "0cbk7shnry75p95zyg14pszf396pgpyjwzhraqbds5mmncqisvgz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "7.0.20"; sha256 = "02fz22di6ax1819spb4v22nb89glp3h08kk88am6rx3vgb440sbm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "7.0.20"; sha256 = "0wvg2rfp4v8cnqkfjv4ifj9q0bd3vljqnbnf719nf1h0ilmcxcjx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "7.0.20"; sha256 = "1mq59gpd6p46zl2nl5ijjncghx6fms9nig9zqhxazjd15bqy0l33"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "7.0.20"; sha256 = "01xpgbphknkjqgsbcngvckg3a8q0y74g409v7hmxsh7rjcradnqd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "7.0.20"; sha256 = "155z494bpri732h1yba6ggmalgwxw68qjpyrbzfj9mi4whwy6p47"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "7.0.20"; sha256 = "021mg80b9x25jpdm2rc6m91wib15bb5arkxjjfa0cp509i5hnshi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "7.0.20"; sha256 = "0jpxs82ndrbs3r28951v0p31ngfkhcs0k7plgywyvd1lpkvdm2nh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "7.0.20"; sha256 = "0bcnw653m7w7if6z84rf4k3mr7hdmvnlv4icflk0kc5jd98bkvhc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "7.0.20"; sha256 = "03107bdy4i9sckpwnk9s497sfq1prl4mccbc3mak43vbnfyqrsad"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "7.0.20"; sha256 = "1lhlaj2ra25jjr6f6rq5rw4wg981h9js7amld10ccyg2vfrswv9d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "7.0.20"; sha256 = "1w5r2nv27h3csd5qd3sx2zmf5drrp3ygb519m4hvn5lazyfah5p6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "7.0.20"; sha256 = "0r002hclq07y275qwj5pq0nxmb6k8h8yglcynpvw8m0pz8d9mr9g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "7.0.20"; sha256 = "0msncsn0lz0dvc6clvc4blq8a1bv5qap7qx27fdibdx24i5lsjya"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "7.0.20"; sha256 = "13x37m9mdg8pvq1rzcrr4bp5yqaayz7173p39s623n8zjxrh60ww"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "7.0.20"; sha256 = "1cv1zmkiz114vk0b0spnnczagbcks5k1fb198lc88pi3c9dpfm0d"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "7.0.20"; sha256 = "0wpf2p1476ns8xd5qvih5llswag133q4s6mj62yzbba890lg5y78"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "02iri99mhfq9awdymsqhg86pg6qfgfig2r2w96jm9lbx4gkg1rgm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0g24nr6v86nikikfvg2b3d8im9cp1hib3xiccklbhkpbym3y98dj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1dldykby8yfvq7r7kmlg5wi6spy1ngsxbs18ng34lcqjfxjjdnpb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "07ip7aflkg89gsbfm1w7sgidn4lvc3csrirzkbdv2jhm876bxz2y"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "13pvjwqlacls6hz719lwc6rz0ghs29gxywisldwnwwbm9i6wdnga"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "15qwwdf3c03gs916r3k49wwg411cmrf5xldydkxjjab8pavdlq0s"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1mjwlxy5gy7k2iil1jcrssqspn3hrpm2dqwghzx9dr61wvpl6sq6"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0dwpzaasn5044aqm2xix3czfgrwx0y0jwis6p0x8n8jdqyskpim2"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0ai75b700v76rmqlblxpkwsd97jidfd5kn3jl0y52yq0ylvc4zyf"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "1jkh7kjhaghslhlx6x7w03kdxi1xbrgxwdj9qav0ci7nvf5j00v6"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0k5skgnss5hknr4r15gxph54zhk65cnglp117gih8qxyzn0245m7"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1kllpbyldix05ab1pb775ykxwh9lrcji9vqbyp964b8m68r9yf1h"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0a5gajmkchf2ad3zwmjaa6mw72snf6hrf3xz581mn8qnjjv68whj"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0xsyd8jvj39z99ga9x26g1fi4zi39pf3ym87fr9102bg5rllj8m6"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "18jp8cykpj40r61ji5fpvfj7yw6cw041l6r4q30am9sj80sgq73m"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "086cn7jilskr7q2hfy810f4hshzhm9r6kvd2kjzvjwf93s0qfgya"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "11y8c16m63kb1masa0x7ympwjg93ffyp4yfycd0fcf0zhzyw00bx"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "175qh1czpm8vs0ifbg3iwgz2cn3v0rvd51g1k81k6j00z9gmhrsm"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "098177bqda2viwzcabsxrpj1p45jqi5fnyfg9xnnw198gh0iskvj"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "180bkmdr4h14a8l2gs9khm835037pw8aqgjz4snx6wxhq7jbdypr"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0jdvi1pcb3fxqa01633asixs93rg1lfq98vnba018nbqdifqyvf1"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "09can99m6psr9v93awwkahyxq899sg1l6p8gpp4qscqwpil22r4c"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0idzsi16ny8bjhii6fwjwqn8wmy8x4q2y0zx4d1vmxfx51ym634f"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1k5yigh196dn961bbvbyy8jfvw8ghmk4da313a304b4m9rf6q5c6"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "1rnpmqmgdw2y9snjj3kp2irg1aggkq2lccd7v4q53ghnl55jdil8"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0xibpawi6nahdbrdcb71panhx4w5zlmbfxspwmljn2a77sy9caw7"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "07qrpww6nd67xjj3jin97jwiymyxgpm9mdg4raxs9ss0pc05l5xv"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0dskgn19yhsq28hvzqs422bq64y5gx5cx33m1m3zq8mfycvscnsv"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "0k70cb1lh6j9qg4pjy6r58z0n5xip3l6i6vkgrdx2rqqvpmq2ky8"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "1qr458jrmsb9nijll88hp56msjmvnk20q73x7qypvqlydsn2ap3y"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1503pddh5klr3z9kpmbxnr4w472v1w8ggh37iqi79z3b0x72zzi6"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "09ddji35a92iq9f4rm5xmz1vi3bki75xskq3iypjbc52ar7wkfl1"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "03338hfl2sb8ca9v3a42b4fgr7qyv3r2khc0ydhif45r0xjx6zrx"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0lnm29n2z4r7kjwyfa5gbl8qc5nbbc5qkl9kg8vj2xb9mlk5zsmz"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "15ah793265ikivb5iqblcl4x86g4bqgwmhdlhikgv6a18bq32sjz"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1jnz72f7m292863wvpmm12gwdnqwbvm45br1958f0gkgp0zmhyjs"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "18k3qs54a4x342ypc0p54ch6xwx9wpfgb5f6iyw0i0f8jjxspbay"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0nyk8x3myh6b0jfka8mvxbhlzl38qiljky8acfkyvw4dzw0y63rb"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0541ykf9hhc56jin59lg5iw96apcg740wg1hrj0m8dagjll2c599"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "09dlmiqcscdrvjrg9w5mjlz59ly0la4as4hkadz6j4mqvv2k7j6y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "7.0.20"; sha256 = "11bcpf986m4wzrln9v4frh63arrg9r3vmv2lq7x338xnrwxadz8q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "7.0.20"; sha256 = "0i07x8kwsifhzkbx1j8argx31g9dxppqwaysn21cd623d16r2g1i"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "7.0.20"; sha256 = "0aq01ld9k4064bgki4q4g4fl08i82pnh5xgxaqk3k48nbsbrzvwc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "7.0.20"; sha256 = "18an54s6jldf330ckigig6s1xnadm7zygrlb35qrhawvygbqayal"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "7.0.20"; sha256 = "1fv6p9idx6g58y0khw7jl23lkwj01l8246mv045i9q6sp3fm9m2v"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "7.0.20"; sha256 = "0qfv5w1s5pj3c46jx2g75parx12p40rywacvb7v0fbllj2nvm89r"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "7.0.20"; sha256 = "10d13b4vl5nhk3iqcpbhdhqgwmymzx875w4yq3pwjkcc2vyhg3j5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "7.0.20"; sha256 = "1rbl46pfwh1hkbf5djy1khqyiv2fivkgxs0gcnpx0kpx4lncf73a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "7.0.20"; sha256 = "03760jw9bbhcg5gmx5z5xjyccl0sv1lzznk3hx2ynwrwg6dhbkyi"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "7.0.20"; sha256 = "1gw4wlraqbr5m5w62wyfx7gsvyj92a8h7i04n9jgc6sfs4yfrsz4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "7.0.20"; sha256 = "0fcph5pd0myyzzl3ihnvp6wii4vl09ayri5ba12xgixb3qidskgp"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "7.0.20"; sha256 = "1zxpbwc52xsylc6kwk0sqf24cgyv9b2cz9l3icpl1hnkqims9xy4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "7.0.20"; sha256 = "1jhw9f2mzx8a1bqdiq7ylk8nccwcqa57sd31ykd7lzq1wbhy2r45"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "11l84kx7v6y10kzlsr74kwvvz44wzj476m5mkm2xv2b8pv1z0i7z"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "11xxvyals3q16bzjd7a4gg0nzidsm822aa92yd752jzcxchdn6z0"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "0dg1m80mxvabdkqjgynnws6vlzj9469d5nrjnk5x2zqcsw9kjj08"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "0rdq3z66azlwsak8n8j9jz8pj0lwsvz9f7n6k7x6mlz20wcw4qs6"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "02ymh38rj3pwak3g9qhviv64kqpclcp40paijg7m184y5bli68b3"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0s9bca6p8j96as25r22vbcmyyhbavkczdk68ypd7qn4g1s44l34w"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "1mi25ilkzw9375lybrmi78g24xzmcz7mnqgjf8y9qvivwsf7ysgn"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "15jfwa5fva8qz6g2gnbxnppd9cfs7r8fspc9xb7n9zgxl7w5n6gd"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "7.0.20"; sha256 = "1xvhyafgxaraf97s364a3jk5dad4hsssqqvzx4i8qwg36fdijcq2"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "7.0.20"; sha256 = "1r27bm12x9gwzv0cid1fdzx9hv9bdy6p6a65lypjzvgwfdgnyksv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "7.0.20"; sha256 = "039l3qdsz3ima2jgvp8nqby68cr9mvj8q2xd0lmx37drxvck7bx4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "7.0.20"; sha256 = "05zybhb8dc22f934gj3f55xvsfvqizq0nf4d29ns3z9d370jklp3"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "7.0.20"; sha256 = "01rrnbwjpy138pra53ypixk3cr528fazjsl3vsrvf6jnymgxlb4y"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "7.0.20"; sha256 = "0g09yyi0a00q9xa51p1k9hvdj20jmy1ss2r2l28zk9s7lwyih7kl"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "7.0.20"; sha256 = "09kb949p1qc6rz6mf736id8qfsj6dq8azbrpzx19xzpnylqjch47"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "7.0.20"; sha256 = "0l76v2w34igvh6i2hgvhfwmkcch1574ylwl1159649pg7c95kj7c"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm"; version = "7.0.20"; sha256 = "1jj2mzcn1dd66fic37wnyrvd07fplrsdj4azrvi0qz3qyykc8wmj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm"; version = "7.0.20"; sha256 = "0q8i69qc58kyxzxfz0cqjlbjcz1n3p130nz2q852rvvcxa4644zc"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetAppHost"; version = "7.0.20"; sha256 = "09xk16nb9wrsgjr531dhd7mvpqa7b50akmkqrlndyspma7cbvrzn"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHost"; version = "7.0.20"; sha256 = "0l82bqvqw5qqhkgrxfscc4dw197b5sh7ic63pymdhixvx0d3fi1h"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "7.0.20"; sha256 = "18sarln3kbkqc1ab9jnadcqqxs8iicf7jqldxzbjzhdpmf96vwna"; }) + (fetchNuGet { pname = "runtime.win-arm.Microsoft.NETCore.DotNetHostResolver"; version = "7.0.20"; sha256 = "1vh3ymhv33qysc4vj4gb3g1rgajy4jr4kxfjcsq2myn96aan84i1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Composite"; version = "7.0.20"; sha256 = "12w9hlq70ynkrgqbr555lnqmbf67iz3kaci2vi07zsn3mmak3z6j"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "11c31fzq4qfxcsz3p6vzdfnaqs29saf1dnmzq7l90p6ylwsblc7f"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "087q3p57snmvvzzqpxp3vwvi2q21kzlk8qh1w6axrcjdci31xmji"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1nc8m38jsqai934nn26f6dkl3c0r4sabssjiizcixdyypzlv3hcf"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "0iyn0rkf9vf7vbd58xs24209557dzq1dppjb5d35g39z2kh06k1c"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1b0ys3g3bg9kxxvs1h1kj79b9n9nl2g6hjhmb3c2cpp4slzlsd3d"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "14nq8b869k43chsn4ba3b3ww9w25fip39ik8rfxa1z8l5k4k6xb0"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "7.0.20"; sha256 = "1gajqvzf18p0jppvcwky0shkmw4nzwz8hzx4kwblrs41d8xmw39a"; }) ]; in rec { - release_7_0 = "7.0.19"; + release_7_0 = "7.0.20"; aspnetcore_7_0 = buildAspNetCore { - version = "7.0.19"; + version = "7.0.20"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/d3d6c11a-a7d6-4be4-8b2b-11154b846100/69bd5fbe2621600e84bb191d0b13abdd/aspnetcore-runtime-7.0.19-linux-x64.tar.gz"; - sha512 = "569fcc25f0c32df3b28c4569bbeabb6c20afc8865088f14a405d3847bbfd159cf291d2dc4810140b8f436f06c95ebb09214ac837b5ade6bd8121e9c0204eb217"; + url = "https://download.visualstudio.microsoft.com/download/pr/09e67261-215a-4003-bcf8-f90d67dcd02b/b32cf12a5c10b1f74e21c8cb03880891/aspnetcore-runtime-7.0.20-linux-x64.tar.gz"; + sha512 = "62ed9743972043a72e48d5aa2f7fdf3483cf684a32b051315004d1c778e9712bf66e5e7a97a5a53993fa8e92daf5bacaf2cdb3eae44bb9a9e25532b9a80f4f70"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/78d9729a-9f05-49a6-81b7-b041452a2828/73214343fb60deddb7faf355ecbbaca3/aspnetcore-runtime-7.0.19-linux-arm64.tar.gz"; - sha512 = "c71e6a756bdac7f68289fb6c67fcb8c347586e421cbf4345fb510686ff5948e25898759dc7ab30904ac07a7d595508e59d66b5b6dc88d30b54c141c82bd590cf"; + url = "https://download.visualstudio.microsoft.com/download/pr/ae3027ce-cadf-4510-a1aa-125958cf0432/c3d958ba80ec21e9d75ca5e8f43ec2d3/aspnetcore-runtime-7.0.20-linux-arm64.tar.gz"; + sha512 = "dfb1c1bef4d826defd3d995599a5c03e1bf1a64c65d98b675d6c05dbb7380d98233953e68d53fc5ebec60ad4ef75417073fb1fb3256a0176bb964f0e01161f6c"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e2bed645-39cb-4ea7-ba7c-503741d8d9e6/07bc37ec71cfe01a4187d94275580b3c/aspnetcore-runtime-7.0.19-osx-x64.tar.gz"; - sha512 = "5f16d0cea6b637ad9835dabf23b37f47d8fe92fbd4cfb1ac046fb607beb380255759f14f3e80f9a49c3545afc47000c770394d4dacc5b7444ab0b6d87a5336b5"; + url = "https://download.visualstudio.microsoft.com/download/pr/65fff3f3-1b87-42aa-b1f9-04e7e318c1af/4bfbb002455b9a037e75791e99a18c19/aspnetcore-runtime-7.0.20-osx-x64.tar.gz"; + sha512 = "00677819450d14d9adc2b65f25b9a069bc2b43f72e4db651e77fe0e48320be8eb7c555277281de968e75d0fb19bef960d4dcb27161b8c57bce076ee18bb5ca98"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/879c8cbe-37bd-4fc9-b8db-857a3fe09144/231cf7ae2bca959750144d08ad08d057/aspnetcore-runtime-7.0.19-osx-arm64.tar.gz"; - sha512 = "10fdc9868efdd8cf25dbe10843ea17075747cc1bee52e495af7e1858ff556dac2802bfcc85fd474527f142672b45e7a1c5b63a927529036923671f6cb9092431"; + url = "https://download.visualstudio.microsoft.com/download/pr/2833b957-8fb7-45fa-bf85-4960260ae344/fa4678e8c3ceba67771b5195a2343049/aspnetcore-runtime-7.0.20-osx-arm64.tar.gz"; + sha512 = "7de161ea45faef7693d78ca44b585ab73fc183232d3f8d229fde3d05d696818d8d6402ac7ac86ce239a0a6cdae8fc2eafbb445e99443d0c7a4aab3781df35be6"; }; }; }; runtime_7_0 = buildNetRuntime { - version = "7.0.19"; + version = "7.0.20"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/09ab2389-5bab-4d45-9a91-a56ff322e83c/2f8192a98b6887c7f12b0d2dc4a06247/dotnet-runtime-7.0.19-linux-x64.tar.gz"; - sha512 = "4e556c1437a58d2325e3eeb5a5c4b718599dff206af957a80490ef2945b1a2f5114d25b808b4c9ea233cc4eb2e5ce40932bb249e198319e97f3b5cc443612e6f"; + url = "https://download.visualstudio.microsoft.com/download/pr/2c5981ff-0f0c-47ab-bff4-0ea4919b395b/cbfdfa7f35d133b0bdef87fa3830bfa0/dotnet-runtime-7.0.20-linux-x64.tar.gz"; + sha512 = "87855297338555a7b577d7e314e5dbf2c2350f8c867a489cd1e535634bad5c123a1871464d37fc9421837ff5d426c2eadecbe0f60bbf3fd32bc2461f47790a40"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/81616b49-6c82-4778-884d-caeca4c195a9/51a0a0bcdd17fdb77be7f1c5db52165e/dotnet-runtime-7.0.19-linux-arm64.tar.gz"; - sha512 = "fde0a0190c77cd361722d2ce449b207b6a26c7f6462dcc9a2debfa1b0e670f7df0b538758ea5eb865f156df17a98722ed7e8f7a2bfceb0a486d1b06a2d436240"; + url = "https://download.visualstudio.microsoft.com/download/pr/af6e12de-a63c-449f-b35b-b72ec6ee3da5/ae129eca3d734117d14cd5965dca93a3/dotnet-runtime-7.0.20-linux-arm64.tar.gz"; + sha512 = "c245125ee2708252119a1544556e1aa9e00aa18b2303de69877da10c6c17e3f25024b749ca93b53be76ee0e8e4a75d403f7019b8bc2e50ed1278f656cb2f7e06"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/92c2b6d8-783f-4a48-8575-e001296d4a54/c11d13f994d5016fc13d5c9a81e394f0/dotnet-runtime-7.0.19-osx-x64.tar.gz"; - sha512 = "005828f1138cfce1f04741a478595186a1098185747ed0872099d7541d2bed16416f36d1214f6289f6ed1d3543e119733e4bba6dddf42db43150bc7bf2e980df"; + url = "https://download.visualstudio.microsoft.com/download/pr/cbade9d9-be1e-46c0-9f90-13ba882965dc/31c86e8f4beaf0e5ad9ad35a408be7de/dotnet-runtime-7.0.20-osx-x64.tar.gz"; + sha512 = "acdcde92f2f2e43584ee59be447f778f4a152c308975c7bdc5c2372b5bbd3092eb9d2233aec3b82756ba1e352a0877ffc17e4c8cfb20a9de91ca6db54d79b591"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4b8da067-3b82-4636-8e0d-18583857e64b/fba7ceea0e014535a695ceb9259886c6/dotnet-runtime-7.0.19-osx-arm64.tar.gz"; - sha512 = "394f0f068b1dcd8f116c41391baccb46fd1112578281b0d11edd6dc194b767850c8a2bb9e2bc041b1e872872afb130fa10f7c98fbac988dd80c0d788a0f23e7f"; + url = "https://download.visualstudio.microsoft.com/download/pr/50dbf5c1-942d-4fd8-b646-1f024326ec1c/5fb99e9dae294298a8131757b3ea829e/dotnet-runtime-7.0.20-osx-arm64.tar.gz"; + sha512 = "af1cb62e29c69648ebe334e651c2703cd5e87fa0bb28c670bacb3b3dd1608aeae35ae53402c5eb4ed8bf34abd831a08ccb5ef84e5ec70617d9f8d9969fe7b8fa"; }; }; }; sdk_7_0_4xx = buildNetSdk { - version = "7.0.409"; + version = "7.0.410"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/03e24745-90c7-4661-8ffe-e5a857b6e6a3/99038e4e48e403a17bcbe509bfe8d6b8/dotnet-sdk-7.0.409-linux-x64.tar.gz"; - sha512 = "0b67d04621d7c2a1856fdb0cf6e081090b4e1df1075d2f881fb33655422f2f59f63f8324559dc207510485f77781cc20c7a407e3c04dc0b53246987164427671"; + url = "https://download.visualstudio.microsoft.com/download/pr/0ddc1522-2361-4394-97e9-52318bf51951/c5aef30601a86810f1f8ea89d42c26a0/dotnet-sdk-7.0.410-linux-x64.tar.gz"; + sha512 = "20b8e02979328e4c4a14493f7791ed419aabd0175233db80cd60e2c004b829b3e8301281ea86b27ba818372473accf5a6d553e5354c54917c8e84d25f5855caa"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/f065c679-7039-4968-9a2f-dda7cda72f5f/702eb11e596f498a1cb23b636e1d83be/dotnet-sdk-7.0.409-linux-arm64.tar.gz"; - sha512 = "ebf98115e3ef9a5388394443b8cec8aa104c2468fbcb6c964661115665645326abb0bce42786a98eef4ebffe42dedd36de8608e15538d191e934dc83fcd8b2f5"; + url = "https://download.visualstudio.microsoft.com/download/pr/3e408891-74af-4ccb-9ce8-895f6806a97d/3a589bbf6e264059544cef47be672540/dotnet-sdk-7.0.410-linux-arm64.tar.gz"; + sha512 = "2db6a3b9a532d2f59a2b459e634206913a9585c821f3f578a421e3bae346a92dd9b85b76ebde343ca3057275f7ec4d0bca71cbb7f2badb6dcdb516244e84da46"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/feee7b85-ddb2-4ff5-8927-5656ea1e0a6f/ecdfb330298d11e0d49c3b595ddea452/dotnet-sdk-7.0.409-osx-x64.tar.gz"; - sha512 = "70efa550d6d78e17db0368e8500ddfd9a6343707e009247d00062613e8052463d3d83779af619128233e78a29f5b5a5f71f0eaba740c3c3f74be0c76145c892b"; + url = "https://download.visualstudio.microsoft.com/download/pr/fc8614cd-f333-4adb-815a-9bbd07e02b16/0ccf5e50cf8fa5c600716395e240aff1/dotnet-sdk-7.0.410-osx-x64.tar.gz"; + sha512 = "782e15c19ce20aa8333566f23c2d3cdb8e89c7626de6330ddf670c4426e30cc854e44ff3341578622aecf210fa66ddcb63a7d2ad629ed92cb5582ab670f953d2"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0025e3a3-0221-493e-90cf-a5baaedc3cfa/716e07c6342d6625dd9a04f632ca8d50/dotnet-sdk-7.0.409-osx-arm64.tar.gz"; - sha512 = "bf234cc2c6e90abb891cbefc3eed35e63fae07d312f01193d8890dce03edbaa3fe5a095cc695bb03ef35fcfd1c2e45e7b9d54c3b483761d7b1653a019c55b53f"; + url = "https://download.visualstudio.microsoft.com/download/pr/bfba06ea-d182-4a12-8066-fd78413e6cc3/f7940d1e8d8ae641a3a3d65b6bfa1071/dotnet-sdk-7.0.410-osx-arm64.tar.gz"; + sha512 = "c0ef1914f2b298504433bca9cdab02dcf324421ece39657b66523f13b7a7166e726783673a602fb462f3db5c53f59a89381b918e7658d49a57763b43cf75cedc"; }; }; inherit packages; }; sdk_7_0_3xx = buildNetSdk { - version = "7.0.316"; + version = "7.0.317"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/28d800b7-e6c4-42a2-a27b-ff9de8979025/ef5dd5c9329e1789ab1dfd3a82e88677/dotnet-sdk-7.0.316-linux-x64.tar.gz"; - sha512 = "1489f33f3314b93ac7b9411e4c884fb630622336bee6765b7f193aecda8798cfa201ae0b32d82ec401d5839601d79d6a854832502b08f6eea860fc47fc1da6f2"; + url = "https://download.visualstudio.microsoft.com/download/pr/3207f51e-26ad-4d43-9249-5e03e93e5895/af409554ce918557a05f8e8102f199ea/dotnet-sdk-7.0.317-linux-x64.tar.gz"; + sha512 = "906ecbfa31b10ae5e2a8ba713d113ccd83e3a9b9e4d3e322482692891542959e76c51db5dd3825fb4a2cf1e951737006a99be7290f309d6822567d3a533a7a9e"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/09e91afb-d0a7-4468-9aba-70484bd8cfe2/8ef2416d952b14ec9e00380025960b36/dotnet-sdk-7.0.316-linux-arm64.tar.gz"; - sha512 = "c6c7d57f6ddcb26fae6cef846745bb151296d0f359526161a0e700d9b54ccaef6a24acf2485f2abae1b7305608bfe9204ab89842a712f2913caa092efb756833"; + url = "https://download.visualstudio.microsoft.com/download/pr/e08e38c2-46b5-45ba-b318-6b0949b3cc2b/1780549adba82e521439b7a0511229ef/dotnet-sdk-7.0.317-linux-arm64.tar.gz"; + sha512 = "22badcdb2cba0f1bedb1fcbdc99269a66a01a232193e00b42823806cee5d46194b8dd008a53e17455072a410f77bd351676f351670be96c13572d8e30cfad180"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/9a092178-2aa4-4c06-b73d-144327a4992d/4709a913d89feda462d9cccd508b4a5f/dotnet-sdk-7.0.316-osx-x64.tar.gz"; - sha512 = "52a96edba93029283d555c13abd1c1b016870bcdbf10db4caaea6f4b18c46aff3b49355f8bf7b8b2548287c1bc31dbe38c6b7a27e40c1129c2eb010c697c002c"; + url = "https://download.visualstudio.microsoft.com/download/pr/c03db249-372d-404f-8767-dc7e4a104ade/49d2336dc14b70dc937d8f91716e4fba/dotnet-sdk-7.0.317-osx-x64.tar.gz"; + sha512 = "d3dbd0fe7cbc62388f150adba5d818abee3986863d757ce63088f4feabf801052c08a608acd5036f97191435fe99224acb12c7365be7f77def28553a231ac3c9"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8e2764ac-debb-4e46-a6f2-637f7c7d8e70/d3da856e4a7d4b45581ff405aee923fb/dotnet-sdk-7.0.316-osx-arm64.tar.gz"; - sha512 = "7f59874fb1638f6f09a5538483ed1b39e482a90bc11555b07cac8fc8ea941dbd9419f57fec252810bb324b89d8647b6bf32d1bd4e6b720c568929d82297d260a"; + url = "https://download.visualstudio.microsoft.com/download/pr/697b6485-989f-48d7-86ac-320529a85b35/5b5ed55e7e4e2c0a1ba2c3e0cceefe95/dotnet-sdk-7.0.317-osx-arm64.tar.gz"; + sha512 = "b5f367e1e20d728d7167c81e4146358e760f136b9ee0fc410d813c14366e38b09a069031aa8ca6d8df438435b6ab4e2e989be309e097169459365d4befaf9f5a"; }; }; inherit packages; }; sdk_7_0_1xx = buildNetSdk { - version = "7.0.119"; + version = "7.0.120"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/03102e44-64d0-414c-9cfa-e212d0160ce8/aad0796ede4708933a4cd75bebd878dc/dotnet-sdk-7.0.119-linux-x64.tar.gz"; - sha512 = "6be08bbbb9d961879b63943413b70e0ceff413e68af59c5c5f01120b02c605e83145a5a9f3417563f9b39159cc5ee149219e99e48ebc92ca2b25c2c0554dd5d6"; + url = "https://download.visualstudio.microsoft.com/download/pr/8b678e05-b3c7-43ae-a31a-c007a901d939/934ec0853faa6404aa924c99e019f788/dotnet-sdk-7.0.120-linux-x64.tar.gz"; + sha512 = "cb9faba83ab276c935ef35b31f016ca4617f0d967c5b4bf1e993c2159992fb59d1dd25dce09928915b9ff586ead7acf92ec1dd96937c93317a99ca0c92b616c9"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/c0dd267e-4f6a-4a36-9f7d-19813033cb60/69a960be31caa92da70e68c9529ceeab/dotnet-sdk-7.0.119-linux-arm64.tar.gz"; - sha512 = "187b1422f0ce4eb59c3f894cacb074abe285ad0346ce6cd95a240506167932f08c90ef2529492a8fe6a9abf8bd7cf3dd4c7258cc5972ee4fa630d75f03b42ccd"; + url = "https://download.visualstudio.microsoft.com/download/pr/17a7bef9-4696-4b93-a3cb-f4bb9aaf2985/3e19b62d05b8e85b0a46d5dfd99196a5/dotnet-sdk-7.0.120-linux-arm64.tar.gz"; + sha512 = "f530f794afe3c3b9bd87b8ed509a1a13b1c8fe6f2bc6e6cce3e8cd6b56327c0ff27fc138122c2dad68770cc5015737e007ef5706599c189ef0cc7521cbf0b654"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/aea7635c-c965-4ee1-9f2d-496873e2c308/e9a800bff17679887458ec75e988fe82/dotnet-sdk-7.0.119-osx-x64.tar.gz"; - sha512 = "dd70345a9093abfd0a839394e425c7b9907afc5884828127ee503ead5395338c1f1b013a481eabff6f1ea1e9e57ce76ef0875d5feb1540f3b05539e9afd129ff"; + url = "https://download.visualstudio.microsoft.com/download/pr/b1da5ec0-e336-4716-b9ff-77f8160e7878/5c40db0a17dc493eb0be8d047d0c6885/dotnet-sdk-7.0.120-osx-x64.tar.gz"; + sha512 = "94deb9988509fcbfffc357114d0f5645fc6b6f6156664040cd5643a191bef10ae2fba4168aa689ff7da1a1b6fa779eb4e53a77a7847beceb7f0ba451d2c20d57"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/06970037-ff94-42b5-a640-16cc25e0ca30/628233310199d362e7af0fb25825f8ad/dotnet-sdk-7.0.119-osx-arm64.tar.gz"; - sha512 = "c411bae746be15f270513412a38e8fde5a72795f876f26b7e5452eaecd3b4fb0e979f9391e0f5f652c692a4516741f2165d77afd5ef264bb24b8bda9cc1e4bf4"; + url = "https://download.visualstudio.microsoft.com/download/pr/3d081107-64cb-46ef-ab37-41560d585efb/5aa6a70b37790bbea98d7b8c380eacaa/dotnet-sdk-7.0.120-osx-arm64.tar.gz"; + sha512 = "dc06801d8de34df698f93e3aa872d57131dd3e33ac4f7cddbc96223911e0ff32fdcea78332da7be0013362c90cd24db2d86c1e275297be6dd162948f2bd38cbc"; }; }; inherit packages; From 5f7390af48af1645620cc47976420bb7b384feac Mon Sep 17 00:00:00 2001 From: David McFarland Date: Wed, 29 May 2024 14:28:11 -0300 Subject: [PATCH 071/219] dotnetCorePackages.sdk_8_0: 8.0.5 -> 8.0.6 --- .../compilers/dotnet/versions/8.0.nix | 306 +++++++++--------- 1 file changed, 153 insertions(+), 153 deletions(-) diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix index a6468f685cf0..e88c122e3a8d 100644 --- a/pkgs/development/compilers/dotnet/versions/8.0.nix +++ b/pkgs/development/compilers/dotnet/versions/8.0.nix @@ -4,225 +4,225 @@ let packages = { fetchNuGet }: [ - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.5"; sha256 = "0zfpmawx2pc1mjdjkadch2ycqfsvjxz6zr4r5lb2s9w8ywafyqcf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.5"; sha256 = "0vn6kq3svv9kbgwdfa3lswc4pwsqxplg7kc3srd1a07k4jkz9qn5"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.5"; sha256 = "0cvzrnqizdccrajfznjgwj6qra8kbqqln5z6x2l9gqklawk4ncdl"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.5"; sha256 = "0phhkwilyhh764m8pf403d3qv072ld0z7jg6x9sywqlb4q6za443"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.5"; sha256 = "1m9gp68z0wyv0xxr4aqc1c2v6v8grml3jxkiqabddn46d6gsisqh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.5"; sha256 = "0mdcrzpj17g8xkk5j3flk5xkgp2dx44gamyfn9x5lf9siyi4812p"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.5"; sha256 = "1r2hcmi5l05n1s84gdpiqys0bc4lik1fmp8085dlqz5pc5kg0ibh"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.5"; sha256 = "1118p6981b74zzm3p1nr2kwd5db35y21z3xif940xahh52zc887n"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.5"; sha256 = "1bd0spskxlc4kwqd260ycxxvysxq19hrz6z0chlbc8kxfwf3kf9z"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.5"; sha256 = "0s62x5cv1bw6g4jmmg7vyfpj4nha3bpsanhwpbk1vwgkridwxfgi"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.5"; sha256 = "0b50abmhp8l8qjiwqxd1i1zw1kfddpr25nxl061kxb319zp5qslb"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.5"; sha256 = "1m29wm2i6666cl6jlv5r5y75v98qidqjsc74sl2xazxsd105p7iw"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.5"; sha256 = "1f37i0f227lns4x2zxw670f7lj8lkxhpn805dk07xd2a70w3h54p"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.5"; sha256 = "1b4js7g35nq5kx50cjbncrpychrhxqysic46x082g50kvkn877zy"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.5"; sha256 = "18ln96i7md0b3p00gyaka8jr9hly47gkbyqsmyzvvp4b98z5lda9"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.5"; sha256 = "14mipnqvw6h7pw58sqjjc7013znz9wgcdklfcj6nbpr3cvb297xm"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.5"; sha256 = "1004mzihgamdrv66nd9bv44kk0qxbmzbqgjlrq54k8fxwy1602ps"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.5"; sha256 = "1wv6sqhf77x5iac6h64sr1ip8qyz9w79wlvs82h5wxn84hjrb97h"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.5"; sha256 = "0vz07rfkl7jday1qgjrgvqf47pgzqajx75fz9v3z55n94wdrsrk3"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.5"; sha256 = "0176paxswr5phr8x29xir3sd4rxygp4w107anpwx14a2fbm01wmc"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.5"; sha256 = "1rl8f4bgx6hmh4q7lgr4nvx6fb044rg96ja128m22v925wx3wq9q"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.5"; sha256 = "0j09zajb36z3gyv6f7gw9d80kvcjc8z9qw52x4cs5bynakx97563"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.5"; sha256 = "00m2f6fi9nagcv9s0f9nd0wkcq9qs6dmwchdp0khfsl3xj1hv99g"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.5"; sha256 = "0jn3rpk6xcndrlkjvr0s8wlk4vgakvc18js0psmlrswrq9crq4ix"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.5"; sha256 = "0l1shrv0rshx527dy90wq1w5x3rvx3kzqj1mslx4ysjzf8841q6r"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.5"; sha256 = "15vadqfi0w7sdq0rh35rb9ph4h4qbal2i5m5ifabbfwjp7348z9c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.5"; sha256 = "0f5ya9gb16wi6jff586g67icwshsca22afx4k6vnssr2p38xvh7v"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.5"; sha256 = "09wjap5ykxsyyxfplhjn7jpxbx8qnks6cbc0200nfx3xqi5hyj6c"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.5"; sha256 = "03nin18sqjc79b4dwwfzd620vr0ph1jnj462sfaszhyrcxs41vz1"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.5"; sha256 = "0f9pw81cc2z6jir7nfr0nn211857ac9ix0dq7rpib0ld0bzf9naz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.5"; sha256 = "0b8bdyckb4l2z4byxlw84pz4nfahp8kfx5valbll8sj0f9357apn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.5"; sha256 = "0wv2c8cf1fi7pm42by9dhyrld48cl5mssm70aq7fwa2hgnvy5kaz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.5"; sha256 = "1yg53pnw2an4vmw9aqmhdnrk54ir16i3q95lv44p3vfdx8az582b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.5"; sha256 = "0zjh0ang18sxayr3imidda99bbcna3iwml77f77fyw7cq5xm57xd"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.5"; sha256 = "0bvnc073s7g9pap6cl0v18xp7shpmck6mfmcwryjzpj98za8fiz3"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.5"; sha256 = "1lnxgpd66psjciafhgwm37lzd8a5n980m77bbmaclcmx1jf5knv6"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.5"; sha256 = "1r753a0bhlz9iiw1k47drjmwckwjzzixzgggji8glp3a22p2d8bp"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.5"; sha256 = "08wcywhnjl2pw5w2ybswnwwzgmyanxm4bma80rbz86xchlqakk5z"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.5"; sha256 = "12r3is7ddra45yvkwqcrm63lhpya5l9g912xw4rqbnfz4pbmr8dz"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.5"; sha256 = "1m3vglk8q3bycg6k5x3v29ylrb62kih56hn63dfzb7f20qb8xv8z"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.5"; sha256 = "1pxw3wxak4x2pm2mqsz9fipzx98d3blma8y0cz03nqqcmxfq2lnr"; }) - (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.5"; sha256 = "1m60wsv54czd55qw770mcnv8m7lnn5s99dya38is7szvgjgq0zx1"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.5"; sha256 = "1xdpipcybj54phsm1xn8ycfrwd6xaa8d67jxdakfiyzdwgbdqnam"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.5"; sha256 = "17xj4qrmmb6yxd3w0xi5x9la1ywrzczbmyx975p0z97yx5js719d"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.5"; sha256 = "01wq0zf646c87yz1zgf1vzvwd5kxjv8dfd0vvqq2w6af8670vxwa"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.5"; sha256 = "1s85bhrhyq7sjks0frj4mkh8g1pd0j0bifd0wj3qnlagrbxmq33b"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.5"; sha256 = "1qcnnshmqj6i6xf34pfi6ampvgcissclfs547yxjzgjizxgkkhy4"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.5"; sha256 = "1ar9jssv4njgk6gy3nh81d0p81as8ff5vmgzranshyr6djrmshna"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.5"; sha256 = "0d0yl060my0f9z3qbkzbks9jhw3zsms5issfa94rnkpgw9is40fh"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.5"; sha256 = "11v1bk0wsdx87rdk32cx63118bqmrvl054ai6h231yqw75q680sv"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.5"; sha256 = "0j4g9n88vdss1qzslr11pf49jxdv6pkbchdmsnis4nypp4nc4vk9"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.5"; sha256 = "1gmgj6h9nhzdcmn4mq2vfv8a69ncwcaix0vyyk8rrzzcrypvizpy"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.5"; sha256 = "04ihcgls7w20g8v3s47fyxc6cxx554mcmmfynkwp0206l6mfka78"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.5"; sha256 = "1lr79q6bpmggmm1kpgr195662r47mnl4infva84w51daw6hkdkq2"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.5"; sha256 = "0rz6d960kxc4c1nc31w46l76lkpzmrh74qf0l4qy1cmsdylkbsby"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.5"; sha256 = "1cczas7zmdc8wal2n9axgz5kb5ccmh4i94k94jfma3p0c7s69msy"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.5"; sha256 = "1p9hi32ibv12dyiwgysj60as2g53an0dqidgxl93pazmmg1v25fd"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.5"; sha256 = "1l4cbxlw33grx3pyf08079c8f2cmwnvdxkqpnw0072sb50s8yqk3"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.5"; sha256 = "1bzw2w73glg96mnf9cjjdk1bwz4z5rf8pgn1rmnpb3ldlawhz4g1"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.5"; sha256 = "02jz8kvs30d9vnxnv20dc3w8q9vhzff6n6r1qcyym3zfalmc4maz"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.5"; sha256 = "1hwfn3yy9iprikfvc0wz99fvb000w5nya2hmkix2fx3nydxd1gl3"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.5"; sha256 = "18havx9c3m2py0zzccxh1jmj8wb2hq28vqixib0kcicgvdl3rwis"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.5"; sha256 = "1lvp94im006cgi17mj26c9yhhzz6js0lxmdpqas9vh7qxlikj7nx"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.5"; sha256 = "12bc6r867izzb6s092wwj1cfmi09qmyy7q6l1d8r48jq3p14v0np"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.5"; sha256 = "1x6xwq8n9y0n2sj5rfh4pqzhkz62qxaa2g6y4s089f4bcg721l3d"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.5"; sha256 = "06a37cr1pg1nmzw07nbxsvfs3q8wn5p4xiglzg1b4fdpcwr0xpl6"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.5"; sha256 = "1wlrapi8928jd9yfck7kfjdzgrzkylw8d7k4faaxrkbxpzn687br"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.5"; sha256 = "1q4wbircp3dcbhgc7vdxm2m81ywpw3ls44jv6i3j7hkvh83v7kms"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.5"; sha256 = "1rrrfig168zv5hznv19b1pb8k5r6j9smfxg4jn4vcr8qmy0vnfi1"; }) - (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.5"; sha256 = "118558hm53ix8fr7lib2h4vgp6vmf1gmaxph75220c3v966wbbz6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.5"; sha256 = "1sjyap9avwq1p5gk2iw11zmqlh3bh1ch02phvmqp0s9pawwa6mvs"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.5"; sha256 = "1s2n57qjggyznf23gf9gk7dzsr8nr8ypsv3gyacn8fvy42fvq9v2"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.5"; sha256 = "04g6vriblgzhaf960pfjbxhql9xdqkwx778pklim0kck4prn39f6"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.5"; sha256 = "18fxpdzlb9kqq754hs67aabklq7k13b1gxyjmbi7mldcn7yjw0wg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.5"; sha256 = "0mjwyl4ywakvzqgiy5gm0rld8fwxw7gp81qa1cn8ns2yn7ll2zhl"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.5"; sha256 = "0805yfy47fz5348ydi54546g43qr7fp4wpb2xzry5nfh0sn0693s"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.5"; sha256 = "0rwjw6ahinci3bajky0m421cg7a0h6rjdnx389cd3wan3ij5l8bk"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.5"; sha256 = "08j0xrfp7b2vj9hxrjf8zdp0agj2jvwyr5xii9wbkhnq4cwikjgn"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.5"; sha256 = "0vag2bgllay20fmyvvjbckjircry690sr2fykf010kzb4zmywiaz"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.5"; sha256 = "1pf1m7miy6r430z5fbja0p38ixr4pj9jbh7mzqj6fqm4vqxbfiqg"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.5"; sha256 = "186q4jy948hy128271rhsjy1z8isc45snvss37pnz5r0wq68vy3b"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.5"; sha256 = "0njzarmfay3jhqmjr1qmhgsldsff0rhb5lnl6zp0c337i85yd7xh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.5"; sha256 = "0fwpmdw5d89mkmzfq16659mlswjp9fnd0cqdyfy5frgb3mi3g10a"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.5"; sha256 = "0j68y9gp3ci4982imhdri513in9sldicx8xn6kvg3czqanc34n9j"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.5"; sha256 = "1frixdwdpxjzkzlwrfkxrx6qnf4vpb7flhl7r1z2wi8m2x8xyami"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.5"; sha256 = "1wmf8b422s3l6rld07zr5qyg43wp6cd3xnz80j45zmny6sl1ksd9"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.5"; sha256 = "1yp69lwz1yj89258sq0pznr037ihng9444d06893vajyn86x2ys3"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.5"; sha256 = "1r1bzbisjxqkl310yfqjrsivjg55l61rlw60xm77nr4iww4av6l9"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.5"; sha256 = "0gc6kmqvqmgzf22fgsimfybdj7yp889nc50jnlskm20hp6mia4wi"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.5"; sha256 = "0ymnh483ds18699mvcg0k2j1an8xrknsb4zb3nxj97246wgdh9hp"; }) - (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.5"; sha256 = "1r3cn282p3qv4fzsq5cwd5lkjjrv5dfqp54ffgh6yi9j9s2h0j99"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.5"; sha256 = "1xkzzn8vg4h4nf63nbzvd5pk19y5cg3k0ljzkblva4knppaxx6k5"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.5"; sha256 = "00dbmjlcfckpgbl4f44p8vfr5aqabx21jllsqkqcy1qnp8a504h0"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.5"; sha256 = "1syiaqw9dmqm5n5fvwhaycip1d7mj14dcivjwbhyf5nyd67zy8bp"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.5"; sha256 = "0jpf2axjfv8nwd4yiib25agfx2y1mmksxz8laf6akac33gf6swgh"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.5"; sha256 = "02mpnyyklhwyysjz8rhk42cnl5v1gb64la8zm95nldrsgv1viw70"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.5"; sha256 = "1ky9whq5k3a1x0amailp1kd5926lx3kpir2ji68wj80w7c4kpr72"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.5"; sha256 = "1jaw4mgzsf7jjkqlzkxjbpj3jszpg86fgjjvkc2vyk91p15dsgll"; }) - (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.5"; sha256 = "1jw06my5ds295lap3q35pg4hqcqmrx2bjqjaxgxhm6vyaif756nx"; }) - (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.5"; sha256 = "1iq19frhagk99a9wjgb10059mh0k5wp28inwy7diivj4lpi7wr24"; }) - (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.5"; sha256 = "1qrmwr0vvl49slnjf5r63lyyl7zlli98lbn0g44n6ra8drbhdyp6"; }) - (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.5"; sha256 = "17i0cgs6w8vlr7fnypj4c6188rpc3sgkr80ly453nb2qrmkyhzh4"; }) - (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.5"; sha256 = "1x80i4rbkdanana8hhbhkw47410bpryinry2axxwaw6yyk5gyr3g"; }) - (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.5"; sha256 = "1psh3vxfp37xx6bdhgj7l7d9r6p0kkxwfi98i89l1s407nj6cwvc"; }) - (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.5"; sha256 = "0msnc3iqrlslipar5zbjhz7v4f27lc7rkyy1fv18rqv787a87bbx"; }) - (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.5"; sha256 = "1q6vx9d2z57idkickjfxf9jf90x9x7jmxz7lrhyxcrprnf7sscgw"; }) - (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.5"; sha256 = "06siqqihzhmxbkryrw3x3xvmv5fr6gw5qdyb6y8z3l9bzd5qdf7r"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm"; version = "8.0.6"; sha256 = "1wgxqrnwhxrss67qm72zwgvf0wzskfpq6jmsj7qrl5z035v6wqsk"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.6"; sha256 = "16m3qvial8wm0p56wf1135fl1v71fv4lmxqgfp79nrs0p5hrvyy2"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64"; version = "8.0.6"; sha256 = "0qaq8wv1xhr3wm03qiagwyrks18xg81m23q3fw2i1wq61pb3r7b5"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64"; version = "8.0.6"; sha256 = "1834b3cxmjpxw9q9b6i7a3rkjy1rmcxv3kvnwzbyszn9k41bfcd0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.6"; sha256 = "1cx96knhh3nkjd0qasw8z89c9f9y7agazdf8ba61r8ir3k9nmh9q"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.6"; sha256 = "1a7l158y6g2dmrviiisf8qzmnmv5zn5r2cdmrdfwmcsqg9n3dcxx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-arm64"; version = "8.0.6"; sha256 = "1m71clfwd7gcgpqblp2q8f4m3a72a90jfv6iif7j3v2wjhmg6ckc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x64"; version = "8.0.6"; sha256 = "16ln87byqnf7bd8jp5p8lr9blzcwpnrxgsznpv3j4kf7a48q3cip"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.win-x86"; version = "8.0.6"; sha256 = "10dk5lwimgbj436asx89wnghlr2x0lm09yc9c642f6dy58g2fgyl"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Ref"; version = "8.0.6"; sha256 = "18y39dkflh9xyga94nhm1xvz9jpz06nd1189k92mp410zv940561"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm"; version = "8.0.6"; sha256 = "10h4v3a847h0chxs6q88133x8kbx3g74s8zvb5p0p0akkmljyx69"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.6"; sha256 = "11d6by5vd18vri4cfwfx1yv62dh8bh5q8s63ngrmx84f7vdis30n"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm"; version = "8.0.6"; sha256 = "07ghgyk9j3bhjw5ik8dv57r4yvri3652yzshvbvh6rh6l0b10ylv"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "8.0.6"; sha256 = "0i13a09hrglpfzh130q7cdys49s27k1kafhqkd7d524irnid6hpf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm64"; version = "8.0.6"; sha256 = "1p3h4mhcx1f6m667771blxm13dprrxq3kgpwmxpmiv2qkgqgy63g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-x64"; version = "8.0.6"; sha256 = "0asaa081vq2m7zcawld8r2zhf1i1ch4sj0qj5c4w2d2wynrc3yl8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-x64"; version = "8.0.6"; sha256 = "1npwnm05kz368fyx2fli6k74zxlmbkmnpzs0bavcjdqw91m72rn6"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "8.0.6"; sha256 = "1qhn6d2nax5pak9nw0ly09lkjgx26ir06a9kbqsrd5al2if7vxmm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-arm64"; version = "8.0.6"; sha256 = "1102pac84v6740nwnh7w40lkdjq1qq0v1f1d93zbml52w1k31hcf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x64"; version = "8.0.6"; sha256 = "098x9l0adam6nfqjs8lisdjv3zlmic9jvf0qf7b7j0cazpsck437"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.win-x86"; version = "8.0.6"; sha256 = "169drx723b5hgy4jav2pj25hfxjj3vzs0aj86ck7wwiwkzjnn714"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm"; version = "8.0.6"; sha256 = "1slpg1gjhmwr1a2yvbxn1qqjpsrzww6552fbqq6gvghdkbjfis0l"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.6"; sha256 = "06d6jn7fn61iynhqbykdpy37mdi0l46cidlz2s2gn6vlwpz0h150"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64"; version = "8.0.6"; sha256 = "14zjhrb208zxa0xc2k9lm7s9507rvap9fhwsdrdkf6nd3gvdfmyz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64"; version = "8.0.6"; sha256 = "1dh3nynradl8gnilx02zv4qgqjq81cmszrqx3kamki05dbga4v6q"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.6"; sha256 = "0ngsjx4pxwig87y9n9z538y9kh5kwkff3x7f2kkmi5h19kwdkwk8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.6"; sha256 = "0qgcmxhyhbxyrs74l7700psxpfyj17q4mbsrvd7112h8yyvxvspn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-arm64"; version = "8.0.6"; sha256 = "0q3nyjdh4n5kgsxqkq6sj5kngra40lhq4ms3p097m0aj2225zvfh"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x64"; version = "8.0.6"; sha256 = "10ihdkap0l8dvixp9qwc54n9397smfnivqhcv56vgzva1ys4fp4z"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.win-x86"; version = "8.0.6"; sha256 = "01r85dmhca8k8791l0p8frw94bnaxm5x3imcmpb9nyflw5cqvalc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "0izgwc1qv5dfimxnl7aq13qbviyf462cw7igbgzzn1jqrc8j77fx"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1dv5xf8bmh4q14s8vnjpz8xvv76f1hxpl2w485v37a6znd7jcbjn"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "0isvgn41x6x9wdnf8phn84b3w5ir9r6drpawrrbbx099gwzzay4a"; }) + (fetchNuGet { pname = "Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "18gi6vrqamlcv6js0bggjj0gf7q9qzj9hfgps480b5qj7a4lsw6z"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "16swhnl9zyf0bijhwy6gixp4brf7nc0avlhh0rh3q3zknfa32mls"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "07p4s12pkyb7w60g2h18155lida80xwycbyp2c98ak8zrk58j9hi"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "09yz8isiaka54h5pgp7d2llzl11262xwmv02q20bla1rmax8d0qj"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "17q5gzg4r9ljflahnp8rip66bm34sbj33hm0a32m3hlkpjjs302h"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "1kynfwp6aqxiazqy970r8dbpwdl88s1acfwinj8wq6dj125brhyc"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1xhi7nakjskr3cnsdg5cx0b6ijmmzj4kaawcqwbph06gfbf9s07m"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "1sfn8mrfy5w6piirgqrla99v70g6csxc7sibj52r9iyw9x1hwm1z"; }) + (fetchNuGet { pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "122h4b1ndpphcap2xigv4l28a4wyhpv4kj9q4zjsliz4dc6bfmnx"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "1825wj7ijw7r9552lq1wppcaqhp1ncigaw8wn1yg82invmshflf8"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1gc39h7lna08dgrp1gxrzh6m4wqlyp12vbsyh7mzlpbiqdi9bbvp"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "02gc74yx87riml3aadsm9yv7y6ylamicc0mpd5wg91b9vzsj236j"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "0vgh3fpgagkbv0ff6r4fczhg2lq44zshf6sja96ja8wafsjby17s"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "012fl9873nb71v2fgfzg7d35zac7hn13qfqm7201sl0fqs42iyn9"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "0ajr9bwa9jlcf2rwpd7h06q457jhfm01hlzsp6yz3ix8ilbghlv5"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "19zqzlq1fbri10xis3q8h2l8fcjmgllsxyp84yz93kwxh82yakl1"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "1yg9zrji6dqhi9nv89bznbqm7rr167axx5s1rnc1p6g8snpy67yz"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "0hn0kyry6hhrilj957qaa7nxb34ix3hsj8293vlnqrsdfcn3r3v2"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "0jlpz6xpidhj42rnirl5mn8agxxy6nlym0a79nqblznc6nfsk3mp"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "1z6n3gfmmpb291r4ns84lz9l7gcjyfbbqwidc7cfidlf0g87j6kn"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "1s4wpsywinfp59nbpc66l8h4f6r3w2abjdfz0pbw4inqqxdf16qr"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "1vd3la5sl9az2kh5g3i4f3sh6gjwqnq9lijj9d2rzq6wlbg0ygi8"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "0hrwgjz94swf1zdsplbdddzj5afnchzsrd8wf5h25x6blq0sk8hj"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "1yh21ypyzjlzz1r9b1f987pqnhsy1hlb1zw1v4q4zf52v7ja03kn"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "0k2g7vi1d2d4wddyccxhzbj1zrj50819227lggmd8hmfz50qdm4h"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "1yk87srq1i7n7wihzadsb6yqgi74aybk4n0n8vbgqfgfk19aipif"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1j5b7kb0lj0nqp632plpv4hz9blfwvslx82l4nk58lfk9n37dlsk"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "0qlk7cdkplc30isb4ljk26x7pnbiad6lfnjj4h4m9l5lz1pfl1fs"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "072bm84fw6q8q1a2dvwn6m176l4vj8kjkzwjgd78ihg34gdiz125"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "131gcwp0nisfil3cf9is09cc9dbrv6kisk2llzfyq7m1wcy3ixqz"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "0vwfl048xgv2fwhym10b2hg8lmviamaxs7qkf96pn8s67b2h39ks"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "0flfn8zkq1ds72wf66f0sqahm6ab4ajc28dcanrpadyc1vxyqm34"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "02xsrxwag62fnmg490l920c6nnyjvxxashjikf58ysfmvlsxvpbw"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "0mvgb6fjia8ajds872g5ycwb8885d0fhgx9wjp3r9rcxb1cgkl44"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1mwiis128nmljsim4phf1ms9r9ww9wg950fr3k0y89j9abdfbdmd"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "0kmvd79gf3gax266f8gh41px181anh6mpdj6ys2634f55syfyvb4"; }) + (fetchNuGet { pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "0gg64xa48wg9vz4r896grd0xqdv4l8kcqlv0pccfaslmlja6f9dc"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-musl-arm"; version = "8.0.6"; sha256 = "009ych2a5swg9cbbzhyy23rjisa5hcm683hwd4f9sjg9j6yxdyzw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-arm64"; version = "8.0.6"; sha256 = "1gnky9ippjpdbrksbvff13xyjxyzw8k2bapqiw3mnivy4a4h4zcf"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm"; version = "8.0.6"; sha256 = "0miwpwm3y97jz7345c6fknhgrwr8gacrgs5bbb638vfp6vw2jb7h"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.6"; sha256 = "1j9hfqiz5gqsz91q5snywzrql6bvxczj9yk4jmnp47kp9n9fwi2m"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Ref"; version = "8.0.6"; sha256 = "11lg910fgdnh79lmpc0v501a3ykvk99c015w3nsf87pb2hsfgmi8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm"; version = "8.0.6"; sha256 = "0w885xnxlyvrlyvddvlzry3jscy16dg6mxk585fzw046yww60318"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64"; version = "8.0.6"; sha256 = "0sz8pl62mfjr65jca4j15277a48ly943l0agwpg87l61pybxlqny"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64"; version = "8.0.6"; sha256 = "0mi44y7nz4n3h70v6v0x4ldfg3ma9wp7yys6l5rm551dbsmfrpbz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64"; version = "8.0.6"; sha256 = "14hhibn8swy9d0n1jz7sbdc8z0qahn40m10ras18yl2cy717bdvw"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64"; version = "8.0.6"; sha256 = "1gapc36yd1a9q12av0hz9jqjlilmqp07zbwpzjdh7pvsp5vygf0x"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64"; version = "8.0.6"; sha256 = "0vbhpg42sgjppqskz065z5h6bz4rn5xizffg7znw95vbxwclqmn1"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64"; version = "8.0.6"; sha256 = "14h3qfwp27zzi6l1rh98z47yja5l7aa8pvc0cx6fcvqrlrpz5c5g"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86"; version = "8.0.6"; sha256 = "01ss9lni310cjb5d8ifrq5arq83mhvxa6dnisk7rgh0y3qc635nl"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "0rcvc38vmr58mwyc0fqbdlgh3iaq41y9djlswniplc4m3m0llq4v"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1lmngy0101diwbb84f80q71qg10whm38mqfaa8n63qa42q7niski"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "0s2ihbzjvq53npkjp40mzknm1q6s5bv4wpznqa8y2s29f1am8p8s"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "0l7ysphsimif6l19z1awvqmpkm6a16d4ymxn08qhqf9yl8ywr341"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost"; version = "8.0.6"; sha256 = "1qir2zm02wf133ak5pw8fs7gzmixz1hh867zczclf6l2swnxhb6q"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost"; version = "8.0.6"; sha256 = "1gci3c46m16yf045w4vsgi8fjvsmqblzkjj2fd4d03h789spqyf6"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy"; version = "8.0.6"; sha256 = "0kjqc9x3vna55prp0gc29ndzysdrvzm8lq7fk907xhs1655xly0d"; }) + (fetchNuGet { pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver"; version = "8.0.6"; sha256 = "0gqbcgakcimdmdhyif036r00wk1mfbqir5k513nzv4vi2gbxiypj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm"; version = "8.0.6"; sha256 = "1b5155pcj5j3y7irdjn8ba7rhcfm9vd8cwmybdn470r89frq7qf4"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64"; version = "8.0.6"; sha256 = "1hwrgwil7na9my78wgphx9hjd4qjj5ayr1hx73bglf058mi9kgsb"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64"; version = "8.0.6"; sha256 = "0f9z837gbyi4179xgrrfmvhach8iq4inknihfwpvrz5jlmg48f3k"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm"; version = "8.0.6"; sha256 = "1jzr4zj9wa68rn8zcb6wk4sy8fiih8sibsdvy89029x9f3qgchjr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64"; version = "8.0.6"; sha256 = "0aigvzg1ppjpr4mgg56hmkfrqg89zn3vyrpwz8cfysjbqz356xx9"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.linux-x64"; version = "8.0.6"; sha256 = "1628i25saxmny4k8zzhh6nkz0njlvmi05f1m2sx976flqd3kxr78"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-x64"; version = "8.0.6"; sha256 = "0fz0a4hm8lf56r5hff4vcz6pfmwfqygddm6cyxj04x63wqd16sl8"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64"; version = "8.0.6"; sha256 = "1bg9d8fcwr7808vbakkgrzry4wf0l7r28xn9hsnh14awsqprngid"; }) + (fetchNuGet { pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "0l3pibk6q4hhinf2ki42vcc6kvvi5x4icm8bpcnm9iss6kafchry"; }) + (fetchNuGet { pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "19wwim19f1aqscvya85chbycj30ns5cxr2ga5jfrkxbyni9q557m"; }) + (fetchNuGet { pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "1bggciasdgh7yr9vjkfq8fjxzg8lbcj4cd16slcr8kkpqy1lj79s"; }) + (fetchNuGet { pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "1zz8d3dq0n58qnxb4y1njbgls5nfaaqibgxq4k3s5wnclxp8fmys"; }) + (fetchNuGet { pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "0l6rsnf39m6fp4p8bs0rl98k36bj4yg2q49hgg89yf7q3r5xka91"; }) + (fetchNuGet { pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "0cqm5183as2m3nsl9as00qm9928bani6gflndg0fv73r799k5raz"; }) + (fetchNuGet { pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler"; version = "8.0.6"; sha256 = "0yjji845ngsaqxyg2cmngj3vba8v4wyriv0qz4hgn1wbrramml6b"; }) + (fetchNuGet { pname = "Microsoft.NET.ILLink.Tasks"; version = "8.0.6"; sha256 = "0slfrm65izibsxg505vr8m4k6n2a2kl4iqyyr9xkgr8541g7rrs5"; }) ]; in rec { - release_8_0 = "8.0.5"; + release_8_0 = "8.0.6"; aspnetcore_8_0 = buildAspNetCore { - version = "8.0.5"; + version = "8.0.6"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ccccfeb7-0af4-4713-b4f1-cf49b5c8bd6c/5b04c0188dfcf78b70da78ae3bd7f3ab/aspnetcore-runtime-8.0.5-linux-x64.tar.gz"; - sha512 = "ffe6a534ed7dffe031e7d687b153f09a743792fad6ddcdf70fcbdbe4564462d5db71a8c9eb52036b817192386ef6a8fc574d995e0cdf572226302e797a6581c4"; + url = "https://download.visualstudio.microsoft.com/download/pr/ce31d92b-b514-4f9c-843b-29c466871369/b332eba5641cbc6eed1e3a98480972d2/aspnetcore-runtime-8.0.6-linux-x64.tar.gz"; + sha512 = "16cd54c431d80710a06037f8ea593e04764a80cbaad75e1db4225fbe3e7fce4c4d279f40757b9811e1c092436d2a1ca3be64c74cb190ebf78418a9865992ad12"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/208a57a8-fcc0-4801-a337-79095304d2af/d1ffa79af24735af4bd748229778c1a9/aspnetcore-runtime-8.0.5-linux-arm64.tar.gz"; - sha512 = "54ad859a3307a4ccce6aa794df20dab3fc38cb4a8fc9f1c2cb41636d6d19fed1e82f88a0099bdc9f30e08c919ae5653da828ae54b0299291dafcc755575f02db"; + url = "https://download.visualstudio.microsoft.com/download/pr/ccdcbb70-a5e9-4753-b6e3-4461ce56a69d/240803fc1ffba38ab3603778c03e9b87/aspnetcore-runtime-8.0.6-linux-arm64.tar.gz"; + sha512 = "9ed12847e404a0a4fdd8fca33a9a787c5ac2e6745d23821c7890f731f2f8f5682e7f9166b2764b13b612b08e091c71e13359b68acc11bcf990afdef1d42f6473"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/77cd03cb-5575-48c9-8714-6498ee88694b/8bfba2913a4db23e3dffdff779fb7866/aspnetcore-runtime-8.0.5-osx-x64.tar.gz"; - sha512 = "d214a8b6a60547acb1a7f879e7a82348585b699f714b73b168918ebc60ee580ca5ff973f64e7738063f79dd04f0807bef0d73e90ce42c3b4464b87b768ccd789"; + url = "https://download.visualstudio.microsoft.com/download/pr/ccd03400-c514-4956-9e9d-ad1bd67d1338/436b9590788dd3df98e73d4c5379c711/aspnetcore-runtime-8.0.6-osx-x64.tar.gz"; + sha512 = "61786ecd784b83eacfe4dd901bdd55474e52d9da85806b3d52184e8e35a3065b476e574c939f3af491a925bf7f04fdf376c53a25c103a187a7939f4736158297"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c264657c-7a93-4ba5-b6e0-91bf41341e1e/90fb45ed7d2f92c374899b1c7a5254b2/aspnetcore-runtime-8.0.5-osx-arm64.tar.gz"; - sha512 = "b1a47d2ae3b528f5c32b57e3a03b46d12a14126b9768f9dd5dd979d49dc6543c6aafe55684eae3890ffe6b867aa664805b920ae1514f67cc841b882d5da7c091"; + url = "https://download.visualstudio.microsoft.com/download/pr/b90758d2-834d-4fe7-b97f-e8294b68d07c/71d63df9474999f831811dd6989d9ba7/aspnetcore-runtime-8.0.6-osx-arm64.tar.gz"; + sha512 = "85d82e90182375ca21326e3d57be0dc5a39d7e64f1a4005950fe21c720f1d1e1615f64030c950fa7a49f6a104f029b9845648cebeb98d48d892aad3309c583c8"; }; }; }; runtime_8_0 = buildNetRuntime { - version = "8.0.5"; + version = "8.0.6"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/baeb5da3-4b77-465b-8816-b29f0bc3e1a9/b04b17a2aae79e5f5635a3ceffbd4645/dotnet-runtime-8.0.5-linux-x64.tar.gz"; - sha512 = "3efff49feb2e11cb5ec08dcee4e1e8ad92a4d2516b721a98b55ef2ada231cad0c91fd20b71ab5e340047fc837bd02d143449dd32f4f95288f6f659fa6c790eaa"; + url = "https://download.visualstudio.microsoft.com/download/pr/021c3de8-14d5-493f-92dc-2c8f8be76961/6ee3407acebf74631bfc01f14301afa6/dotnet-runtime-8.0.6-linux-x64.tar.gz"; + sha512 = "c0c5e93d4e68e2075c4c63336dc74246efb704ac9663411351efdefc4cc7da5a7750f44b8a23aebe959bb4308575bead443a41b2524ae03b29ac41929d27e0e0"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/00ca4d7a-e529-4384-8ad4-acb8237d540f/a7df4c26e3c0e1dcf8e17d2abb79aad5/dotnet-runtime-8.0.5-linux-arm64.tar.gz"; - sha512 = "cd6c0ac051c3a8b6f3452a5a93600e664e30b9ba14c33948fbbfc21482fe55a8b16268035dd0725c85189d18c83860ea7a7bc96c87d6a4ee6a6083130c5586c3"; + url = "https://download.visualstudio.microsoft.com/download/pr/0039e2c5-d78d-45fb-94c0-e258ff0335fe/c3bff45767f679bbab149398e9ee2c6b/dotnet-runtime-8.0.6-linux-arm64.tar.gz"; + sha512 = "428c5a81938273c5e63b04858dbf2f4e82c9bcfa3bd33f954081238be2fb52aadce99296698eabac72e4be55c61e6c1ff06d2d8d1fd5d6a2d0c7a2917cd50739"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0dabe69f-fa99-4b53-96d1-9f9791bb0b6b/f72acbfd3b0e60528d9494b43bcf21ca/dotnet-runtime-8.0.5-osx-x64.tar.gz"; - sha512 = "29a8be6dd738d634cc33857dc1f1f6cc2c263177d78eb1c4585c96b5bf568f8f2689f1a30eec728ccb96a2d005049936abbfd44daca1962caf4f6d53325ba42f"; + url = "https://download.visualstudio.microsoft.com/download/pr/20271d05-67e0-4356-87a9-0ce5102b5007/b7c91c6470e1c2ffbb493a35dd6883c0/dotnet-runtime-8.0.6-osx-x64.tar.gz"; + sha512 = "44c0ad9fc613975fa0c12b12b91ff8cd8ba0be5e8ed59510e7a5ab22e55267a468b321ce34515daf070ffc8d557c09d7ea3ed3c3407887f706553b5d378e3232"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/fac90ccb-5864-4d4a-a116-67387aaee61e/df82eea80efffad3c9ec8b0522847e68/dotnet-runtime-8.0.5-osx-arm64.tar.gz"; - sha512 = "5401135b8871d85ca6f774958e6a644ef2bf85a88d2358f15c3bdc928b21a700be428efede677d83640085461d000e55a28bfbacdc9f01af0334a6e8b257efbd"; + url = "https://download.visualstudio.microsoft.com/download/pr/6f090da0-5f55-44f1-ac17-9bd001b33d66/eae314b23ab350b375e794e136a2ca9e/dotnet-runtime-8.0.6-osx-arm64.tar.gz"; + sha512 = "21ae6420914e45be9fe17bfb0c89948eead27756dedb13fc2c6b9b08d78aee80daa2b8cda358268c819f00ba7ca33ed75e21bed387045b3a62160fea159eaa3c"; }; }; }; sdk_8_0_3xx = buildNetSdk { - version = "8.0.300"; + version = "8.0.301"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/4a252cd9-d7b7-41bf-a7f0-b2b10b45c068/1aff08f401d0e3980ac29ccba44efb29/dotnet-sdk-8.0.300-linux-x64.tar.gz"; - sha512 = "6ba966801ad3869275469b0f7ee7af0b88b659d018a37b241962335bd95ef6e55cb6741ab77d96a93c68174d30d0c270b48b3cda21b493270b0d6038ee3fe79e"; + url = "https://download.visualstudio.microsoft.com/download/pr/86497c4f-3dc8-4ee7-9f6a-9e0464059427/293d074c28bbfd9410f4db8e021fa290/dotnet-sdk-8.0.301-linux-x64.tar.gz"; + sha512 = "6e2e1ad5fe3f00e6974ad3eac9c5b74cd09521f19e06eb9aff45a44d6c55e4a2c1cd489364735215d2ea53cec2a7d45892a5ede344a8421be9ad15872c3496a2"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/54e5bb2e-bdd6-496d-8aba-4ed14658ee91/34fd7327eadad7611bded51dcda44c35/dotnet-sdk-8.0.300-linux-arm64.tar.gz"; - sha512 = "b38d34afe6d92f63a0e5b6fc37c88fbb5a1c73fba7d8df41d25432b64b2fbc31017198a02209b3d4343d384bc352834b9ee68306307a3f0fe486591dd2f70efd"; + url = "https://download.visualstudio.microsoft.com/download/pr/cd9decc0-f3ef-46d6-b7d1-348b757781ad/9ad92a8f4b805feb3d017731e78eca15/dotnet-sdk-8.0.301-linux-arm64.tar.gz"; + sha512 = "cb904a625d5e4ef4db995225d6705b84201dc7d7d09a0b1669baccc86e05419472719025036dd78983b21850f7663d159ae41926364d1d3ca0eab62862f75d29"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/e05a3055-c987-4127-a315-51d6b982fd67/fbda30d8e461b2c5098f3c405378b559/dotnet-sdk-8.0.300-osx-x64.tar.gz"; - sha512 = "12ed6044dad31c65d6894d7e1cf861a6c330c23761fed90ca2fe0c7d2700433fb8b8541c35bb235b044762f5fd33496cd6e92dbd70deeeb7b9e59423d9d49f5e"; + url = "https://download.visualstudio.microsoft.com/download/pr/6ef47a54-b1c6-4000-8df4-486f64464c2b/ae87b597b19312fa9f73b9f2f8c687bd/dotnet-sdk-8.0.301-osx-x64.tar.gz"; + sha512 = "5d91fbc584f32f4d48dee303c7eb16b38b2e2fab9549bd54293bac28508a6d53f93782ff102266010f8cd8c15c6436a807a7e6efede2e1051fe206957ba73071"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/4d7af168-9a20-40a3-8744-b2f1c10c0227/3d6d8d16545d6c05125c51ef8142296f/dotnet-sdk-8.0.300-osx-arm64.tar.gz"; - sha512 = "98a9b56b2795bf6faa848062ed34d917b187eda220db50c8e73de1bfa37244dd68d8c3cbc598b5fc5be4620a2b92724f95d7c13299f8b873fdefe880890a1bbb"; + url = "https://download.visualstudio.microsoft.com/download/pr/c503e53c-0567-4604-b7a8-1d6e7a1357f5/53e78f56b01147a092c0cc273b443550/dotnet-sdk-8.0.301-osx-arm64.tar.gz"; + sha512 = "8d56980b6a6ffd78618a6e9833126d7e67052ca6041bd5f167a32e277aac7094a5cd37b9e7e145d5c9b74da95561535189a077d074ddb0fe710a76c2a2c9b1eb"; }; }; inherit packages; }; sdk_8_0_2xx = buildNetSdk { - version = "8.0.205"; + version = "8.0.206"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/7cdbcd68-c4e8-4212-b4a2-f30ae2ffdb19/48a359550fd7eab1f03ea18eb2689eb3/dotnet-sdk-8.0.205-linux-x64.tar.gz"; - sha512 = "2ec774350ca3192e1c68c9c8ee62d0c089f9bd03fe1aaebb118fbe7625f2e0960f5dbd800ea3f974cc7ac7fba32830f41faec9ee1bae736497ba05d9c7addb59"; + url = "https://download.visualstudio.microsoft.com/download/pr/5fd599e9-4bf8-4603-8a14-87777293837d/1d5f0729055901dce471570bb82a441f/dotnet-sdk-8.0.206-linux-x64.tar.gz"; + sha512 = "d03cbb5ea44a6f4957d7c1fa0f7c19e3df2efcbf569b071082e37ac86776af0729540c3bbddc44668ae2eedcfcb4b098883bb560d26418f1583a558d60c99ef5"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/96b5cb76-37e3-4514-a8c5-bb4834e275d3/b541205fa6efc3bd223b3201dcb7735c/dotnet-sdk-8.0.205-linux-arm64.tar.gz"; - sha512 = "092ce55cc45ab5109c9d991382e7ed7f40bc0281e94766738dbf179d618f03dbf8ba38e43c418a3d5cac0377afc5e5b82a969e36832e386b851f3679a2e988e3"; + url = "https://download.visualstudio.microsoft.com/download/pr/f25f9e53-deba-4c1c-b9d2-5e026e5a4d92/c291c78eb71c30b1c66745dec87936ce/dotnet-sdk-8.0.206-linux-arm64.tar.gz"; + sha512 = "eb0489785dc5bf824bc3fc1014815ebd371fbc73eb02b63e5a1650bcadb158cab7e909904889f6e198a180a1742976351208a57796ef38a4205c52fb945b7d09"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/0dcb3b2f-6bbe-4dc0-a42a-283826d8b9ce/16767a67d602bd267122a26f4c4c2935/dotnet-sdk-8.0.205-osx-x64.tar.gz"; - sha512 = "15f410ae81027f4537a03a00114873fe9bacf799d5ddc24663fefc3b1d977d237269fef48c80334bcaf7230495f304bb123f310692f880fea8cb8e0072abb4a3"; + url = "https://download.visualstudio.microsoft.com/download/pr/ea0371ce-1119-416c-bab1-578cb8c1fa77/71cb9d66778c8e2a65ca40d8456300ef/dotnet-sdk-8.0.206-osx-x64.tar.gz"; + sha512 = "d7742a0b00c4df835639eeb18f2ae4888ac33d7d7c25d097a8868c5172c878d7df8c5bbd54de9b34f877f07a2dc6c748ea510f783e1842058e8cfd0ad2cda83f"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/c8126855-4f38-4d01-8e22-b7f93452a9d7/725dda9ebd1ae3486febf496217ba0b9/dotnet-sdk-8.0.205-osx-arm64.tar.gz"; - sha512 = "2792e9b0cd4fd69373022c5e4c17bd128dd8e31db773f51b39c8696f37e72af8c4b67d0c017ee068587c0f664efa8bbd9a0bc4472b072a7897d2ff4ef8fafa58"; + url = "https://download.visualstudio.microsoft.com/download/pr/bca24333-c463-4f90-8085-f856962fac39/ef02fb556ff3d92938a2c11e408c7d71/dotnet-sdk-8.0.206-osx-arm64.tar.gz"; + sha512 = "c4a17c17b02d9559e0029328179d22617321e439e9360175f25385d60789f91582a4024ce41690439d85852e4c85f0d0ae20fe818c0f4acf0d7d48ffac2d2b5c"; }; }; inherit packages; }; sdk_8_0_1xx = buildNetSdk { - version = "8.0.105"; + version = "8.0.106"; srcs = { x86_64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/e898e5ae-041a-4e64-95c7-751479f40df5/9e36a84d3e1283e1932d7f82f6980cd8/dotnet-sdk-8.0.105-linux-x64.tar.gz"; - sha512 = "60ff271ee7851ff9ab851f9dc3e3d0abc87ac9b982959abfc8f0a3b58301fb6a0ff7b9f07f8df18668e1e8182c688d0d661bb9cb1771a2d40a0015d02009fce8"; + url = "https://download.visualstudio.microsoft.com/download/pr/0fe59d31-bc28-4f57-8d1a-285f47b5a0ec/e4c5def191daf9f999efc5812b085924/dotnet-sdk-8.0.106-linux-x64.tar.gz"; + sha512 = "06eecc146b16eef0654fb4fd17faec06c6dc1b7236acc7e4a33e4b13cbea1d725faeb9eda41a0c12e65ec4c89d6624971429ca223638387c66f1d3e4dcd1407b"; }; aarch64-linux = { - url = "https://download.visualstudio.microsoft.com/download/pr/ffadc6b9-6f16-4671-866d-4c150f2888d1/256d5909ff60dae42cbd251347cc14df/dotnet-sdk-8.0.105-linux-arm64.tar.gz"; - sha512 = "8f04afa385676d2ec879ad22734a4c869d931ba4bc7507d0aa5889561d0230e382598057bdf75792048b28bd9a1c8eb187e80691f603309a46d6c50d71373381"; + url = "https://download.visualstudio.microsoft.com/download/pr/34676827-2699-4f0d-81e3-347939a91b7e/6f2f3851e005f57f8b6c132ead1952e5/dotnet-sdk-8.0.106-linux-arm64.tar.gz"; + sha512 = "e8f735d20d79b20d24ce5b2f7c25c60604cb6b694b6572488c654cbf14a4d99c269f64f4ca23ab78aefaedf14f35a0ae1f33adf6afac5556e2ebd22ec73e04eb"; }; x86_64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/54b48c6e-1a50-4dd5-9592-8ae5dfbe9d2f/913341d866eaf3149a6158cabf9ce2ad/dotnet-sdk-8.0.105-osx-x64.tar.gz"; - sha512 = "052fd0783bd0901876a29b57a0f15e9f9cf859373bf4f3867a8f3e00b4edac5f3814b066be81c76d6bc74a20bd696e4ec65db48dc19703bbb4ee56d60aedd96d"; + url = "https://download.visualstudio.microsoft.com/download/pr/8380cce5-930a-43ff-8a27-981e175d9881/4ddeae425c3c344f4afd8adddb03af5b/dotnet-sdk-8.0.106-osx-x64.tar.gz"; + sha512 = "4e6d45b7b1618bdb528a865d1c89e7ec7750f8a73ae7e805675dd9d7d3974f0b19785e743298f0c468144cd7fe9e20e521f65e9fc081b89d8bd9e187b5783c2c"; }; aarch64-darwin = { - url = "https://download.visualstudio.microsoft.com/download/pr/8d741dd4-ab83-4bd8-8667-998cc1c6d345/c7ac6cf87561262db36b18e505150e89/dotnet-sdk-8.0.105-osx-arm64.tar.gz"; - sha512 = "f910adb274065fef581728e7d043bc3f0c105a939f659865753c11a0dd0b550bdc4c0bc01e2ce6f710efcdebb3966ef138986113f595af4d6a9be8b15008abc6"; + url = "https://download.visualstudio.microsoft.com/download/pr/d595db17-776d-4b09-aefe-44777823a4de/55867e85ac1b03cd5609a936055c8ee1/dotnet-sdk-8.0.106-osx-arm64.tar.gz"; + sha512 = "490c20abc3cf52f76fecf422a6fcc66c98b7500a56986f84e617860a2758f43ddc4b235647837fae69e4c46a9d1ab9177d4bbfe134258797599b69178f6b91f8"; }; }; inherit packages; From f44b27ce93b6bb137180162ac8aa03697fa0876e Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 31 May 2024 21:48:40 -0300 Subject: [PATCH 072/219] dotnetCorePackages.dotnet_8: 8.0.5 -> 8.0.6 --- .../development/compilers/dotnet/8/release-info.json | 2 +- pkgs/development/compilers/dotnet/8/release.json | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/dotnet/8/release-info.json b/pkgs/development/compilers/dotnet/8/release-info.json index 6b829ab65903..cc1ea74ed354 100644 --- a/pkgs/development/compilers/dotnet/8/release-info.json +++ b/pkgs/development/compilers/dotnet/8/release-info.json @@ -1,5 +1,5 @@ { - "tarballHash": "sha256-Hu3mq+cJpbS6Qzvt3PmRe4iRbWJDuMUaNmRlS6tuphw=", + "tarballHash": "sha256-BC1K5hjTdhdEYGkC32gXDfdR6A3WVBVvTKqbslE40fc=", "artifactsUrl": "https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.104-servicing.24171.1.centos.8-x64.tar.gz", "artifactsHash": "sha256-+ft4PIFOwfv5Z8VqW6bt71LP/HuvTWRTDYnB71Ti0O8=" } diff --git a/pkgs/development/compilers/dotnet/8/release.json b/pkgs/development/compilers/dotnet/8/release.json index b1ea86dba79a..9aa1bd7305be 100644 --- a/pkgs/development/compilers/dotnet/8/release.json +++ b/pkgs/development/compilers/dotnet/8/release.json @@ -1,10 +1,10 @@ { - "release": "8.0.5", + "release": "8.0.6", "channel": "8.0", - "tag": "v8.0.5", - "sdkVersion": "8.0.105", - "runtimeVersion": "8.0.5", - "aspNetCoreVersion": "8.0.5", + "tag": "v8.0.6", + "sdkVersion": "8.0.106", + "runtimeVersion": "8.0.6", + "aspNetCoreVersion": "8.0.6", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "181780576f29353fd077b649e7624cf806e882e7" + "sourceVersion": "64c5c1aee8dc1faa16021350fcdd0bba15004160" } From a7a6356c14ddfe1b2c6a017606d96c474c519a39 Mon Sep 17 00:00:00 2001 From: David McFarland Date: Sun, 2 Jun 2024 16:26:42 -0300 Subject: [PATCH 073/219] tests.dotnet.project-references: use dir instead of file output This fixes an error in nixpkgs-review when it tries to pass this to buildEnv: error: The store path [...]project-references-test is a file and can't be merged into an environment using pkgs.buildEnv! at [...]-builder.pl line 122. --- pkgs/test/dotnet/project-references/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/test/dotnet/project-references/default.nix b/pkgs/test/dotnet/project-references/default.nix index f40b9196c209..0736cedc9096 100644 --- a/pkgs/test/dotnet/project-references/default.nix +++ b/pkgs/test/dotnet/project-references/default.nix @@ -34,5 +34,5 @@ in runCommand "project-references-test" { } '' ${application}/bin/Application - touch $out + mkdir $out '' From 54bcb9a02aa8ae5d718509cd6ca033ade31deb4f Mon Sep 17 00:00:00 2001 From: emilylange Date: Sun, 2 Jun 2024 22:41:44 +0200 Subject: [PATCH 074/219] grafana-agent: 0.40.5 -> 0.41.0 Note: Upstream moved a few internal components into their own directory including the flow web ui (./web/ui -> ./internal/web/ui). Contains breaking changes. https://github.com/grafana/agent/releases/tag/v0.41.0 diff: https://github.com/grafana/agent/compare/v0.40.5...v0.41.0 --- .../servers/monitoring/grafana-agent/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-agent/default.nix b/pkgs/servers/monitoring/grafana-agent/default.nix index ad9605239013..a1738695604b 100644 --- a/pkgs/servers/monitoring/grafana-agent/default.nix +++ b/pkgs/servers/monitoring/grafana-agent/default.nix @@ -15,28 +15,28 @@ buildGoModule rec { pname = "grafana-agent"; - version = "0.40.5"; + version = "0.41.0"; src = fetchFromGitHub { owner = "grafana"; repo = "agent"; rev = "v${version}"; - hash = "sha256-Ctv/s9lgZQ9uCXx+xwJlNVe1ycQnQHtziVNafdYVBig="; + hash = "sha256-I763iHBMWnfGzh6KyGGzZekafseEIetnflnVVvro/cE="; }; - vendorHash = "sha256-pI2hk91wqMVaZ5/6uegoQOh94p4zb7Tvn2CtOMRhZME="; + vendorHash = "sha256-ueU9n57KUiUe2kXcxDsxpidjwmDLN8eoFO9nQRkZyKY="; proxyVendor = true; # darwin/linux hash mismatch frontendYarnOfflineCache = fetchYarnDeps { - yarnLock = src + "/web/ui/yarn.lock"; + yarnLock = src + "/internal/web/ui/yarn.lock"; hash = "sha256-WqbIg18qUNcs9O2wh7DAzwXKb60iEuPL8zFCIgScqI0="; }; ldflags = let - prefix = "github.com/grafana/agent/pkg/build"; + prefix = "github.com/grafana/agent/internal/build"; in [ "-s" "-w" - # https://github.com/grafana/agent/blob/d672eba4ca8cb010ad8a9caef4f8b66ea6ee3ef2/Makefile#L125 + # https://github.com/grafana/agent/blob/v0.41.0/Makefile#L132-L137 "-X ${prefix}.Version=${version}" "-X ${prefix}.Branch=v${version}" "-X ${prefix}.Revision=v${version}" @@ -56,13 +56,13 @@ buildGoModule rec { subPackages = [ "cmd/grafana-agent" "cmd/grafana-agentctl" - "web/ui" + "internal/web/ui" ]; preBuild = '' export HOME="$TMPDIR" - pushd web/ui + pushd internal/web/ui fixup-yarn-lock yarn.lock yarn config --offline set yarn-offline-mirror $frontendYarnOfflineCache yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive From c9cc328009011847b020d86adf87cec826a8d42c Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 2 Jun 2024 22:40:46 +0100 Subject: [PATCH 075/219] ytdownloader: 3.17.4 -> 3.18.0 --- pkgs/by-name/yt/ytdownloader/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/yt/ytdownloader/package.nix b/pkgs/by-name/yt/ytdownloader/package.nix index b471ec819329..fc419cccc318 100644 --- a/pkgs/by-name/yt/ytdownloader/package.nix +++ b/pkgs/by-name/yt/ytdownloader/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "ytDownloader"; - version = "3.17.4"; + version = "3.18.0"; src = fetchFromGitHub { owner = "aandrew-me"; repo = "ytDownloader"; rev = "refs/tags/v${version}"; - hash = "sha256-GW+17DfPiFxw2QyJ5KTMZLDWmqXfnHfkg+QpM5XOP0M="; + hash = "sha256-/3VlBxT06/jnBwk07zoUs1yb9MUB9U+oJtXBGoKH6Dg="; }; - npmDepsHash = "sha256-lhFyiWy9dgnxxaElavzqA4YpRm7cVC23pvL5Kwve58E="; + npmDepsHash = "sha256-dAd9O3iOELBRRzQV/+DSQXHS5PLjDZvsF2D1vwT9dw8="; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ ffmpeg yt-dlp ]; From 81f218628bb2fdb0c565ee091c5e20c6ac592d88 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 19:39:46 -0300 Subject: [PATCH 076/219] .github/labeler.yml: add dotnet label --- .github/labeler.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index 57086953f8d0..88c2c6677f29 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -16,6 +16,17 @@ - nixos/modules/services/x11/desktop-managers/cinnamon.nix - nixos/tests/cinnamon.nix +"6.topic: dotnet": + - any: + - changed-files: + - any-glob-to-any-file: + - doc/languages-frameworks/dotnet.section.md + - maintainers/scripts/update-dotnet-lockfiles.nix + - pkgs/build-support/dotnet/**/* + - pkgs/development/compilers/dotnet/**/* + - pkgs/test/dotnet/**/* + - pkgs/top-level/dotnet-packages.nix + "6.topic: emacs": - any: - changed-files: From a2ab68ab9263224bb01b92a62852ef741dd6880f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:29:33 -0300 Subject: [PATCH 077/219] buildMavenPackage: add doCheck support --- .../tools/build-managers/apache-maven/build-package.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/apache-maven/build-package.nix b/pkgs/development/tools/build-managers/apache-maven/build-package.nix index df5d67cb42e6..f9ff54696dfe 100644 --- a/pkgs/development/tools/build-managers/apache-maven/build-package.nix +++ b/pkgs/development/tools/build-managers/apache-maven/build-package.nix @@ -6,6 +6,7 @@ { src , sourceRoot ? null , buildOffline ? false +, doCheck ? true , patches ? [ ] , pname , version @@ -22,6 +23,7 @@ # created to allow using maven packages in the same style as rust let + mvnSkipTests = lib.optionalString (!doCheck) "-DskipTests"; fetchedMavenDeps = stdenv.mkDerivation ({ name = "${pname}-${version}-maven-deps"; inherit src sourceRoot patches; @@ -49,7 +51,7 @@ let mvn dependency:sources -DincludeGroupIds="$group" -DincludeArtifactIds="$artifact" -Dmaven.repo.local=$out/.m2 done '' + lib.optionalString (!buildOffline) '' - mvn package -Dmaven.repo.local=$out/.m2 ${mvnParameters} + mvn package -Dmaven.repo.local=$out/.m2 ${mvnSkipTests} ${mvnParameters} '' + '' runHook postBuild ''; @@ -85,7 +87,7 @@ stdenv.mkDerivation (builtins.removeAttrs args [ "mvnFetchExtraArgs" ] // { runHook preBuild mvnDeps=$(cp -dpR ${fetchedMavenDeps}/.m2 ./ && chmod +w -R .m2 && pwd) - mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnParameters} + mvn package -o -nsu "-Dmaven.repo.local=$mvnDeps/.m2" ${mvnSkipTests} ${mvnParameters} runHook postBuild ''; From af11e0182ce58de8fa01b1f8aa5fed08fa7c196d Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:30:51 -0300 Subject: [PATCH 078/219] mariadb-connector-java: normalize doCheck --- pkgs/by-name/ma/mariadb-connector-java/package.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/mariadb-connector-java/package.nix b/pkgs/by-name/ma/mariadb-connector-java/package.nix index d6fed528e1d0..3fa6f7a5186c 100644 --- a/pkgs/by-name/ma/mariadb-connector-java/package.nix +++ b/pkgs/by-name/ma/mariadb-connector-java/package.nix @@ -17,8 +17,7 @@ maven.buildMavenPackage rec { mvnHash = "sha256-7O+G5HT6mtp12zWL3Gn12KPVUwp3GMaWGvXX6Sg1+6k="; - # Disable tests because they require networking - mvnParameters = "-DskipTests"; + doCheck = false; # Requires networking installPhase = '' runHook preInstall From 1ca1182e537bd52ce9c1870de42e186f8d64f7e1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:37:37 -0300 Subject: [PATCH 079/219] forge-mtg: normalize doCheck --- pkgs/games/forge-mtg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/forge-mtg/default.nix b/pkgs/games/forge-mtg/default.nix index cc5c56977bb9..8ca1675591ee 100644 --- a/pkgs/games/forge-mtg/default.nix +++ b/pkgs/games/forge-mtg/default.nix @@ -25,10 +25,10 @@ maven.buildMavenPackage { pname = "forge-mtg"; inherit version src patches; - # Tests need a running Xorg. - mvnParameters = "-DskipTests"; mvnHash = "sha256-QK9g0tG75lIhEtf4jW03N32YbD9Fe5iI0JTuqmCTtnE="; + doCheck = false; # Needs a running Xorg + nativeBuildInputs = [ makeWrapper ]; installPhase = '' From 2c5961d4b7cd70a738e6d2e6f54309beabf96ef8 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:39:18 -0300 Subject: [PATCH 080/219] java-language-server: normalize doCheck --- pkgs/development/tools/java/java-language-server/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/java/java-language-server/default.nix b/pkgs/development/tools/java/java-language-server/default.nix index 0cca4d4ca56e..744e20fce611 100644 --- a/pkgs/development/tools/java/java-language-server/default.nix +++ b/pkgs/development/tools/java/java-language-server/default.nix @@ -23,7 +23,6 @@ maven.buildMavenPackage rec { }; mvnFetchExtraArgs.dontConfigure = true; - mvnParameters = "-DskipTests"; mvnHash = "sha256-2uthmSjFQ43N5lgV11DsxuGce+ZptZsmRLTgjDo0M2w="; nativeBuildInputs = [ jdk makeWrapper ]; @@ -39,6 +38,8 @@ maven.buildMavenPackage rec { --compress 2 ''; + doCheck = false; + installPhase = '' runHook preInstall From 66472eba4d12ba882b7c53f262d7ac7bd3c78c92 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:40:55 -0300 Subject: [PATCH 081/219] commafeed: normalize doCheck --- pkgs/by-name/co/commafeed/package.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix index cc203468feea..369a5801ff48 100644 --- a/pkgs/by-name/co/commafeed/package.nix +++ b/pkgs/by-name/co/commafeed/package.nix @@ -56,7 +56,6 @@ maven.buildMavenPackage { "-Dskip.npm" "-Dspotless.check.skip" "-Dmaven.gitcommitid.skip" - "-DskipTests" ]; nativeBuildInputs = [ makeWrapper ]; @@ -71,6 +70,8 @@ maven.buildMavenPackage { runHook postConfigure ''; + doCheck = false; + installPhase = '' runHook preInstall From 2037c8febc673d2f21b923d0241732c5dbe8b48f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:42:21 -0300 Subject: [PATCH 082/219] openrefine: normalize doCheck --- pkgs/applications/science/misc/openrefine/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix index 6a9d4be6c50b..b94f23671024 100644 --- a/pkgs/applications/science/misc/openrefine/default.nix +++ b/pkgs/applications/science/misc/openrefine/default.nix @@ -55,11 +55,13 @@ in maven'.buildMavenPackage { postPatch = '' cp -r ${npmPkg} main/webapp/modules/core/3rdparty ''; - mvnParameters = "-DskipTests=true -pl !packaging"; + mvnParameters = "-pl !packaging"; mvnHash = "sha256-0qsKUMV9M0ZaddR5ust8VikSrsutdxVNNezKqR+F/6M="; nativeBuildInputs = [ makeWrapper ]; + doCheck = false; + installPhase = '' mkdir -p $out/lib/server/target/lib cp -r server/target/lib/* $out/lib/server/target/lib/ From 5c263158043914f50da9d489f371a6ddd6a45656 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:43:23 -0300 Subject: [PATCH 083/219] ns-usbloader: normalize doCheck --- pkgs/applications/misc/ns-usbloader/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/ns-usbloader/default.nix b/pkgs/applications/misc/ns-usbloader/default.nix index 8ab52711a6ce..a97d3e6f9f88 100644 --- a/pkgs/applications/misc/ns-usbloader/default.nix +++ b/pkgs/applications/misc/ns-usbloader/default.nix @@ -37,7 +37,6 @@ maven.buildMavenPackage rec { x86_64-linux = "sha256-vXZAlZOh9pXNF1RL78oQRal5pkXFRKDz/7SP9LibgiA="; aarch64-linux = "sha256-xC+feb41EPi30gBrVR8usanVULI2Pt0knztzNagPQiw="; }; - mvnParameters = "-DskipTests"; nativeBuildInputs = [ copyDesktopItems @@ -46,6 +45,8 @@ maven.buildMavenPackage rec { gvfs ]; + doCheck = false; + # Don't wrap binaries twice. dontWrapGApps = true; From 9855e223acb301475f463743b3543ef4ba66e846 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:45:34 -0300 Subject: [PATCH 084/219] sonarlint-ls: normalize doCheck --- pkgs/by-name/so/sonarlint-ls/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/so/sonarlint-ls/package.nix b/pkgs/by-name/so/sonarlint-ls/package.nix index 8382d3b8b270..42b8d6098947 100644 --- a/pkgs/by-name/so/sonarlint-ls/package.nix +++ b/pkgs/by-name/so/sonarlint-ls/package.nix @@ -40,7 +40,7 @@ mavenJdk17.buildMavenPackage rec { # disable node and npm module installation because the need network access # for the tests. - mvnDepsParameters = "-Dskip.installnodenpm=true -Dskip.npm -DskipTests package"; + mvnDepsParameters = "-Dskip.installnodenpm=true -Dskip.npm package"; # disable failing tests which either need network access or are flaky mvnParameters = lib.escapeShellArgs [ @@ -53,6 +53,8 @@ mavenJdk17.buildMavenPackage rec { !JavaMediumTests" ]; + doCheck = false; + installPhase = '' runHook preInstall From aa993504e77e78b7e52f0c67f11b884ef0c78d42 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:46:33 -0300 Subject: [PATCH 085/219] kotlin-interactive-shell: normalize doCheck --- pkgs/by-name/ko/kotlin-interactive-shell/package.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ko/kotlin-interactive-shell/package.nix b/pkgs/by-name/ko/kotlin-interactive-shell/package.nix index 23848a48969e..752be68d4245 100644 --- a/pkgs/by-name/ko/kotlin-interactive-shell/package.nix +++ b/pkgs/by-name/ko/kotlin-interactive-shell/package.nix @@ -12,10 +12,12 @@ maven.buildMavenPackage rec { }; mvnHash = "sha256-m1o0m0foqJhEzWjC9behBeld5HT08WClcZN2xc3fZrI="; - mvnParameters = "-DskipTests compile"; + mvnParameters = "compile"; nativeBuildInputs = [ makeWrapper ]; + doCheck = false; + installPhase = '' runHook preInstall From 44e435d24151be6878eee6eb88629843810b40eb Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:47:10 -0300 Subject: [PATCH 086/219] h2: normalize doCheck --- pkgs/servers/h2/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/h2/default.nix b/pkgs/servers/h2/default.nix index 84a8b98b6dfc..297802f59a92 100644 --- a/pkgs/servers/h2/default.nix +++ b/pkgs/servers/h2/default.nix @@ -13,11 +13,13 @@ maven.buildMavenPackage rec { hash = "sha256-pS9jSiuInA0eULPOZK5cjwr9y5KDVY51blhZ9vs4z+g="; }; - mvnParameters = "-f h2/pom.xml -DskipTests"; + mvnParameters = "-f h2/pom.xml"; mvnHash = "sha256-hUzE4F+RNCAfoY836pjrivf04xqN4m9SkiLXhmVzZRA="; nativeBuildInputs = [ makeWrapper ]; + doCheck = false; + installPhase = '' mkdir -p $out/share/java install -Dm644 h2/target/h2-${version}.jar $out/share/java From 6ab6515def09d321385be3b657071ae8142b4e9d Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sun, 2 Jun 2024 20:48:25 -0300 Subject: [PATCH 087/219] s3proxy: normalize doCheck --- pkgs/by-name/s3/s3proxy/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/s3/s3proxy/package.nix b/pkgs/by-name/s3/s3proxy/package.nix index b2fd1b03a5ab..72f18af79cc1 100644 --- a/pkgs/by-name/s3/s3proxy/package.nix +++ b/pkgs/by-name/s3/s3proxy/package.nix @@ -21,7 +21,7 @@ maven.buildMavenPackage { hash = "sha256-GhZPvo8wlXInHwg8rSmpwMMkZVw5SMpnZyKqFUYLbrE="; }; - mvnParameters = lib.optionalString stdenv.isDarwin "-DskipTests"; + doCheck = !stdenv.isDarwin; nativeBuildInputs = [ makeWrapper ]; From 65292ff26568337fef4f725534cdc6b71088a417 Mon Sep 17 00:00:00 2001 From: oo-infty Date: Mon, 3 Jun 2024 12:30:36 +0800 Subject: [PATCH 088/219] lx-music-desktop: 2.7.0 -> 2.8.0 Changelog: https://github.com/lyswhut/lx-music-desktop/releases/tag/v2.8.0 --- pkgs/by-name/lx/lx-music-desktop/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index 0886f7282b77..59ad9edb25c2 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -13,24 +13,24 @@ let pname = "lx-music-desktop"; - version = "2.7.0"; + version = "2.8.0"; buildUrl = version: arch: "https://github.com/lyswhut/lx-music-desktop/releases/download/v${version}/lx-music-desktop_${version}_${arch}.deb"; srcs = { x86_64-linux = fetchurl { url = buildUrl version "amd64"; - hash = "sha256-+mCAFfiJwa+RQ/9vnSPDrC1LoLIoZyFUEJAF6sXdqRM="; + hash = "sha256-Kt/foI7NrXV+Ex2DxLRyP3bVFw0Bx4TLuMyBMZD0bDw="; }; aarch64-linux = fetchurl { url = buildUrl version "arm64"; - hash = "sha256-fDlgHJqoZLGnUuZeZGdocYLbsE02QBrWPKS31fbGThk="; + hash = "sha256-4X4fXb2V/FigArcIgpgkNBa2+mOemPOx/HkxPlx//gw="; }; armv7l-linux = fetchurl { url = buildUrl version "armv7l"; - hash = "sha256-X6EXsBvTbPGXCJ+ektMCMGDG2zqGKBvWT/TwjGFL3ug="; + hash = "sha256-uWEQYOT4wxg6HWoL18mEpWF8pONl5Bwf/bnoN4X+A7c="; }; }; From 6031652ebf6c0eb0602d0edaf069bcec5f9b9ea1 Mon Sep 17 00:00:00 2001 From: Vinny Meller Date: Sat, 1 Jun 2024 02:20:22 -0400 Subject: [PATCH 089/219] twm: 0.9.1 -> 0.10.2 --- pkgs/tools/misc/twm/default.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/twm/default.nix b/pkgs/tools/misc/twm/default.nix index 02f1f011a99c..213378e41f05 100644 --- a/pkgs/tools/misc/twm/default.nix +++ b/pkgs/tools/misc/twm/default.nix @@ -6,24 +6,35 @@ , pkg-config , Security , nix-update-script +, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "twm"; - version = "0.9.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "vinnymeller"; repo = "twm"; - rev = "v${version}"; - hash = "sha256-1hRGcvUGHO5ENgI3tdT46736ODN8QZ6vg+Y1y2XeuAA="; + rev = "refs/tags/v${version}"; + hash = "sha256-qOOEeaxae7nYbvNzl3BEZkdjO69lgtGrrLS5Q7akN9U="; }; - cargoHash = "sha256-iJB+7+1tFT/tKvXlxaaW3QJHjWNZmCVIEXwtrSei/Do="; + cargoHash = "sha256-gJ5go9V8c97pQZICUD1ksLJhOyJXyVXAWssH3fhrRVQ="; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config installShellFiles ]; buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ]; + postInstall = '' + installShellCompletion --cmd twm \ + --bash <($out/bin/twm --print-bash-completion) \ + --zsh <($out/bin/twm --print-zsh-completion) \ + --fish <($out/bin/twm --print-fish-completion) + + $out/bin/twm --print-man > twm.1 + installManPage twm.1 + ''; + passthru.updateScript = nix-update-script { }; meta = { From 73dee9023bda28cac7d0f5077c055abcc787b471 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jun 2024 08:28:09 +0200 Subject: [PATCH 090/219] python311Packages.llama-index-graph-stores-neo4j: 0.2.0 -> 0.2.2 --- .../python-modules/llama-index-graph-stores-neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix index 57ed756fc5b6..08c6dde08639 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-neo4j/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-neo4j"; - version = "0.2.0"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_neo4j"; inherit version; - hash = "sha256-+FkhevhrjEmJk9WXHJ0oR9T6DF5ZHWzDtrIWMjVa2vY="; + hash = "sha256-z2XLZ5tt2uTzTxx5F3jxSLLva2PwDMterKH17P46qjU="; }; build-system = [ poetry-core ]; From d97eb00a066263892a2bed41a94b79c7e2874f8f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jun 2024 08:32:11 +0200 Subject: [PATCH 091/219] python311Packages.llama-index-graph-stores-nebula: 0.1.3 -> 0.2.0 --- .../llama-index-graph-stores-nebula/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix index 5bb617e53262..cd093a05e17c 100644 --- a/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix +++ b/pkgs/development/python-modules/llama-index-graph-stores-nebula/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "llama-index-graph-stores-nebula"; - version = "0.1.3"; + version = "0.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_graph_stores_nebula"; inherit version; - hash = "sha256-Mhej0nslypY1Z99VUrTgl4S9PlrBWbaKvANSwEKTMZk="; + hash = "sha256-wX/j4wSUp12QlXLy0B0dUB0V7zjDX75NBE9mNWbj0w8="; }; build-system = [ poetry-core ]; From ed75226cdf67037dec1060e97f75e2bcbbd6ca0f Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 2 Jun 2024 22:50:04 +0100 Subject: [PATCH 092/219] ytdownloader: disable updates --- pkgs/by-name/yt/ytdownloader/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/yt/ytdownloader/package.nix b/pkgs/by-name/yt/ytdownloader/package.nix index fc419cccc318..fdf08b1fa2d9 100644 --- a/pkgs/by-name/yt/ytdownloader/package.nix +++ b/pkgs/by-name/yt/ytdownloader/package.nix @@ -49,6 +49,9 @@ buildNpmPackage rec { --replace-fail $\{__dirname}/../ffmpeg '${lib.getExe ffmpeg}' \ --replace-fail 'path.join(os.homedir(), ".ytDownloader", "ytdlp")' '`${lib.getExe yt-dlp}`' \ --replace-fail '!!localStorage.getItem("fullYtdlpBinPresent")' 'true' + # Disable auto-updates + substituteInPlace src/preferences.js \ + --replace-warn 'const autoUpdateDisabled = getId("autoUpdateDisabled");' 'const autoUpdateDisabled = "true";' ''; postInstall = '' From bfe23d4fad97a5ad6607a937593210a1a5257337 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Sun, 2 Jun 2024 22:47:48 +0100 Subject: [PATCH 093/219] ytdownloader: refactor code with copyDesktopItems & nixfmt --- pkgs/by-name/yt/ytdownloader/package.nix | 49 ++++++++++++++---------- 1 file changed, 29 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/yt/ytdownloader/package.nix b/pkgs/by-name/yt/ytdownloader/package.nix index fdf08b1fa2d9..e2d6d970f1e1 100644 --- a/pkgs/by-name/yt/ytdownloader/package.nix +++ b/pkgs/by-name/yt/ytdownloader/package.nix @@ -1,11 +1,13 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub -, makeWrapper -, ffmpeg -, yt-dlp -, makeDesktopItem -, electron +{ + lib, + buildNpmPackage, + fetchFromGitHub, + copyDesktopItems, + makeWrapper, + ffmpeg, + yt-dlp, + makeDesktopItem, + electron, }: buildNpmPackage rec { @@ -21,18 +23,26 @@ buildNpmPackage rec { npmDepsHash = "sha256-dAd9O3iOELBRRzQV/+DSQXHS5PLjDZvsF2D1vwT9dw8="; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ ffmpeg yt-dlp ]; + nativeBuildInputs = [ + copyDesktopItems + makeWrapper + ]; + buildInputs = [ + ffmpeg + yt-dlp + ]; - desktopItem = makeDesktopItem { - name = "ytDownloader"; - exec = "ytdownloader %U"; - icon = "ytdownloader"; - desktopName = "ytDownloader"; - comment = "A modern GUI video and audio downloader"; - categories = [ "Utility" ]; - startupWMClass = "ytDownloader"; - }; + desktopItems = [ + (makeDesktopItem { + name = "ytDownloader"; + exec = "ytdownloader %U"; + icon = "ytdownloader"; + desktopName = "ytDownloader"; + comment = "A modern GUI video and audio downloader"; + categories = [ "Utility" ]; + startupWMClass = "ytDownloader"; + }) + ]; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -59,7 +69,6 @@ buildNpmPackage rec { --add-flags $out/lib/node_modules/ytdownloader/main.js install -Dm444 assets/images/icon.png $out/share/pixmaps/ytdownloader.png - install -Dm444 "${desktopItem}/share/applications/"* -t $out/share/applications ''; meta = { From 08869be075d4ce0a95f6e740e066de8c5b2528f8 Mon Sep 17 00:00:00 2001 From: Dominik Schrempf Date: Mon, 3 Jun 2024 10:47:55 +0200 Subject: [PATCH 094/219] kodiPackages.youtube: fix dependencies As per the changelod (https://github.com/anxdpanic/plugin.video.youtube/blob/master/changelog.txt), the dependencies on `six` and `infotagger` have been removed a while ago. Also, a new dependency was added: `inputstream-adaptive`. Fixes: Annoying popup about enabling `inputstream-adaptive` whenever a video is played. Tested on linux-x86-64. --- pkgs/applications/video/kodi/addons/youtube/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 23c59d702e4d..9279f157fb1e 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -1,4 +1,4 @@ -{ lib, buildKodiAddon, fetchFromGitHub, six, requests, infotagger, inputstreamhelper }: +{ lib, buildKodiAddon, fetchFromGitHub, requests, inputstream-adaptive, inputstreamhelper }: buildKodiAddon rec { pname = "youtube"; @@ -13,9 +13,8 @@ buildKodiAddon rec { }; propagatedBuildInputs = [ - six requests - infotagger + inputstream-adaptive inputstreamhelper ]; From 97904031e20e659d946a30be7c30d4bf5020737d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jun 2024 11:31:13 +0200 Subject: [PATCH 095/219] python312Packages.iterfzf: init at 1.4.0.51.0 Pythonic interface to fzf, a CLI fuzzy finder https://github.com/dahlia/iterfzf --- .../python-modules/iterfzf/default.nix | 62 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/development/python-modules/iterfzf/default.nix diff --git a/pkgs/development/python-modules/iterfzf/default.nix b/pkgs/development/python-modules/iterfzf/default.nix new file mode 100644 index 000000000000..099fad45d53e --- /dev/null +++ b/pkgs/development/python-modules/iterfzf/default.nix @@ -0,0 +1,62 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + flit-core, + fzf, + packaging, + pytestCheckHook, + pythonOlder, + setuptools, +}: + +buildPythonPackage rec { + pname = "iterfzf"; + version = "1.4.0.51.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "dahlia"; + repo = "iterfzf"; + rev = "refs/tags/${version}"; + hash = "sha256-Xjk+r2PdIg+oULA5gfI129p1fNOO8RINNxP+pveiocM="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail 'dynamic = ["version"]' 'version = "${version}"' \ + --replace-fail 'backend-path = ["."]' '# backend-path = ["."]' \ + --replace-fail 'build-backend = "build_dist"' '# build-backend = "build_dist"' + + substituteInPlace iterfzf/test_iterfzf.py \ + --replace-fail 'executable="fzf"' 'executable="${fzf}/bin/fzf"' + ''; + + build-system = [ + flit-core + setuptools + packaging + ]; + + dependencies = [ fzf ]; + + nativeCheckInputs = [ pytestCheckHook ]; + + disabledTests = [ + # AttributeError + "test_no_query" + "test_select_one_ambiguous" + ]; + + pythonImportsCheck = [ "iterfzf" ]; + + meta = with lib; { + description = "Pythonic interface to fzf, a CLI fuzzy finder"; + homepage = "https://github.com/dahlia/iterfzf"; + changelog = "https://github.com/dahlia/iterfzf/releases/tag/${version}"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 061b75dfcffe..d1a65a2e9c53 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5971,6 +5971,8 @@ self: super: with self; { iterative-telemetry = callPackage ../development/python-modules/iterative-telemetry { }; + iterfzf = callPackage ../development/python-modules/iterfzf { }; + iterm2 = callPackage ../development/python-modules/iterm2 { }; itsdangerous = callPackage ../development/python-modules/itsdangerous { }; From 1a9df0630934ff5d56dd6177d469fd82241c18af Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jun 2024 11:32:11 +0200 Subject: [PATCH 096/219] python312Packages.typer-shell: init at 0.1.9 Library for making beautiful shells/REPLs with Typer https://github.com/FergusFettes/typer-shell --- .../python-modules/typer-shell/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/typer-shell/default.nix diff --git a/pkgs/development/python-modules/typer-shell/default.nix b/pkgs/development/python-modules/typer-shell/default.nix new file mode 100644 index 000000000000..bb195d121fb6 --- /dev/null +++ b/pkgs/development/python-modules/typer-shell/default.nix @@ -0,0 +1,59 @@ +{ + lib, + buildPythonPackage, + click, + click-shell, + fetchFromGitHub, + iterfzf, + poetry-core, + pythonRelaxDepsHook, + pythonOlder, + pyyaml, + rich, + typer, +}: + +buildPythonPackage rec { + pname = "typer-shell"; + version = "0.1.9"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "FergusFettes"; + repo = "typer-shell"; + rev = "refs/tags/v${version}"; + hash = "sha256-y66Je9E0IWDuGrHtd1D8zP7E0EVfvrF3KOlA2dRFU+s="; + }; + + pythonRelaxDeps = [ + "iterfzf" + "typer" + ]; + + build-system = [ poetry-core ]; + + nativeBuildInputs = [ pythonRelaxDepsHook ]; + + dependencies = [ + click + click-shell + iterfzf + pyyaml + rich + typer + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ "typer_shell" ]; + + meta = with lib; { + description = "Library for making beautiful shells/REPLs with Typer"; + homepage = "https://github.com/FergusFettes/typer-shell"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d1a65a2e9c53..492a12b3047f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -15562,6 +15562,8 @@ self: super: with self; { typer = callPackage ../development/python-modules/typer { }; + typer-shell = callPackage ../development/python-modules/typer-shell { }; + type-infer = callPackage ../development/python-modules/type-infer { }; types-aiobotocore = callPackage ../development/python-modules/types-aiobotocore { }; From ebbd613587758567d62555cfe91a770148e1a30f Mon Sep 17 00:00:00 2001 From: Marc Jakobi Date: Mon, 3 Jun 2024 11:55:10 +0200 Subject: [PATCH 097/219] jdt-language-server: 1.31.0 -> 1.36.0 --- pkgs/by-name/jd/jdt-language-server/package.nix | 6 +++--- pkgs/by-name/jd/jdt-language-server/update.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 pkgs/by-name/jd/jdt-language-server/update.sh diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix index 04376d201722..87031d45006b 100644 --- a/pkgs/by-name/jd/jdt-language-server/package.nix +++ b/pkgs/by-name/jd/jdt-language-server/package.nix @@ -6,15 +6,15 @@ }: let - timestamp = "202401111522"; + timestamp = "202405301306"; in stdenv.mkDerivation (finalAttrs: { pname = "jdt-language-server"; - version = "1.31.0"; + version = "1.36.0"; src = fetchurl { url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz"; - hash = "sha256-bCX2LQt00d2SqxmvuvvlBB6wbCuFPqtX9/Qv5v6wH3w="; + hash = "sha256-Ao4nTQb0phytT/1W+J70FKj2VhPG0F2UZ2Ubf7A9rns="; }; sourceRoot = "."; diff --git a/pkgs/by-name/jd/jdt-language-server/update.sh b/pkgs/by-name/jd/jdt-language-server/update.sh old mode 100644 new mode 100755 index b482db22ee05..153d2024b1cb --- a/pkgs/by-name/jd/jdt-language-server/update.sh +++ b/pkgs/by-name/jd/jdt-language-server/update.sh @@ -15,7 +15,7 @@ filename=$(curl -s "$prefix/latest.txt") newtimestamp=$(echo $filename | sed "s|^.*-$newver-||;s|\.tar\.gz$||") newhash="$(nix-hash --to-sri --type sha256 $(nix-prefetch-url "$prefix/$filename"))"; -sed -i default.nix \ +sed -i package.nix \ -e "/^ version =/ s|\".*\"|\"$newver\"|" \ -e "/^ timestamp =/ s|\".*\"|\"$newtimestamp\"|" \ -e "/^ hash =/ s|\".*\"|\"$newhash\"|" \ From 51fd7221521e9ed456de79bd1e15f2a573eade12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 10:33:22 +0000 Subject: [PATCH 098/219] graphite-cli: 1.3.5 -> 1.3.6 --- pkgs/by-name/gr/graphite-cli/package-lock.json | 4 ++-- pkgs/by-name/gr/graphite-cli/package.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json index 95b5700cb8bd..cd4e46f3fb42 100644 --- a/pkgs/by-name/gr/graphite-cli/package-lock.json +++ b/pkgs/by-name/gr/graphite-cli/package-lock.json @@ -1,12 +1,12 @@ { "name": "@withgraphite/graphite-cli", - "version": "1.3.5", + "version": "1.3.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@withgraphite/graphite-cli", - "version": "1.3.5", + "version": "1.3.6", "hasInstallScript": true, "license": "None", "dependencies": { diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index a22f592a7bb1..147e6de68def 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -7,14 +7,14 @@ buildNpmPackage rec { pname = "graphite-cli"; - version = "1.3.5"; + version = "1.3.6"; src = fetchurl { url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-W/EFhlJeiZrBK9FG4DhR1iyU9YSSbaf/np2vQ8obA0M="; + hash = "sha256-rD/YWFRHzoM9Gsd9tnCF56RChckaeWGFphYgHa0UvUU="; }; - npmDepsHash = "sha256-X1FWYAuHouOXuAlgrbwgrbwaxKX5JS8iG0RnCPX5TvM="; + npmDepsHash = "sha256-WyV0f5thWG7hg7Vm1UUIlcFCgP83HfXQFBUVHcQdjRo="; postPatch = '' ln -s ${./package-lock.json} package-lock.json From eb77fcd0b10e7ceae69f6eb7d278a9eb5c195d08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 3 Jun 2024 12:40:09 +0200 Subject: [PATCH 099/219] buildbot: apply upstream fix for gitpoller --- .../buildbot/master.nix | 23 +++++++++++++++---- .../buildbot/skip_test_linux_distro.patch | 6 ++--- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/buildbot/master.nix b/pkgs/development/tools/continuous-integration/buildbot/master.nix index 2a2911cf131f..138930d8b6bf 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/master.nix +++ b/pkgs/development/tools/continuous-integration/buildbot/master.nix @@ -1,7 +1,8 @@ { lib , stdenv , buildPythonApplication -, fetchPypi +, fetchFromGitHub +, fetchpatch , makeWrapper # Tie withPlugins through the fixed point here, so it will receive an # overridden version properly @@ -77,9 +78,11 @@ buildPythonApplication rec { disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-qcICSsjcgOrLG8zHBx0eSVSiXDAeHPH4roRZI9TZTkk="; + src = fetchFromGitHub { + owner = "buildbot"; + repo = "buildbot"; + rev = "v${version}"; + hash = "sha256-rDbAWLoEEjygW72YDBsVwiaHdRTVYA9IFxY3XMDleho="; }; build-system = [ @@ -134,10 +137,20 @@ buildPythonApplication rec { # This patch disables the test that tries to read /etc/os-release which # is not accessible in sandboxed builds. ./skip_test_linux_distro.patch + # Fix gitpoller, source: https://github.com/buildbot/buildbot/pull/7664 + # Included in next release. + (fetchpatch { + url = "https://github.com/buildbot/buildbot/commit/dd5d61e63e3b0740cc538a225ccf104ccecfc734.patch"; + sha256 = "sha256-CL6uRaKxh8uCBfWQ0tNiLh2Ym0HVatWni8hcuTyAAw0="; + excludes = ["master/buildbot/test/unit/changes/test_gitpoller.py"]; + }) ]; postPatch = '' - substituteInPlace buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" + substituteInPlace master/buildbot/scripts/logwatcher.py --replace '/usr/bin/tail' "$(type -P tail)" + ''; + preBuild = '' + cd master ''; # Silence the depreciation warning from SqlAlchemy diff --git a/pkgs/development/tools/continuous-integration/buildbot/skip_test_linux_distro.patch b/pkgs/development/tools/continuous-integration/buildbot/skip_test_linux_distro.patch index 8fe5c7b56b4f..e7190680ad2e 100644 --- a/pkgs/development/tools/continuous-integration/buildbot/skip_test_linux_distro.patch +++ b/pkgs/development/tools/continuous-integration/buildbot/skip_test_linux_distro.patch @@ -1,6 +1,6 @@ -diff -Nur buildbot-0.9.6/buildbot/test/unit/test_buildbot_net_usage_data.py buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py ---- buildbot-0.9.6/buildbot/test/unit/test_buildbot_net_usage_data.py 2017-04-19 16:57:02.000000000 +0200 -+++ buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py 2017-05-04 12:22:54.575762551 +0200 +diff -Nur buildbot-0.9.6/master/buildbot/test/unit/test_buildbot_net_usage_data.py buildbot-0.9.6.patched/buildbot/test/unit/test_buildbot_net_usage_data.py +--- buildbot-0.9.6/master/buildbot/test/unit/test_buildbot_net_usage_data.py 2017-04-19 16:57:02.000000000 +0200 ++++ buildbot-0.9.6.patched/master/buildbot/test/unit/test_buildbot_net_usage_data.py 2017-05-04 12:22:54.575762551 +0200 @@ -147,6 +147,7 @@ _sendBuildbotNetUsageData({'foo': 'bar'}) From f5e5ce66efff5f6f710e306183b5ff38b60cd57d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 14:05:38 +0000 Subject: [PATCH 100/219] git-cliff: 2.2.2 -> 2.3.0 --- pkgs/applications/version-management/git-cliff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-cliff/default.nix b/pkgs/applications/version-management/git-cliff/default.nix index b8b5d480e39b..37a8620d2143 100644 --- a/pkgs/applications/version-management/git-cliff/default.nix +++ b/pkgs/applications/version-management/git-cliff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "git-cliff"; - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "orhun"; repo = "git-cliff"; rev = "v${version}"; - hash = "sha256-e7DeGcavBgjnH2QY/nqRThYHKzhmbNxYPoOmMF+0I3s="; + hash = "sha256-iTjfFl/bTvyElCIpTj7dsVu3azUSwNTryyssHdCaODg="; }; - cargoHash = "sha256-MaSqQD3SRuqiOj5hTHAMyTDj2xgboA5QIZEH7BAxjF4="; + cargoHash = "sha256-/Elb/hsk96E7D6TrLgbhD5cQhsXpDigNm5p9FpKGEUQ="; # attempts to run the program on .git in src which is not deterministic doCheck = false; From 514fd17eff435f458c5189556f5d4e74404bfee9 Mon Sep 17 00:00:00 2001 From: isabel Date: Mon, 3 Jun 2024 15:13:20 +0100 Subject: [PATCH 101/219] izrss: 0.0.6 -> 0.1.0 --- pkgs/by-name/iz/izrss/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/iz/izrss/package.nix b/pkgs/by-name/iz/izrss/package.nix index ae6b8a5afb5e..921e99196e35 100644 --- a/pkgs/by-name/iz/izrss/package.nix +++ b/pkgs/by-name/iz/izrss/package.nix @@ -5,7 +5,7 @@ ... }: let - version = "0.0.6"; + version = "0.1.0"; in buildGoModule { pname = "izrss"; @@ -15,7 +15,7 @@ buildGoModule { owner = "isabelroses"; repo = "izrss"; rev = "refs/tags/v${version}"; - hash = "sha256-tO/m39FMtvxZzNgnVY84k4J2v8vQVdzR3IKofJWCf9U="; + hash = "sha256-Op9aiCQrBH8TuhMTt+3Wthd8UY3lU2g9yJ110v7TtXA="; }; ldflags = [ @@ -24,7 +24,7 @@ buildGoModule { "-X main.version=${version}" ]; - vendorHash = "sha256-/gD82wT4jWNMQsGPb2nYQiFQsUdKICyO6eiRPHrLsy8="; + vendorHash = "sha256-/TRCD6akZV2qDqJz62p7UzFIGuTAKLnUtYqqvdw3rCI="; meta = { description = "An RSS feed reader for the terminal written in Go"; From e5504d52eb880a2fbd746b9d0c1e2c9cb4017c8f Mon Sep 17 00:00:00 2001 From: lelgenio Date: Mon, 3 Jun 2024 11:47:09 -0300 Subject: [PATCH 102/219] maintainers: update email for lelgenio --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ed63b2a11196..cc1ee94a3378 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11537,7 +11537,7 @@ name = "Daniel Kuehn"; }; lelgenio = { - email = "lelgenio@disroot.org"; + email = "lelgenio@lelgenio.com"; github = "lelgenio"; githubId = 31388299; name = "Leonardo Eugênio"; From 7a44183c8698e8254e6921032381363fe367a71e Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Fri, 31 May 2024 23:54:11 -0400 Subject: [PATCH 103/219] gitea: build from source --- .../version-management/gitea/default.nix | 51 ++++++++++++++----- 1 file changed, 37 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index d5cf49053f0f..68cd69d380b0 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -1,7 +1,7 @@ { lib , stdenv , buildGoModule -, fetchurl +, fetchFromGitHub , makeWrapper , git , bash @@ -16,23 +16,47 @@ , brotli , xorg , nixosTests +, buildNpmPackage }: -buildGoModule rec { +let + frontend = buildNpmPackage { + pname = "gitea-frontend"; + inherit (gitea) src version; + + npmDepsHash = "sha256-gXBBiDIIS0aW6qK37HcF0AuJOliblinznRVXoo6DV1s="; + + # use webpack directly instead of 'make frontend' as the packages are already installed + buildPhase = '' + BROWSERSLIST_IGNORE_OLD_DATA=true npx webpack + ''; + + installPhase = '' + mkdir -p $out + cp -R public $out/ + ''; + }; +in buildGoModule rec { pname = "gitea"; version = "1.22.0"; - # not fetching directly from the git repo, because that lacks several vendor files for the web UI - src = fetchurl { - url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-bU4u/RsE12InXjJ2ZvIL31z9AzB7XULyV0+ytAYnyjg="; + src = fetchFromGitHub { + owner = "go-gitea"; + repo = "gitea"; + rev = "v${gitea.version}"; + hash = "sha256-LdNEiPch2BZNYMOjE9yWsq78g6DolMjM5wUci3jXj30="; }; - vendorHash = null; + vendorHash = "sha256-8VoJR4p2WnhG6nTFMzBlcrd/B6UwaOU3Q/rnDx9MtWc="; - patches = [ - ./static-root-path.patch - ]; + outputs = [ "out" "data" ]; + + patches = [ ./static-root-path.patch ]; + + # go-modules derivation doesn't provide $data + # so we need to wait until it is built, and then + # at that time we can then apply the substituteInPlace + overrideModAttrs = _: { postPatch = null; }; postPatch = '' substituteInPlace modules/setting/server.go --subst-var data @@ -54,11 +78,10 @@ buildGoModule rec { "-X 'main.Tags=${lib.concatStringsSep " " tags}'" ]; - outputs = [ "out" "data" ]; - postInstall = '' mkdir $data - cp -R ./{public,templates,options} $data + ln -s ${frontend}/public $data/public + cp -R ./{templates,options} $data mkdir -p $out cp -R ./options/locale $out/locale @@ -84,7 +107,7 @@ buildGoModule rec { meta = with lib; { description = "Git with a cup of tea"; - homepage = "https://gitea.io"; + homepage = "https://about.gitea.com"; license = licenses.mit; maintainers = with maintainers; [ ma27 techknowlogick SuperSandro2000 ]; broken = stdenv.isDarwin; From fbe20f603bb62789d67a019c3ab9a18caae50529 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Sat, 1 Jun 2024 00:00:04 -0400 Subject: [PATCH 104/219] gitea: move to by-name --- .../gitea/default.nix => by-name/gi/gitea/package.nix} | 0 .../gi}/gitea/static-root-path.patch | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{applications/version-management/gitea/default.nix => by-name/gi/gitea/package.nix} (100%) rename pkgs/{applications/version-management => by-name/gi}/gitea/static-root-path.patch (100%) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/by-name/gi/gitea/package.nix similarity index 100% rename from pkgs/applications/version-management/gitea/default.nix rename to pkgs/by-name/gi/gitea/package.nix diff --git a/pkgs/applications/version-management/gitea/static-root-path.patch b/pkgs/by-name/gi/gitea/static-root-path.patch similarity index 100% rename from pkgs/applications/version-management/gitea/static-root-path.patch rename to pkgs/by-name/gi/gitea/static-root-path.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a08430fcb777..43675c668ebb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8331,8 +8331,6 @@ with pkgs; git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { }; - gitea = callPackage ../applications/version-management/gitea { }; - gitea-actions-runner = callPackage ../development/tools/continuous-integration/gitea-actions-runner { }; gokart = callPackage ../development/tools/gokart { }; From 5208f33633beae825d185e2e205c09777dfd89d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 15:18:27 +0000 Subject: [PATCH 105/219] halo: 2.15.2 -> 2.16.0 --- pkgs/by-name/ha/halo/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index 998e1f370698..ab9e461cfaea 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -7,10 +7,10 @@ }: stdenv.mkDerivation rec { pname = "halo"; - version = "2.15.2"; + version = "2.16.0"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${version}/${pname}-${version}.jar"; - hash = "sha256-BCcIDaWtn8OkI+GWs741nWgqyO8qlE9m2hZ3e+iViUI="; + hash = "sha256-YjRoq38y4nFmcvEEWyJMociGNzUgQ5FXzTw2R64urcY="; }; nativeBuildInputs = [ From df8c4c6b1d0114cb5e29fe93e4e5777c72a4a0bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 15:21:08 +0000 Subject: [PATCH 106/219] hishtory: 0.294 -> 0.295 --- pkgs/shells/hishtory/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/hishtory/default.nix b/pkgs/shells/hishtory/default.nix index 5bdf3a1b5992..83b902c2e926 100644 --- a/pkgs/shells/hishtory/default.nix +++ b/pkgs/shells/hishtory/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "hishtory"; - version = "0.294"; + version = "0.295"; src = fetchFromGitHub { owner = "ddworken"; repo = pname; rev = "v${version}"; - hash = "sha256-vwjzJTBgD4XzZekxGk02WW9/A7wLlLBsIUyvt0VCkOg="; + hash = "sha256-f9iVKHrgq6whE1s5Q2NXSf1qYsV5WUq4frHUoX94cMs="; }; vendorHash = "sha256-zTwZ/sMhQdlf7RYfR2/K/m08U1Il0VQmYFyNNiYsWhc="; From b3f36c3b58ae028cca34720644a1e2bcbea6cfc8 Mon Sep 17 00:00:00 2001 From: tarneo Date: Mon, 3 Jun 2024 17:58:14 +0200 Subject: [PATCH 107/219] qutebrowser: 3.1.0 -> 3.2.0 Also updates pdf.js from 4.0.269 to the last supported version 4.2.67. Changelog: https://www.qutebrowser.org/doc/changelog.html#v3.2.0 --- .../networking/browsers/qutebrowser/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 62465e5efd2f..bfb40dc9bc2d 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -18,15 +18,15 @@ let isQt6 = lib.versions.major qtbase.version == "6"; pdfjs = let - version = "4.0.269"; + version = "4.2.67"; in fetchzip { url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip"; - hash = "sha256-8gwJUxygcdvERDni/k6WIx3tzk7yb+qHZ4NsfkP0VDo="; + hash = "sha256-7kfT3+ZwoGqZ5OwkO9h3DIuBFd0v8fRlcufxoBdcy8c="; stripRoot = false; }; - version = "3.1.0"; + version = "3.2.0"; in python3.pkgs.buildPythonApplication { @@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication { inherit version; src = fetchurl { url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz"; - hash = "sha256-UA3MHMoI1rC4FPowbiII4lM1rL4OLPmZ+1GRbg9LLl8="; + hash = "sha256-4eGRG5VWI2rKpZ0NGYbWFHlvs2Zz0TljwhZYzWSh8DM="; }; # Needs tox From 1a8183eebb4f6e55449b3d193695d0e4294b362d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 16:37:32 +0000 Subject: [PATCH 108/219] vscode-extensions.chenglou92.rescript-vscode: 1.50.0 -> 1.52.0 --- .../vscode/extensions/chenglou92.rescript-vscode/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix index fadcfe758a55..f84f1ef95731 100644 --- a/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/chenglou92.rescript-vscode/default.nix @@ -5,7 +5,7 @@ callPackage, }: let - version = "1.50.0"; + version = "1.52.0"; rescript-editor-analysis = callPackage ./rescript-editor-analysis.nix { inherit version; }; arch = if stdenv.isLinux then @@ -21,7 +21,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec { name = "rescript-vscode"; publisher = "chenglou92"; inherit version; - hash = "sha256-Dt7mqZQ/vEUFyUD5SsY6RGzg9kq19/Amksrwtfv0TuE="; + hash = "sha256-3H7JgdmrGMdirVpT08wmwy4G6QLt0H65d3l7o/DuvpI="; }; postPatch = '' rm -r ${analysisDir} From 9742a3b6f51c9fe31eb9296ba94dc62431a9b225 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 16:40:03 +0000 Subject: [PATCH 109/219] svlint: 0.9.2 -> 0.9.3 --- pkgs/development/tools/analysis/svlint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/svlint/default.nix b/pkgs/development/tools/analysis/svlint/default.nix index 07693196a956..ef859f2a66a2 100644 --- a/pkgs/development/tools/analysis/svlint/default.nix +++ b/pkgs/development/tools/analysis/svlint/default.nix @@ -5,14 +5,14 @@ rustPlatform.buildRustPackage rec { pname = "svlint"; - version = "0.9.2"; + version = "0.9.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-5fPra4kgvykeQnvRtO3enbMIzbh5+nDJ2x0aHYMGiww="; + sha256 = "sha256-u61gmkO7eij7r1A1RPk0ro+pml7ZmMsg0ukJLCFNaD0="; }; - cargoHash = "sha256-R7jqFgMj4YjUbEObdRxxvataYMXe9wq8B8k+t7+Dv30="; + cargoHash = "sha256-HBfCTOETQ1hHzLFDw12W58omRmliiWDFGSrmr3PELD8="; cargoBuildFlags = [ "--bin" "svlint" ]; From 6d8e514c7854a0ae69c04b54d442d5019bb152b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 16:41:04 +0000 Subject: [PATCH 110/219] svls: 0.2.11 -> 0.2.12 --- pkgs/development/tools/language-servers/svls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/language-servers/svls/default.nix b/pkgs/development/tools/language-servers/svls/default.nix index fc4ebb51e1ca..6faefffee2f5 100644 --- a/pkgs/development/tools/language-servers/svls/default.nix +++ b/pkgs/development/tools/language-servers/svls/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "svls"; - version = "0.2.11"; + version = "0.2.12"; src = fetchFromGitHub { owner = "dalance"; repo = "svls"; rev = "v${version}"; - sha256 = "sha256-pvvtJOwb9N7CzCXoLG19iuLQjABABaOUe6wKfYizgQc="; + sha256 = "sha256-DuwH0qie8SctvOGntljOdTRMGKrNFPycdaFG3QZxihA="; }; - cargoHash = "sha256-sMprdvBSfCIzoTHyUC447pyZWGgZkKa9t3A9BiGbQvY="; + cargoHash = "sha256-vDpuIWB5pbhYrFgQ1ogALMJpZvy8ETZtneX1fjpjl+0="; meta = with lib; { description = "SystemVerilog language server"; From 52c000b937a75ce49a8975d94483cd6e6324e732 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 16:41:43 +0000 Subject: [PATCH 111/219] trivy: 0.51.4 -> 0.52.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index a3b2398db12a..02f90364c167 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -11,19 +11,19 @@ buildGoModule rec { pname = "trivy"; - version = "0.51.4"; + version = "0.52.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = "trivy"; rev = "refs/tags/v${version}"; - hash = "sha256-f7qWD63dvKGnwGmeENPjtqvpRgq06MkLCQ0MVgsLJRw="; + hash = "sha256-lsUqzbHv+/P5RAOc774GhFMaY21+T7NnPKK9v/uLP8M="; }; # Hash mismatch on across Linux and Darwin proxyVendor = true; - vendorHash = "sha256-U1HkIBHoZVrisTbVRqqP/B9idZ9G3KsCGLSVBbBV7lE="; + vendorHash = "sha256-MsHlJ56MT+UqF+Psj+hKKpwPnRTcQ3RvWoHbmI93A5E="; subPackages = [ "cmd/trivy" ]; From aa10d70b2199855fa9d45b8a2eb535b463a86207 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 3 Jun 2024 13:30:35 +0000 Subject: [PATCH 112/219] uuu: 1.5.181 -> 1.5.182 --- pkgs/by-name/uu/uuu/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/uu/uuu/package.nix b/pkgs/by-name/uu/uuu/package.nix index d0fa46bb6a40..c3cfef25fa6e 100755 --- a/pkgs/by-name/uu/uuu/package.nix +++ b/pkgs/by-name/uu/uuu/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "uuu"; - version = "1.5.181"; + version = "1.5.182"; src = fetchFromGitHub { owner = "nxp-imx"; repo = "mfgtools"; rev = "uuu_${finalAttrs.version}"; - hash = "sha256-HMpirdXpcBFTkO7anGDIjsBJKjQ+kIN4kDhPlcqIDqY="; + hash = "sha256-I0EX+vsaOwz+HJUWFC5Z/xRu6xegzEfmuAlBd/OSAp4="; }; passthru.updateScript = nix-update-script { From e910454dc80be851a4e1fa815b1e8a353fbe96a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 18:02:53 +0000 Subject: [PATCH 113/219] nixpacks: 1.23.0 -> 1.24.1 --- pkgs/applications/virtualization/nixpacks/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/nixpacks/default.nix b/pkgs/applications/virtualization/nixpacks/default.nix index 9da8b1fc1747..b32e60703275 100644 --- a/pkgs/applications/virtualization/nixpacks/default.nix +++ b/pkgs/applications/virtualization/nixpacks/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nixpacks"; - version = "1.23.0"; + version = "1.24.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-M4RZwcFiupZdePDkUWRTiTNA58siMsggTGpvHb8j88Y="; + sha256 = "sha256-niKz+F1RJtZrE8+BaJwy5bjGS3miJf5C9LttTnC+iuk="; }; - cargoHash = "sha256-hSzDboP2YJoPPzugb0ABiogKU7lauJNML8szThB2zqg="; + cargoHash = "sha256-fzG53DqZKgW6Gen+0ZO9lxgPXkxw7S6OdZWNNI+y9hU="; # skip test due FHS dependency doCheck = false; From 8fd92a1dc29c6f81e7ed6605c37d1a00a0557adc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 3 Jun 2024 20:12:53 +0200 Subject: [PATCH 114/219] python312Packages.pytrydan: 0.6.1 -> 0.7.0 Diff: https://github.com/dgomes/pytrydan/compare/refs/tags/v0.6.1...v0.7.0 Changelog: https://github.com/dgomes/pytrydan/blob/0.7.0/CHANGELOG.md --- pkgs/development/python-modules/pytrydan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytrydan/default.nix b/pkgs/development/python-modules/pytrydan/default.nix index 6ee8162b4ba0..87cac954c486 100644 --- a/pkgs/development/python-modules/pytrydan/default.nix +++ b/pkgs/development/python-modules/pytrydan/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pytrydan"; - version = "0.6.1"; + version = "0.7.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "dgomes"; repo = "pytrydan"; rev = "refs/tags/v${version}"; - hash = "sha256-5sTHfxNV4JEonGke8ZZ/pXoLA15iCuJ/iSW1XwFMltg="; + hash = "sha256-9TZZ4J3fIUGaeWYd5kP9eFABvL/95muD7sDevUaGprQ="; }; postPatch = '' From 0ff6a8b88c94d8d60c0da4bba7f4d544edabe588 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Mon, 3 Jun 2024 14:31:00 -0400 Subject: [PATCH 115/219] paperless-ngx: 2.8.6 -> 2.9.0 --- pkgs/applications/office/paperless-ngx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index 554e86664f1b..a0764c940e3a 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -24,13 +24,13 @@ }: let - version = "2.8.6"; + version = "2.9.0"; src = fetchFromGitHub { owner = "paperless-ngx"; repo = "paperless-ngx"; rev = "refs/tags/v${version}"; - hash = "sha256-Jcy/nds/JuivRV8mRtq2FbBB2L/CGqmoHoG1wVCwHFU="; + hash = "sha256-7dcZbuz3yi0sND6AEqIwIo9byeZheOpIAhmBpOW5lhU="; }; # subpath installation is broken with uvicorn >= 0.26 @@ -74,7 +74,7 @@ let cd src-ui ''; - npmDepsHash = "sha256-xRUZnFekzWHPtlUbpt0JZmlNjdjS1bBZDz8MmH8DC2U="; + npmDepsHash = "sha256-gLEzifZK8Ok1SOo3YIIV5pTx4cbedQh025VqkodYrYQ="; nativeBuildInputs = [ pkg-config From bc72d82bbdc427d4eff7cecc2c8fddcd9d86eb7a Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sun, 21 Apr 2024 21:06:38 +0200 Subject: [PATCH 116/219] neomutt: 20231221 -> 20240425 --- .../mailreaders/neomutt/default.nix | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix index 7bad118dc38b..b662ce400e56 100644 --- a/pkgs/applications/networking/mailreaders/neomutt/default.nix +++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix @@ -5,15 +5,15 @@ , withContrib ? true }: -stdenv.mkDerivation rec { - version = "20231221"; +stdenv.mkDerivation (finalAttrs: { pname = "neomutt"; + version = "20240425"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; - rev = version; - sha256 = "sha256-IXly2N/DD2+XBXVIXJw1sE/0eJwbUaONDNRMi7n1T44="; + rev = finalAttrs.version; + hash = "sha256-QBqPFteoAm3AdQN0XTWpho8DEW2BFCCzBcHUZIiSxyQ="; }; buildInputs = [ @@ -73,42 +73,47 @@ stdenv.mkDerivation rec { '' # https://github.com/neomutt/neomutt-contrib # Contains vim-keys, keybindings presets and more. - + lib.optionalString withContrib "${lib.getExe lndir} ${passthru.contrib} $out/share/doc/neomutt"; + + lib.optionalString withContrib "${lib.getExe lndir} ${finalAttrs.passthru.contrib} $out/share/doc/neomutt"; doCheck = true; preCheck = '' - cp -r ${passthru.test-files} $(pwd)/test-files + cp -r ${finalAttrs.passthru.test-files} $(pwd)/test-files + chmod -R +w test-files (cd test-files && ./setup.sh) export NEOMUTT_TEST_DIR=$(pwd)/test-files + + # The test fails with: node_padding.c:135: Check rc == 15... failed + substituteInPlace test/main.c \ + --replace-fail "NEOMUTT_TEST_ITEM(test_expando_node_padding)" "" ''; passthru = { test-files = fetchFromGitHub { owner = "neomutt"; repo = "neomutt-test-files"; - rev = "1569b826a56c39fd09f7c6dd5fc1163ff5a356a2"; - sha256 = "sha256-MaH2zEH1Wq3C0lFxpEJ+b/A+k2aKY/sr1EtSPAuRPp8="; + rev = "00efc8388110208e77e6ed9d8294dfc333753d54"; + hash = "sha256-/ELowuMq67v56MAJBtO73g6OqV0DVwW4+x+0u4P5mB0="; }; contrib = fetchFromGitHub { owner = "neomutt"; repo = "neomutt-contrib"; rev = "8e97688693ca47ea1055f3d15055a4f4ecc5c832"; - sha256 = "sha256-tx5Y819rNDxOpjg3B/Y2lPcqJDArAxVwjbYarVmJ79k="; + hash = "sha256-tx5Y819rNDxOpjg3B/Y2lPcqJDArAxVwjbYarVmJ79k="; }; }; checkTarget = "test"; postCheck = "unset NEOMUTT_TEST_DIR"; - meta = with lib; { - description = "A small but very powerful text-based mail client"; + meta = { + description = "Small but very powerful text-based mail client"; mainProgram = "neomutt"; - homepage = "http://www.neomutt.org"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ erikryb vrthra ma27 raitobezarius ]; - platforms = platforms.unix; + homepage = "https://www.neomutt.org"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ erikryb vrthra ma27 raitobezarius ]; + platforms = lib.platforms.unix; }; -} +}) From b0e8aea401acda527de710902fce523140d33574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Mon, 3 Jun 2024 14:46:10 -0400 Subject: [PATCH 117/219] cemu: fix build --- pkgs/applications/emulators/cemu/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index b8aef2760eb3..c5860d3b0b26 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -108,7 +108,8 @@ in stdenv.mkDerivation rec { tag = last (splitString "-" version); in '' rm -rf dependencies/imgui - ln -s ${imgui'}/include/imgui dependencies/imgui + # cemu expects imgui source code, not just header files + ln -s ${imgui'.src} dependencies/imgui substituteInPlace src/Common/version.h --replace " (experimental)" "-${tag} (experimental)" substituteInPlace dependencies/gamemode/lib/gamemode_client.h --replace "libgamemode.so.0" "${gamemode.lib}/lib/libgamemode.so.0" ''; From f878224fd74a4830935a592815506b50184027a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 19:16:09 +0000 Subject: [PATCH 118/219] libretro.swanstation: unstable-2024-05-27 -> unstable-2024-05-30 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index e27eafce9d51..371b1be98b3e 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -814,10 +814,10 @@ "src": { "owner": "libretro", "repo": "swanstation", - "rev": "d5169ed204838b622551c82b3c20df376324870f", - "hash": "sha256-ixLd2xdy6r5irNEhBDbdMpvRR7clnHr1LrTywuqkr84=" + "rev": "7a27436548128c00e70b08dde63c52118e2a6228", + "hash": "sha256-u7D044lKNAH4aAaY/Ol7BR3dNeusX4wirIMdUEGw2oM=" }, - "version": "unstable-2024-05-27" + "version": "unstable-2024-05-30" }, "tgbdual": { "fetcher": "fetchFromGitHub", From 36e8f6d73b9c48b37f9f8e2d4731f7602e52f565 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 19:16:25 +0000 Subject: [PATCH 119/219] libretro.gambatte: unstable-2024-05-17 -> unstable-2024-06-02 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index e27eafce9d51..9846ed4ee894 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -348,10 +348,10 @@ "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "238b195bca073bc1a2032c4e92c097d157e521f8", - "hash": "sha256-i9+a1kVlJ6EPaCOMkuIZgujNEg6MwPRM3mHnhconWHo=" + "rev": "f0d83f0eff4ad91471f90acd098d078eea0a67b3", + "hash": "sha256-zcqFVPotOu5gDwzgWzn0lpzhcTwQUm81UpA5FtCrz1M=" }, - "version": "unstable-2024-05-17" + "version": "unstable-2024-06-02" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", From 5780590f503cde0059483d95c5a607bc784fa894 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 19:21:42 +0000 Subject: [PATCH 120/219] libretro.dosbox-pure: unstable-2024-05-20 -> unstable-2024-06-03 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index e27eafce9d51..09bf2e3ae1a2 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -246,10 +246,10 @@ "src": { "owner": "schellingb", "repo": "dosbox-pure", - "rev": "1c7ad4fafc5204e3aff83e2caa6020cb2fe43a2d", - "hash": "sha256-cOamfnwLilAz2I8CKA18JvauadbObuAq4JabNcdw7EQ=" + "rev": "1e3cb35355769467ca7be192e740eb9728ecc88c", + "hash": "sha256-svVpHUOPPAFMypmeaHLCQfwTAVOZajTMKyeKvWLZlcc=" }, - "version": "unstable-2024-05-20" + "version": "unstable-2024-06-03" }, "easyrpg": { "fetcher": "fetchFromGitHub", From a79f4a9161f86df8322baf6e6a7336c306ef7378 Mon Sep 17 00:00:00 2001 From: Izorkin Date: Mon, 3 Jun 2024 22:22:09 +0300 Subject: [PATCH 121/219] angie: 1.5.1 -> 1.5.2 --- pkgs/servers/http/angie/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix index f57dc2e012bd..84a24ece767d 100644 --- a/pkgs/servers/http/angie/default.nix +++ b/pkgs/servers/http/angie/default.nix @@ -10,12 +10,12 @@ }@args: callPackage ../nginx/generic.nix args rec { - version = "1.5.1"; + version = "1.5.2"; pname = if withQuic then "angieQuic" else "angie"; src = fetchurl { url = "https://download.angie.software/files/angie-${version}.tar.gz"; - hash = "sha256-pSBy+Gv3rSa0WqQOxLHM0V03/vLqvOYBGxrjY9qsBfQ="; + hash = "sha256-jX0WBIdL3RQpgdeVf4oZByDNKQbrEjKbImC86Ceqkoc="; }; configureFlags = lib.optionals withAcme [ From f5d1bca4bf6d8505c8fa1c91fbf98e3d3be65268 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 19:24:18 +0000 Subject: [PATCH 122/219] retroarch-joypad-autoconfig: 1.18.1 -> 1.19.0 --- .../emulators/retroarch/retroarch-joypad-autoconfig.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix b/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix index b4e60fdcaba8..36bc02c43f7d 100644 --- a/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix +++ b/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix @@ -6,13 +6,13 @@ stdenvNoCC.mkDerivation rec { pname = "retroarch-joypad-autoconfig"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "libretro"; repo = "retroarch-joypad-autoconfig"; rev = "v${version}"; - hash = "sha256-eWfSqHusTri1HQUkSxY/iAceF/9PFVMC0rhLu/4W35k="; + hash = "sha256-iwxTMwGHix2K5UyjBWFamyo3nVULxwbIF+djyQWz5L0="; }; makeFlags = [ From d4bcd3a83145cb747d12045f76f1675a6755a9c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 3 Jun 2024 13:09:29 +0200 Subject: [PATCH 123/219] syslinux: fix replace warning, use https --- pkgs/os-specific/linux/syslinux/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index f5153eb5abc9..5c1216c8bfd1 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -68,12 +68,12 @@ stdenv.mkDerivation { ]; postPatch = '' - substituteInPlace Makefile --replace /bin/pwd $(type -P pwd) - substituteInPlace utils/ppmtolss16 --replace /usr/bin/perl $(type -P perl) + substituteInPlace Makefile --replace-fail /bin/pwd $(type -P pwd) + substituteInPlace utils/ppmtolss16 --replace-fail /usr/bin/perl $(type -P perl) # fix tests substituteInPlace tests/unittest/include/unittest/unittest.h \ - --replace /usr/include/ "" + --replace-fail /usr/include/ "" # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. mkdir gnu-efi/inc/ia32/gnu @@ -126,7 +126,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "http://www.syslinux.org/"; + homepage = "https://www.syslinux.org/"; description = "A lightweight bootloader"; license = licenses.gpl2Plus; maintainers = [ maintainers.samueldr ]; From 0fd77ad648e60d546977a181cb4916b851206665 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Mon, 3 Jun 2024 22:11:13 +0200 Subject: [PATCH 124/219] got: 0.99 -> 0.100 --- pkgs/by-name/go/got/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix index d6f5629e3cd6..7faf1ff013a5 100644 --- a/pkgs/by-name/go/got/package.nix +++ b/pkgs/by-name/go/got/package.nix @@ -17,11 +17,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "got"; - version = "0.99"; + version = "0.100"; src = fetchurl { url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz"; - hash = "sha256-rqQINToCsuOtm00bdgeQAmmvl5htQJmMV/EKzfD6Hjg="; + hash = "sha256-/DqKIGf/aZ09aL/rB7te+AauHmJ+mOTrVEbkqT9WUBI="; }; nativeBuildInputs = [ pkg-config bison ] From ae94be272036ce6b821d0ceae70226d255529e96 Mon Sep 17 00:00:00 2001 From: octodi <127038896+octodi@users.noreply.github.com> Date: Mon, 3 Jun 2024 20:09:14 +0000 Subject: [PATCH 125/219] muffon: init at 2.0.3 --- pkgs/by-name/mu/muffon/package.nix | 41 ++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 pkgs/by-name/mu/muffon/package.nix diff --git a/pkgs/by-name/mu/muffon/package.nix b/pkgs/by-name/mu/muffon/package.nix new file mode 100644 index 000000000000..43a5f135b844 --- /dev/null +++ b/pkgs/by-name/mu/muffon/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchurl, + appimageTools, + makeWrapper, +}: + +let + pname = "muffon"; + version = "2.0.3"; + src = fetchurl { + url = "https://github.com/staniel359/muffon/releases/download/v${version}/muffon-${version}-linux-x86_64.AppImage"; + hash = "sha256-2eLe/xvdWcOcUSE0D+pMOcOYCfFVEyKO13LiaJiZgX0="; + }; + appimageContents = appimageTools.extractType2 { inherit pname src version; }; +in +appimageTools.wrapType2 { + inherit pname src version; + + extraInstallCommands = '' + source "${makeWrapper}/nix-support/setup-hook" + wrapProgram $out/bin/muffon \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" + install -m 444 -D ${appimageContents}/muffon.desktop -t $out/share/applications + substituteInPlace $out/share/applications/muffon.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=muffon' + install -m 444 -D ${appimageContents}/muffon.png \ + $out/share/icons/hicolor/512x512/apps/muffon.png + ''; + + meta = { + description = "Advanced multi-source music streaming client"; + homepage = "https://muffon.netlify.app/"; + changelog = "https://github.com/staniel359/muffon/releases/tag/v${version}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ octodi ]; + mainProgram = "muffon"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + }; +} From c697af74473f080f5de0991f5e259dcce175510b Mon Sep 17 00:00:00 2001 From: Patrick Aldis Date: Sat, 1 Jun 2024 16:09:22 +0100 Subject: [PATCH 126/219] swaycons: 0.2.0 -> 0.3.1 --- pkgs/by-name/sw/swaycons/package.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/sw/swaycons/package.nix b/pkgs/by-name/sw/swaycons/package.nix index 9716f8708795..b60b5a6115a2 100644 --- a/pkgs/by-name/sw/swaycons/package.nix +++ b/pkgs/by-name/sw/swaycons/package.nix @@ -5,21 +5,21 @@ rustPlatform.buildRustPackage rec { pname = "swaycons"; - version = "unstable-2023-01-05"; + version = "unstable-2023-11-29"; src = fetchFromGitHub { - owner = "ActuallyAllie"; + owner = "allie-wake-up"; repo = "swaycons"; - rev = "e863599fb56177fc9747d60db661be2d7c2d290b"; - hash = "sha256-zkCpZ3TehFKNePtSyFaEk+MA4mi1+la9yFjRPFy+eq8="; + rev = "aa1102393be34e8bd7ed4e74c574e851fbd8cff9"; + hash = "sha256-vyZcfBH2mry8Yd41QPX4+yLv0nS9J1yrgg7lpslJs7M="; }; - cargoSha256 = "sha256-GcoRx52dwL/ehJ1Xg6xQHVzPIKXWqBrG7IjzxRjfgqA="; + cargoSha256 = "sha256-cdZ7DpH//c9TulvPYd6aaXpQHYC1b+T7BrxAyr56Pf0="; meta = with lib; { description = "Window Icons in Sway with Nerd Fonts!"; mainProgram = "swaycons"; - homepage = "https://github.com/ActuallyAllie/swaycons"; + homepage = "https://github.com/allie-wake-up/swaycons"; license = licenses.asl20; platforms = platforms.linux; maintainers = with maintainers; [ aacebedo ]; From 03654dacae772734322e7fb6717380185235da34 Mon Sep 17 00:00:00 2001 From: Kai Norman Clasen Date: Mon, 3 Jun 2024 22:47:07 +0200 Subject: [PATCH 127/219] immich-go: 0.15.0 -> 0.16.0 Diff: https://github.com/simulot/immich-go/compare/0.15.0...0.16.0 Changelog: https://github.com/simulot/immich-go/releases/tag/0.16.0 --- pkgs/by-name/im/immich-go/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix index 9d8cfda974e1..017bef88c9a2 100644 --- a/pkgs/by-name/im/immich-go/package.nix +++ b/pkgs/by-name/im/immich-go/package.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub, nix-update-script, testers, immich-go }: buildGoModule rec { pname = "immich-go"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "simulot"; repo = "immich-go"; rev = "${version}"; - hash = "sha256-gZVjs0aFwlx5joX7iqy7uDd23d/4LjP/t6u7z8X/P8o="; + hash = "sha256-9b9eQ1ufVQsg9hzwK0570HKmWTPcTag6DM2NB7mutjk="; # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32 # The intention here is to write the information into files in the `src`'s From c8052a3143bddc7917c28598406fc169fad4e4e7 Mon Sep 17 00:00:00 2001 From: Eli <88557639+lishaduck@users.noreply.github.com> Date: Mon, 3 Jun 2024 12:54:41 -0500 Subject: [PATCH 128/219] oils-for-unix: reenable binary stripping It seems that pkg.oils-for-unix was just copied from pkg.oil, so it didn't reenable stripping the binary. As the comment says, the old oil.ovm file had an appended zip file. The new C++ interpreter doesn't, so this should be safe. --- pkgs/by-name/oi/oils-for-unix/package.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/by-name/oi/oils-for-unix/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix index f477d66d8a07..316ba4a15030 100644 --- a/pkgs/by-name/oi/oils-for-unix/package.nix +++ b/pkgs/by-name/oi/oils-for-unix/package.nix @@ -51,9 +51,6 @@ stdenv.mkDerivation rec { "--readline=${readline-all}" ]; - # Stripping breaks the bundles by removing the zip file from the end. - dontStrip = true; - meta = { description = "A Unix shell with JSON-compatible structured data. It's our upgrade path from bash to a better language and runtime."; homepage = "https://www.oilshell.org/"; From 079edf9c81f93606f47cef5fd3aec17afd39209a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 21:00:45 +0000 Subject: [PATCH 129/219] homepage-dashboard: 0.8.13 -> 0.9.1 --- pkgs/servers/homepage-dashboard/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix index c32aa1b07593..33c338e2a358 100644 --- a/pkgs/servers/homepage-dashboard/default.nix +++ b/pkgs/servers/homepage-dashboard/default.nix @@ -27,16 +27,16 @@ let in buildNpmPackage rec { pname = "homepage-dashboard"; - version = "0.8.13"; + version = "0.9.1"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; rev = "v${version}"; - hash = "sha256-5AGtNfeFI5fkeXg1PK9ylifHzp9P6XW80XQQFY1YGj8="; + hash = "sha256-EgZhk3NtuIjvFab0y9UdGYDR+Iw/0vg/uFxnzqKuloo="; }; - npmDepsHash = "sha256-UrRpjbFGziPNN03Fj9T+K+kav0LhaAFp/o+SXja6Jxk="; + npmDepsHash = "sha256-jYZUVwrOxoAbfHHSBkN5IlYhC6yZVVwRoZErkbYrjUs="; preBuild = '' mkdir -p config From 1e27f2320be96b924353b308950fcf3e8f186421 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Sat, 4 May 2024 22:32:49 +0100 Subject: [PATCH 130/219] zx: 7.2.3 -> 8.1.2 Diff: https://github.com/google/zx/compare/7.2.3...8.1.2 Changelog: - https://github.com/google/zx/releases/tag/8.0.0 - https://github.com/google/zx/releases/tag/8.0.1 - https://github.com/google/zx/releases/tag/8.0.2 - https://github.com/google/zx/releases/tag/8.1.0 - https://github.com/google/zx/releases/tag/8.1.1 - https://github.com/google/zx/releases/tag/8.1.2 Fixes #309047. --- pkgs/tools/system/zx/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/tools/system/zx/default.nix index 1dec344ed3aa..a1ae3947b701 100644 --- a/pkgs/tools/system/zx/default.nix +++ b/pkgs/tools/system/zx/default.nix @@ -1,24 +1,26 @@ -{ lib -, buildNpmPackage -, fetchFromGitHub +{ + lib, + buildNpmPackage, + fetchFromGitHub, }: buildNpmPackage rec { pname = "zx"; - version = "7.2.3"; + version = "8.1.2"; src = fetchFromGitHub { owner = "google"; repo = "zx"; rev = version; - hash = "sha256-YMfecNazmL8J+f80FdIRvr2upQ7VgXSkQQnm8z0Swhw="; + hash = "sha256-tv66idt+IfELc5TpMwDujJeIOi+kxFSl3RX3SrYL9ac="; }; - npmDepsHash = "sha256-ywNd2LGjM35ecW4dnj0oNwdSX2CRy8i9OGKPIdI0UEQ="; + npmDepsHash = "sha256-WZJDbdqoy/JkKAR00nG4IdM6okHLsqfudHw0Gs+WntM="; meta = { description = "Tool for writing scripts using JavaScript"; homepage = "https://github.com/google/zx"; + changelog = "https://github.com/google/zx/releases/tag/${version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hlolli ]; mainProgram = "zx"; From f555d4ca3cd5406d77c93d9882220a783fbced1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Mon, 6 May 2024 15:55:19 +0100 Subject: [PATCH 131/219] zx: change maintainer to jlbribeiro Following https://github.com/NixOS/nixpkgs/issues/309047#issuecomment-2095530702, I'm replacing @hlolli as zx maintainer. --- pkgs/tools/system/zx/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/system/zx/default.nix b/pkgs/tools/system/zx/default.nix index a1ae3947b701..f8e18a310629 100644 --- a/pkgs/tools/system/zx/default.nix +++ b/pkgs/tools/system/zx/default.nix @@ -22,7 +22,7 @@ buildNpmPackage rec { homepage = "https://github.com/google/zx"; changelog = "https://github.com/google/zx/releases/tag/${version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ hlolli ]; + maintainers = with lib.maintainers; [ jlbribeiro ]; mainProgram = "zx"; }; } From 6d83737c25babbde767a458830e6a2327d912992 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 3 Jun 2024 21:14:55 +0000 Subject: [PATCH 132/219] kaldi: 0-unstable-2024-04-30 -> 0-unstable-2024-06-03 --- pkgs/tools/audio/kaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/kaldi/default.nix b/pkgs/tools/audio/kaldi/default.nix index 7bc50da5c4cd..0ad07bae9fd9 100644 --- a/pkgs/tools/audio/kaldi/default.nix +++ b/pkgs/tools/audio/kaldi/default.nix @@ -19,13 +19,13 @@ assert blas.implementation == "openblas" && lapack.implementation == "openblas"; stdenv.mkDerivation (finalAttrs: { pname = "kaldi"; - version = "0-unstable-2024-04-30"; + version = "0-unstable-2024-06-03"; src = fetchFromGitHub { owner = "kaldi-asr"; repo = "kaldi"; - rev = "51744d32acc9b19457f9aaed09c83f218f4b5de4"; - sha256 = "sha256-StONwrzu3i+OCTQ7IAB6slM2cPGZVfCoVqa5gPnREc4="; + rev = "67548a31c45f93d8b25ee553c5969d6a6d5d9408"; + sha256 = "sha256-yCyBha7i2rxYjEDRYdg8QI7raCEkOPT0Tc8dzSamsmc="; }; cmakeFlags = [ From 6fc5c63584ab71e042acbc74d09b828cf03504b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Ribeiro?= Date: Mon, 3 Jun 2024 22:16:55 +0100 Subject: [PATCH 133/219] doc(rl-24.11): zx v8 breaking changes --- nixos/doc/manual/release-notes/rl-2411.section.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 28264b0b3429..51904352b3b7 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -30,6 +30,9 @@ for `stateVersion` ≥ 24.11. (It was previously using SQLite for structured data and the filesystem for blobs). +- `zx` was updated to v8, which introduces several breaking changes. + See the [v8 changelog](https://github.com/google/zx/releases/tag/8.0.0) for more information. + - The `portunus` package and service do not support weak password hashes anymore. If you installed Portunus on NixOS 23.11 or earlier, upgrade to NixOS 24.05 first to get support for strong password hashing. Then, follow the instructions on the [upstream release notes](https://github.com/majewsky/portunus/releases/tag/v2.0.0) to upgrade all existing user accounts to strong password hashes. From 84b5b4cfa7ac2c32c12f899f1eddb3e40e043102 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 3 Jun 2024 23:18:43 +0200 Subject: [PATCH 134/219] aaaaxy: 1.5.129 -> 1.5.139 https://github.com/divVerent/aaaaxy/releases/tag/v1.5.139 --- pkgs/by-name/aa/aaaaxy/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix index 3fca10f2577e..5a2a1f9b0077 100644 --- a/pkgs/by-name/aa/aaaaxy/package.nix +++ b/pkgs/by-name/aa/aaaaxy/package.nix @@ -20,17 +20,17 @@ buildGoModule rec { pname = "aaaaxy"; - version = "1.5.129"; + version = "1.5.139"; src = fetchFromGitHub { owner = "divVerent"; repo = pname; rev = "v${version}"; - hash = "sha256-kH2eFFxohvuuEP2p7bt8zOYbk3gF86X9y3sNdLYl/Qo="; + hash = "sha256-j8BpLN0PhMqUQXhF1L7uEW2KLaVq5cfckXnWrkltCgM="; fetchSubmodules = true; }; - vendorHash = "sha256-VEayNWztJYeQoJHVJfAlmHD65PEho1TCttTfT0cbgUQ="; + vendorHash = "sha256-a6nfGP6Lwjwr4wXXRUrCyV9+BCyHOSKczk5rjZdFnlA="; buildInputs = [ alsa-lib From 6ef9d5288a6aef9370fc2f9f61970ba03301614d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Mon, 3 Jun 2024 19:00:41 -0300 Subject: [PATCH 135/219] python312Packages.latex2pydata: 0.2.0 -> 0.3.0 --- pkgs/development/python-modules/latex2pydata/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/latex2pydata/default.nix b/pkgs/development/python-modules/latex2pydata/default.nix index f6b9654aaad5..535978bad8aa 100644 --- a/pkgs/development/python-modules/latex2pydata/default.nix +++ b/pkgs/development/python-modules/latex2pydata/default.nix @@ -7,16 +7,15 @@ buildPythonPackage rec { pname = "latex2pydata"; - version = "0.2.0"; - - format = "pyproject"; + version = "0.3.0"; + pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-lFYGBFox7fv/vlfqZN3xsh9UIRCQ+C5Cizq9j4RTcJ0="; + hash = "sha256-XMGmTK1H6f66pI/wDLA3+Pytl4A7spbMMpfa77xr2M4="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; From 79cd2f97383a9527378fb20157c531da12cb551d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ab=C3=ADlio=20Costa?= Date: Mon, 3 Jun 2024 23:18:34 +0100 Subject: [PATCH 136/219] nixos/nvidia-optimus: add nvidia-modeset to blacklist The nvidia-modeset module is loaded, which in turn pulls in the nvidia module. This makes bbswitch fail to turn off the card since it would be in use by the module. --- nixos/modules/services/hardware/nvidia-optimus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/hardware/nvidia-optimus.nix b/nixos/modules/services/hardware/nvidia-optimus.nix index d53175052c74..307bc78098d1 100644 --- a/nixos/modules/services/hardware/nvidia-optimus.nix +++ b/nixos/modules/services/hardware/nvidia-optimus.nix @@ -23,7 +23,7 @@ let kernel = config.boot.kernelPackages; in ###### implementation config = lib.mkIf config.hardware.nvidiaOptimus.disable { - boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidiafb" "nvidia-drm"]; + boot.blacklistedKernelModules = ["nouveau" "nvidia" "nvidiafb" "nvidia-drm" "nvidia-modeset"]; boot.kernelModules = [ "bbswitch" ]; boot.extraModulePackages = [ kernel.bbswitch ]; From d5e6d0c0fb7fe765b7727fda23ca6f65e8003cb7 Mon Sep 17 00:00:00 2001 From: Tomas Antonio Lopez Date: Sun, 2 Jun 2024 13:10:11 +0200 Subject: [PATCH 137/219] protege: init at 5.6.4 --- .../pr/protege/enforce-plugin-versions.patch | 43 +++++++++ pkgs/by-name/pr/protege/package.nix | 93 +++++++++++++++++++ .../protege/platform-independent-only.patch | 24 +++++ 3 files changed, 160 insertions(+) create mode 100644 pkgs/by-name/pr/protege/enforce-plugin-versions.patch create mode 100644 pkgs/by-name/pr/protege/package.nix create mode 100644 pkgs/by-name/pr/protege/platform-independent-only.patch diff --git a/pkgs/by-name/pr/protege/enforce-plugin-versions.patch b/pkgs/by-name/pr/protege/enforce-plugin-versions.patch new file mode 100644 index 000000000000..1df4594f2c99 --- /dev/null +++ b/pkgs/by-name/pr/protege/enforce-plugin-versions.patch @@ -0,0 +1,43 @@ +diff --git a/pom.xml b/pom.xml +index 839bed04..4cb5f392 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -358,6 +358,30 @@ + 11 + + ++ ++ ++ org.apache.maven.plugins ++ maven-install-plugin ++ 3.1.1 ++ ++ ++ ++ org.apache.maven.plugins ++ maven-site-plugin ++ 3.12.1 ++ ++ ++ ++ org.apache.maven.plugins ++ maven-deploy-plugin ++ 3.1.1 ++ ++ ++ ++ org.apache.maven.plugins ++ maven-jar-plugin ++ 3.3.0 ++ + + + org.apache.maven.plugins +@@ -476,6 +494,7 @@ + + 3.6.3 + ++ + + + diff --git a/pkgs/by-name/pr/protege/package.nix b/pkgs/by-name/pr/protege/package.nix new file mode 100644 index 000000000000..f6d22a08e2f5 --- /dev/null +++ b/pkgs/by-name/pr/protege/package.nix @@ -0,0 +1,93 @@ +{ lib +, fetchFromGitHub +, copyDesktopItems +, iconConvTools +, makeDesktopItem +, makeWrapper +, jdk11 +, maven +}: + +let + mvn = maven.override { jdk = jdk11; }; +in +mvn.buildMavenPackage rec { + pname = "protege"; + version = "5.6.4"; + + src = fetchFromGitHub { + owner = "protegeproject"; + repo = "protege"; + rev = version; + hash = "sha256-Q3MHa7nCeF31n7JPltcemFBc/sJwGA9Ev0ymjQhY/U0="; + }; + + mvnHash = "sha256-kemP2gDv1CYuaoK0fwzBxdLTusarPasf2jCDQj/HPYE="; + + patches = [ + # Pin built-in Maven plugins to avoid checksum variations on Maven updates + ./enforce-plugin-versions.patch + # Avoid building platform-dependent builds which embed their own JREs + ./platform-independent-only.patch + ]; + + nativeBuildInputs = [ + copyDesktopItems + iconConvTools + jdk11 + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin $out/share/protege + + # Copy the application directory whole into the output, as it is used by the + # launcher script as a reference point to look for default configuration + mv protege-desktop/target/protege-${version}-platform-independent/Protege-${version} $out/Protege + + # Place a wrapper for the launcher script into a default /bin location + makeWrapper $out/Protege/run.sh $out/bin/protege \ + --set JAVA_HOME ${jdk11.home} + + # Link all jars from within the standard /share/protege directory + ln -s -t $out/share/protege $out/Protege/bundles/* + + # Generate and copy icons to where they can be found + icoFileToHiColorTheme $out/Protege/app/Protege.ico protege $out + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + desktopName = "Protege Desktop"; + genericName = "Ontology Editor"; + icon = "protege"; + comment = meta.description; + categories = [ "Development" ]; + exec = "protege"; + }) + ]; + + meta = { + homepage = "https://protege.stanford.edu/"; + downloadPage = "https://protege.stanford.edu/software.php#desktop-protege"; + description = "A free and open-source OWL 2 ontology editor"; + longDescription = '' + Protégé Desktop is a feature rich ontology editing environment with full + support for the OWL 2 Web Ontology Language, and direct in-memory + connections to description logic reasoners. + ''; + maintainers = with lib.maintainers; [ nessdoor ]; + license = with lib.licenses; [ bsd2 ]; + # TODO Protege is able to run on Darwin as well, but I (@nessdoor) had no + # way of testing it nor any experience in packaging Darwin apps, so I + # will leave the task to someone who has the right tools and knowledge. + platforms = lib.platforms.unix; + mainProgram = "protege"; + sourceProvenance = with lib.sourceTypes; [ fromSource binaryBytecode ]; + }; +} diff --git a/pkgs/by-name/pr/protege/platform-independent-only.patch b/pkgs/by-name/pr/protege/platform-independent-only.patch new file mode 100644 index 000000000000..d0f489372f2e --- /dev/null +++ b/pkgs/by-name/pr/protege/platform-independent-only.patch @@ -0,0 +1,24 @@ +diff --git a/protege-desktop/pom.xml b/protege-desktop/pom.xml +index 2f599708..60059308 100644 +--- a/protege-desktop/pom.xml ++++ b/protege-desktop/pom.xml +@@ -110,9 +110,6 @@ + + + src/main/assembly/protege-platform-independent.xml +- src/main/assembly/protege-os-x.xml +- src/main/assembly/protege-win.xml +- src/main/assembly/protege-linux.xml + + + +@@ -165,9 +162,6 @@ + + + src/main/assembly/protege-platform-independent.xml +- src/main/assembly/protege-os-x.xml +- src/main/assembly/protege-win.xml +- src/main/assembly/protege-linux.xml + + + From 9b4bed49a389c54932e79e62e8612e7791756fe7 Mon Sep 17 00:00:00 2001 From: Alexander Shpilkin Date: Tue, 4 Jun 2024 01:57:25 +0300 Subject: [PATCH 138/219] parlatype: 4.1 -> 4.2 --- pkgs/applications/audio/parlatype/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/parlatype/default.nix b/pkgs/applications/audio/parlatype/default.nix index 927de1d93856..3d9a3da25c2e 100644 --- a/pkgs/applications/audio/parlatype/default.nix +++ b/pkgs/applications/audio/parlatype/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "parlatype"; - version = "4.1"; + version = "4.2"; src = fetchFromGitHub { owner = "gkarsay"; repo = pname; rev = "v${version}"; - sha256 = "0546rl5sm7xmgl54cqps3a7bhfs7xdvz98jgdcf4sgiz1k2vh9xq"; + sha256 = "1wi9f23zgvsa98xcxgghm53jlafnr3pan1zl4gkn0yd8b2d6avhk"; }; nativeBuildInputs = [ @@ -58,9 +58,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - substituteInPlace data/meson_post_install.py \ - --replace-fail 'gtk-update-icon-cache' 'gtk4-update-icon-cache' - patchShebangs data/meson_post_install.py patchShebangs libparlatype/tests/data/generate_config_data ''; @@ -76,8 +73,7 @@ stdenv.mkDerivation rec { useful for journalists, students, scientists and whoever needs to transcribe audio files. ''; - # maintainer lost control of parlatype.org - homepage = "https://github.com/gkarsay/parlatype"; + homepage = "https://www.parlatype.xyz/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ alexshpilkin melchips ]; platforms = platforms.linux; From 8576c5d1f8d5c2b4fd7ca6cfd0845280f06c7b48 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 1 Jun 2024 10:16:38 -0400 Subject: [PATCH 139/219] telegram-desktop: 5.0.6 -> 5.1.0 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.0.6...v5.1.0 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.1.0 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index f663d6f637a3..e1d7aaa92ed2 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.0.6"; + version = "5.1.0"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-n3WeyGQCw9fbA/1hZ85mqdm5xuBLjy9qHMcVRb4cmAg="; + hash = "sha256-3AUYaEVnVSHh4Z6eEQUDL+tAp9eaZgtJqSRzpYBWN2U="; }; patches = [ From e88cab11f0bb7d70ef40f472b6e1e78a0b958aba Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sat, 1 Jun 2024 17:03:11 -0400 Subject: [PATCH 140/219] telegram-desktop: 5.1.0 -> 5.1.1 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.1.0...v5.1.1 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.1.1 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index e1d7aaa92ed2..0f619eb4aeea 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-3AUYaEVnVSHh4Z6eEQUDL+tAp9eaZgtJqSRzpYBWN2U="; + hash = "sha256-u9pVx7pGHDFefHV8bWhlNn88ytV5tHU0JnzedrufxEM="; }; patches = [ From da374b5629899a8557729888c462279ebfb69104 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 3 Jun 2024 19:53:02 -0400 Subject: [PATCH 141/219] telegram-desktop: 5.1.1 -> 5.1.2 Diff: https://github.com/telegramdesktop/tdesktop/compare/v5.1.1...v5.1.2 Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.1.2 --- .../instant-messengers/telegram/telegram-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix index 0f619eb4aeea..5167890de17f 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix @@ -64,14 +64,14 @@ let in stdenv.mkDerivation rec { pname = "telegram-desktop"; - version = "5.1.1"; + version = "5.1.2"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-u9pVx7pGHDFefHV8bWhlNn88ytV5tHU0JnzedrufxEM="; + hash = "sha256-KTgID7pd0QSFi5t9cdIVEi4/oQirDgsf7tTcEEtRdY0="; }; patches = [ From f6ddc5ce5efcbb0523008bca3735435fe84f7369 Mon Sep 17 00:00:00 2001 From: Jono Chang Date: Mon, 3 Jun 2024 19:51:03 +1000 Subject: [PATCH 142/219] glab: 1.40.0 -> 1.41.0 diff: https://gitlab.com/gitlab-org/cli/-/compare/v1.37.0...v1.40.0?from_project_id=34675721&straight=false changelog: https://gitlab.com/gitlab-org/cli/-/releases/v1.41.0 --- pkgs/applications/version-management/glab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/glab/default.nix b/pkgs/applications/version-management/glab/default.nix index 2d704143bfda..9f3e08464dd3 100644 --- a/pkgs/applications/version-management/glab/default.nix +++ b/pkgs/applications/version-management/glab/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "glab"; - version = "1.40.0"; + version = "1.41.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; rev = "v${version}"; - hash = "sha256-setvszKdG2EQUlVJNbo7gPKE4b7lfdGT30MC82Kk2/s="; + hash = "sha256-DvIp7eMBWKWQ5VW9MW391xnUz8o1KNz1mkJtu7YVILo="; }; - vendorHash = "sha256-vx4dNFM0PfapRQxz9ef1vNs4RiZlZDNhcKlo87gjGTs="; + vendorHash = "sha256-WM19Kx2b31e4/iA92U9FUuF8R1DMvbKotE2D9HpLQpQ="; ldflags = [ "-s" From d7a9d49c422d53b01da9fa899d97c2bc53401938 Mon Sep 17 00:00:00 2001 From: Daniel Barter Date: Sun, 26 May 2024 09:49:54 -0700 Subject: [PATCH 143/219] repart-image: removing unshare (and util-linux dep) form systemd-repart invocation .. --- nixos/modules/image/repart-image.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/image/repart-image.nix b/nixos/modules/image/repart-image.nix index 59d5fc26efe9..e40406729900 100644 --- a/nixos/modules/image/repart-image.nix +++ b/nixos/modules/image/repart-image.nix @@ -10,7 +10,6 @@ , mypy , systemd , fakeroot -, util-linux # filesystem tools , dosfstools @@ -105,7 +104,6 @@ in nativeBuildInputs = [ systemd fakeroot - util-linux ] ++ lib.optionals (compression.enable) [ compressionPkg ] ++ fileSystemTools; @@ -148,7 +146,7 @@ in runHook preBuild echo "Building image with systemd-repart..." - unshare --map-root-user fakeroot systemd-repart \ + fakeroot systemd-repart \ ''${systemdRepartFlags[@]} \ ${imageFileBasename}.raw \ | tee repart-output.json From a3026321a5633677338cc7d23e6eb8610bc6272a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Tue, 4 Jun 2024 10:42:17 +0900 Subject: [PATCH 144/219] mepo: 1.2.0 -> 1.2.1 --- pkgs/applications/misc/mepo/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/misc/mepo/default.nix b/pkgs/applications/misc/mepo/default.nix index 23a57c343b4f..afa5ffe3d797 100644 --- a/pkgs/applications/misc/mepo/default.nix +++ b/pkgs/applications/misc/mepo/default.nix @@ -17,23 +17,23 @@ , util-linux , xwininfo , zenity -, zig_0_11 +, zig_0_12 }: stdenv.mkDerivation (finalAttrs: { pname = "mepo"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromSourcehut { owner = "~mil"; repo = "mepo"; rev = finalAttrs.version; - hash = "sha256-sxN7yTnk3KDAkP/d3miKa2bEgB3AUaf9/M9ajJyRt3g="; + hash = "sha256-Ii5E9TgUxzlVIdkKS/6RtasOETeclMm1yoU86gs4hB8="; }; nativeBuildInputs = [ pkg-config - zig_0_11.hook + zig_0_12.hook makeWrapper ]; @@ -56,10 +56,10 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' substituteInPlace $out/bin/mepo_ui_menu_user_pin_updater.sh \ - --replace /usr/libexec/geoclue-2.0 ${geoclue2-with-demo-agent}/libexec/geoclue-2.0 + --replace-fail /usr/libexec/geoclue-2.0 ${geoclue2-with-demo-agent}/libexec/geoclue-2.0 substituteInPlace $out/bin/mepo_ui_central_menu.sh \ - --replace "grep mepo_" "grep '^\.mepo_\|^mepo_'" \ - --replace " ls " " ls -a " #circumvent wrapping for script detection + --replace-fail "grep mepo_" "grep '^\.mepo_\|^mepo_'" \ + --replace-fail " ls " " ls -a " #circumvent wrapping for script detection for program in $out/bin/* ; do wrapProgram $program \ --suffix PATH : $out/bin:${lib.makeBinPath ([ From d38bc8b64c1a89547f551631236dfb8ce188c0c8 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Mon, 3 Jun 2024 17:03:11 -0400 Subject: [PATCH 145/219] syslinux: Use Nixpkgs' gnu-efi This resolves awkwardness with the gnu-efi submodule. Though this builds only the arch-appropriate EFI program, but since it was not used within Nixpkgs, it shouldn't be an issue. --- pkgs/os-specific/linux/syslinux/default.nix | 40 +++++++++++++++------ 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 5c1216c8bfd1..162db8a040a6 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,7 +1,9 @@ { lib , stdenv -, fetchgit +, fetchFromRepoOrCz +, gnu-efi , fetchurl +, fetchpatch , libuuid , makeWrapper , mtools @@ -16,11 +18,10 @@ stdenv.mkDerivation { # This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run. # Same issue here https://www.syslinux.org/archives/2019-February/026330.html - src = fetchgit { - url = "https://repo.or.cz/syslinux"; - rev = "b40487005223a78c3bb4c300ef6c436b3f6ec1f7"; - sha256 = "sha256-GqvRTr9mA2yRD0G0CF11x1X0jCgqV4Mh+tvE0/0yjqk="; - fetchSubmodules = true; + src = fetchFromRepoOrCz { + repo = "syslinux"; + rev = "759fe3d75276aac5c7f9dd7dcbfb56323a85fff1"; + hash = "sha256-NNA8Q7+rQ/TdcB6rgtjWjtoXxLJtI4HjV+2UVKqTSR0="; }; patches = let @@ -65,6 +66,12 @@ stdenv.mkDerivation { "0018-prevent-pow-optimization.patch" "26f0e7b2" "sha256-dVzXBi/oSV9vYgU85mRFHBKuZdup+1x1BipJX74ED7E=") + (fetchpatch { + # Fixes build with "modern" gnu-efi + # https://github.com/samueldr/syslinux/commit/68defee52f4eba82eefaeea17f21c7498448dd6b + url = "https://github.com/samueldr/syslinux/commit/68defee52f4eba82eefaeea17f21c7498448dd6b.patch"; + hash = "sha256-5xIqM8Gq8D86HL1i7fBTHRB/ZR2XtCz5VsT4bI5vneo="; + }) ]; postPatch = '' @@ -74,10 +81,6 @@ stdenv.mkDerivation { # fix tests substituteInPlace tests/unittest/include/unittest/unittest.h \ --replace-fail /usr/include/ "" - - # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. - mkdir gnu-efi/inc/ia32/gnu - touch gnu-efi/inc/ia32/gnu/stubs-32.h ''; nativeBuildInputs = [ @@ -89,6 +92,7 @@ stdenv.mkDerivation { buildInputs = [ libuuid + gnu-efi ]; # Fails very rarely with 'No rule to make target: ...' @@ -111,8 +115,22 @@ stdenv.mkDerivation { "MANDIR=$(out)/share/man" "PERL=perl" "HEXDATE=0x00000000" + # Works around confusing (unrelated) error messages when upx is not made available + "UPX=false" + + # Configurations needed to make use of external gnu-efi + "LIBEFI=${gnu-efi}/lib/libefi.a" + "LIBDIR=${gnu-efi}/lib/" + "EFIINC=${gnu-efi}/include/efi" + + # Legacy bios boot target is always built + "bios" ] - ++ lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ]; + # Build "ia32" EFI for i686 + ++ lib.optional stdenv.hostPlatform.isi686 "efi32" + # Build "x86_64" EFI for x86_64 + ++ lib.optional stdenv.hostPlatform.isx86_64 "efi64" + ; # Some tests require qemu, some others fail in a sandboxed environment doCheck = false; From 3422283eec39ac953d1318319537ff00a8573a5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 02:28:47 +0000 Subject: [PATCH 146/219] dysk: 2.8.2 -> 2.9.0 --- pkgs/tools/filesystems/dysk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/dysk/default.nix b/pkgs/tools/filesystems/dysk/default.nix index 2dc4698f8172..de64684efa02 100644 --- a/pkgs/tools/filesystems/dysk/default.nix +++ b/pkgs/tools/filesystems/dysk/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "dysk"; - version = "2.8.2"; + version = "2.9.0"; src = fetchFromGitHub { owner = "Canop"; repo = "dysk"; rev = "v${version}"; - hash = "sha256-h/vdc7ltlXJQi1f013+fNyYB6fc0hTUcx4LN6UySIGM="; + hash = "sha256-EXP9uI98NXP1VRlhEaMTkJsAYVT9DpMFwquAVMoyjxU="; }; - cargoHash = "sha256-LC7A+fu4SqfsxT3K9gYJPx8G9h+7kXq0Nq70iSlfygE="; + cargoHash = "sha256-N51M9uEMfcoNyR8r76bd0PW2jSQTpU/0V+cEl82gFqk="; nativeBuildInputs = [ installShellFiles From bb226076fe87fea8406c5e329af8fa20c0f27c4e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 02:37:39 +0000 Subject: [PATCH 147/219] dex-oidc: 2.39.1 -> 2.40.0 --- pkgs/servers/dex/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/dex/default.nix b/pkgs/servers/dex/default.nix index f62721b2ad07..374c2f24620f 100644 --- a/pkgs/servers/dex/default.nix +++ b/pkgs/servers/dex/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dex"; - version = "2.39.1"; + version = "2.40.0"; src = fetchFromGitHub { owner = "dexidp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+P3KYowZmtgZP3i0D+GFaAqgWDqJ8sxI4LyDUOM+J38="; + sha256 = "sha256-FaM8rBmfFmawtJRK0UmQNrRHebeFUg9ujXX8ubt4flw="; }; - vendorHash = "sha256-NQXsptpRNgRuEeh2ft/dbqcZqO/d1KZ19wc/7To0xCM="; + vendorHash = "sha256-4YfuJPFYmIFKK1RqrdRy+LA8dXQbcB/qrBzzkQ60pXI="; subPackages = [ "cmd/dex" From 636ef594165d182e2d0574672a6093c36d510786 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 02:42:30 +0000 Subject: [PATCH 148/219] gobgpd: 3.26.0 -> 3.27.0 --- pkgs/servers/misc/gobgpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/misc/gobgpd/default.nix b/pkgs/servers/misc/gobgpd/default.nix index 14021f5a39c6..abc04b539558 100644 --- a/pkgs/servers/misc/gobgpd/default.nix +++ b/pkgs/servers/misc/gobgpd/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "gobgpd"; - version = "3.26.0"; + version = "3.27.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "refs/tags/v${version}"; - hash = "sha256-bFxKFAw02M8RmMCFFT3nu3urmvh7Wzi0rryuTi8Hw9k="; + hash = "sha256-RxBAnElmQkrkMuIC0UpneJXN1OiPhaTPm/tYvc8QSg8="; }; vendorHash = "sha256-wrgRQwisOHAhvRbvGXMW5VWkQuEifCwCo3usuxLie4A="; From a24aa8e7b47a56f2ab30b4daf4fe437e131bacea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 02:42:50 +0000 Subject: [PATCH 149/219] gobgp: 3.26.0 -> 3.27.0 --- pkgs/tools/networking/gobgp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index bd9049ee8cdc..2163bc1f51da 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gobgp"; - version = "3.26.0"; + version = "3.27.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-bFxKFAw02M8RmMCFFT3nu3urmvh7Wzi0rryuTi8Hw9k="; + sha256 = "sha256-RxBAnElmQkrkMuIC0UpneJXN1OiPhaTPm/tYvc8QSg8="; }; vendorHash = "sha256-wrgRQwisOHAhvRbvGXMW5VWkQuEifCwCo3usuxLie4A="; From 82e3df91b6bceab99728e9626817a0b0c36937be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 02:43:34 +0000 Subject: [PATCH 150/219] railway: 3.7.0 -> 3.8.1 --- pkgs/development/tools/railway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 32be89b90d18..197e53666714 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "railway"; - version = "3.7.0"; + version = "3.8.1"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - hash = "sha256-a3d1FtcXSLL8peveBagTEF6EcNADNDhnLAmyCfTW4+4="; + hash = "sha256-511FTnaVdj+MB9avyKvHe5oedkPK7iIYy5kS0eI0jeg="; }; - cargoHash = "sha256-fwraQd7dOamhc3Tp3yLxASWCVhDOxj4vX7oTTOufkeY="; + cargoHash = "sha256-uBBbTb5dsJNe2Kpw2SN/a2nJGrU+g2kkX7t3O+IRbs0="; nativeBuildInputs = [ pkg-config ]; From 710958e6b3a76d37bd6a39fc118b920996333aec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 02:56:00 +0000 Subject: [PATCH 151/219] quarto: 1.4.554 -> 1.4.555 --- pkgs/development/libraries/quarto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/quarto/default.nix b/pkgs/development/libraries/quarto/default.nix index 78dc32fbbf55..816139a1693d 100644 --- a/pkgs/development/libraries/quarto/default.nix +++ b/pkgs/development/libraries/quarto/default.nix @@ -19,10 +19,10 @@ stdenv.mkDerivation (final: { pname = "quarto"; - version = "1.4.554"; + version = "1.4.555"; src = fetchurl { url = "https://github.com/quarto-dev/quarto-cli/releases/download/v${final.version}/quarto-${final.version}-linux-amd64.tar.gz"; - sha256 = "sha256-/RID+nqjMAEg2jzTBYc/8hz/t+k4TJlks7oCJ5YrjIY="; + sha256 = "sha256-uBKKgRsM7kUDeF0kMYbo6RjmiU6wq4EEcE94qqMSzt8="; }; nativeBuildInputs = [ From 44899e65678204ef2e1b40f26319437cbdc9d110 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 02:58:10 +0000 Subject: [PATCH 152/219] typos: 1.21.0 -> 1.22.0 --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 37a096c0d758..09a8b1f15f81 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.21.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-PvMa2hQYDu42ZzwBZrMQZy48RxUzHMvlLYEzPN3sh1w="; + hash = "sha256-d77K9WVBpcnXj0l61TkJFzbIE+swmVN+5c2nTDu7Xdo="; }; - cargoHash = "sha256-P7pzyfv+0ckzVjC95a+YW6Ni3sLnqgjoZ4JlnfKO17M="; + cargoHash = "sha256-pZGdt1hxhl7glPUP3XNk9c3fmfzD9sS4rKG6K8+jc5k="; meta = with lib; { description = "Source code spell checker"; From b5461e20c1878a7592ef4112dbe00e1e4dc977ae Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 4 Jun 2024 03:25:24 +0000 Subject: [PATCH 153/219] labplot: patch permissive cast --- pkgs/applications/science/math/labplot/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/science/math/labplot/default.nix b/pkgs/applications/science/math/labplot/default.nix index 8bb667e1a8fa..0aeb232dd031 100644 --- a/pkgs/applications/science/math/labplot/default.nix +++ b/pkgs/applications/science/math/labplot/default.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch , fetchurl , cmake , extra-cmake-modules @@ -54,6 +55,14 @@ stdenv.mkDerivation rec { "-DENABLE_VECTOR_BLF=OFF" ]; + patches = [ + (fetchpatch { + name = "matio-fix-compilation-for-latest-version-1.5.27.patch"; + url = "https://github.com/KDE/labplot/commit/d6142308ffa492d9f7cea00fad3b4cd1babfd00c.patch"; + hash = "sha256-qD5jj6GxBKbQezKJb1Z8HnwFO84WJBGQDawS/6o/wHE="; + }) + ]; + nativeBuildInputs = [ cmake extra-cmake-modules From 137aea5823578515dc54587f528850f121988d30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 03:25:48 +0000 Subject: [PATCH 154/219] pkcrack: 1.2.2 -> 1.2.3 --- pkgs/by-name/pk/pkcrack/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pk/pkcrack/package.nix b/pkgs/by-name/pk/pkcrack/package.nix index 2f3f16e07411..5cbe977c38ec 100644 --- a/pkgs/by-name/pk/pkcrack/package.nix +++ b/pkgs/by-name/pk/pkcrack/package.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "pkcrack"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/pkcrack-${finalAttrs.version}.tar.gz"; - hash = "sha256-TS3Bk/+kNCrC7TpjEf33cK5qB3Eiaz70U9yo0D5DiVo="; + hash = "sha256-j0n6OHlio3oUyavVSQFnIaY0JREFv0uDfMcvC61BPTg="; }; sourceRoot = "pkcrack-${finalAttrs.version}/src"; From 08852d1511183c29fdef454f84777a79dbca96d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 03:38:17 +0000 Subject: [PATCH 155/219] openfortivpn: 1.22.0 -> 1.22.1 --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index 6ab3809c4796..91ec26c96a61 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "openfortivpn"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "adrienverge"; repo = pname; rev = "v${version}"; - hash = "sha256-K4sTvt0rIDh8A7uhUQmw3zvS2ksclOLBO76wHevRONU="; + hash = "sha256-FhS4q8p1Q2Lu7xj2ZkUbJcMWvRSn+lqFdYqBNYB3V1E="; }; # we cannot write the config file to /etc and as we don't need the file, so drop it From 8be1155eee2476dc5ce70276a3204df46d2f4e62 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Mon, 3 Jun 2024 23:49:40 -0400 Subject: [PATCH 156/219] slimserver: 8.5.1 -> 8.5.2 --- pkgs/by-name/sl/slimserver/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/sl/slimserver/package.nix b/pkgs/by-name/sl/slimserver/package.nix index 4e5b2e45fd31..7f13fd15b368 100644 --- a/pkgs/by-name/sl/slimserver/package.nix +++ b/pkgs/by-name/sl/slimserver/package.nix @@ -33,13 +33,13 @@ let in perlPackages.buildPerlPackage rec { pname = "slimserver"; - version = "8.5.1"; + version = "8.5.2"; src = fetchFromGitHub { owner = "LMS-Community"; repo = "slimserver"; rev = version; - hash = "sha256-ULyYZC0/ruJCdwR6cxvBRV1S3DTBJiNua64foi80qvI="; + hash = "sha256-262SHaxt5ow3nJtNVk10sbiPUfDb/U+Ab97DRjkJZFI="; }; nativeBuildInputs = [ makeWrapper ]; From 3933d4a0da6036bdb9b92669aa779fe4da1adb42 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Tue, 4 Jun 2024 00:05:13 -0400 Subject: [PATCH 157/219] OVMF: fix eval/build on i686 --- pkgs/applications/virtualization/OVMF/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 79df60253ff5..60eaa6428d62 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -44,6 +44,10 @@ let platformSpecific = { + i686.msVarsArgs = { + flavor = "OVMF"; + archDir = "Ia32"; + }; x86_64.msVarsArgs = { flavor = "OVMF_4M"; archDir = "X64"; From 8f39a66890365dcc6913dbf15f3c0b4000b6c884 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 04:14:48 +0000 Subject: [PATCH 158/219] rambox: 2.3.2 -> 2.3.3 --- .../networking/instant-messengers/rambox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index f66da460afdb..3ecda10bb973 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -2,11 +2,11 @@ let pname = "rambox"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; - hash = "sha256-9AGzhj4UL2rEe67qvkX5VYhQEMETGYSDWv5XOgABSEE="; + hash = "sha256-Z6ux/liDpE0Fb4h0eAZC7F/Tt3eKlXQPBQVCd7Je9TI="; }; desktopItem = (makeDesktopItem { From b7c5c2954bec282a358a587e26228686d61ddb26 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Tue, 4 Jun 2024 08:30:35 +0400 Subject: [PATCH 159/219] atlauncher: update meta attributes - Remove nested `with` in meta. See: https://nix.dev/guides/best-practices#with-scopes - Add changelog --- pkgs/by-name/at/atlauncher/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 428ffffd8836..a2a97daa549b 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -77,14 +77,15 @@ stdenv.mkDerivation (finalAttrs: { }) ]; - meta = with lib; { + meta = { + changelog = "https://github.com/ATLauncher/ATLauncher/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "A simple and easy to use Minecraft launcher which contains many different modpacks for you to choose from and play"; downloadPage = "https://atlauncher.com/downloads"; homepage = "https://atlauncher.com"; - license = licenses.gpl3; + license = lib.licenses.gpl3; mainProgram = "atlauncher"; - maintainers = [ maintainers.getpsyched ]; - platforms = platforms.all; - sourceProvenance = [ sourceTypes.binaryBytecode ]; + maintainers = with lib.maintainers; [ getpsyched ]; + platforms = lib.platforms.all; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; }; }) From 29494034d0daf24d01983dbc62faeafbcd8c3b04 Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Tue, 4 Jun 2024 09:00:30 +0400 Subject: [PATCH 160/219] atlauncher: 3.4.36.4 -> 3.4.36.5 --- pkgs/by-name/at/atlauncher/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index a2a97daa549b..970a713d1317 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.36.4"; + version = "3.4.36.5"; src = fetchurl { url = "https://github.com/ATLauncher/ATLauncher/releases/download/v${finalAttrs.version}/ATLauncher-${finalAttrs.version}.jar"; - hash = "sha256-7l4D99rTOP+oyaa+O8GPGugr3Nv8EIt6EqK1L9ttFBA="; + hash = "sha256-sytUMRp3qkdE5uzfFhuVqwsBYfRPubEG7/X/JqS2uxY="; }; env.ICON = fetchurl { From c9fdde2a11a9b9294c10f13ec37130d069b23dd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 05:25:43 +0000 Subject: [PATCH 161/219] eid-mw: 5.1.18 -> 5.1.19 --- pkgs/tools/security/eid-mw/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix index 1b445312353a..408d40609403 100644 --- a/pkgs/tools/security/eid-mw/default.nix +++ b/pkgs/tools/security/eid-mw/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "eid-mw"; # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS. - version = "5.1.18"; + version = "5.1.19"; src = fetchFromGitHub { owner = "Fedict"; repo = "eid-mw"; rev = "v${version}"; - hash = "sha256-1cdBFpO9bvLlHJE6c7TCscV/Qgx8BHUtFe9UoKPfUOQ="; + hash = "sha256-SGdM3GJECFZwd4tAQ6YP7H7YB6DngvD4IU9DTXbJEIo="; }; postPatch = '' From c25484219c81b4cd76a9ca336f4a77bfa857f32c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 05:58:46 +0000 Subject: [PATCH 162/219] apt: 2.9.3 -> 2.9.4 --- pkgs/by-name/ap/apt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index 1a227d7a17d5..28b10c954745 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "apt"; - version = "2.9.3"; + version = "2.9.4"; src = fetchurl { url = "mirror://debian/pool/main/a/apt/apt_${finalAttrs.version}.tar.xz"; - hash = "sha256-7R0BlcpujXjbulOJ7Eb8/gQiut77vce1GkbJCfa6LXE="; + hash = "sha256-Ra6jeJM7nkaPZWBR7Sv8+TurArs1D5TodUcn6xe0B6Q="; }; # cycle detection; lib can't be split From e2655a62573b0958133858205932d78f58ccfdec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 06:06:38 +0000 Subject: [PATCH 163/219] cri-o-unwrapped: 1.30.1 -> 1.30.2 --- pkgs/applications/virtualization/cri-o/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 8b13c01852ba..00f17d75d6e5 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.30.1"; + version = "1.30.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - hash = "sha256-3TO7pPDIYxlWXWNIAqCMWPCFPRxG6k6ilL2wDiAXFVY="; + hash = "sha256-4v7Pt3WS68h+Un4QNATyQ/o/+8b8nVoNsy6VgwB9Brc="; }; vendorHash = null; From b1852656d71e361571788abeb87693f23b1b9302 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Jun 2024 08:25:58 +0200 Subject: [PATCH 164/219] exploitdb: 2024-06-02 -> 2024-06-04 Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/refs/tags/2024-06-02...2024-06-04 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 872d99175b07..df6b1cff90f1 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2024-06-02"; + version = "2024-06-04"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; rev = "refs/tags/${version}"; - hash = "sha256-TCKZwnufLLBwDh0ei/6h3EhAkP3ugcO5jgvH7aFAt5s="; + hash = "sha256-8Vj5rj+4DGCHXHgJBOlUffRaS8ejS6EurU3OcaYOezg="; }; nativeBuildInputs = [ makeWrapper ]; From 68f8803128e06f79beb7c36cb2912655e1ec0bcf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Jun 2024 08:26:59 +0200 Subject: [PATCH 165/219] python312Packages.google-generativeai: 0.5.4 -> 0.6.0 Diff: https://github.com/google/generative-ai-python/compare/refs/tags/v0.5.4...v0.6.0 Changelog: https://github.com/google/generative-ai-python/releases/tag/v0.6.0 --- .../python-modules/google-generativeai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index a595dae0dc24..2d8673ad3fdf 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.5.4"; + version = "0.6.0"; pyproject = true; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-g/strcvXNT21pD4Lt9sgFBgEgiFid+D/cUlTm6k3R6s="; + hash = "sha256-LPT7pyI1crgLCMHZmjGLFvDwuLwdPNGojgvli6qUOy8="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; From ed442f4ec5765f18de8e0ec879f941386c2cbfdf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Jun 2024 08:35:38 +0200 Subject: [PATCH 166/219] python312Packages.holidays: 0.49 -> 0.50 Diff: https://github.com/vacanza/python-holidays/compare/refs/tags/v0.49...v0.50 Changelog: https://github.com/vacanza/python-holidays/releases/tag/v0.50 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 54f00eef6b97..4fa22965e5cb 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.49"; + version = "0.50"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-pO2365FS8Axo+dBSHmlnHtnXIExzSI86BVGD0DCN2KU="; + hash = "sha256-C5DZzLfxTzo+s2HWvqWbtEUT0/CLKPQXyEUN4vgRmBA="; }; build-system = [ From 5abc0e9d5ec050ea446141388a3640046ab4cbfd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Jun 2024 08:56:27 +0200 Subject: [PATCH 167/219] python312Packages.pyoverkiz: 1.13.10 -> 1.13.11 Diff: https://github.com/iMicknl/python-overkiz-api/compare/refs/tags/v1.13.10...v1.13.11 Changelog: https://github.com/iMicknl/python-overkiz-api/releases/tag/v1.13.11 --- pkgs/development/python-modules/pyoverkiz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyoverkiz/default.nix b/pkgs/development/python-modules/pyoverkiz/default.nix index aa2048ea50c4..e006bbcefd51 100644 --- a/pkgs/development/python-modules/pyoverkiz/default.nix +++ b/pkgs/development/python-modules/pyoverkiz/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "pyoverkiz"; - version = "1.13.10"; + version = "1.13.11"; pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "iMicknl"; repo = "python-overkiz-api"; rev = "refs/tags/v${version}"; - hash = "sha256-05S0tCfCXgvkheUBVDGX8my0c7SCi/ran2emjaGWd9s="; + hash = "sha256-N1PcyaVvPBX9ahHedR7pow6jAKwVOMmKqddWhYLtT8w="; }; postPatch = '' From b2f458b65901643ed512a70e9c1aa3971aaad10b Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sat, 25 May 2024 16:22:21 +0200 Subject: [PATCH 168/219] open62541: 1.3.10 -> 1.4.1 --- pkgs/by-name/op/open62541/package.nix | 76 +++++++++++++++------------ 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/pkgs/by-name/op/open62541/package.nix b/pkgs/by-name/op/open62541/package.nix index 0ddc010deb65..49099e7b0e73 100644 --- a/pkgs/by-name/op/open62541/package.nix +++ b/pkgs/by-name/op/open62541/package.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config , check @@ -19,8 +18,6 @@ , openssl , mbedtls -, withPubSub ? false - # for passthru.tests only , open62541 }: @@ -33,44 +30,35 @@ in stdenv.mkDerivation (finalAttrs: { pname = "open62541"; - version = "1.3.10"; + version = "1.4.1"; src = fetchFromGitHub { owner = "open62541"; repo = "open62541"; rev = "v${finalAttrs.version}"; - hash = "sha256-FekO0cKgpYulMXz4r0/TUPz2tawC4k3Sq07Og4xqh4I="; + hash = "sha256-An8Yg6VSelNV/7poLEOjeiIb0+eMoQWG7sYqhytEKMA="; fetchSubmodules = true; }; - patches = [ - (fetchpatch { - name = "Ensure-absolute-paths-in-pkg-config-file.patch"; - url = "https://github.com/open62541/open62541/commit/023d4b6b8bdec987f8f3ffee6c09801bbee4fa2d.patch"; - sha256 = "sha256-mq4h32js2RjI0Ljown/01SXA3gc+7+zX8meIcvDPvoA="; - }) - ]; - cmakeFlags = [ - "-DOPEN62541_VERSION=v${finalAttrs.version}" + (lib.cmakeFeature "OPEN62541_VERSION" finalAttrs.src.rev) + (lib.cmakeFeature "UA_NAMESPACE_ZERO" "FULL") + (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic)) - "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" - "-DUA_NAMESPACE_ZERO=FULL" + # Note comment near doCheck + (lib.cmakeBool "UA_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "UA_ENABLE_ALLOW_REUSEADDR" finalAttrs.finalPackage.doCheck) - "-DUA_BUILD_UNIT_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}" - ] - ++ lib.optional withExamples "-DUA_BUILD_EXAMPLES=ON" - ++ lib.optional (withEncryption != false) - "-DUA_ENABLE_ENCRYPTION=${lib.toUpper withEncryption}" - ++ lib.optional withPubSub "-DUA_ENABLE_PUBSUB=ON" - ; + (lib.cmakeBool "UA_BUILD_EXAMPLES" withExamples) + ] ++ lib.optionals (withEncryption != false) [ + (lib.cmakeFeature "UA_ENABLE_ENCRYPTION" (lib.toUpper withEncryption)) + ]; nativeBuildInputs = [ cmake pkg-config python3Packages.python - ] - ++ lib.optionals withDoc (with python3Packages; [ + ] ++ lib.optionals withDoc (with python3Packages; [ sphinx sphinx_rtd_theme graphviz-nox @@ -80,7 +68,11 @@ stdenv.mkDerivation (finalAttrs: { buildFlags = [ "all" ] ++ lib.optional withDoc "doc"; - doCheck = true; + # Tests must normally be disabled because they require + # -DUA_ENABLE_ALLOW_REUSEADDR=ON. The option must not be used in production, + # since it is a security risk. + # See https://github.com/open62541/open62541/issues/6407 + doCheck = false; checkInputs = [ check @@ -92,14 +84,30 @@ stdenv.mkDerivation (finalAttrs: { enableParallelChecking = false; preCheck = let - disabledTests = lib.optionals withPubSub [ - # "Cannot set socket option IP_ADD_MEMBERSHIP" - "pubsub_publish" + disabledTests = [ + # error "Could not create a raw Ethernet socket (are you root?)" + "check_eventloop_eth" + + # Cannot set socket option IP_ADD_MEMBERSHIP + "check_pubsub_publish" + "check_pubsub_publish_json" + "check_pubsub_connection_udp" "check_pubsub_get_state" - "check_pubsub_publish_rt_levels" + "check_pubsub_publisherid" + "check_pubsub_subscribe" + "check_pubsub_publishspeed" "check_pubsub_subscribe_config_freeze" "check_pubsub_subscribe_rt_levels" "check_pubsub_multiple_subscribe_rt_levels" + "check_pubsub_config_freeze" + "check_pubsub_publish_rt_levels" + + # Could not find the interface + "check_pubsub_connection_ethernet" + "check_pubsub_connection_ethernet_etf" + "check_pubsub_publish_ethernet_etf" + "check_pubsub_informationmodel" + "check_pubsub_informationmodel_methods" ]; regex = "^(${builtins.concatStringsSep "|" disabledTests})\$"; in lib.optionalString (disabledTests != []) '' @@ -131,14 +139,16 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; passthru.tests = let - open62541Full = encBackend: open62541.override { + open62541Full = encBackend: (open62541.overrideAttrs (_: { + doCheck = true; + })).override { withDoc = true; - # if (withExamples && withPubSub), one of the example currently fails to build + # if withExamples, one of the example currently fails to build #withExamples = true; withEncryption = encBackend; - withPubSub = true; }; in { + open62541WithTests = finalAttrs.finalPackage.overrideAttrs (_: { doCheck = true; }); open62541Full = open62541Full false; open62541Full-openssl = open62541Full "openssl"; open62541Full-mbedtls = open62541Full "mbedtls"; From 848f835da11038cf7fa140f94e934115da2998e1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Jun 2024 09:17:38 +0200 Subject: [PATCH 169/219] python312Packages.python-motionmount: 1.0.1 -> 2.0.0 Diff: https://github.com/vogelsproducts/python-MotionMount/compare/refs/tags/1.0.1...2.0.0 --- .../development/python-modules/python-motionmount/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-motionmount/default.nix b/pkgs/development/python-modules/python-motionmount/default.nix index 8e1ba0bb644e..de451018a874 100644 --- a/pkgs/development/python-modules/python-motionmount/default.nix +++ b/pkgs/development/python-modules/python-motionmount/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-motionmount"; - version = "1.0.1"; + version = "2.0.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vogelsproducts"; repo = "python-MotionMount"; rev = "refs/tags/${version}"; - hash = "sha256-F/nFo/PivnIogVwEh6MsQZQWg95kQMr6pZuf0SZa3n4="; + hash = "sha256-jmHFsJwnmdSUKz2W9pWtc9KpUAs6QWnO2V5KROwmTGs="; }; build-system = [ setuptools ]; From b6939101f2bb873856776a31d98bddedc29bb522 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Jun 2024 09:21:57 +0200 Subject: [PATCH 170/219] qovery-cli: 0.93.3 -> 0.93.6 Diff: https://github.com/Qovery/qovery-cli/compare/refs/tags/v0.93.3...v0.93.6 Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.93.6 --- pkgs/tools/admin/qovery-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix index 3496e1fb8e68..eebb57eaa863 100644 --- a/pkgs/tools/admin/qovery-cli/default.nix +++ b/pkgs/tools/admin/qovery-cli/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "qovery-cli"; - version = "0.93.3"; + version = "0.93.6"; src = fetchFromGitHub { owner = "Qovery"; repo = "qovery-cli"; rev = "refs/tags/v${version}"; - hash = "sha256-TUgtozPI9nxlQoEnzuuWsUtPPeR72tEX197WHrk7et0="; + hash = "sha256-5HGLzdygcM7GldtU24Arbr/AaGJYlyqEVIpc+arfFsw="; }; vendorHash = "sha256-wGgzVtQc4e0thiM9fJb7BxJl348wCDZvPCx0+Qlw0mQ="; From 4fa521e8c119f182b705961693edd9830d757be6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Jun 2024 09:24:32 +0200 Subject: [PATCH 171/219] python312Packages.tencentcloud-sdk-python: 3.0.1160 -> 3.0.1161 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1160...3.0.1161 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1161/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index a6d07cc90945..ca355069e907 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1160"; + version = "3.0.1161"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; rev = "refs/tags/${version}"; - hash = "sha256-G0qft2hz9LfN0QKarANtJavxKVTx3rMNG6i8rJmlGnU="; + hash = "sha256-dev6qDLT6rMG6hiWdx+HQDXkvd2wLzlZaZp3dbh3A5c="; }; build-system = [ setuptools ]; From 4904375bac2e0ca58db2d2499936c55b2afdc279 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Jun 2024 09:24:50 +0200 Subject: [PATCH 172/219] python312Packages.boto3-stubs: 1.34.117 -> 1.34.118 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 73766679d9b3..74d997a92739 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.117"; + version = "1.34.118"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-2awDTdlD1UXR8GeteXbNvHKcaJ0WyWG4vCbsWVg4vqw="; + hash = "sha256-4og35CsVe1kBgYtLSf5ovs4msXlXqasQyv7MI3PoyLo="; }; build-system = [ setuptools ]; From 8e0c43ecfd2592e0143d23e0e1aa6d3e20a6675b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 16 Apr 2023 18:48:57 +0300 Subject: [PATCH 173/219] sdr-j-fm: init at 3.16-unstable-2023-12-07 --- pkgs/applications/radio/sdr-j-fm/default.nix | 77 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 79 insertions(+) create mode 100644 pkgs/applications/radio/sdr-j-fm/default.nix diff --git a/pkgs/applications/radio/sdr-j-fm/default.nix b/pkgs/applications/radio/sdr-j-fm/default.nix new file mode 100644 index 000000000000..6c1dd5f4a0a1 --- /dev/null +++ b/pkgs/applications/radio/sdr-j-fm/default.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + wrapQtAppsHook, + pkg-config, + qtbase, + qwt, + fftwFloat, + libsamplerate, + portaudio, + libusb1, + libsndfile, + featuresOverride ? { }, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "sdr-j-fm"; + # The stable release doen't include the commit the came after 3.16 which + # added support for cmake options instead of using cmake set() commands. See + # also: https://github.com/JvanKatwijk/sdr-j-fm/pull/25 + version = "3.16-unstable-2023-12-07"; + + src = fetchFromGitHub { + owner = "JvanKatwijk"; + repo = "sdr-j-fm"; + rev = "8e3a67f8fbf72dd6968cbeb2e3d7d513fd107c71"; + hash = "sha256-l9WqfhDp2V01lhleYZqRpmyL1Ww+tJj10bjkMMlvyA0="; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + pkg-config + ]; + + buildInputs = [ + qtbase + qwt + fftwFloat + libsamplerate + portaudio + libusb1 + libsndfile + ]; + cmakeFlags = lib.mapAttrsToList lib.cmakeBool finalAttrs.passthru.features; + + passthru = { + features = { + # All of these features don't require an external depencies, althought it + # may be implied - upstraem bundles everything they need in their repo. + AIRSPY = true; + SDRPLAY = true; + SDRPLAY_V3 = true; + HACKRF = true; + PLUTO = true; + # Some more cmake flags are mentioned in upstream's CMakeLists.txt file + # but they don't actually make a difference. + } // featuresOverride; + }; + + postInstall = '' + # Weird default of upstream + mv $out/linux-bin $out/bin + ''; + + meta = with lib; { + description = "SDR based FM radio receiver software"; + homepage = "https://github.com/JvanKatwijk/sdr-j-fm"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ doronbehar ]; + # Upstream doesn't find libusb1 on Darwin. Upstream probably doesn't + # support it officially. + platforms = platforms.linux; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d89c5a2f8840..37883bb61f71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24258,6 +24258,8 @@ with pkgs; sdrplay = callPackage ../applications/radio/sdrplay { }; + sdr-j-fm = libsForQt5.callPackage ../applications/radio/sdr-j-fm { }; + sdrpp = callPackage ../applications/radio/sdrpp { inherit (darwin.apple_sdk.frameworks) AppKit; }; From ca06a4ab76ebbcc476b79a034a9d60e9f1dd5a3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 08:28:24 +0000 Subject: [PATCH 174/219] kustomize: 5.4.1 -> 5.4.2 --- pkgs/development/tools/kustomize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 849c8054b002..8d364f2d58c5 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "5.4.1"; + version = "5.4.2"; ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ @@ -15,13 +15,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - hash = "sha256-zt+/CKIIaZxfjfMu9L4/bDc5MmaqeEp3MI/m++GQoEc="; + hash = "sha256-cNmDhKRi4pk26vADFMXN6SocdPF1EIYf4wT4fQYgPVc="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-YxkZ2YlkvMihTYi34lfwpUrmGa4LrrWsP2cpJZY/41A="; + vendorHash = "sha256-Nbc3zdVD8KIL80TqdcVNFMowfFsKKIPsEpkwq5fvWAI="; nativeBuildInputs = [ installShellFiles ]; From f865656fca5b4848457b089771c865dd4670159a Mon Sep 17 00:00:00 2001 From: K900 Date: Tue, 4 Jun 2024 12:18:21 +0300 Subject: [PATCH 175/219] Revert "syslinux: Use Nixpkgs' gnu-efi" --- pkgs/os-specific/linux/syslinux/default.nix | 48 +++++++-------------- 1 file changed, 15 insertions(+), 33 deletions(-) diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix index 162db8a040a6..f5153eb5abc9 100644 --- a/pkgs/os-specific/linux/syslinux/default.nix +++ b/pkgs/os-specific/linux/syslinux/default.nix @@ -1,9 +1,7 @@ { lib , stdenv -, fetchFromRepoOrCz -, gnu-efi +, fetchgit , fetchurl -, fetchpatch , libuuid , makeWrapper , mtools @@ -18,10 +16,11 @@ stdenv.mkDerivation { # This is syslinux-6.04-pre3^1; syslinux-6.04-pre3 fails to run. # Same issue here https://www.syslinux.org/archives/2019-February/026330.html - src = fetchFromRepoOrCz { - repo = "syslinux"; - rev = "759fe3d75276aac5c7f9dd7dcbfb56323a85fff1"; - hash = "sha256-NNA8Q7+rQ/TdcB6rgtjWjtoXxLJtI4HjV+2UVKqTSR0="; + src = fetchgit { + url = "https://repo.or.cz/syslinux"; + rev = "b40487005223a78c3bb4c300ef6c436b3f6ec1f7"; + sha256 = "sha256-GqvRTr9mA2yRD0G0CF11x1X0jCgqV4Mh+tvE0/0yjqk="; + fetchSubmodules = true; }; patches = let @@ -66,21 +65,19 @@ stdenv.mkDerivation { "0018-prevent-pow-optimization.patch" "26f0e7b2" "sha256-dVzXBi/oSV9vYgU85mRFHBKuZdup+1x1BipJX74ED7E=") - (fetchpatch { - # Fixes build with "modern" gnu-efi - # https://github.com/samueldr/syslinux/commit/68defee52f4eba82eefaeea17f21c7498448dd6b - url = "https://github.com/samueldr/syslinux/commit/68defee52f4eba82eefaeea17f21c7498448dd6b.patch"; - hash = "sha256-5xIqM8Gq8D86HL1i7fBTHRB/ZR2XtCz5VsT4bI5vneo="; - }) ]; postPatch = '' - substituteInPlace Makefile --replace-fail /bin/pwd $(type -P pwd) - substituteInPlace utils/ppmtolss16 --replace-fail /usr/bin/perl $(type -P perl) + substituteInPlace Makefile --replace /bin/pwd $(type -P pwd) + substituteInPlace utils/ppmtolss16 --replace /usr/bin/perl $(type -P perl) # fix tests substituteInPlace tests/unittest/include/unittest/unittest.h \ - --replace-fail /usr/include/ "" + --replace /usr/include/ "" + + # Hack to get `gcc -m32' to work without having 32-bit Glibc headers. + mkdir gnu-efi/inc/ia32/gnu + touch gnu-efi/inc/ia32/gnu/stubs-32.h ''; nativeBuildInputs = [ @@ -92,7 +89,6 @@ stdenv.mkDerivation { buildInputs = [ libuuid - gnu-efi ]; # Fails very rarely with 'No rule to make target: ...' @@ -115,22 +111,8 @@ stdenv.mkDerivation { "MANDIR=$(out)/share/man" "PERL=perl" "HEXDATE=0x00000000" - # Works around confusing (unrelated) error messages when upx is not made available - "UPX=false" - - # Configurations needed to make use of external gnu-efi - "LIBEFI=${gnu-efi}/lib/libefi.a" - "LIBDIR=${gnu-efi}/lib/" - "EFIINC=${gnu-efi}/include/efi" - - # Legacy bios boot target is always built - "bios" ] - # Build "ia32" EFI for i686 - ++ lib.optional stdenv.hostPlatform.isi686 "efi32" - # Build "x86_64" EFI for x86_64 - ++ lib.optional stdenv.hostPlatform.isx86_64 "efi64" - ; + ++ lib.optionals stdenv.hostPlatform.isi686 [ "bios" "efi32" ]; # Some tests require qemu, some others fail in a sandboxed environment doCheck = false; @@ -144,7 +126,7 @@ stdenv.mkDerivation { ''; meta = with lib; { - homepage = "https://www.syslinux.org/"; + homepage = "http://www.syslinux.org/"; description = "A lightweight bootloader"; license = licenses.gpl2Plus; maintainers = [ maintainers.samueldr ]; From 3e1b36a7403a800db3d7072d9acb1c953aa9d520 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 03:44:57 +0000 Subject: [PATCH 176/219] butt: 1.41.1 -> 1.42.0 --- pkgs/by-name/bu/butt/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/bu/butt/package.nix b/pkgs/by-name/bu/butt/package.nix index 08f4b2401fee..9e0938652e01 100644 --- a/pkgs/by-name/bu/butt/package.nix +++ b/pkgs/by-name/bu/butt/package.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "butt"; - version = "1.41.1"; + version = "1.42.0"; src = fetchurl { url = "https://danielnoethen.de/butt/release/${finalAttrs.version}/butt-${finalAttrs.version}.tar.gz"; - hash = "sha256-y/XIcFm1TWVd5SL+kDCJc21CtMwipMQgRE4gPra5+98="; + hash = "sha256-/Y96Pq/3D37n/2JZdvcEQ1BBEtHlJ030QLesfNyBg2g="; }; postPatch = '' From 621010a92674ada5f62b5bca0d689436eddf3c9e Mon Sep 17 00:00:00 2001 From: Alexander Sieg Date: Tue, 4 Jun 2024 12:01:51 +0200 Subject: [PATCH 177/219] git-town: fix completions generation --- pkgs/applications/version-management/git-town/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-town/default.nix b/pkgs/applications/version-management/git-town/default.nix index 634d529cafd2..a678e496cdf1 100644 --- a/pkgs/applications/version-management/git-town/default.nix +++ b/pkgs/applications/version-management/git-town/default.nix @@ -48,9 +48,9 @@ buildGoModule rec { postInstall = '' installShellCompletion --cmd git-town \ - --bash <($out/bin/git-town completion bash) \ - --fish <($out/bin/git-town completion fish) \ - --zsh <($out/bin/git-town completion zsh) + --bash <($out/bin/git-town completions bash) \ + --fish <($out/bin/git-town completions fish) \ + --zsh <($out/bin/git-town completions zsh) wrapProgram $out/bin/git-town --prefix PATH : ${lib.makeBinPath [ git ]} ''; From 8b7d1a382183c2504516c1527001f21cef33a312 Mon Sep 17 00:00:00 2001 From: paparodeo <170618376+paparodeo@users.noreply.github.com> Date: Fri, 24 May 2024 10:38:48 +0000 Subject: [PATCH 178/219] python311Packages.ibis-framework: 9.0.0 -> 9.0.0-unstable-2024-06-03 add duckdb 1.0.0 support https://github.com/ibis-project/ibis/compare/9.0.0..395c8b539bcd541d36892d95f413dcc3f93ca0bc --- .../python-modules/ibis-framework/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix index 596bba56f0ae..53e96f9dfbd4 100644 --- a/pkgs/development/python-modules/ibis-framework/default.nix +++ b/pkgs/development/python-modules/ibis-framework/default.nix @@ -80,7 +80,7 @@ in buildPythonPackage rec { pname = "ibis-framework"; - version = "9.0.0"; + version = "9.0.0-unstable-2024-06-03"; pyproject = true; disabled = pythonOlder "3.9"; @@ -89,8 +89,8 @@ buildPythonPackage rec { name = "ibis-source"; repo = "ibis"; owner = "ibis-project"; - rev = "refs/tags/${version}"; - hash = "sha256-ebTYCBL1zm2Rmwg998x2kYvKhyQDk8Di1pcx5lR37xo="; + rev = "395c8b539bcd541d36892d95f413dcc3f93ca0bc"; + hash = "sha256-PPjp8HOwM4IaBz7TBGDgkVytHmX9fKO+ZBR33BoB55s="; }; nativeBuildInputs = [ @@ -98,7 +98,8 @@ buildPythonPackage rec { poetry-dynamic-versioning ]; - POETRY_DYNAMIC_VERSIONING_BYPASS = version; + dontBypassPoetryDynamicVersioning = true; + env.POETRY_DYNAMIC_VERSIONING_BYPASS = lib.head (lib.strings.splitString "-" version); propagatedBuildInputs = [ atpublic From 8aa2062c3a0ecccb070aa3018665a723fdbc1e6c Mon Sep 17 00:00:00 2001 From: paparodeo <170618376+paparodeo@users.noreply.github.com> Date: Fri, 24 May 2024 10:54:12 +0000 Subject: [PATCH 179/219] duckdb: 0.10.2 -> 1.0.0 https://github.com/duckdb/duckdb/releases/tag/v1.0.0 --- pkgs/development/libraries/duckdb/versions.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/duckdb/versions.json b/pkgs/development/libraries/duckdb/versions.json index de679be88599..8ae8b4bc57d2 100644 --- a/pkgs/development/libraries/duckdb/versions.json +++ b/pkgs/development/libraries/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "0.10.2", - "rev": "1601d94f94a7e0d2eb805a94803eb1e3afbbe4ed", - "hash": "sha256-CTZ90KJvLPQqu1FYciEWsxJbvybCjeBsi/12bkfVd9Q=" + "version": "1.0.0", + "rev": "1f98600c2cf8722a6d2f2d805bb4af5e701319fc", + "hash": "sha256-bzFxWv8+Ac8vZLd2OWJyu4T0/0dc7wykdOORMpx92Ic=" } From d48a9bb622abeb8a6eef6ed167512fa75ed03536 Mon Sep 17 00:00:00 2001 From: Sigmanificient Date: Sat, 25 May 2024 16:04:25 +0200 Subject: [PATCH 180/219] treewide: remove unused fetchpatch arguments --- pkgs/data/misc/v2ray-geoip/default.nix | 1 - pkgs/data/themes/ubuntu-themes/default.nix | 1 - pkgs/desktops/cinnamon/nemo/default.nix | 1 - pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix | 3 --- pkgs/desktops/deepin/core/dde-dock/default.nix | 1 - pkgs/desktops/deepin/library/dtk6systemsettings/default.nix | 1 - pkgs/desktops/deepin/library/dtkwidget/default.nix | 1 - pkgs/desktops/gnome/apps/file-roller/default.nix | 1 - pkgs/desktops/gnome/extensions/gsconnect/default.nix | 1 - .../gnome/extensions/sound-output-device-chooser/default.nix | 1 - pkgs/desktops/lomiri/services/biometryd/default.nix | 1 - pkgs/desktops/lomiri/services/telephony-service/default.nix | 2 -- pkgs/games/airshipper/default.nix | 1 - pkgs/games/colobot/default.nix | 2 +- pkgs/games/crawl/default.nix | 1 - pkgs/games/dxx-rebirth/default.nix | 1 - pkgs/games/empty-epsilon/default.nix | 2 +- pkgs/games/freesweep/default.nix | 2 +- pkgs/games/gogdl/default.nix | 1 - pkgs/games/openclonk/default.nix | 2 +- pkgs/games/qtads/default.nix | 2 +- pkgs/games/redeclipse/default.nix | 2 +- pkgs/games/rocksndiamonds/default.nix | 1 - pkgs/games/space-cadet-pinball/default.nix | 1 - pkgs/games/ultrastardx/default.nix | 1 - pkgs/games/unvanquished/default.nix | 1 - pkgs/games/widelands/default.nix | 1 - pkgs/misc/cliscord/default.nix | 1 - pkgs/os-specific/linux/audit/default.nix | 2 -- pkgs/os-specific/linux/batman-adv/default.nix | 1 - pkgs/os-specific/linux/catfs/default.nix | 1 - pkgs/os-specific/linux/dpdk-kmods/default.nix | 2 +- pkgs/os-specific/linux/esdm/default.nix | 1 - pkgs/os-specific/linux/exfat/default.nix | 2 +- pkgs/os-specific/linux/firejail/default.nix | 1 - pkgs/os-specific/linux/g15daemon/default.nix | 3 --- pkgs/os-specific/linux/irqbalance/default.nix | 2 +- pkgs/os-specific/linux/kernel/perf/default.nix | 1 - pkgs/os-specific/linux/libaio/default.nix | 2 +- pkgs/os-specific/linux/libselinux/default.nix | 2 +- pkgs/os-specific/linux/libsepol/default.nix | 2 +- pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix | 2 +- pkgs/os-specific/linux/pktgen/default.nix | 1 - pkgs/os-specific/linux/rtl8189fs/default.nix | 2 +- pkgs/os-specific/linux/usbip/default.nix | 2 +- pkgs/os-specific/linux/util-linux/default.nix | 2 +- pkgs/os-specific/linux/wpa_supplicant/gui.nix | 2 +- pkgs/os-specific/linux/xone/default.nix | 2 +- pkgs/os-specific/linux/zfs/generic.nix | 2 +- pkgs/servers/asterisk/default.nix | 1 - pkgs/servers/coturn/default.nix | 1 - pkgs/servers/db-rest/default.nix | 1 - pkgs/servers/freeradius/default.nix | 1 - pkgs/servers/frr/default.nix | 1 - pkgs/servers/http/angie/default.nix | 2 -- pkgs/servers/http/envoy/default.nix | 1 - pkgs/servers/http/lighttpd/default.nix | 3 +-- pkgs/servers/http/nginx/modules.nix | 1 - pkgs/servers/ldap/lldap/default.nix | 3 --- pkgs/servers/misc/oven-media-engine/default.nix | 1 - pkgs/servers/monitoring/icinga2/default.nix | 2 +- pkgs/servers/monitoring/net-snmp/default.nix | 4 ++-- pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/domain-exporter.nix | 2 +- pkgs/servers/monitoring/prometheus/xmpp-alerts.nix | 1 - pkgs/servers/sip/freeswitch/default.nix | 1 - pkgs/servers/sql/postgresql/generic.nix | 2 +- pkgs/servers/tt-rss/plugin-auth-ldap/default.nix | 2 +- pkgs/servers/uhub/default.nix | 2 +- pkgs/servers/varnish/default.nix | 2 +- pkgs/servers/web-apps/invoiceplane/default.nix | 2 +- pkgs/servers/web-apps/peering-manager/default.nix | 1 - pkgs/servers/web-apps/sogo/default.nix | 2 +- pkgs/servers/zoneminder/default.nix | 2 +- pkgs/shells/bash/bash-completion/default.nix | 1 - pkgs/tools/audio/wyoming/piper.nix | 1 - pkgs/tools/filesystems/garage/default.nix | 1 - pkgs/tools/graphics/asymptote/default.nix | 3 +-- pkgs/tools/misc/crudini/default.nix | 1 - pkgs/tools/misc/ethtool/default.nix | 1 - pkgs/tools/misc/ets/default.nix | 2 +- pkgs/tools/misc/grub/default.nix | 2 +- pkgs/tools/misc/mstflint/default.nix | 1 - pkgs/tools/misc/screen/default.nix | 1 - pkgs/tools/misc/vector/default.nix | 1 - pkgs/tools/networking/aria2/default.nix | 2 +- pkgs/tools/networking/nzbget/default.nix | 1 - pkgs/tools/security/echidna/default.nix | 2 -- pkgs/tools/security/opensc/default.nix | 1 - pkgs/tools/security/pass/extensions/import.nix | 1 - pkgs/tools/security/semgrep/default.nix | 1 - pkgs/tools/security/tpm2-tools/default.nix | 2 +- pkgs/tools/security/yersinia/default.nix | 2 +- pkgs/tools/text/groff/default.nix | 2 +- pkgs/tools/text/tesh/default.nix | 2 +- pkgs/tools/typesetting/pdf2djvu/default.nix | 1 - pkgs/tools/virtualization/mkosi/default.nix | 1 - 97 files changed, 40 insertions(+), 110 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 94631881fb07..f25004016795 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -1,6 +1,5 @@ { lib , stdenvNoCC -, fetchpatch , fetchFromGitHub , pkgsBuildBuild , jq diff --git a/pkgs/data/themes/ubuntu-themes/default.nix b/pkgs/data/themes/ubuntu-themes/default.nix index fb23141a64eb..ea6a9abcb779 100644 --- a/pkgs/data/themes/ubuntu-themes/default.nix +++ b/pkgs/data/themes/ubuntu-themes/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchurl -, fetchpatch , gnome-icon-theme , gnome , gtk-engine-murrine diff --git a/pkgs/desktops/cinnamon/nemo/default.nix b/pkgs/desktops/cinnamon/nemo/default.nix index 482c9b6b4193..fbc12c13dce0 100644 --- a/pkgs/desktops/cinnamon/nemo/default.nix +++ b/pkgs/desktops/cinnamon/nemo/default.nix @@ -1,5 +1,4 @@ { fetchFromGitHub -, fetchpatch , glib , gobject-introspection , meson diff --git a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix index d9f810c95184..003e46a3817b 100644 --- a/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix +++ b/pkgs/desktops/deepin/apps/deepin-movie-reborn/default.nix @@ -1,11 +1,9 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config , wrapQtAppsHook -, qtbase , qttools , qtx11extras , qtmultimedia @@ -30,7 +28,6 @@ , gst_all_1 , gtest , libpulseaudio -, runtimeShell }: stdenv.mkDerivation rec { diff --git a/pkgs/desktops/deepin/core/dde-dock/default.nix b/pkgs/desktops/deepin/core/dde-dock/default.nix index 275d8e589492..7e05e41315ba 100644 --- a/pkgs/desktops/deepin/core/dde-dock/default.nix +++ b/pkgs/desktops/deepin/core/dde-dock/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, fetchpatch , fetchFromGitHub , cmake , extra-cmake-modules diff --git a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix index d9f400ce979f..f6b185582031 100644 --- a/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix +++ b/pkgs/desktops/deepin/library/dtk6systemsettings/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config , doxygen diff --git a/pkgs/desktops/deepin/library/dtkwidget/default.nix b/pkgs/desktops/deepin/library/dtkwidget/default.nix index 59c1ae7be856..51130710af46 100644 --- a/pkgs/desktops/deepin/library/dtkwidget/default.nix +++ b/pkgs/desktops/deepin/library/dtkwidget/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , cmake , pkg-config , qttools diff --git a/pkgs/desktops/gnome/apps/file-roller/default.nix b/pkgs/desktops/gnome/apps/file-roller/default.nix index 3c6cb7264dc3..d1af3b91db88 100644 --- a/pkgs/desktops/gnome/apps/file-roller/default.nix +++ b/pkgs/desktops/gnome/apps/file-roller/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , desktop-file-utils , gettext , glibcLocales diff --git a/pkgs/desktops/gnome/extensions/gsconnect/default.nix b/pkgs/desktops/gnome/extensions/gsconnect/default.nix index 3401db037eda..ca5c939de263 100644 --- a/pkgs/desktops/gnome/extensions/gsconnect/default.nix +++ b/pkgs/desktops/gnome/extensions/gsconnect/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , substituteAll , openssl , gsound diff --git a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix index 71deb73c2990..4ec00ee9f149 100644 --- a/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix +++ b/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , substituteAll , fetchFromGitHub -, fetchpatch , libpulseaudio , python3 }: diff --git a/pkgs/desktops/lomiri/services/biometryd/default.nix b/pkgs/desktops/lomiri/services/biometryd/default.nix index d06ecf16942e..6ae46fbc158b 100644 --- a/pkgs/desktops/lomiri/services/biometryd/default.nix +++ b/pkgs/desktops/lomiri/services/biometryd/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitLab -, fetchpatch , gitUpdater , testers , boost diff --git a/pkgs/desktops/lomiri/services/telephony-service/default.nix b/pkgs/desktops/lomiri/services/telephony-service/default.nix index f07d8b2baa99..15f6ab167972 100644 --- a/pkgs/desktops/lomiri/services/telephony-service/default.nix +++ b/pkgs/desktops/lomiri/services/telephony-service/default.nix @@ -2,7 +2,6 @@ , lib , fetchFromGitLab , fetchpatch -, fetchpatch2 , gitUpdater , nixosTests , ayatana-indicator-messages @@ -20,7 +19,6 @@ , libphonenumber , libpulseaudio , libusermetrics -, lomiri-ui-toolkit , lomiri-url-dispatcher , makeWrapper , pkg-config diff --git a/pkgs/games/airshipper/default.nix b/pkgs/games/airshipper/default.nix index 0791aa8dfa27..ae26c4cf7bbf 100644 --- a/pkgs/games/airshipper/default.nix +++ b/pkgs/games/airshipper/default.nix @@ -1,7 +1,6 @@ { lib , rustPlatform , fetchFromGitLab -, fetchpatch , openssl , libGL , vulkan-loader diff --git a/pkgs/games/colobot/default.nix b/pkgs/games/colobot/default.nix index 90018acd50d5..58edbea1881b 100644 --- a/pkgs/games/colobot/default.nix +++ b/pkgs/games/colobot/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, SDL2, SDL2_image, SDL2_ttf, libpng +{ lib, stdenv, fetchFromGitHub, cmake, boost, SDL2, SDL2_image, SDL2_ttf, libpng , glew, gettext, libsndfile, libvorbis, libogg, physfs, openal , xmlstarlet, doxygen, python3, callPackage }: diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix index 37dd788d8296..e32fb5fa60d6 100644 --- a/pkgs/games/crawl/default.nix +++ b/pkgs/games/crawl/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , which , sqlite , lua5_1 diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/games/dxx-rebirth/default.nix index d69a4c6adc02..9ca1a591cf4a 100644 --- a/pkgs/games/dxx-rebirth/default.nix +++ b/pkgs/games/dxx-rebirth/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , fetchFromGitHub , fetchurl -, fetchpatch , scons , pkg-config , SDL2 diff --git a/pkgs/games/empty-epsilon/default.nix b/pkgs/games/empty-epsilon/default.nix index 8ed49e7c2203..657607031295 100644 --- a/pkgs/games/empty-epsilon/default.nix +++ b/pkgs/games/empty-epsilon/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python3, fetchpatch, applyPatches, glm, meshoptimizer, SDL2, ninja}: +{ lib, stdenv, fetchFromGitHub, cmake, sfml, libX11, glew, python3, glm, meshoptimizer, SDL2, ninja}: let diff --git a/pkgs/games/freesweep/default.nix b/pkgs/games/freesweep/default.nix index 8add760f930b..955e172203cc 100644 --- a/pkgs/games/freesweep/default.nix +++ b/pkgs/games/freesweep/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, fetchpatch, ncurses, lib, stdenv +{ fetchFromGitHub, ncurses, lib, stdenv , updateAutotoolsGnuConfigScriptsHook, installShellFiles }: stdenv.mkDerivation rec { diff --git a/pkgs/games/gogdl/default.nix b/pkgs/games/gogdl/default.nix index 91cfe972d9c6..f3de9b11f949 100644 --- a/pkgs/games/gogdl/default.nix +++ b/pkgs/games/gogdl/default.nix @@ -1,5 +1,4 @@ { lib -, fetchpatch , writeScript , buildPythonApplication , fetchFromGitHub diff --git a/pkgs/games/openclonk/default.nix b/pkgs/games/openclonk/default.nix index 5dd8d8252d01..66b0d8ac06e1 100644 --- a/pkgs/games/openclonk/default.nix +++ b/pkgs/games/openclonk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, fetchDebianPatch, fetchpatch, cmake, pkg-config +{ lib, stdenv, fetchurl, fetchFromGitHub, fetchDebianPatch, cmake, pkg-config , SDL2, libvorbis, libogg, libjpeg, libpng, freetype, glew, tinyxml, openal, libepoxy , curl , freealut, readline, libb2, gcc-unwrapped diff --git a/pkgs/games/qtads/default.nix b/pkgs/games/qtads/default.nix index aef921900ae7..2d5ae31814e0 100644 --- a/pkgs/games/qtads/default.nix +++ b/pkgs/games/qtads/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchFromGitHub, fetchpatch, pkg-config, qmake +{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake , SDL2, fluidsynth, libsndfile, libvorbis, mpg123, qtbase }: diff --git a/pkgs/games/redeclipse/default.nix b/pkgs/games/redeclipse/default.nix index a9255b918911..5c4443d7bd04 100644 --- a/pkgs/games/redeclipse/default.nix +++ b/pkgs/games/redeclipse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl , curl, ed, pkg-config, freetype, zlib, libX11 , SDL2, SDL2_image, SDL2_mixer }: diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index 65f0dd9392f7..2803ca5d18cf 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , makeDesktopItem , SDL2 , SDL2_image diff --git a/pkgs/games/space-cadet-pinball/default.nix b/pkgs/games/space-cadet-pinball/default.nix index 20016809f255..53edf5860518 100644 --- a/pkgs/games/space-cadet-pinball/default.nix +++ b/pkgs/games/space-cadet-pinball/default.nix @@ -1,7 +1,6 @@ { lib, stdenv, fetchFromGitHub, fetchzip , cmake, SDL2, SDL2_mixer, Cocoa , unrar-wrapper, makeWrapper -, fetchpatch }: let diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index dafedf42147f..7708652d22b3 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -1,7 +1,6 @@ { lib, stdenv , autoreconfHook , fetchFromGitHub -, fetchpatch , pkg-config , lua , fpc diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index 628c72a24a92..a77c4b0ceab2 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -2,7 +2,6 @@ , stdenv , fetchzip , fetchFromGitHub -, fetchpatch , SDL2 , buildFHSEnv , cmake diff --git a/pkgs/games/widelands/default.nix b/pkgs/games/widelands/default.nix index 324f388e716e..0be50f2b8be1 100644 --- a/pkgs/games/widelands/default.nix +++ b/pkgs/games/widelands/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config # needed to find minizip , SDL2 , SDL2_image diff --git a/pkgs/misc/cliscord/default.nix b/pkgs/misc/cliscord/default.nix index 1f8de323efe3..bdfa620ef3f2 100644 --- a/pkgs/misc/cliscord/default.nix +++ b/pkgs/misc/cliscord/default.nix @@ -4,7 +4,6 @@ , openssl , pkg-config , fetchFromGitHub -, fetchpatch , Security }: diff --git a/pkgs/os-specific/linux/audit/default.nix b/pkgs/os-specific/linux/audit/default.nix index 1e941a13767e..d5e38ea62fb8 100644 --- a/pkgs/os-specific/linux/audit/default.nix +++ b/pkgs/os-specific/linux/audit/default.nix @@ -1,11 +1,9 @@ { lib , stdenv , fetchurl -, fetchpatch , autoreconfHook , bash , buildPackages -, libtool , linuxHeaders , python3 , swig diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix index b825cfc0a962..3d8fbafb2358 100644 --- a/pkgs/os-specific/linux/batman-adv/default.nix +++ b/pkgs/os-specific/linux/batman-adv/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch2 , kernel }: diff --git a/pkgs/os-specific/linux/catfs/default.nix b/pkgs/os-specific/linux/catfs/default.nix index 107dce2123db..af804262f20b 100644 --- a/pkgs/os-specific/linux/catfs/default.nix +++ b/pkgs/os-specific/linux/catfs/default.nix @@ -1,5 +1,4 @@ { lib, rustPlatform, fetchFromGitHub -, fetchpatch , fuse , pkg-config }: diff --git a/pkgs/os-specific/linux/dpdk-kmods/default.nix b/pkgs/os-specific/linux/dpdk-kmods/default.nix index ec5fda7aa419..4205da7e7e80 100644 --- a/pkgs/os-specific/linux/dpdk-kmods/default.nix +++ b/pkgs/os-specific/linux/dpdk-kmods/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, fetchpatch, kernel }: +{ lib, stdenv, fetchzip, kernel }: stdenv.mkDerivation rec { pname = "dpdk-kmods"; diff --git a/pkgs/os-specific/linux/esdm/default.nix b/pkgs/os-specific/linux/esdm/default.nix index 195c645eb539..95fdd9648f23 100644 --- a/pkgs/os-specific/linux/esdm/default.nix +++ b/pkgs/os-specific/linux/esdm/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , protobufc , pkg-config , fuse3 diff --git a/pkgs/os-specific/linux/exfat/default.nix b/pkgs/os-specific/linux/exfat/default.nix index 3d2445df4980..e247bbb9e837 100644 --- a/pkgs/os-specific/linux/exfat/default.nix +++ b/pkgs/os-specific/linux/exfat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, kernel }: +{ stdenv, lib, fetchFromGitHub, kernel }: stdenv.mkDerivation rec { name = "exfat-nofuse-${version}-${kernel.version}"; diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index 64607c5653eb..768d07dab900 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , pkg-config , libapparmor , which diff --git a/pkgs/os-specific/linux/g15daemon/default.nix b/pkgs/os-specific/linux/g15daemon/default.nix index e1d310a995b4..de1c0bca0017 100644 --- a/pkgs/os-specific/linux/g15daemon/default.nix +++ b/pkgs/os-specific/linux/g15daemon/default.nix @@ -1,9 +1,6 @@ { stdenv , lib , fetchurl -, fetchpatch -, patchelf -, freetype , libusb-compat-0_1 }: let diff --git a/pkgs/os-specific/linux/irqbalance/default.nix b/pkgs/os-specific/linux/irqbalance/default.nix index 5e4b7fff489c..0087f52c3873 100644 --- a/pkgs/os-specific/linux/irqbalance/default.nix +++ b/pkgs/os-specific/linux/irqbalance/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkg-config, glib, ncurses, libcap_ng }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, ncurses, libcap_ng }: stdenv.mkDerivation rec { pname = "irqbalance"; diff --git a/pkgs/os-specific/linux/kernel/perf/default.nix b/pkgs/os-specific/linux/kernel/perf/default.nix index 02f0407425d1..851a4c8d5d7b 100644 --- a/pkgs/os-specific/linux/kernel/perf/default.nix +++ b/pkgs/os-specific/linux/kernel/perf/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, fetchpatch , fetchurl , kernel , elfutils diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index 324e2695dd53..d2cccef37b89 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch }: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { version = "0.3.113"; diff --git a/pkgs/os-specific/linux/libselinux/default.nix b/pkgs/os-specific/linux/libselinux/default.nix index c0711f693377..de092af473de 100644 --- a/pkgs/os-specific/linux/libselinux/default.nix +++ b/pkgs/os-specific/linux/libselinux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, buildPackages, pcre2, pkg-config, libsepol +{ lib, stdenv, fetchurl, buildPackages, pcre2, pkg-config, libsepol , enablePython ? !stdenv.hostPlatform.isStatic , swig ? null, python3 ? null, python3Packages , fts diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index 41d8a724e53c..9c7f1abb3a4e 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, flex }: +{ lib, stdenv, fetchurl, flex }: stdenv.mkDerivation rec { pname = "libsepol"; diff --git a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix index 46587028f296..656a3e62caca 100644 --- a/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix +++ b/pkgs/os-specific/linux/pam_ssh_agent_auth/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, nixosTests, fetchpatch, fetchFromGitHub, pam, openssl, perl }: +{ lib, stdenv, nixosTests, fetchFromGitHub, pam, openssl, perl }: stdenv.mkDerivation rec { pname = "pam_ssh_agent_auth"; diff --git a/pkgs/os-specific/linux/pktgen/default.nix b/pkgs/os-specific/linux/pktgen/default.nix index 66971444e71a..7fbc445902e9 100644 --- a/pkgs/os-specific/linux/pktgen/default.nix +++ b/pkgs/os-specific/linux/pktgen/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config diff --git a/pkgs/os-specific/linux/rtl8189fs/default.nix b/pkgs/os-specific/linux/rtl8189fs/default.nix index 0405fc8561a9..5f806069daf9 100644 --- a/pkgs/os-specific/linux/rtl8189fs/default.nix +++ b/pkgs/os-specific/linux/rtl8189fs/default.nix @@ -1,4 +1,4 @@ -{ lib, kernel, rtl8189es, fetchFromGitHub, fetchpatch }: +{ lib, kernel, rtl8189es, fetchFromGitHub }: # rtl8189fs is a branch of the rtl8189es driver rtl8189es.overrideAttrs (drv: rec { diff --git a/pkgs/os-specific/linux/usbip/default.nix b/pkgs/os-specific/linux/usbip/default.nix index b91f55dcd2fb..adaaab868b78 100644 --- a/pkgs/os-specific/linux/usbip/default.nix +++ b/pkgs/os-specific/linux/usbip/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, kernel, udev, autoconf, automake, libtool, hwdata, kernelOlder }: +{ lib, stdenv, kernel, udev, autoconf, automake, libtool, hwdata, kernelOlder }: stdenv.mkDerivation { name = "usbip-${kernel.name}"; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index ef3614bce02e..b006165b3e96 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, autoreconfHook, gtk-doc, pkg-config +{ lib, stdenv, fetchurl, pkg-config , zlib, shadow , capabilitiesSupport ? stdenv.isLinux , libcap_ng diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix index ac1de01af974..45eedb25a953 100644 --- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix +++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchpatch, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: +{ lib, mkDerivation, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }: mkDerivation { pname = "wpa_gui"; diff --git a/pkgs/os-specific/linux/xone/default.nix b/pkgs/os-specific/linux/xone/default.nix index 92a10878a36a..fdc9990fb63d 100644 --- a/pkgs/os-specific/linux/xone/default.nix +++ b/pkgs/os-specific/linux/xone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, kernel, fetchpatch }: +{ stdenv, lib, fetchFromGitHub, kernel }: stdenv.mkDerivation (finalAttrs: { pname = "xone"; diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index c0ff834cb34a..ac32f034b7cd 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -1,6 +1,6 @@ let genericBuild = - { pkgs, lib, stdenv, fetchFromGitHub, fetchpatch + { pkgs, lib, stdenv, fetchFromGitHub , autoreconfHook269, util-linux, nukeReferences, coreutils , perl , configFile ? "all" diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix index 7333f6607da5..7d88cacd8b48 100644 --- a/pkgs/servers/asterisk/default.nix +++ b/pkgs/servers/asterisk/default.nix @@ -27,7 +27,6 @@ , autoconf , libtool , automake -, fetchpatch , python3 , writeScript , withOpus ? true diff --git a/pkgs/servers/coturn/default.nix b/pkgs/servers/coturn/default.nix index d23c39355e1b..374b1a0cdb71 100644 --- a/pkgs/servers/coturn/default.nix +++ b/pkgs/servers/coturn/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , openssl , libevent , pkg-config diff --git a/pkgs/servers/db-rest/default.nix b/pkgs/servers/db-rest/default.nix index dc216b08e3c2..2217d341bfb3 100644 --- a/pkgs/servers/db-rest/default.nix +++ b/pkgs/servers/db-rest/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , nodejs_18 , nix-update-script -, fetchpatch , nixosTests }: buildNpmPackage rec { diff --git a/pkgs/servers/freeradius/default.nix b/pkgs/servers/freeradius/default.nix index 36d16fda4fb4..690e8b3238d3 100644 --- a/pkgs/servers/freeradius/default.nix +++ b/pkgs/servers/freeradius/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , autoreconfHook , bsd-finger , perl diff --git a/pkgs/servers/frr/default.nix b/pkgs/servers/frr/default.nix index ba1f46414f6a..ab997612810a 100644 --- a/pkgs/servers/frr/default.nix +++ b/pkgs/servers/frr/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch # build time , autoreconfHook diff --git a/pkgs/servers/http/angie/default.nix b/pkgs/servers/http/angie/default.nix index 84a24ece767d..c9e6ec815d3a 100644 --- a/pkgs/servers/http/angie/default.nix +++ b/pkgs/servers/http/angie/default.nix @@ -1,11 +1,9 @@ { callPackage -, runCommand , lib , fetchurl , nixosTests , withAcme ? false , withQuic ? false -, fetchpatch , ... }@args: diff --git a/pkgs/servers/http/envoy/default.nix b/pkgs/servers/http/envoy/default.nix index 8a91e361f37f..da87f0c12afb 100644 --- a/pkgs/servers/http/envoy/default.nix +++ b/pkgs/servers/http/envoy/default.nix @@ -3,7 +3,6 @@ , bazel-gazelle , buildBazelPackage , fetchFromGitHub -, fetchpatch , stdenv , cmake , gn diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 65bafdac1120..28e5af7a44d6 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, buildPackages, fetchurl, pkg-config, pcre2, libxml2, zlib, bzip2, which, file -, fetchpatch , openssl , enableDbi ? false, libdbi , enableMagnet ? false, lua5_1 @@ -8,7 +7,7 @@ , enablePam ? false, linux-pam , enableSasl ? false, cyrus_sasl , enableWebDAV ? false, sqlite, libuuid -, enableExtendedAttrs ? false, attr +, enableExtendedAttrs ? false , perl , nixosTests }: diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 4d8a1daa81cb..f06b5b9426f2 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , fetchFromGitLab , fetchhg -, fetchpatch , runCommand , arpa2common diff --git a/pkgs/servers/ldap/lldap/default.nix b/pkgs/servers/ldap/lldap/default.nix index cf4cc82ed875..18d95d30b849 100644 --- a/pkgs/servers/ldap/lldap/default.nix +++ b/pkgs/servers/ldap/lldap/default.nix @@ -1,13 +1,10 @@ { binaryen , fetchFromGitHub -, fetchpatch -, fetchzip , lib , lldap , nixosTests , rustPlatform , rustc -, stdenv , wasm-bindgen-cli , wasm-pack , which diff --git a/pkgs/servers/misc/oven-media-engine/default.nix b/pkgs/servers/misc/oven-media-engine/default.nix index c5e2d181c1cb..e84dc8ea9e43 100644 --- a/pkgs/servers/misc/oven-media-engine/default.nix +++ b/pkgs/servers/misc/oven-media-engine/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , srt , bc , pkg-config diff --git a/pkgs/servers/monitoring/icinga2/default.nix b/pkgs/servers/monitoring/icinga2/default.nix index 165e6e186808..1425dc07fdf5 100644 --- a/pkgs/servers/monitoring/icinga2/default.nix +++ b/pkgs/servers/monitoring/icinga2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, runCommand, lib, fetchFromGitHub, fetchpatch, cmake, flex, bison, systemd +{ stdenv, runCommand, lib, fetchFromGitHub, cmake, flex, bison, systemd , boost, openssl, patchelf, mariadb-connector-c, postgresql, zlib, tzdata # Databases , withMysql ? true, withPostgresql ? false diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix index 8961bc549535..66085a04babd 100644 --- a/pkgs/servers/monitoring/net-snmp/default.nix +++ b/pkgs/servers/monitoring/net-snmp/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, fetchpatch -, file, openssl, perl, perlPackages, nettools +{ lib, stdenv, fetchurl +, file, openssl, perl, nettools , withPerlTools ? false }: let perlWithPkgs = perl.withPackages (ps: with ps; [ diff --git a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix index 21dedaa1b70e..dace095e13d2 100644 --- a/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, fetchpatch, python3Packages }: +{ lib, fetchFromGitHub, python3Packages }: python3Packages.buildPythonApplication rec { pname = "bitcoin-prometheus-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/pkgs/servers/monitoring/prometheus/domain-exporter.nix index 26afdca834a3..8e25a2c523ad 100644 --- a/pkgs/servers/monitoring/prometheus/domain-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/domain-exporter.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "domain-exporter"; diff --git a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index 16897e894f69..d710eea6c081 100644 --- a/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -2,7 +2,6 @@ , fetchFromGitHub , python3Packages , prometheus-alertmanager -, fetchpatch , runCommand , prometheus-xmpp-alerts }: diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index 8174e85c3a43..c139edbab98e 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -1,5 +1,4 @@ { fetchFromGitHub -, fetchpatch , stdenv , lib , pkg-config diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix index 294d9a86305d..b082a1b9292c 100644 --- a/pkgs/servers/sql/postgresql/generic.nix +++ b/pkgs/servers/sql/postgresql/generic.nix @@ -2,7 +2,7 @@ let generic = # dependencies - { stdenv, lib, fetchurl, makeWrapper, fetchpatch + { stdenv, lib, fetchurl, makeWrapper , glibc, zlib, readline, openssl, icu, lz4, zstd, systemd, libossp_uuid , pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin , linux-pam diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix index f47156091a4b..6261c1f5f3fd 100644 --- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix +++ b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch }: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "tt-rss-plugin-auth-ldap"; diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix index df76789f9086..37bddc3759f5 100644 --- a/pkgs/servers/uhub/default.nix +++ b/pkgs/servers/uhub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchpatch, fetchFromGitHub, cmake, openssl, sqlite, pkg-config +{ lib, stdenv, fetchFromGitHub, cmake, openssl, sqlite, pkg-config , systemd, tlsSupport ? false }: assert tlsSupport -> openssl != null; diff --git a/pkgs/servers/varnish/default.nix b/pkgs/servers/varnish/default.nix index 5327f4edb19e..ddc190a2887a 100644 --- a/pkgs/servers/varnish/default.nix +++ b/pkgs/servers/varnish/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pcre, pcre2, jemalloc, libunwind, libxslt, groff, ncurses, pkg-config, readline, libedit +{ lib, stdenv, fetchurl, pcre, pcre2, jemalloc, libunwind, libxslt, groff, ncurses, pkg-config, readline, libedit , coreutils, python3, makeWrapper, nixosTests }: let diff --git a/pkgs/servers/web-apps/invoiceplane/default.nix b/pkgs/servers/web-apps/invoiceplane/default.nix index 8f4265cbd10b..ade13a137574 100644 --- a/pkgs/servers/web-apps/invoiceplane/default.nix +++ b/pkgs/servers/web-apps/invoiceplane/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, writeText, unzip, nixosTests, fetchpatch }: +{ lib, stdenv, fetchurl, unzip, nixosTests }: stdenv.mkDerivation rec { pname = "invoiceplane"; diff --git a/pkgs/servers/web-apps/peering-manager/default.nix b/pkgs/servers/web-apps/peering-manager/default.nix index aec18b2904c6..a5dfa6884694 100644 --- a/pkgs/servers/web-apps/peering-manager/default.nix +++ b/pkgs/servers/web-apps/peering-manager/default.nix @@ -1,6 +1,5 @@ { python3 , fetchFromGitHub -, fetchpatch , nixosTests , lib diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index ab617dc291b2..b6072ca4480d 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -1,4 +1,4 @@ -{ gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python3, lndir, libxcrypt +{ gnustep, lib, fetchFromGitHub, makeWrapper, python3, lndir, libxcrypt , openssl, openldap, sope, libmemcached, curl, libsodium, libytnef, libzip, pkg-config, nixosTests , oath-toolkit , enableActiveSync ? false diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index 503f7b04cd28..d50563098355 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkg-config +{ stdenv, lib, fetchFromGitHub, fetchurl, cmake, makeWrapper, pkg-config , curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mariadb, pcre, perl, perlPackages , polkit, util-linuxMinimal, x264, zlib , coreutils, procps, psmisc, nixosTests }: diff --git a/pkgs/shells/bash/bash-completion/default.nix b/pkgs/shells/bash/bash-completion/default.nix index 80f5ffeff951..bdd545231c0c 100644 --- a/pkgs/shells/bash/bash-completion/default.nix +++ b/pkgs/shells/bash/bash-completion/default.nix @@ -1,5 +1,4 @@ { lib, stdenv, fetchurl -, fetchpatch , autoreconfHook , perl , ps diff --git a/pkgs/tools/audio/wyoming/piper.nix b/pkgs/tools/audio/wyoming/piper.nix index 82d8c003348e..8a614ef4083c 100644 --- a/pkgs/tools/audio/wyoming/piper.nix +++ b/pkgs/tools/audio/wyoming/piper.nix @@ -1,7 +1,6 @@ { lib , python3Packages , fetchFromGitHub -, fetchpatch }: python3Packages.buildPythonApplication rec { diff --git a/pkgs/tools/filesystems/garage/default.nix b/pkgs/tools/filesystems/garage/default.nix index 1072134e31a9..ce5ccbf69643 100644 --- a/pkgs/tools/filesystems/garage/default.nix +++ b/pkgs/tools/filesystems/garage/default.nix @@ -2,7 +2,6 @@ , stdenv , rustPlatform , fetchFromGitea -, fetchpatch , openssl , pkg-config , protobuf diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 4af2e3be5371..ca31161e980a 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,11 +1,10 @@ -{ lib, stdenv, fetchurl, fetchpatch +{ lib, stdenv, fetchurl , autoreconfHook, bison, glm, flex, wrapQtAppsHook, cmake, pkg-config , freeglut, ghostscriptX, imagemagick, fftw, eigen, libtirpc , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv , python3, qtbase, qtsvg, boost , zlib, perl, curl , texinfo -, texlive , texliveSmall , darwin }: diff --git a/pkgs/tools/misc/crudini/default.nix b/pkgs/tools/misc/crudini/default.nix index ea77f4db163e..393b78ad6470 100644 --- a/pkgs/tools/misc/crudini/default.nix +++ b/pkgs/tools/misc/crudini/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , python3Packages , help2man , installShellFiles diff --git a/pkgs/tools/misc/ethtool/default.nix b/pkgs/tools/misc/ethtool/default.nix index 72590420e1a1..c16f22178bdb 100644 --- a/pkgs/tools/misc/ethtool/default.nix +++ b/pkgs/tools/misc/ethtool/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , libmnl , pkg-config , writeScript diff --git a/pkgs/tools/misc/ets/default.nix b/pkgs/tools/misc/ets/default.nix index 874c57ccaa89..ad81513a89a9 100644 --- a/pkgs/tools/misc/ets/default.nix +++ b/pkgs/tools/misc/ets/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, fetchpatch, installShellFiles }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "ets"; diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix index d48f35915896..ce58f6ea0a18 100644 --- a/pkgs/tools/misc/grub/default.nix +++ b/pkgs/tools/misc/grub/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, runCommand, fetchFromSavannah, fetchpatch, flex, bison, python3, autoconf, automake, libtool, bash +{ lib, stdenv, fetchFromSavannah, flex, bison, python3, autoconf, automake, libtool, bash , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkg-config , fetchzip , buildPackages diff --git a/pkgs/tools/misc/mstflint/default.nix b/pkgs/tools/misc/mstflint/default.nix index 16b46002a301..cd94f83f3f1b 100644 --- a/pkgs/tools/misc/mstflint/default.nix +++ b/pkgs/tools/misc/mstflint/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , rdma-core , openssl , zlib diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index 9d6d302634f8..1559aa11de4b 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , autoreconfHook , ncurses , libxcrypt diff --git a/pkgs/tools/misc/vector/default.nix b/pkgs/tools/misc/vector/default.nix index 91b755f82827..b5a09c23eb19 100644 --- a/pkgs/tools/misc/vector/default.nix +++ b/pkgs/tools/misc/vector/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , rustPlatform , pkg-config , openssl diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix index 094cc8733bdc..29426eef06e4 100644 --- a/pkgs/tools/networking/aria2/default.nix +++ b/pkgs/tools/networking/aria2/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, autoreconfHook +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook , gnutls, c-ares, libxml2, sqlite, zlib, libssh2 , cppunit, sphinx , Security diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index 5ecda7d8f73a..177e513c2373 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , autoreconfHook , boost , pkg-config diff --git a/pkgs/tools/security/echidna/default.nix b/pkgs/tools/security/echidna/default.nix index 7f503acd6f0b..b6c0d652ebb3 100644 --- a/pkgs/tools/security/echidna/default.nix +++ b/pkgs/tools/security/echidna/default.nix @@ -1,9 +1,7 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , haskellPackages -, haskell , slither-analyzer }: diff --git a/pkgs/tools/security/opensc/default.nix b/pkgs/tools/security/opensc/default.nix index 8d8246028f7c..b767261b4e0a 100644 --- a/pkgs/tools/security/opensc/default.nix +++ b/pkgs/tools/security/opensc/default.nix @@ -1,6 +1,5 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, zlib, readline, openssl , libiconv, pcsclite, libassuan, libXt -, fetchpatch , docbook_xsl, libxslt, docbook_xml_dtd_412 , Carbon, PCSC, buildPackages , withApplePCSC ? stdenv.isDarwin diff --git a/pkgs/tools/security/pass/extensions/import.nix b/pkgs/tools/security/pass/extensions/import.nix index 0be41525ea28..badc58361d53 100644 --- a/pkgs/tools/security/pass/extensions/import.nix +++ b/pkgs/tools/security/pass/extensions/import.nix @@ -1,6 +1,5 @@ { lib , fetchurl -, fetchpatch , python3Packages , gnupg , pass diff --git a/pkgs/tools/security/semgrep/default.nix b/pkgs/tools/security/semgrep/default.nix index 6b62ab80e7ea..13307d310102 100644 --- a/pkgs/tools/security/semgrep/default.nix +++ b/pkgs/tools/security/semgrep/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , semgrep-core , buildPythonApplication , pythonPackages diff --git a/pkgs/tools/security/tpm2-tools/default.nix b/pkgs/tools/security/tpm2-tools/default.nix index 1cf4d4009138..2e78257a13e2 100644 --- a/pkgs/tools/security/tpm2-tools/default.nix +++ b/pkgs/tools/security/tpm2-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, lib, fetchpatch +{ stdenv, fetchurl, lib , pandoc, pkg-config, makeWrapper, curl, openssl, tpm2-tss, libuuid , abrmdSupport ? true, tpm2-abrmd ? null }: diff --git a/pkgs/tools/security/yersinia/default.nix b/pkgs/tools/security/yersinia/default.nix index ae2ca9babff2..a0c5fff28ef2 100644 --- a/pkgs/tools/security/yersinia/default.nix +++ b/pkgs/tools/security/yersinia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config, fetchpatch +{ stdenv, lib, fetchFromGitHub, autoreconfHook, pkg-config , ncurses, libpcap, libnet # alpha version of GTK interface , withGtk ? false, gtk2 diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index df06292c4f3e..6e10144bb587 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, perl +{ lib, stdenv, fetchurl, perl , enableGhostscript ? false , ghostscript, gawk, libX11, libXaw, libXt, libXmu # for postscript and html output , enableHtml ? false, psutils, netpbm # for html output diff --git a/pkgs/tools/text/tesh/default.nix b/pkgs/tools/text/tesh/default.nix index abff7771add2..d4d2c1e0ed71 100644 --- a/pkgs/tools/text/tesh/default.nix +++ b/pkgs/tools/text/tesh/default.nix @@ -1,4 +1,4 @@ -{ python3Packages, fetchFromGitHub, fetchpatch }: +{ python3Packages, fetchFromGitHub }: let version = "0.3.2"; diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix index b695ff9ebec3..da741c76c70b 100644 --- a/pkgs/tools/typesetting/pdf2djvu/default.nix +++ b/pkgs/tools/typesetting/pdf2djvu/default.nix @@ -1,7 +1,6 @@ { stdenv , lib , fetchFromGitHub -, fetchpatch , autoreconfHook , gettext , libtool diff --git a/pkgs/tools/virtualization/mkosi/default.nix b/pkgs/tools/virtualization/mkosi/default.nix index 130b47a5c9d2..4514280f7757 100644 --- a/pkgs/tools/virtualization/mkosi/default.nix +++ b/pkgs/tools/virtualization/mkosi/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , stdenv , python3 , bubblewrap From 04a44862c426f44b845fadea5e9694dc4c44838e Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 4 Jun 2024 12:55:43 +0200 Subject: [PATCH 181/219] composefs: 1.0.3 -> 1.0.4 --- pkgs/by-name/co/composefs/package.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/co/composefs/package.nix b/pkgs/by-name/co/composefs/package.nix index 6d0b6b9319b9..ef3fe6e5b20f 100644 --- a/pkgs/by-name/co/composefs/package.nix +++ b/pkgs/by-name/co/composefs/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , autoreconfHook , go-md2man @@ -24,18 +25,27 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "composefs"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "containers"; repo = "composefs"; rev = "v${finalAttrs.version}"; - hash = "sha256-YmredtZZKMjzJW/kxiTUmdgO/1iPIKzJsuJz8DeEdGM="; + hash = "sha256-ekUFLZGWTsiJZFv3nHoxuV057zoOtWBIkt+VdtzlaU4="; }; strictDeps = true; outputs = [ "out" "lib" "dev" ]; + patches = [ + # fixes composefs-info tests, remove in next release + # https://github.com/containers/composefs/pull/291 + (fetchpatch { + url = "https://github.com/containers/composefs/commit/f7465b3a57935d96451b392b07aa3a1dafb56e7b.patch"; + hash = "sha256-OO3IfqLf3dQGjEgKx3Bo630KALmLAWwgdACuyZm2Ujc="; + }) + ]; + postPatch = lib.optionalString installExperimentalTools '' sed -i "s/noinst_PROGRAMS +\?=/bin_PROGRAMS +=/g" tools/Makefile.am ''; @@ -64,8 +74,8 @@ stdenv.mkDerivation (finalAttrs: { preCheck = '' patchShebangs --build tests/*dir tests/*.sh substituteInPlace tests/*.sh \ - --replace " /tmp" " $TMPDIR" \ - --replace " /var/tmp" " $TMPDIR" + --replace-quiet " /tmp" " $TMPDIR" \ + --replace-quiet " /var/tmp" " $TMPDIR" ''; passthru = { From 1860d7862be0fb8a7c240234befd3250f1ce773f Mon Sep 17 00:00:00 2001 From: shivaraj-bh Date: Tue, 4 Jun 2024 16:06:51 +0530 Subject: [PATCH 182/219] open-webui: init at 0.2.4 --- pkgs/by-name/op/open-webui/package.nix | 142 +++++++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 pkgs/by-name/op/open-webui/package.nix diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix new file mode 100644 index 000000000000..735c61184146 --- /dev/null +++ b/pkgs/by-name/op/open-webui/package.nix @@ -0,0 +1,142 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + python3, + nixosTests, +}: +let + pname = "open-webui"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "open-webui"; + repo = "open-webui"; + rev = "v${version}"; + hash = "sha256-jWO0mo26C+QTIX5j3ucDk/no+vQnAh7Q6JwB3lLM83k="; + }; + + frontend = buildNpmPackage { + inherit pname version src; + + npmDepsHash = "sha256-QIgYHZusuq2QD8p8MGsNVhCbz6fR+qP9UuU/kbBkadc="; + + # Disabling `pyodide:fetch` as it downloads packages during `buildPhase` + # Until this is solved, running python packages from the browser will not work. + postPatch = '' + substituteInPlace package.json \ + --replace-fail "npm run pyodide:fetch && vite build" "vite build" \ + ''; + + env.CYPRESS_INSTALL_BINARY = "0"; # disallow cypress from downloading binaries in sandbox + + installPhase = '' + runHook preInstall + + mkdir -p $out/share + cp -a build $out/share/open-webui + + runHook postInstall + ''; + }; +in +python3.pkgs.buildPythonApplication rec { + inherit pname version src; + pyproject = true; + + # The custom hook tries to run `npm install` in `buildPhase`. + # We don't have to worry, as nodejs depedencies are managed by `frontend` drv. + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail '[tool.hatch.build.hooks.custom]' "" \ + --replace-fail ', build = "open_webui/frontend"' "" + ''; + + pythonRelaxDeps = true; + + pythonRemoveDeps = [ + # using `psycopg2` instead + "psycopg2-binary" + # using `opencv4` + "opencv-python-headless" + # package request: https://github.com/NixOS/nixpkgs/issues/317065 + "rapidocr-onnxruntime" + # package request: https://github.com/NixOS/nixpkgs/issues/317066 + "langfuse" + # package request: https://github.com/NixOS/nixpkgs/issues/317068 + "langchain-chroma" + ]; + + dependencies = with python3.pkgs; [ + beautifulsoup4 + fastapi + uvicorn + python-multipart + flask + flask-cors + python-socketio + python-jose + passlib + requests + aiohttp + peewee + peewee-migrate + psycopg2 + pymysql + bcrypt + litellm + boto3 + argon2-cffi + apscheduler + google-generativeai + langchain + langchain-community + fake-useragent + chromadb + sentence-transformers + pypdf + docx2txt + python-pptx + unstructured + markdown + pypandoc + pandas + openpyxl + pyxlsb + xlrd + validators + opencv4 + fpdf2 + rank-bm25 + faster-whisper + pyjwt + black + youtube-transcript-api + pytube + ]; + + build-system = with python3.pkgs; [ + hatchling + pythonRelaxDepsHook + ]; + + pythonImportsCheck = [ "open_webui" ]; + + postInstall = '' + wrapProgram $out/bin/open-webui \ + --set FRONTEND_BUILD_DIR "${frontend}/share/open-webui" + ''; + + passthru.tests = { + inherit (nixosTests) open-webui; + }; + + meta = { + description = "Full-stack of open-webui. open-webui is a user-friendly WebUI for LLMs (Formerly Ollama WebUI)"; + homepage = "https://github.com/open-webui/open-webui"; + changelog = "https://github.com/open-webui/open-webui/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ shivaraj-bh ]; + mainProgram = "open-webui"; + }; +} From f66cb82fef9d3f02cb1f72744e9493116aa41408 Mon Sep 17 00:00:00 2001 From: shivaraj-bh Date: Tue, 4 Jun 2024 16:07:06 +0530 Subject: [PATCH 183/219] nixos/open-webui: init --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/open-webui.nix | 94 ++++++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/open-webui.nix | 33 ++++++++ 4 files changed, 129 insertions(+) create mode 100644 nixos/modules/services/misc/open-webui.nix create mode 100644 nixos/tests/open-webui.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 76fa899ef7ce..8bee5f3cb042 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -767,6 +767,7 @@ ./services/misc/octoprint.nix ./services/misc/ollama.nix ./services/misc/ombi.nix + ./services/misc/open-webui.nix ./services/misc/osrm.nix ./services/misc/owncast.nix ./services/misc/packagekit.nix diff --git a/nixos/modules/services/misc/open-webui.nix b/nixos/modules/services/misc/open-webui.nix new file mode 100644 index 000000000000..de61ff80e922 --- /dev/null +++ b/nixos/modules/services/misc/open-webui.nix @@ -0,0 +1,94 @@ +{ + config, + lib, + pkgs, + ... +}: +let + inherit (lib) types; + + cfg = config.services.open-webui; +in +{ + options = { + services.open-webui = { + enable = lib.mkEnableOption "Enable open-webui, an interactive chat web app"; + package = lib.mkPackageOption pkgs "open-webui" { }; + + stateDir = lib.mkOption { + type = types.path; + default = "/var/lib/open-webui"; + description = "State directory of open-webui."; + }; + + host = lib.mkOption { + type = types.str; + default = "localhost"; + description = "Host of open-webui"; + }; + + port = lib.mkOption { + type = types.port; + default = 8080; + description = "Port of open-webui"; + }; + + environment = lib.mkOption { + type = types.attrsOf types.str; + default = { }; + example = '' + { + OLLAMA_API_BASE_URL = "http://localhost:11434"; + # Disable authentication + WEBUI_AUTH = "False"; + } + ''; + description = "Extra environment variables for open-webui"; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.open-webui = { + description = "User-friendly WebUI for LLMs (Formerly Ollama WebUI)"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + preStart = '' + mkdir -p ${cfg.stateDir}/static + ''; + + environment = { + STATIC_DIR = "${cfg.stateDir}/static"; + DATA_DIR = "${cfg.stateDir}"; + } // cfg.environment; + + serviceConfig = { + ExecStart = "${lib.getExe cfg.package} serve --host ${cfg.host} --port ${toString cfg.port}"; + WorkingDirectory = cfg.stateDir; + StateDirectory = "open-webui"; + RuntimeDirectory = "open-webui"; + RuntimeDirectoryMode = "0755"; + PrivateTmp = true; + DynamicUser = true; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = false; # onnxruntime/capi/onnxruntime_pybind11_state.so: cannot enable executable stack as shared object requires: Permission Denied + PrivateUsers = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + ProcSubset = "all"; # Error in cpuinfo: failed to parse processor information from /proc/cpuinfo + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + UMask = "0077"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ shivaraj-bh ]; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 035c288c22e5..e2f13a474ce6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -691,6 +691,7 @@ in { outline = handleTest ./outline.nix {}; image-contents = handleTest ./image-contents.nix {}; openvscode-server = handleTest ./openvscode-server.nix {}; + open-webui = runTest ./open-webui.nix; orangefs = handleTest ./orangefs.nix {}; os-prober = handleTestOn ["x86_64-linux"] ./os-prober.nix {}; osquery = handleTestOn ["x86_64-linux"] ./osquery.nix {}; diff --git a/nixos/tests/open-webui.nix b/nixos/tests/open-webui.nix new file mode 100644 index 000000000000..f10ef1ad98fb --- /dev/null +++ b/nixos/tests/open-webui.nix @@ -0,0 +1,33 @@ +{ lib, ... }: +let + mainPort = "8080"; +in +{ + name = "open-webui"; + meta = with lib.maintainers; { + maintainers = [ shivaraj-bh ]; + }; + + nodes = { + machine = + { ... }: + { + services.open-webui = { + enable = true; + environment = { + # Requires network connection + RAG_EMBEDDING_MODEL = ""; + }; + }; + }; + }; + + testScript = '' + machine.start() + + machine.wait_for_unit("open-webui.service") + machine.wait_for_open_port(${mainPort}) + + machine.succeed("curl http://127.0.0.1:${mainPort}") + ''; +} From d005b6bae87ecb3783f0145c7307c3e2ddaa2eeb Mon Sep 17 00:00:00 2001 From: Terje Larsen Date: Tue, 4 Jun 2024 13:26:39 +0200 Subject: [PATCH 184/219] google-cloud-sdk: 475.0.0 -> 478.0.0 --- .../admin/google-cloud-sdk/components.json | 616 +++++++++--------- pkgs/tools/admin/google-cloud-sdk/data.nix | 22 +- 2 files changed, 319 insertions(+), 319 deletions(-) diff --git a/pkgs/tools/admin/google-cloud-sdk/components.json b/pkgs/tools/admin/google-cloud-sdk/components.json index 25154deed587..b15934f1e875 100644 --- a/pkgs/tools/admin/google-cloud-sdk/components.json +++ b/pkgs/tools/admin/google-cloud-sdk/components.json @@ -5,7 +5,7 @@ "checksum": "5a65179c291bc480696ca323d2f8c4874985458303eff8f233e16cdca4e88e6f", "contents_checksum": "038c999c7a7d70d5133eab7dc5868c4c3d0358431dad250f9833306af63016c8", "size": 800, - "source": "components/google-cloud-sdk-alpha-20240503145345.tar.gz", + "source": "components/google-cloud-sdk-alpha-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -22,8 +22,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240503145345, - "version_string": "2024.05.03" + "build_number": 20240524155722, + "version_string": "2024.05.24" } }, { @@ -258,15 +258,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "0.2.48" + "version_string": "0.2.51" } }, { "data": { - "checksum": "4072c0c3b3d6f40c5ca5969cf4ce3d530d45cb260b0ccea3d40099504307b7f4", - "contents_checksum": "0a6d7ed6b3073e8da7569f723fa6dd1c9907f0d270228dd02d16c9d1900089f7", - "size": 70276185, - "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20240209195330.tar.gz", + "checksum": "e1541d0f19866acd7f02ba9b730cd8baa79927214f51586785d22bd6dd9d96d0", + "contents_checksum": "37b07e4ab5884c8fc3163cf3f868b04de6b8fa65391d3f677f4638ed67bc6989", + "size": 70641868, + "source": "components/google-cloud-sdk-anthoscli-darwin-arm-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -290,16 +290,16 @@ }, "platform_required": false, "version": { - "build_number": 20240209195330, - "version_string": "0.2.48" + "build_number": 20240510142152, + "version_string": "0.2.51" } }, { "data": { - "checksum": "6d8ae30ff42cbd2549a77dd9b4542f1d6bd444adf7a9c1166a8688ca7a2f96da", - "contents_checksum": "f6d26cbd246d289b9a5f6df50adc8a7179b98358dee21873f71283384cd260f5", - "size": 73173000, - "source": "components/google-cloud-sdk-anthoscli-darwin-x86-20240209195330.tar.gz", + "checksum": "a79426a22ede74645a49f4f6ea2ead54f4bbb978d297507f0a9cc827aca74d4a", + "contents_checksum": "9cc851b3b90a0148b2136d673ef3750a16337270ec8850f6ce5678975058a9d5", + "size": 74278294, + "source": "components/google-cloud-sdk-anthoscli-darwin-x86-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -323,16 +323,16 @@ }, "platform_required": false, "version": { - "build_number": 20240209195330, - "version_string": "0.2.48" + "build_number": 20240510142152, + "version_string": "0.2.51" } }, { "data": { - "checksum": "5aa411f1acee57507bd5ed78b9370ddc47b07ed7a97c551677c5847211ca9d12", - "contents_checksum": "f6d26cbd246d289b9a5f6df50adc8a7179b98358dee21873f71283384cd260f5", - "size": 73173003, - "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20240209195330.tar.gz", + "checksum": "e0f65a9d0bcc4051d1cba885e4693ba002d868e8adcbfe860489836754db371c", + "contents_checksum": "9cc851b3b90a0148b2136d673ef3750a16337270ec8850f6ce5678975058a9d5", + "size": 74278297, + "source": "components/google-cloud-sdk-anthoscli-darwin-x86_64-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -356,16 +356,16 @@ }, "platform_required": false, "version": { - "build_number": 20240209195330, - "version_string": "0.2.48" + "build_number": 20240510142152, + "version_string": "0.2.51" } }, { "data": { - "checksum": "132825b8e3d349181132c31f6a9d3789997eaf733e79b49e6207315a00b21592", - "contents_checksum": "32d0ae794185fd24adaecc5b1c31715f600afbb70f079546fdaa3c22a0a18823", - "size": 67454849, - "source": "components/google-cloud-sdk-anthoscli-linux-arm-20240209195330.tar.gz", + "checksum": "a2a7bc2c5b398f38b611b9fb7f4cea1fdfc9a730c27812423fadf76302536ecd", + "contents_checksum": "5ebfe3a26d5efed23f391e280010b1162a11e75b9b8369ae3c82980bd0dec1dd", + "size": 67807780, + "source": "components/google-cloud-sdk-anthoscli-linux-arm-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -389,16 +389,16 @@ }, "platform_required": false, "version": { - "build_number": 20240209195330, - "version_string": "0.2.48" + "build_number": 20240510142152, + "version_string": "0.2.51" } }, { "data": { - "checksum": "f6451b9ed3b68042a5a58d5fa7d5281ac729291c3380733bb58e7fb4495339c5", - "contents_checksum": "1d0815760f9ee60b2837a16837c5550cffe144de6ff6d766521f553584dcccea", - "size": 65536636, - "source": "components/google-cloud-sdk-anthoscli-linux-x86-20240209195330.tar.gz", + "checksum": "fc5bcbc677a7066d48686c2fc8962172f56f2795378b5b95b65342246a3e550a", + "contents_checksum": "0795a21686a22fc15bf78e6055ae1a64aa98f0309baec8ad3f6bad75aade8f60", + "size": 65502037, + "source": "components/google-cloud-sdk-anthoscli-linux-x86-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -422,16 +422,16 @@ }, "platform_required": false, "version": { - "build_number": 20240209195330, - "version_string": "0.2.48" + "build_number": 20240510142152, + "version_string": "0.2.51" } }, { "data": { - "checksum": "353c04a84703c0a507ce095bdd2dae814b464a8d11273b29b517894815232707", - "contents_checksum": "5c444bb3875fe95e3b4e961a425c30d0d664c18a8f61eaf82935b041bfc0e637", - "size": 72231225, - "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20240209195330.tar.gz", + "checksum": "812d5fbea1d143efc81bb692e0868532a97f9a670043498961345c6a3bc2ebb8", + "contents_checksum": "6f1752f2e2fd0f524b35f6087029c44a7a4d1dca7fdd40de9cf375603eea3b0f", + "size": 72538768, + "source": "components/google-cloud-sdk-anthoscli-linux-x86_64-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -455,16 +455,16 @@ }, "platform_required": false, "version": { - "build_number": 20240209195330, - "version_string": "0.2.48" + "build_number": 20240510142152, + "version_string": "0.2.51" } }, { "data": { - "checksum": "dddd7a0af6168ce4f23dd26010f15232972c3c7ce134c7677605f81316bd9ef7", - "contents_checksum": "2f06c8d0090fdb54381888b0bcd66e8849c5c0e87a303a76bab56ab0a31c8bfd", - "size": 67482145, - "source": "components/google-cloud-sdk-anthoscli-windows-x86-20240209195330.tar.gz", + "checksum": "45f187c48434cae0b00da5c210480e607bbf187f43a40b66683b47e19bbb373b", + "contents_checksum": "e160ef2c6526ad052dfa619298d44383c7f7502392a92b38929521a9ca858630", + "size": 67424078, + "source": "components/google-cloud-sdk-anthoscli-windows-x86-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -488,16 +488,16 @@ }, "platform_required": false, "version": { - "build_number": 20240209195330, - "version_string": "0.2.48" + "build_number": 20240510142152, + "version_string": "0.2.51" } }, { "data": { - "checksum": "d4fd88249c1cc7a91a63ea9c1142b14c82d1c9c022d0302f0cd981963601c41d", - "contents_checksum": "a69fc1bacbf484cc8034c3eae2cb5479797c9db41461bef73cda18a96e26d672", - "size": 72854116, - "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20240209195330.tar.gz", + "checksum": "cb5f588dffbb5d629588ea15e6fb44536a477c6bf55c5ae02a0a4ef65f1e433a", + "contents_checksum": "c5ce5039556b91366d6ed1e35aeb57b796f0b73c135ac29178ee615e43805209", + "size": 73168252, + "source": "components/google-cloud-sdk-anthoscli-windows-x86_64-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -521,8 +521,8 @@ }, "platform_required": false, "version": { - "build_number": 20240209195330, - "version_string": "0.2.48" + "build_number": 20240510142152, + "version_string": "0.2.51" } }, { @@ -1020,10 +1020,10 @@ }, { "data": { - "checksum": "8d48814998e693aad877ddac4e1cc9c16b107898eda5e1e8fde6f677968a121c", - "contents_checksum": "b6d38276b7131e073deaff71ecdb3b994fd4a4bdfc4a9a2b2e64cff35884ad49", - "size": 132375338, - "source": "components/google-cloud-sdk-app-engine-java-20240329151455.tar.gz", + "checksum": "b1609ab7b619594661f457a0e58e3f72be94dfee7686af3bf1480a9804a1364d", + "contents_checksum": "582e30d1bd5e7d63b92f565111424585ab69af8da8d75ed2bc738d033c4f0600", + "size": 133086961, + "source": "components/google-cloud-sdk-app-engine-java-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -1041,8 +1041,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240329151455, - "version_string": "2.0.26" + "build_number": 20240510142152, + "version_string": "2.0.27" } }, { @@ -1432,7 +1432,7 @@ "checksum": "707d412854a14450b4fddee199d258e75946fe51b44eb2980c8cd7e274c15760", "contents_checksum": "0b4e9d8e6394dc841aece07ca4da91920a460cbd7ec22495be4a2b4f46635b4d", "size": 797, - "source": "components/google-cloud-sdk-beta-20240503145345.tar.gz", + "source": "components/google-cloud-sdk-beta-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -1449,8 +1449,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240503145345, - "version_string": "2024.05.03" + "build_number": 20240524155722, + "version_string": "2024.05.24" } }, { @@ -1765,10 +1765,10 @@ }, { "data": { - "checksum": "a99ddbb8738b92fb9e899fdcd81b8f6ff10499ae301d4c5660de756d5c689046", - "contents_checksum": "c2012e29e4fe8f14dacb252272e0953ea0618df9f9182bb6405eb7bcbab5af96", - "size": 1746678, - "source": "components/google-cloud-sdk-bq-20240412130805.tar.gz", + "checksum": "cde4e71a348b97ed7da266d97745519c70c806793d3495b5f14d9b5062a73384", + "contents_checksum": "ce776833b9b7645c4e36ba6a5df015e90c8d8976d6c7bf18a5b6281f81ee015d", + "size": 1789662, + "source": "components/google-cloud-sdk-bq-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -1787,8 +1787,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240412130805, - "version_string": "2.1.4" + "build_number": 20240524155722, + "version_string": "2.1.5" } }, { @@ -2014,10 +2014,10 @@ }, { "data": { - "checksum": "e0819134f743b2524add92d5ed3bfff5e4098dfd5d77944ef1a8f95a14fe02ee", - "contents_checksum": "3969f4cfb146659adf2d3b34dfe6e0a3b471317db2512ff3c1523b809b5ad765", - "size": 78486918, - "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20240229170130.tar.gz", + "checksum": "400089c6607993c7b9e5f06616208e592a3a9892589e8c10167f70bfabdb5a2b", + "contents_checksum": "e147b6037ab53942f556f7914ce786005473f41d8b98c24b2d2ab9342e366b31", + "size": 78697278, + "source": "components/google-cloud-sdk-bundled-python3-unix-linux-x86_64-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -2042,7 +2042,7 @@ }, "platform_required": false, "version": { - "build_number": 20240229170130, + "build_number": 20240510142152, "version_string": "3.11.8" } }, @@ -2148,15 +2148,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.19.0" + "version_string": "1.20.0" } }, { "data": { - "checksum": "afa1887247d8c5eb0ab71127767c289267f5742702e07827d4c856249efc3753", - "contents_checksum": "c2239a7e4967b5c0ab0a3bf09328d269a444b06dfab5617879f29ec94bbde352", - "size": 17509814, - "source": "components/google-cloud-sdk-cbt-darwin-arm-20240329151455.tar.gz", + "checksum": "d5cbe5833410e7311827444000ca564d8bbe608a1a2e647245ba3d36bf0c2f8f", + "contents_checksum": "96989a9ef3161e0b0b694c7fd66620fd40c12acb8de95f539f57ddcbe0cbd4a4", + "size": 17893438, + "source": "components/google-cloud-sdk-cbt-darwin-arm-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -2180,8 +2180,8 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, - "version_string": "1.19.0" + "build_number": 20240510142152, + "version_string": "1.20.0" } }, { @@ -2219,10 +2219,10 @@ }, { "data": { - "checksum": "1fc383dfab3e4c99969d05b939620349fadd115124cfcfd7e6d5c8853718f7cf", - "contents_checksum": "76b3bc91860334a7263fbad820ac8ac2db54ca773568aafb86e9221e717e24d3", - "size": 18273086, - "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20240329151455.tar.gz", + "checksum": "cd3facd4c0e16eac188743379a6d967bfdb93d7bf169bdce8239323663b7b048", + "contents_checksum": "a3ae695ae36042223c03c6e0cff6a153f20cc9635da83c270d1008f1e65c2f55", + "size": 18664476, + "source": "components/google-cloud-sdk-cbt-darwin-x86_64-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -2246,16 +2246,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, - "version_string": "1.19.0" + "build_number": 20240510142152, + "version_string": "1.20.0" } }, { "data": { - "checksum": "2ea8a9dfff13f06b8498622b7b4a13488749dc4ac1560728f3df9fe63537df88", - "contents_checksum": "f70c2888bdb2efec1afe421edc65bef9c356fec3b09a5cc0c4650409dca303f2", - "size": 17062983, - "source": "components/google-cloud-sdk-cbt-linux-arm-20240329151455.tar.gz", + "checksum": "f3ca11891da580532e6aa4598d8fbde08f761b950636ce48094f738f5bdfdbc9", + "contents_checksum": "e2dd27cc276256584d33c02f81c71b078eba398e57802f534b42bd5b9be09a08", + "size": 17422248, + "source": "components/google-cloud-sdk-cbt-linux-arm-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -2279,16 +2279,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, - "version_string": "1.19.0" + "build_number": 20240510142152, + "version_string": "1.20.0" } }, { "data": { - "checksum": "25ffea5b8d4a13120cbff9cdeee10759f0149f522efa3b090de7e49fcfe44ca4", - "contents_checksum": "73be18b59b731a6c2aca12e254c0248039ee0b4d3f460198f84842a9753286c9", - "size": 16860591, - "source": "components/google-cloud-sdk-cbt-linux-x86-20240329151455.tar.gz", + "checksum": "57696fc6c79eaf43af572ea73a7fd2de8ec37f49e739ff2b4dfcc03dbf5b5911", + "contents_checksum": "8c219444eccd9a4dab443586df961def13e95449e2e225e5e3d27d04124358fb", + "size": 17237577, + "source": "components/google-cloud-sdk-cbt-linux-x86-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -2312,16 +2312,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, - "version_string": "1.19.0" + "build_number": 20240510142152, + "version_string": "1.20.0" } }, { "data": { - "checksum": "0e5a55bd053d76d9f22223728241e1a0ca89b36661a7e886250de942da8afd76", - "contents_checksum": "fb9e07d468b2d3043632c4b1ace676cc503e5e5efa5b8c3a757f1725cb142dbc", - "size": 18166629, - "source": "components/google-cloud-sdk-cbt-linux-x86_64-20240329151455.tar.gz", + "checksum": "50325cf8742e4c14c1ec11d57f9e9e0fbb7eaee2bd3474b1deb0bb6ed146a676", + "contents_checksum": "d464a3b284972bf15830d964b89a9c1ddc6c6e19b6e8c4b93470f4fdca1f78ab", + "size": 18566977, + "source": "components/google-cloud-sdk-cbt-linux-x86_64-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -2345,16 +2345,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, - "version_string": "1.19.0" + "build_number": 20240510142152, + "version_string": "1.20.0" } }, { "data": { - "checksum": "b6b9ad0a151bcddc67829349ed03f18b21598b6ced116eb721947acabe4cae10", - "contents_checksum": "13b82fdff12b1385cdf3fc71da26f449c2668cf45fff1d0fb76d3c9b9992a64c", - "size": 17268775, - "source": "components/google-cloud-sdk-cbt-windows-x86-20240329151455.tar.gz", + "checksum": "1ac8348cea516de3639d37942f8b9fe4fc7a128431ab82f8b53f0a1ba36fdc75", + "contents_checksum": "9b7a21e015629f59cd3c1c5965c2773a2f078888792f100b05458b9c68b650b1", + "size": 17660232, + "source": "components/google-cloud-sdk-cbt-windows-x86-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -2378,16 +2378,16 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, - "version_string": "1.19.0" + "build_number": 20240510142152, + "version_string": "1.20.0" } }, { "data": { - "checksum": "ba26da1afb70320e7faeecd5f0378b3d9e16dd7e51091c373c79a53d1fb0fde4", - "contents_checksum": "492d56556efb6c662c8702d66dc4b48e837de0112fc1e949ea7e24671eee5840", - "size": 18413114, - "source": "components/google-cloud-sdk-cbt-windows-x86_64-20240329151455.tar.gz", + "checksum": "601cd2b70e0db9a8a8fcc8120bc0ecf79b6a896087e994a2e343f7db2505d2e7", + "contents_checksum": "287f76af634352c8d9e8ed3648268b58f2341c82d83bdd82c8715d45ad9e6954", + "size": 18828246, + "source": "components/google-cloud-sdk-cbt-windows-x86_64-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -2411,8 +2411,8 @@ }, "platform_required": false, "version": { - "build_number": 20240329151455, - "version_string": "1.19.0" + "build_number": 20240510142152, + "version_string": "1.20.0" } }, { @@ -2572,10 +2572,10 @@ }, { "data": { - "checksum": "93285cbe088cafc8d3761476b276be1c19a3718ac4545692ece4e6cc147deed8", - "contents_checksum": "fe301599250d79f91f06cfdf570fa5815c82414d322d085b1fa47a364bf7ae12", - "size": 47265060, - "source": "components/google-cloud-sdk-cloud-firestore-emulator-20240503145345.tar.gz", + "checksum": "0f7a96ab1d83ba0e4f53149c6cfc555dfd80be065a4ca966b101feb27fd2061a", + "contents_checksum": "2a20a45ed2b832217af8be6ab9155a3aa718ae60eed21acc19a93aee536884f6", + "size": 47379482, + "source": "components/google-cloud-sdk-cloud-firestore-emulator-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -2592,8 +2592,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240503145345, - "version_string": "1.19.6" + "build_number": 20240524155722, + "version_string": "1.19.7" } }, { @@ -2818,15 +2818,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.5.16" + "version_string": "1.5.18" } }, { "data": { - "checksum": "555c0b4202082b7e94bc9d910460b4f28d2ea6ebf4d51a58825d244331961f84", - "contents_checksum": "e0ad5cac6f972f24e4390fd7d9d54420bc7432ecdcb9c21a299a07ecb893d8cd", - "size": 38255843, - "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20240426154730.tar.gz", + "checksum": "23a3bc38e7f0a1df5526c64eaa8e5e210ed7d87e547396eb76b40cfc4b501389", + "contents_checksum": "6553bbd9db825db5ba50a1141e59303417f4f019780a899eb4217a4ef083b476", + "size": 38325669, + "source": "components/google-cloud-sdk-cloud-spanner-emulator-linux-x86_64-20240517151541.tar.gz", "type": "tar" }, "dependencies": [ @@ -2851,8 +2851,8 @@ }, "platform_required": false, "version": { - "build_number": 20240426154730, - "version_string": "1.5.16" + "build_number": 20240517151541, + "version_string": "1.5.18" } }, { @@ -3419,15 +3419,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.93.0" + "version_string": "1.118.1" } }, { "data": { - "checksum": "dd20420980225726c0bb881fdcfb935bf8d25aad84f0bb315e4d5b0ce51cf0fa", - "contents_checksum": "8dc4d4419a866c0aaa33fd0d4e0fde885aa926dcf9b8025a580e060b916ca599", - "size": 58308273, - "source": "components/google-cloud-sdk-config-connector-darwin-arm-20220912133630.tar.gz", + "checksum": "34e5709351b7d784dcec4227b47b3b4eaa6f3a8f15135636eb05aba919f23758", + "contents_checksum": "a1c8abf6c88e0d3a8ebd47f3850c3b5500ce0a89819fc5e44c4798e5ad13e58a", + "size": 93030625, + "source": "components/google-cloud-sdk-config-connector-darwin-arm-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -3451,16 +3451,16 @@ }, "platform_required": false, "version": { - "build_number": 20220912133630, - "version_string": "1.93.0" + "build_number": 20240524155722, + "version_string": "1.118.1" } }, { "data": { - "checksum": "541307135cc5c06430cf1368a5a6f9dfe050031aedf1b7e7497362505f81074b", - "contents_checksum": "d234dc236ff1c4d88fb4caebd61955df9d3ee5b3db094472dce64f031d646e97", - "size": 59915703, - "source": "components/google-cloud-sdk-config-connector-darwin-x86_64-20220912133630.tar.gz", + "checksum": "d5be87f40407d484fe3a7af51da3fecaf8760cbe75d84fd2ad508d0f82dcec72", + "contents_checksum": "b84e55a8a76aebcb792f4c43a29679fa8b486c8768bda279ff5b418fa18b3bbe", + "size": 97180772, + "source": "components/google-cloud-sdk-config-connector-darwin-x86_64-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -3484,16 +3484,16 @@ }, "platform_required": false, "version": { - "build_number": 20220912133630, - "version_string": "1.93.0" + "build_number": 20240524155722, + "version_string": "1.118.1" } }, { "data": { - "checksum": "693e9b1fdb2b8958388dca7abc405891d481c5973a5a622da8fa54920114af2c", - "contents_checksum": "b29263faa92ec2b3a2780f837c14d991c570914d7a9df10940325fab9e6cbe4d", - "size": 54695578, - "source": "components/google-cloud-sdk-config-connector-linux-arm-20220912133630.tar.gz", + "checksum": "a0698596420502c55bf09ecd68db53217e1b3e64bfad522eb8e4c2c67c8a6610", + "contents_checksum": "998d2544b37dd4dbaffc9e3a90191b500edd4b49157a77e024c187b16547b3d9", + "size": 90082586, + "source": "components/google-cloud-sdk-config-connector-linux-arm-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -3517,16 +3517,16 @@ }, "platform_required": false, "version": { - "build_number": 20220912133630, - "version_string": "1.93.0" + "build_number": 20240524155722, + "version_string": "1.118.1" } }, { "data": { - "checksum": "62babd72829ff1e9c0ee92ee5fcf0052b19780ff028014871ab73d34aeff4021", - "contents_checksum": "29127a962616825f78276a0143a3b75239c66d7df4f582aee85b3801e9590a8d", - "size": 59462846, - "source": "components/google-cloud-sdk-config-connector-linux-x86_64-20220912133630.tar.gz", + "checksum": "3b7988660b12c41ea98cdb1c0a8230c03a113d20b6ffde586d9bc3f4f66b421d", + "contents_checksum": "72c7d8ea234d7ed6b6910709d08113da6f215945bc8fccf410ec546ee088353a", + "size": 95472847, + "source": "components/google-cloud-sdk-config-connector-linux-x86_64-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -3550,16 +3550,16 @@ }, "platform_required": false, "version": { - "build_number": 20220912133630, - "version_string": "1.93.0" + "build_number": 20240524155722, + "version_string": "1.118.1" } }, { "data": { - "checksum": "e2b541bcbbfcdcd359bc828c7d51538cda3ef0fc4f90ad7ca274792b643bd74f", - "contents_checksum": "5221ebb5c2a0cc2c8752806c680382f21366c87cda41f5aa0e009da0d73e9bce", - "size": 59649780, - "source": "components/google-cloud-sdk-config-connector-windows-x86_64-20220912133630.tar.gz", + "checksum": "0300fc4eac0f70400384cc5fdea19166ffb9b44d874ea6c32205e6f3975a4a0e", + "contents_checksum": "ccba2ee9abc014d84b2404f34518c10913eb20fa19d5f7c996cd73d89fea42dd", + "size": 96121234, + "source": "components/google-cloud-sdk-config-connector-windows-x86_64-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -3583,16 +3583,16 @@ }, "platform_required": false, "version": { - "build_number": 20220912133630, - "version_string": "1.93.0" + "build_number": 20240524155722, + "version_string": "1.118.1" } }, { "data": { - "checksum": "e8e87ff80c3f46ff4bce660c584ebe7bae8679366c9d2bf5ec5f98c06e450aa5", - "contents_checksum": "56ce80562703967dc39b2b05e6dd814e07cfe07a078706d9f0ad6ce0716495c8", - "size": 19446060, - "source": "components/google-cloud-sdk-core-20240503145345.tar.gz", + "checksum": "6c1aadf0ae74503a46ea8d4d5d55b17853624ad503b5edea1f18f17d2ff829a6", + "contents_checksum": "11808d47d5b9f497baf24d6e5d91949d0258215fcc3cecefa1eb439b62cfbe5f", + "size": 19546688, + "source": "components/google-cloud-sdk-core-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -3613,8 +3613,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240503145345, - "version_string": "2024.05.03" + "build_number": 20240524155722, + "version_string": "2024.05.24" } }, { @@ -4668,10 +4668,10 @@ }, { "data": { - "checksum": "19aaaf05ce45d6a62dac77e167d4315563dcadddfa9838da2ac9bc9df4ccac62", - "contents_checksum": "b2c128b9a1602e364e4801df1f6ec76004cd84fa2ab25c9df1b309eec73377b3", - "size": 6857693, - "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240503145345.tar.gz", + "checksum": "00d4d5a33fcc9ed3e2234f551b63b1ee2a997ee7d40b5812ce00e1ab3db9cbdd", + "contents_checksum": "0db1f61e6c193d520df0b9b89589a999466406a374eede0e6a402b80210b9f21", + "size": 6964181, + "source": "components/google-cloud-sdk-gcloud-man-pages-nix-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -4696,7 +4696,7 @@ }, "platform_required": false, "version": { - "build_number": 20240503145345, + "build_number": 20240524155722, "version_string": "" } }, @@ -4969,10 +4969,10 @@ }, { "data": { - "checksum": "b4fc023adfe1710bf0ed63ee39aacbaddf090f97deb9435a6e9a955b72904985", - "contents_checksum": "c995625b17def8c1cdabb251bbd61259dc4b3aabc2d15f0dde5259726581dbe7", - "size": 11833901, - "source": "components/google-cloud-sdk-gsutil-20231025210228.tar.gz", + "checksum": "b5ad2b82a6e8ae3fd644e8021b74bde9603bfbf68eb0da56a11a9b6c1082f4fa", + "contents_checksum": "0a00a72f6a2e3a700fad29c05b9f4418fd7e5d3a20aea9a128306251c58d34e0", + "size": 11893574, + "source": "components/google-cloud-sdk-gsutil-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -4991,8 +4991,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20231025210228, - "version_string": "5.27" + "build_number": 20240510142152, + "version_string": "5.29" } }, { @@ -5310,15 +5310,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.0.0-beta.49" + "version_string": "1.0.0-beta.50" } }, { "data": { - "checksum": "0790df1606aadcd3818ad4dd7e7826d454602c6e7d2c93376285c8b73487a91b", - "contents_checksum": "3dbe499874490929331944b276ff0332f4e94f1babf071e6779cb52746bdc906", - "size": 15088020, - "source": "components/google-cloud-sdk-kpt-darwin-arm-20231215195722.tar.gz", + "checksum": "ae0dad6460ee54cc820b57ff6f384d294c30cadf42e834dc45f2e288ad627e19", + "contents_checksum": "74e9c5f7088cbd6c7824a18eddc4721889ebcdf50bb1958dca7557f3c1646cbe", + "size": 14487151, + "source": "components/google-cloud-sdk-kpt-darwin-arm-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -5342,16 +5342,16 @@ }, "platform_required": false, "version": { - "build_number": 20231215195722, - "version_string": "1.0.0-beta.49" + "build_number": 20240510142152, + "version_string": "1.0.0-beta.50" } }, { "data": { - "checksum": "ca3bceb9312bb492a1050ba6ed200b835102c58c76d55f9d1c6822c3e074d7e9", - "contents_checksum": "706fe93e6842fe68860507bc65fdbe08660e1063d61c882667dee51608789284", - "size": 15854938, - "source": "components/google-cloud-sdk-kpt-darwin-x86_64-20231215195722.tar.gz", + "checksum": "e80ffcb2338f17d70bcf5e0d77b049817ad154851f8a68c5a4a112ee3f1fa3e5", + "contents_checksum": "2ccd31d47996bb1e7ad06ef860c2099a88be1b8a9deba0afbd12b9a1bce83e38", + "size": 15556773, + "source": "components/google-cloud-sdk-kpt-darwin-x86_64-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -5375,16 +5375,16 @@ }, "platform_required": false, "version": { - "build_number": 20231215195722, - "version_string": "1.0.0-beta.49" + "build_number": 20240510142152, + "version_string": "1.0.0-beta.50" } }, { "data": { - "checksum": "56d0a81d5b31304c153cf07d4b5eeb433a27245c095f9e181f49eb8b98536ace", - "contents_checksum": "78fe72d925a7144d71ac007c684d7fcbdb3f9b4e5e454bcd6c49ebc133cf132f", - "size": 13629886, - "source": "components/google-cloud-sdk-kpt-linux-arm-20231215195722.tar.gz", + "checksum": "eeb8b320e5d50954c584f84fd0b5d46549ccf7a402628362cdaca39e141bc132", + "contents_checksum": "b52727552507224193bd48871158707738f0582138f4dc6e0eb0a3f83231d61a", + "size": 13818240, + "source": "components/google-cloud-sdk-kpt-linux-arm-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -5408,16 +5408,16 @@ }, "platform_required": false, "version": { - "build_number": 20231215195722, - "version_string": "1.0.0-beta.49" + "build_number": 20240510142152, + "version_string": "1.0.0-beta.50" } }, { "data": { - "checksum": "72b3a2a1e41963a892899e273fff38aa93a83acdc90d59c9f3c335fa62b1d30b", - "contents_checksum": "3de022e880f11c7cbb0e258281b2dc5a7c32ebf688958a99feecaae684cc62bd", - "size": 15090734, - "source": "components/google-cloud-sdk-kpt-linux-x86_64-20231215195722.tar.gz", + "checksum": "db9b4541f14732e4569bcba320a989b8e54660d53088f45b265d234175bdd8e4", + "contents_checksum": "0f56e5d3cee14e5f8e6091938a4ed755de5dd4520643f65b11c2515f94c30631", + "size": 15264863, + "source": "components/google-cloud-sdk-kpt-linux-x86_64-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -5441,16 +5441,16 @@ }, "platform_required": false, "version": { - "build_number": 20231215195722, - "version_string": "1.0.0-beta.49" + "build_number": 20240510142152, + "version_string": "1.0.0-beta.50" } }, { "data": { - "checksum": "8ce711be6e55790700edd6d6f7c03a2fa5a1c5b8cea7571aab75300e976b924c", - "contents_checksum": "90557d61aa4010c4cf40966c482a9560a6ebab9f66fe3858db13134d1a3766fc", - "size": 35936, - "source": "components/google-cloud-sdk-kubectl-20240322135349.tar.gz", + "checksum": "c21058af28fe7e220aa8cfb02b4d0a73036a91b52e1efa976f5c1fce50fef2ab", + "contents_checksum": "2e0a5ed80f5d195267068f7166e405a95076d362df4b0e391ba000d957a3df00", + "size": 35803, + "source": "components/google-cloud-sdk-kubectl-20240517151541.tar.gz", "type": "tar" }, "dependencies": [ @@ -5474,16 +5474,16 @@ "platform": {}, "platform_required": true, "version": { - "build_number": 20240322135349, - "version_string": "1.26.15" + "build_number": 20240517151541, + "version_string": "1.27.14" } }, { "data": { - "checksum": "893498f06440eac7fe42bd0c42e83ab1e2fd30a0bd1d53ddd8ebfebc27d8ca8a", - "contents_checksum": "71c9869732c57c7c66cec80e59ab20bcc2e94b1cc79dce1c8093b2f0862b1383", - "size": 91161627, - "source": "components/google-cloud-sdk-kubectl-darwin-arm-20240426154730.tar.gz", + "checksum": "f0046d0cacea55159afe64d1c1b86a9d75b8cb9a3c5f2fb3620ad38136756d91", + "contents_checksum": "d0f9bede72e21ed6dceac46adf9ff6a50dc6962879ffcdbe9c6e2e09afe7bc38", + "size": 76286320, + "source": "components/google-cloud-sdk-kubectl-darwin-arm-20240517151541.tar.gz", "type": "tar" }, "dependencies": [ @@ -5508,16 +5508,16 @@ }, "platform_required": true, "version": { - "build_number": 20240426154730, - "version_string": "1.26.15" + "build_number": 20240517151541, + "version_string": "1.27.14" } }, { "data": { - "checksum": "ddf25a006aeedb5e717d474dc695882caf35a4befaace22f28d9a4d0fee28bae", - "contents_checksum": "ac249c8eca65960152719c9440c197a0be335fa1d2e724a32e77418dacd6dd12", - "size": 96033579, - "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20240426154730.tar.gz", + "checksum": "db8f9ca7b6aa0027ac3e1118891a189147531048dd89c8b1636ac66200878384", + "contents_checksum": "dbf4b56dfad764ba9cb4eed4a4953bbed3aff19fd8788eb214383b3612dae392", + "size": 80437849, + "source": "components/google-cloud-sdk-kubectl-darwin-x86_64-20240517151541.tar.gz", "type": "tar" }, "dependencies": [ @@ -5542,16 +5542,16 @@ }, "platform_required": true, "version": { - "build_number": 20240426154730, - "version_string": "1.26.15" + "build_number": 20240517151541, + "version_string": "1.27.14" } }, { "data": { - "checksum": "25279f7ff336d39f312dd6f363100b8329ad19e402c378230bfb2a8c4181325e", - "contents_checksum": "255cb5b298d9ddb4f81aa7571d452e3adab7c464e1c2b4686d1bfd5eec7e5abd", - "size": 86862918, - "source": "components/google-cloud-sdk-kubectl-linux-arm-20240426154730.tar.gz", + "checksum": "1cd785b6e4a438283b8be7547eb187077ef16f062d7455c2365dfc859215ab40", + "contents_checksum": "4e5a6e6dadb4f0789198190eb5eb4f754fc6e5aaf1f75ca8c5a6cb458815cb8a", + "size": 73476445, + "source": "components/google-cloud-sdk-kubectl-linux-arm-20240517151541.tar.gz", "type": "tar" }, "dependencies": [ @@ -5576,16 +5576,16 @@ }, "platform_required": true, "version": { - "build_number": 20240426154730, - "version_string": "1.26.15" + "build_number": 20240517151541, + "version_string": "1.27.14" } }, { "data": { - "checksum": "6e8d0ea5ba1b88b82c902d869e54cb42d69cab4544e9b87190e8a9751b8e7510", - "contents_checksum": "5ef6f72d98198ce6ec9a380fab8925259fca9aef9e5afc22bef4f1d8d01c3cf4", - "size": 85033644, - "source": "components/google-cloud-sdk-kubectl-linux-x86-20240426154730.tar.gz", + "checksum": "fe8ae00f29adbe46a07b9a5ecc167dfbc553675becf61135321a985672d1a2d3", + "contents_checksum": "baae0e60cf98e356e8a3848c91464f298f905ae688d7d93028e518662bfe1178", + "size": 71253795, + "source": "components/google-cloud-sdk-kubectl-linux-x86-20240517151541.tar.gz", "type": "tar" }, "dependencies": [ @@ -5610,16 +5610,16 @@ }, "platform_required": true, "version": { - "build_number": 20240426154730, - "version_string": "1.26.15" + "build_number": 20240517151541, + "version_string": "1.27.14" } }, { "data": { - "checksum": "2463ae5fa3cdb8952183845b4b1d5a335edfb22716f38525441121a8233177f0", - "contents_checksum": "41dc3fa15a64ab76478e164cb48bfaf6e93bceaec8edc32772a20deec1a592ea", - "size": 91798182, - "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20240426154730.tar.gz", + "checksum": "2b8ca7ccbc9521579db6b64b2944561721d02746978e7abb915efa725c0ce0de", + "contents_checksum": "7c601db0aefcf2c6d92956a8c1fe83189fca6eef9e9f715c36387096270949f9", + "size": 76954346, + "source": "components/google-cloud-sdk-kubectl-linux-x86_64-20240517151541.tar.gz", "type": "tar" }, "dependencies": [ @@ -5644,8 +5644,8 @@ }, "platform_required": true, "version": { - "build_number": 20240426154730, - "version_string": "1.26.15" + "build_number": 20240517151541, + "version_string": "1.27.14" } }, { @@ -5848,10 +5848,10 @@ }, { "data": { - "checksum": "ea209e06d08eed40e21b67d72464b125a44c0bff85e846d44aef998ddfe5fc1f", - "contents_checksum": "b4a4f3ff7f7b3c687cf47a38813226385f7e893fdcd9a7a5d60b1dbdf99ae2a3", - "size": 89369395, - "source": "components/google-cloud-sdk-kubectl-windows-x86-20240426154730.tar.gz", + "checksum": "2e69b9fefdab2e33e2a68e244606e9e5588ed091a7e0ed1bb43850eba7e8d4ec", + "contents_checksum": "7b43f42e006d3406b46e6d3c69725d886036cb4f4f3072b210a850f79021b0db", + "size": 74875962, + "source": "components/google-cloud-sdk-kubectl-windows-x86-20240517151541.tar.gz", "type": "tar" }, "dependencies": [ @@ -5878,16 +5878,16 @@ }, "platform_required": true, "version": { - "build_number": 20240426154730, - "version_string": "1.26.15" + "build_number": 20240517151541, + "version_string": "1.27.14" } }, { "data": { - "checksum": "0841109ca38d58e3dde3b54854b52ca1a0ac3405cbd7c76ea23cad5c31bdad2b", - "contents_checksum": "d024e22580bf9c9e3e35a5952241cae4681411e9b33c76f19b1b4b623b7269b1", - "size": 94204602, - "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20240426154730.tar.gz", + "checksum": "58ab256106978ea9bfa7a52a2e8ce85fb4bd8b606d120d1a040675d8df610f2f", + "contents_checksum": "6a935880c971037634a2312f25efe9df72cd08b8d5293a20b33f7cfe8c2d3e3a", + "size": 78994894, + "source": "components/google-cloud-sdk-kubectl-windows-x86_64-20240517151541.tar.gz", "type": "tar" }, "dependencies": [ @@ -5914,8 +5914,8 @@ }, "platform_required": true, "version": { - "build_number": 20240426154730, - "version_string": "1.26.15" + "build_number": 20240517151541, + "version_string": "1.27.14" } }, { @@ -6472,15 +6472,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.32.0" + "version_string": "1.33.1" } }, { "data": { - "checksum": "6cdb5663bc455017a2c1b7a7d34acaacc7cb4b0af5785db6ccdbfb0beec199fd", - "contents_checksum": "f7ca3880897a3db31c4619210464df1577b933823248436b8d7b1981d5d302df", - "size": 35193661, - "source": "components/google-cloud-sdk-minikube-darwin-arm-20231201141418.tar.gz", + "checksum": "9a786ac2caf5f10da8c81e013b4c2356aaf219518c30f5b71ee2a695b0caf540", + "contents_checksum": "35e0ed7d0c227ebeaa12ce1577086f0d2a90488099c31656c80a7fb85a63c1cd", + "size": 36470728, + "source": "components/google-cloud-sdk-minikube-darwin-arm-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -6504,16 +6504,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.32.0" + "build_number": 20240524155722, + "version_string": "1.33.1" } }, { "data": { - "checksum": "cdad196423217d1a81f1a00f8d706d4e05a27f58c21660e383d78351f4eda51c", - "contents_checksum": "da96e69ac893ea621f909904c57c57e34b1ae56f60b2de84427fb5d0a6df568f", - "size": 36498067, - "source": "components/google-cloud-sdk-minikube-darwin-x86_64-20231201141418.tar.gz", + "checksum": "05b2b1c945118485c245cf54fab1f34b8511a15523ce98cae552fffc53376ba4", + "contents_checksum": "bbee348ae4cfca17b25da2b53a3f56f38717db3a5f0062f2dcc2882042bc32a4", + "size": 38183819, + "source": "components/google-cloud-sdk-minikube-darwin-x86_64-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -6537,16 +6537,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.32.0" + "build_number": 20240524155722, + "version_string": "1.33.1" } }, { "data": { - "checksum": "8a80e98200d3572f803d700c8475c25f143d30997491ff4aaddb30633ab2cf76", - "contents_checksum": "af8b9577ef05c98d3cb2fe6832a8c2bf182f2cd19cb64a22f492581fc2882d2b", - "size": 34568485, - "source": "components/google-cloud-sdk-minikube-linux-arm-20231201141418.tar.gz", + "checksum": "1e606715175e67b6668ad0c93d34a0748fa31df905377def5c0f0a67417eec15", + "contents_checksum": "3e1cbed6062ff69dde78ef5d0c1b0a1202a2b97a24e3749beb887be196dbb644", + "size": 35836316, + "source": "components/google-cloud-sdk-minikube-linux-arm-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -6570,16 +6570,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.32.0" + "build_number": 20240524155722, + "version_string": "1.33.1" } }, { "data": { - "checksum": "54e5932d307b935e9033bfa9ab956f701ce2bee640c16fddf2ba1f061f2707cd", - "contents_checksum": "28c6cb2657e863e1023b2f905edf91735e0a122c210669fd59e914ecdcb25846", - "size": 37111912, - "source": "components/google-cloud-sdk-minikube-linux-x86_64-20231201141418.tar.gz", + "checksum": "fbe9eed12c7b49767778b7a7e0aba68b1eb627e95835151aa6412d27fd609b58", + "contents_checksum": "d2a2cd4237e2b9c45cee53ad07ad30d4e3523fdc814df0947abcccf5a3775784", + "size": 36038651, + "source": "components/google-cloud-sdk-minikube-linux-x86_64-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -6603,16 +6603,16 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.32.0" + "build_number": 20240524155722, + "version_string": "1.33.1" } }, { "data": { - "checksum": "66ccc0487812cac8ab071d878eda07fae7440eb232df9177520cd1522d67cd92", - "contents_checksum": "6a7de15384ab840952fdbcecad98e73b479542120dc0b9621b0c9452bcca4023", - "size": 37199202, - "source": "components/google-cloud-sdk-minikube-windows-x86_64-20231201141418.tar.gz", + "checksum": "ce9537f1d9706122778e78536a630727067879480ee998172dbd1b79880f303b", + "contents_checksum": "e6fb6538cd3967e201d933e73b37e574b00eab9c3dbe6681ebc779a703865a86", + "size": 38517955, + "source": "components/google-cloud-sdk-minikube-windows-x86_64-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -6636,8 +6636,8 @@ }, "platform_required": false, "version": { - "build_number": 20231201141418, - "version_string": "1.32.0" + "build_number": 20240524155722, + "version_string": "1.33.1" } }, { @@ -6665,15 +6665,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "1.17.3-rc.2" + "version_string": "1.18.0-rc.3" } }, { "data": { - "checksum": "d419aaa0a419d8a01b025d5b79372e92d0b08def255e7a8bfb0361c8332267f6", - "contents_checksum": "d3f8f98cdba8da0aadf0a19d8503955023f70a2d8045838b893eb3e0b0e345ce", - "size": 29981660, - "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20240322135349.tar.gz", + "checksum": "e25768b4cc121658267bacecd76c6bef913ce8f83046e168361199dc47946f0e", + "contents_checksum": "2703dbbec230c683ab31645f2c85764797de91502c9336fec4f216e12e7e0919", + "size": 30051781, + "source": "components/google-cloud-sdk-nomos-darwin-x86_64-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -6697,16 +6697,16 @@ }, "platform_required": false, "version": { - "build_number": 20240322135349, - "version_string": "1.17.3-rc.2" + "build_number": 20240510142152, + "version_string": "1.18.0-rc.3" } }, { "data": { - "checksum": "d744e544fc05b996439c39e36454ec902f2998bcc9bf9d32337aaeb34bbb604e", - "contents_checksum": "d0458512f4a0047c7ba2504246d8428fc0f8de3fec56b37b69b43e62ceb2af75", - "size": 30144536, - "source": "components/google-cloud-sdk-nomos-linux-x86_64-20240322135349.tar.gz", + "checksum": "3ab5af0f69751230c98c7920e3931cd36bdd40c3306190e4ad16c0e768d2eee8", + "contents_checksum": "6ea201c0f057a3a58d43c6e4b3fc1691c5cf00ed27ac40e92528d2334d89c885", + "size": 30217798, + "source": "components/google-cloud-sdk-nomos-linux-x86_64-20240510142152.tar.gz", "type": "tar" }, "dependencies": [ @@ -6730,8 +6730,8 @@ }, "platform_required": false, "version": { - "build_number": 20240322135349, - "version_string": "1.17.3-rc.2" + "build_number": 20240510142152, + "version_string": "1.18.0-rc.3" } }, { @@ -7262,15 +7262,15 @@ "platform_required": false, "version": { "build_number": 0, - "version_string": "3.2.4" + "version_string": "3.2.5" } }, { "data": { - "checksum": "3772182f6246ce7ee4a24d4af5f07a0b0ce718d563c80439baabd8cf13318505", - "contents_checksum": "49868f973b97b24f2f042d5a3b05105ef0c4ba8974c9268ecaa1a232a735d902", - "size": 24679221, - "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20240412130805.tar.gz", + "checksum": "85b90a0016541d6aae62795404aacc7088e0b1701e9f57493bdb4f29c5210fc5", + "contents_checksum": "a5b9958d7ad96d243c7fd5d67ec93d8a4b8a62b668435c18d25b9ce4eb72e185", + "size": 24696653, + "source": "components/google-cloud-sdk-spanner-migration-tool-linux-x86_64-20240517151541.tar.gz", "type": "tar" }, "dependencies": [ @@ -7294,8 +7294,8 @@ }, "platform_required": false, "version": { - "build_number": 20240412130805, - "version_string": "3.2.4" + "build_number": 20240517151541, + "version_string": "3.2.5" } }, { @@ -7551,10 +7551,10 @@ }, { "data": { - "checksum": "f90e47ac6bbf129c724555e5f7ad3dc105de5059d1cc9ab77c99f52a92fae0cb", - "contents_checksum": "b515c8b801cde8a8696832a5dbf16d8f1e9adcc4f4651db36fda76e41b008809", - "size": 56934482, - "source": "components/google-cloud-sdk-tests-20240503145345.tar.gz", + "checksum": "a1f346a6fee441c88145e5e7bde1378b4fdb893a6efd567822f058c1ee8d5907", + "contents_checksum": "cd4bfe5247c8f08ce1cf8826c8ee0154c0af47510e10b20e069a384088ea9f93", + "size": 57089124, + "source": "components/google-cloud-sdk-tests-20240524155722.tar.gz", "type": "tar" }, "dependencies": [ @@ -7571,8 +7571,8 @@ "platform": {}, "platform_required": false, "version": { - "build_number": 20240503145345, - "version_string": "2024.05.03" + "build_number": 20240524155722, + "version_string": "2024.05.24" } } ], @@ -7591,11 +7591,11 @@ ], "post_processing_command": "components post-process", "release_notes_url": "RELEASE_NOTES", - "revision": 20240503145345, + "revision": 20240524155722, "schema_version": { "no_update": false, "url": "https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz", "version": 3 }, - "version": "475.0.0" + "version": "478.0.0" } diff --git a/pkgs/tools/admin/google-cloud-sdk/data.nix b/pkgs/tools/admin/google-cloud-sdk/data.nix index 6150137ea218..543214462025 100644 --- a/pkgs/tools/admin/google-cloud-sdk/data.nix +++ b/pkgs/tools/admin/google-cloud-sdk/data.nix @@ -1,32 +1,32 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "475.0.0"; + version = "478.0.0"; googleCloudSdkPkgs = { x86_64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-475.0.0-linux-x86_64.tar.gz"; - sha256 = "0yqa2c91n948yj8gxjm91ccdb99dzppimf1npckplzhc2bp7shiw"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-478.0.0-linux-x86_64.tar.gz"; + sha256 = "1f4k1n1dic1aqqzhm31hggyjjrvqixbzlvr717z0ri5qi5qkqv2w"; }; x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-475.0.0-darwin-x86_64.tar.gz"; - sha256 = "078wwvjhpc9a56v03y6433zpwaj3cg3y9xrbg9ww5fdqvcc82q1z"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-478.0.0-darwin-x86_64.tar.gz"; + sha256 = "1xs55hvq6bx39xh00nq0hsi52vgkvklvhrgxwghgi2i01ry1fm9n"; }; aarch64-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-475.0.0-linux-arm.tar.gz"; - sha256 = "1wfr6lz62y232wzp7nn3mr18qd4wmw47b3p3sjff0f39jfmcyq30"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-478.0.0-linux-arm.tar.gz"; + sha256 = "0pzgddqmw5bwyg60vavxy3lfl0v2lrx0h2d5k120y7h6zvvnynj9"; }; aarch64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-475.0.0-darwin-arm.tar.gz"; - sha256 = "1cjhbq0qsy35nwl5h1f8xp4d67a6hwmfjzdk349g1npf5dhhdd94"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-478.0.0-darwin-arm.tar.gz"; + sha256 = "0dz25jqv67bvz4vj1p54pxskmxz1x33s18snplkcm32agdjjgaxd"; }; i686-linux = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-475.0.0-linux-x86.tar.gz"; - sha256 = "1cj5321lj3dbb48h35qlxllrzzg90lwq92n71c2y4s2mqk33543h"; + url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-478.0.0-linux-x86.tar.gz"; + sha256 = "1wdxjpr8nycrz0qf8lgl2nrhbgk0y3phy4cx46jjwdagwgdhihas"; }; }; } From b62b88ddb1476fbb0195f95967cde5bb37c1b420 Mon Sep 17 00:00:00 2001 From: natsukium Date: Tue, 4 Jun 2024 20:53:13 +0900 Subject: [PATCH 185/219] python311Packages.hdfs: refactor and remove nose --- pkgs/development/python-modules/hdfs/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/hdfs/default.nix b/pkgs/development/python-modules/hdfs/default.nix index 18a75a338933..c887d8717890 100644 --- a/pkgs/development/python-modules/hdfs/default.nix +++ b/pkgs/development/python-modules/hdfs/default.nix @@ -4,25 +4,27 @@ fastavro, fetchFromGitHub, lib, - nose, pytestCheckHook, requests, + setuptools, six, }: buildPythonPackage rec { pname = "hdfs"; version = "2.7.3"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "mtth"; - repo = pname; + repo = "hdfs"; rev = "refs/tags/v${version}"; hash = "sha256-Pm2E8hB0wbu7npi/sLt9D8jQsH69qNOHLji9CYqST/8="; }; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ docopt requests six @@ -30,7 +32,6 @@ buildPythonPackage rec { nativeCheckInputs = [ fastavro - nose pytestCheckHook ]; @@ -42,5 +43,6 @@ buildPythonPackage rec { changelog = "https://github.com/mtth/hdfs/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ samuela ]; + mainProgram = "hdfscli"; }; } From f3ad1f2937812fdd45b9e17b38c677bc0ac781c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 4 Jun 2024 14:02:56 +0200 Subject: [PATCH 186/219] nixos-small: fix eval --- nixos/release-small.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index b87a58f5eee8..98e36b0669e7 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -124,7 +124,7 @@ in rec { "nixos.tests.firewall" "nixos.tests.ipv6" "nixos.tests.login" - "nixos.tests.misc.default" + "nixos.tests.misc" "nixos.tests.nat.firewall" "nixos.tests.nat.standalone" "nixos.tests.nfs4.simple" From f47a977a370fc3bd6e96a6c9d903ec4db061e5a8 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Tue, 4 Jun 2024 14:22:38 +0200 Subject: [PATCH 187/219] Revert "radicale: 3.2.0 -> 3.2.1" This reverts commit c234b47cc71ff528357f0d60d5153432fc4a1a2a. --- pkgs/by-name/ra/radicale/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix index 64d85ea2b939..d3637df36b07 100644 --- a/pkgs/by-name/ra/radicale/package.nix +++ b/pkgs/by-name/ra/radicale/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "radicale"; - version = "3.2.1"; + version = "3.2.0"; pyproject = true; src = fetchFromGitHub { owner = "Kozea"; repo = "Radicale"; rev = "v${version}"; - hash = "sha256-OUwznn71xl8oWkw90fT1NYYZOuD83k+B5zLhygp1VQQ="; + hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ="; }; postPatch = '' From 7bb4b236ab3d7a386fd6f2c6d6b5b31308c16541 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 4 Jun 2024 14:50:56 +0200 Subject: [PATCH 188/219] python312Packages.adafruit-platformdetect: 3.66.0 -> 3.68.0 Changelog: https://github.com/adafruit/Adafruit_Python_PlatformDetect/releases/tag/3.68.0 --- .../python-modules/adafruit-platformdetect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix index 657305cc3eb4..71edeb838745 100644 --- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.66.0"; + version = "3.68.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "adafruit_platformdetect"; inherit version; - hash = "sha256-GWxtuHMEshb+8JlKgBXxp5atB9cewhylgkSVH8tf7TA="; + hash = "sha256-wJgnwe8szhLMQWABiWC8nluuJICezuhy//OMeMIjftk="; }; build-system = [ setuptools-scm ]; From 81ec09192c2eb534d3ca69195d5f6e0556615f6b Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Tue, 4 Jun 2024 14:52:09 +0200 Subject: [PATCH 189/219] python311Packages.pipenv-poetry-migrate: 0.5.6 -> 0.5.7 Signed-off-by: Florian Brandes --- .../python-modules/pipenv-poetry-migrate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix index 9bb75ce697c4..38f6af66ad9d 100644 --- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix +++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pipenv-poetry-migrate"; - version = "0.5.6"; + version = "0.5.7"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "yhino"; repo = "pipenv-poetry-migrate"; rev = "refs/tags/v${version}"; - hash = "sha256-+OkfuIwbDx6SN5lawDJZYBrjHn9rsT/FT+GQ2MOAtg0="; + hash = "sha256-u58+NRSV+mN6Vd1zyR2UM1rEbjZY1pNnLKSRj/JNxhU="; }; nativeBuildInputs = [ poetry-core ]; From 72e89d74616d06080f897e2fb237c4845c264bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 4 Jun 2024 08:45:40 +0200 Subject: [PATCH 190/219] pkgs/top-level/make-tarball.nix: avoid hardlinks --- pkgs/top-level/make-tarball.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 78b90082547b..2fb6e97a711e 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -55,6 +55,8 @@ pkgs.releaseTools.sourceTarball { echo "file json-br $packages" >> $out/nix-support/hydra-build-products ''; + # --hard-dereference: reproducibility for src if auto-optimise-store = true + # Some context: https://github.com/NixOS/infra/issues/438 distPhase = '' mkdir -p $out/tarballs XZ_OPT="-T0" tar \ @@ -71,6 +73,7 @@ pkgs.releaseTools.sourceTarball { --sort=name \ --mtime="@$SOURCE_DATE_EPOCH" \ --mode=ug+w \ + --hard-dereference \ $src $(pwd)/{.version-suffix,.git-revision} ''; } From 7fb41f03c62f30954a088e5c91c2041f869af060 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 13:21:29 +0000 Subject: [PATCH 191/219] flashmq: 1.13.1 -> 1.14.0 --- pkgs/by-name/fl/flashmq/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix index 95e9d93a36c3..eddaf63f3060 100644 --- a/pkgs/by-name/fl/flashmq/package.nix +++ b/pkgs/by-name/fl/flashmq/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flashmq"; - version = "1.13.1"; + version = "1.14.0"; src = fetchFromGitHub { owner = "halfgaar"; repo = "FlashMQ"; rev = "v${version}"; - hash = "sha256-ZKDoh2eZDs7iQpfsvfsG7ic+A8NG+UUGgq9l2tmfhVI="; + hash = "sha256-rOhH3mRPW4LweQmzztr6/xGqSfo02nFBWrAVd0/oQGA="; }; nativeBuildInputs = [ cmake installShellFiles ]; From 9455b7b3efa9441eeaa7cbcf343f557e893e173a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 13:22:53 +0000 Subject: [PATCH 192/219] granted: 0.27.0 -> 0.27.2 --- pkgs/tools/admin/granted/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/granted/default.nix b/pkgs/tools/admin/granted/default.nix index a6925d94fb40..36476e616f6b 100644 --- a/pkgs/tools/admin/granted/default.nix +++ b/pkgs/tools/admin/granted/default.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "granted"; - version = "0.27.0"; + version = "0.27.2"; src = fetchFromGitHub { owner = "common-fate"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ke54OnO9yjL0RF1dJLTIwaCFp9GvB9Tlr06AN6u8/v4="; + sha256 = "sha256-VsE6CozVl+g+tAGQnf2q1lzKuxIMwbziQ2S76dY542A="; }; - vendorHash = "sha256-QoT7zfNbKDZyxGhDX1Lleu3mpTVXGKleX/b86l8nXXs="; + vendorHash = "sha256-ScWYqbhWwhrTh+k4LNkapiJbrRRSwxnxPT44lt048vw="; nativeBuildInputs = [ makeWrapper ]; From 7f73fe9f02f5e48438773283eb85cf8bb1828781 Mon Sep 17 00:00:00 2001 From: Enric Morales Date: Tue, 4 Jun 2024 15:50:43 +0200 Subject: [PATCH 193/219] basedpyright: 1.12.3 -> 1.12.4 Diff: https://github.com/detachhead/basedpyright/compare/v1.12.3...v1.12.4 Changelog: https://github.com/detachhead/basedpyright/releases/tag/1.12.4 --- pkgs/by-name/ba/basedpyright/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index b22acd3544ff..25fc3771ad10 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -8,13 +8,13 @@ }: let - version = "1.12.3"; + version = "1.12.4"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; rev = "v${version}"; - hash = "sha256-n4jiKxkXGCKJkuXSsUktsiJQuCcZ+D/RJH/ippnOVw8="; + hash = "sha256-ZcFCK6KKX10w5KgsUQIDMMBIzU+8pw0t9/pn1tzCnMg="; }; patchedPackageJSON = runCommand "package.json" { } '' @@ -44,7 +44,7 @@ let pname = "pyright-internal"; inherit version src; sourceRoot = "${src.name}/packages/pyright-internal"; - npmDepsHash = "sha256-ba7GzkKrXps4W1ptv+j9fMMXwpi30ymbqgIJ64PaZ1g="; + npmDepsHash = "sha256-90IGWvXvUpvIQdpukm8njwcNj7La6rWwoENh4kiBayI="; dontNpmBuild = true; # FIXME: Remove this flag when TypeScript 5.5 is released npmFlags = [ "--legacy-peer-deps" ]; @@ -60,7 +60,7 @@ buildNpmPackage rec { inherit version src; sourceRoot = "${src.name}/packages/pyright"; - npmDepsHash = "sha256-9V1T6w1G1SZi19dgRaFmv+Vy71hmQR+L6cDjQZJrGy8="; + npmDepsHash = "sha256-HI3ehtJ29kFSv0XyrXcp5JGs9HGYb9ub2oOSQ6uEn8Q="; postPatch = '' chmod +w ../../ From 7baa30273606555eb5f66876e05fc36f1ea072cb Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 4 Jun 2024 16:11:11 +0200 Subject: [PATCH 194/219] nix: remove myself (ma27) from maintainer team MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using Lix now 🍦 --- .github/CODEOWNERS | 4 ++-- pkgs/tools/package-management/nix/common.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e78e7ab2bdef..8adb04ecbf5a 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -67,8 +67,8 @@ /nixos/lib/make-disk-image.nix @raitobezarius # Nix, the package manager -pkgs/tools/package-management/nix/ @raitobezarius @ma27 -nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius @ma27 +pkgs/tools/package-management/nix/ @raitobezarius +nixos/modules/installer/tools/nix-fallback-paths.nix @raitobezarius # Nixpkgs documentation /maintainers/scripts/db-to-md.sh @jtojnar @ryantm diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix index 94ec74a6a0c8..22b1cb817b69 100644 --- a/pkgs/tools/package-management/nix/common.nix +++ b/pkgs/tools/package-management/nix/common.nix @@ -5,7 +5,7 @@ , hash ? null , src ? fetchFromGitHub { owner = "NixOS"; repo = "nix"; rev = version; inherit hash; } , patches ? [ ] -, maintainers ? with lib.maintainers; [ eelco lovesegfault artturin ma27 ] +, maintainers ? with lib.maintainers; [ eelco lovesegfault artturin ] , self_attribute_name }@args: assert (hash == null) -> (src != null); From b37b08ae04af951640a9a9fcb4d1aab54603f551 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 3 Jun 2024 06:07:47 +0200 Subject: [PATCH 195/219] =?UTF-8?q?coqPackages.aac-tactics:=208.19.0=20?= =?UTF-8?q?=E2=86=92=208.19.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/coq-modules/aac-tactics/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/coq-modules/aac-tactics/default.nix b/pkgs/development/coq-modules/aac-tactics/default.nix index 73d14282a3ab..59a9c9ba1164 100644 --- a/pkgs/development/coq-modules/aac-tactics/default.nix +++ b/pkgs/development/coq-modules/aac-tactics/default.nix @@ -5,6 +5,7 @@ mkCoqDerivation { releaseRev = v: "v${v}"; + release."8.19.1".sha256 = "sha256-W/V57h+rjb3m0ktCG83PquMHfXiv6H1Nhvw9sVEPLqM="; release."8.19.0".sha256 = "sha256-IeCBd8gcu4bAXH5I/XIT7neQIILi+EWR6qqAA4GzQD0="; release."8.18.0".sha256 = "sha256-Vpe79qCyFLOdOtFFvLKR0N+MMpGD661Q01yx4gxRhZo="; release."8.17.0".sha256 = "sha256-c8DtD21QFDZEVyCQc7ScPZEMTmolxlT3+Db3gStofF8="; @@ -24,7 +25,7 @@ mkCoqDerivation { inherit version; defaultVersion = with lib.versions; lib.switch coq.coq-version [ - { case = "8.19"; out = "8.19.0"; } + { case = "8.19"; out = "8.19.1"; } { case = "8.18"; out = "8.18.0"; } { case = "8.17"; out = "8.17.0"; } { case = "8.16"; out = "8.16.0"; } From 0cc88860792daabe184e6a4a65afc93b2599b07f Mon Sep 17 00:00:00 2001 From: Leona Maroni Date: Tue, 4 Jun 2024 16:28:11 +0200 Subject: [PATCH 196/219] keycloak: 24.0.4 -> 24.0.5 Diff: https://github.com/keycloak/keycloak/compare/24.0.4...24.0.5 Changelog: https://github.com/keycloak/keycloak/releases/tag/24.0.5 --- pkgs/servers/keycloak/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/keycloak/default.nix b/pkgs/servers/keycloak/default.nix index 1792b51abf8d..743607a3f471 100644 --- a/pkgs/servers/keycloak/default.nix +++ b/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let ''; in stdenv.mkDerivation rec { pname = "keycloak"; - version = "24.0.4"; + version = "24.0.5"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - hash = "sha256-tqY3rYFRsRpbvms8DVtCp8nXl0hlX1CzuOVFCE+23o4="; + hash = "sha256-lf1miVEGQvPbmlOZMCXUyX/pKE+JoJFawhjVEPJDJ6s="; }; nativeBuildInputs = [ makeWrapper jre ]; From f43aa031d2b4b93c6cb1f71e72d078d37dc06012 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 14:44:19 +0000 Subject: [PATCH 197/219] gmid: 2.0.2 -> 2.0.3 --- pkgs/by-name/gm/gmid/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gm/gmid/package.nix b/pkgs/by-name/gm/gmid/package.nix index b7682b2b6221..858019fdce43 100644 --- a/pkgs/by-name/gm/gmid/package.nix +++ b/pkgs/by-name/gm/gmid/package.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gmid"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - hash = "sha256-5K6+CVX0/m6SBcTvwy4GD0x9R/yQjd+2tTJiA4OagcI="; + hash = "sha256-izugxV+fSYBf193ilu70M3OkT6gnkXrTP45gEkEImuA="; }; nativeBuildInputs = [ bison ]; From bbdf6429cd77a7b512ccdc0c853253dfc81037e4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 14:45:50 +0000 Subject: [PATCH 198/219] flake-checker: 0.1.18 -> 0.1.19 --- pkgs/by-name/fl/flake-checker/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fl/flake-checker/package.nix b/pkgs/by-name/fl/flake-checker/package.nix index 368770d05799..09c3215527f8 100644 --- a/pkgs/by-name/fl/flake-checker/package.nix +++ b/pkgs/by-name/fl/flake-checker/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "flake-checker"; - version = "0.1.18"; + version = "0.1.19"; src = fetchFromGitHub { owner = "DeterminateSystems"; repo = "flake-checker"; rev = "v${version}"; - hash = "sha256-XoYpiqatCQCYuKpVGlWcteVp71LXh+leFEtbL5lb0rs="; + hash = "sha256-KJTObuHJQjIgg/5A25Ee+7s2SrmtyYFnvcnklYhSCNE="; }; - cargoHash = "sha256-LM0tYSRhM4GGb/Pa5l2xMAJ26ZyAuSEKlZansE/VNNw="; + cargoHash = "sha256-ADqc7H2MClXyYEw/lc9F4HAfpHrDc/lqL/BIL/PTZro="; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security From ee3f01fe535a62ddba7253e6bb7c8f28e5a26075 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 14:46:00 +0000 Subject: [PATCH 199/219] nom: 2.2.3 -> 2.4.0 --- pkgs/by-name/no/nom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix index 57291810870d..27b25337d51a 100644 --- a/pkgs/by-name/no/nom/package.nix +++ b/pkgs/by-name/no/nom/package.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "nom"; - version = "2.2.3"; + version = "2.4.0"; src = fetchFromGitHub { owner = "guyfedwards"; repo = "nom"; rev = "v${version}"; - hash = "sha256-W0HDoQURZxTvMyFfRGOu8gcZJihtvXvrEaObmi/CAk0="; + hash = "sha256-1KHU+y8aoEdXzP5jUZlTokbv383aKgMt+Wby2bodCTI="; }; vendorHash = "sha256-wWdsLU656wBAUmnVw21wo+a/OLmyhZ2Bq0j8S190XQs="; From 95065e77400ac99ce1b5854f76c1e3abdf10f91f Mon Sep 17 00:00:00 2001 From: Moraxyc Date: Tue, 4 Jun 2024 23:08:10 +0800 Subject: [PATCH 200/219] nezha-agent: 0.16.10 -> 0.16.11 --- pkgs/by-name/ne/nezha-agent/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index a873f48fe47b..94b29557dc33 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -7,13 +7,13 @@ }: buildGoModule rec { pname = "nezha-agent"; - version = "0.16.10"; + version = "0.16.11"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; rev = "v${version}"; - hash = "sha256-aNonfJxEjK19+Um8tVCi/My88YGajr59+ubIPor5gOI="; + hash = "sha256-mcTS+PjFa5niWhe8pmWmuYpx+Y9ZWX0hpcLEodN/SIs="; }; vendorHash = "sha256-L6QdodI8Ur1H6Zc24KSTYAHfzvW2aq9SYwCVgjvSDII="; From 6ea46543569357d7635910cf2d28937b450c8350 Mon Sep 17 00:00:00 2001 From: Arseniy Zorin Date: Tue, 4 Jun 2024 18:08:44 +0300 Subject: [PATCH 201/219] pulumi-bin: 3.117.0 -> 3.118.0 --- pkgs/tools/admin/pulumi-bin/data.nix | 210 +++++++++++++-------------- 1 file changed, 105 insertions(+), 105 deletions(-) diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix index c9b9ee95b3e7..ccb7c09da674 100644 --- a/pkgs/tools/admin/pulumi-bin/data.nix +++ b/pkgs/tools/admin/pulumi-bin/data.nix @@ -1,40 +1,40 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.117.0"; + version = "3.118.0"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.117.0-linux-x64.tar.gz"; - sha256 = "168ssybbdqprkpm33l98pghbr5a45xfcmwg6lj83i7l31nwxc5qi"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.118.0-linux-x64.tar.gz"; + sha256 = "15xa9j36hjqsr42k7q7svrlc3n3sp6rj5jfkn7kqqzggc550xmsv"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.16.0-linux-amd64.tar.gz"; - sha256 = "1q3z180xx7raybq7w4l5mmns5b2zgjk4g4a6p03ra12xjc7jy7gi"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.1-linux-amd64.tar.gz"; + sha256 = "1qm9wf993d5zj8sj3gv4w7iyxd78h7l7hrqas7n8jhl3lw40x107"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.1.0-linux-amd64.tar.gz"; - sha256 = "18k4gn3b94h9hgj46xn5cv3002wy738ry6wrz57p4hnmklifzikj"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.2.0-linux-amd64.tar.gz"; + sha256 = "0vwlil9awkfs774992bb9lj6bggjw4vnys0z0pzsd4lmidxc8mv8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.55.2-linux-amd64.tar.gz"; - sha256 = "1v0jwklzf02d69p8vlpa35y8f2fkkkjwgrxqf5drs30bqwwswicq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-linux-amd64.tar.gz"; + sha256 = "036rkgs55j2z9gkivc9iw8apc2h82c4wdf6b0wiwd16jbaj5bvwb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.1-linux-amd64.tar.gz"; - sha256 = "1z4nj0nhrnjxzz04lh9bqysdixfgl2ljjamr4ks75s80ql4bhzrx"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.2-linux-amd64.tar.gz"; + sha256 = "081cjsprrx0mqky2gg014w95x0vgk3sq4ca873xh90vq3vmv4yly"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.2-linux-amd64.tar.gz"; - sha256 = "17dyf0zy78qcf3cz5kw1k6pliwiny1184aksq3d45ny4ag15q5zr"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-linux-amd64.tar.gz"; + sha256 = "0vcmyzb6qbg8sfrbq06sdi1cc309132qsf92lswxydvnrqxvy0x4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.37.1-linux-amd64.tar.gz"; - sha256 = "0zzl1hnkvqkchjxbziw5w1g0ymdqvsyggn392dmyxzl1qc4i072j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.38.0-linux-amd64.tar.gz"; + sha256 = "18n3za22c5bfmd96b2fsqxj18i5d6i3vpzysargwks5n5yl8spfi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.78.0-linux-amd64.tar.gz"; - sha256 = "1dyynbhvfj3bdb9n7sifp1xs6yjgz85gdswbiw5djn5yfwpz5zbn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-linux-amd64.tar.gz"; + sha256 = "09cn9g7pxnqsgr6cz62k8vnynvkxgqi9pf172inwm0f01h945zp9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.50.0-linux-amd64.tar.gz"; @@ -45,8 +45,8 @@ sha256 = "05vyz81a5z96k35hh8ky9bl6c505jfb6rxsc82qlfh8kx110p66l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.29.0-linux-amd64.tar.gz"; - sha256 = "1pcril9c8ck99hg0k997vqiawk3iqwcsvg8x81b232pz8vzsxd5q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-linux-amd64.tar.gz"; + sha256 = "159anajw61s89f08kkrkp81r4yg7vf269pzk4ldq8fljikr49y55"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-amd64.tar.gz"; @@ -57,8 +57,8 @@ sha256 = "18876q1n1q4482pfb6r2v8s2ckplq6i0ldf0v7r2m2fws00sin8i"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.29.0-linux-amd64.tar.gz"; - sha256 = "0sdmjaka9d399hgabib1p6kwlydcsgibj0jkz87mi7blj4jgrmsm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.1-linux-amd64.tar.gz"; + sha256 = "1hgfwpzjyvb0yv531ja772xwl3729p8ivnif74hj0hwhd6j3a173"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.4-linux-amd64.tar.gz"; @@ -73,16 +73,16 @@ sha256 = "17zngh68ssilazg5caiz2amzcgd1kp906k5viwp2ig70wp6gwkyy"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.24.0-linux-amd64.tar.gz"; - sha256 = "0bfmgcm1r2w6lva13s2nmxc5i6c16rp0qysyampmhphcl7hyxbvy"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.25.0-linux-amd64.tar.gz"; + sha256 = "09xxzcrlhv6np4ivakm9fmjq01v4k5apl3zmdjsc4x890vdqjd5n"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-linux-amd64.tar.gz"; sha256 = "1ilpp4xkdpp3mq4i0sicxbndn15gbrhjsvxp8aanc20dgpcr5hy5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v7.0.0-linux-amd64.tar.gz"; - sha256 = "0nfk9mk8dgrw6a03a1k3sy936jkwvnbbi2i396hd7vgyvsb56vmk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.0.0-linux-amd64.tar.gz"; + sha256 = "01sc4cysilyxjgljwr8i8wi3cydnl3km58drpmcz1pdy1rnd91yy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz"; @@ -97,8 +97,8 @@ sha256 = "08s5ii5aj5za542gdp1jhzq8pnvqpnzblci4kygdr056wzrcz2zi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.19.1-linux-amd64.tar.gz"; - sha256 = "0ggf8233d2979kmydkm83wxcwwgz8jfxgwf48g6rrcq9a2pgiz9m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.20.1-linux-amd64.tar.gz"; + sha256 = "08pg4fcqnmx3ijmfbcg61cm3l4mk0kdnffa1y6z8kkg0s7a5ff2l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.3-linux-amd64.tar.gz"; @@ -163,36 +163,36 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.117.0-darwin-x64.tar.gz"; - sha256 = "1i594gyrivw3axhp1mpwyqqwzmiggalcg0hwnydpmn54gbaq5arl"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.118.0-darwin-x64.tar.gz"; + sha256 = "16xlm9grcrml8wz971xyrxs9abkqav49mrrmgbd7shnv0qywbm15"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.16.0-darwin-amd64.tar.gz"; - sha256 = "1sigdy8l7iy04ns0qsd3qh9v47p64a0zjyx5ifafrlh2dxsa8gwp"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.1-darwin-amd64.tar.gz"; + sha256 = "0ax2kri5p2hyb55v36mla9if8gb240fbwn0h5zrj0lbsd582dndf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.1.0-darwin-amd64.tar.gz"; - sha256 = "1lvdbyrcx4mpwm3y6dgxa3m9c5g5s3hhfx67qr2vrq1jwkfbc3ss"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.2.0-darwin-amd64.tar.gz"; + sha256 = "0kwj3m50giwk8p0d0amy5nrvf4m4ms5salbh51nd4fm0l5hz2n0q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.55.2-darwin-amd64.tar.gz"; - sha256 = "03v9wcnnnfl83gsrn5q1w6jm9j85gpgbjp2hh2dmwpd39nhkkx6q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-darwin-amd64.tar.gz"; + sha256 = "0czn7l0vnl8w9lkcg7rbr723q1gwv0ci4bxf6jik3vmcchl38z2h"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.1-darwin-amd64.tar.gz"; - sha256 = "1vr5x1rkqx6k297z3jm990v4zpmb88pbblnpdzynrj6h7s0bczgv"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.2-darwin-amd64.tar.gz"; + sha256 = "0vm27ni71jkzwx8d98pq1sv2g7k6myfc0k4xmncpgb871jajnh3f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.2-darwin-amd64.tar.gz"; - sha256 = "06wrd619fi924r1wm66pj93q2j8kb9y7bmjf9sxankq2ma28slgk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-darwin-amd64.tar.gz"; + sha256 = "1jhnh3f2zni8wmddf2bz25r37iwbh1dyf8j9wnjyync1fqjy877y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.37.1-darwin-amd64.tar.gz"; - sha256 = "0vbsbk404js0q1pba4zw4jqyiv97pdjwmk1s7la2y10srqqfa9ng"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.38.0-darwin-amd64.tar.gz"; + sha256 = "0zw9flggwy30c4rx3j8qlf1qwfrwawhi08azvkq0vjcjwyxlgl16"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.78.0-darwin-amd64.tar.gz"; - sha256 = "0mkzrydbnsbg2rv5z04dwhv3fcscqjvmycgdkkcgma82s9ijklph"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-darwin-amd64.tar.gz"; + sha256 = "1vfs8nxck3fwryqbwwbqrai9bcf2b1bw4nv5521z9y6qbskqqyn0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.50.0-darwin-amd64.tar.gz"; @@ -203,8 +203,8 @@ sha256 = "0blhx82diydpwbfr7grj2zxk29pvg0b2w2rawlv60mhc3dw6ixar"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.29.0-darwin-amd64.tar.gz"; - sha256 = "0ih4qli4yj109w662l0jp8mpx69p1rchb5pccdc2sing6mx6ql9i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-darwin-amd64.tar.gz"; + sha256 = "136407vq3m2ilpgmyh01n76izm9zigdm9l8rqd7mlg0c6laivc19"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-amd64.tar.gz"; @@ -215,8 +215,8 @@ sha256 = "1k16z181nd6h3fabxhg1qrcrjnwppbhlqwqks99p7z72zlgx02kp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.29.0-darwin-amd64.tar.gz"; - sha256 = "1z1ai3i41g2nay21z9sq47f7ilnhcjbdzshxx3n8iy9mn3yrsyaw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.1-darwin-amd64.tar.gz"; + sha256 = "1qp6f6dz287qsyvvmdngkdh4s82pzmdbxfk657wmxxrjqzmlwrxr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.4-darwin-amd64.tar.gz"; @@ -231,16 +231,16 @@ sha256 = "009w2zsmy4nkc5w8k0ldm5fl2yjl8h52574w1as27kz0800nibav"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.24.0-darwin-amd64.tar.gz"; - sha256 = "0yaynnssckdy6zb88fgrilymkyciflz4ih8dp3kj3h2frzkwicp0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.25.0-darwin-amd64.tar.gz"; + sha256 = "1qikxb1iyhq8zcy63vbi78b07jqf6pvw3n4sx35z125wpw900ir3"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-darwin-amd64.tar.gz"; sha256 = "08plbmrzdd4vbds4qihdq3c0w9fxjaa64lmlaplla4z0qvi5cjc2"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v7.0.0-darwin-amd64.tar.gz"; - sha256 = "1na9h7x1a4h21v68g4dgvj4jbq4kdziyh2irz8x45bzsa8l8cb16"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.0.0-darwin-amd64.tar.gz"; + sha256 = "0rqr15pmpqfvz7l19m7ij9m7y6agrxcknaz9cs0pvjv35m5pqnwd"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz"; @@ -255,8 +255,8 @@ sha256 = "0jyg244kfkc8d60p6n1df3lyvxfdmc0y0j72dkpwn7fmnm5bnd1f"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.19.1-darwin-amd64.tar.gz"; - sha256 = "1jsy33m03raqvp51xdqic87nldmxlyki4rz0lcdfdf49dzg2pzxb"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.20.1-darwin-amd64.tar.gz"; + sha256 = "1l9qg4inbnmfqy0xxy932f2sciq5318l5p8kka1w3w8fflm51s54"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.3-darwin-amd64.tar.gz"; @@ -321,36 +321,36 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.117.0-linux-arm64.tar.gz"; - sha256 = "0vwdfx6xm63psy00z8a9sc3h6cz0xj4zg49np6g0wnkky4abvw5i"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.118.0-linux-arm64.tar.gz"; + sha256 = "0vwpw9d66g985r87pkanagcvpp2qmglb2s7ljdr6aji7dzni3g41"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.16.0-linux-arm64.tar.gz"; - sha256 = "0nzaxghc1dxp5vb7l40markfi5lyai02hmwalzypq4gq1gy302r0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.1-linux-arm64.tar.gz"; + sha256 = "0pc7gmy0981mb07jyh92pxk0vdm1ixz0mpb0v83jhbwjn3d9s7b1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.1.0-linux-arm64.tar.gz"; - sha256 = "0nr87qclkvn1281prikixvbq3mhkkiklci45vwshzqp7fr7pf3ph"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.2.0-linux-arm64.tar.gz"; + sha256 = "0a1kqpjwsksimv29y5q8d4b36s28801vhim1f5agq0c0lrn1fcds"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.55.2-linux-arm64.tar.gz"; - sha256 = "08kw7ff66rv5g3hm7cv4h0l8vj70m9pz0dfqm5ywnb6dmn1sava2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-linux-arm64.tar.gz"; + sha256 = "026f789v04asxfq0a2bll5qsr28rb7mcm4jmsc4y1bwiv3brcpx8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.1-linux-arm64.tar.gz"; - sha256 = "0ia91rca8cz3dhkmfyjzacpyncyp5jxks6cxsf58zbkgwn1bqxkw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.2-linux-arm64.tar.gz"; + sha256 = "0b18cw31vfav86ymfsqy3vcwji4ybhrf6kn7hkx204mbi00n1vig"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.2-linux-arm64.tar.gz"; - sha256 = "16zbb652as85casz0yayg4vzrrya0r35l8z3vac31d2054bpp367"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-linux-arm64.tar.gz"; + sha256 = "1dv2y358fwcp6pr8mb1yhw5lygs9aqf8ma50vz3p74z1101lz3id"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.37.1-linux-arm64.tar.gz"; - sha256 = "1sby4zgmibq5j98lk05vpnfb20qm6skkhpmc0i1qgirc7765v9ym"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.38.0-linux-arm64.tar.gz"; + sha256 = "1lf87x1w998zx8dy1jh29bw0a6s9q9w2i6qlrk80yaz99dr24cf4"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.78.0-linux-arm64.tar.gz"; - sha256 = "1nn93mbrjyj0gcl2dns5q6dpdqmkzhwnnlg1q6lxcc2a2jkgrsyn"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-linux-arm64.tar.gz"; + sha256 = "1x03nwk51pkcyl6ncsnxiqmk40hd62vswncz0vkd082vhirqfq14"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.50.0-linux-arm64.tar.gz"; @@ -361,8 +361,8 @@ sha256 = "1chrfqdiwx6lvylrih6zx7m1zkrmcb7lz0x1cb9hc0l5fy93rc63"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.29.0-linux-arm64.tar.gz"; - sha256 = "1p9xvwivl0dzvmgnlcbsak9s7qc3ys8i185690wiragj9f818nlf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-linux-arm64.tar.gz"; + sha256 = "0jiqkskhhbb6hvwg0vhh6ms2rqdr8lsl0400yhiin1q1whz9bk4y"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-linux-arm64.tar.gz"; @@ -373,8 +373,8 @@ sha256 = "1nnn6z6j76ky78jh5h1ii07hci041p6qsm7shg8k7fsmb1g0bkji"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.29.0-linux-arm64.tar.gz"; - sha256 = "0zmdsy9x62a9zf1yc3g0c11dagp3653dsbqgp79cjq89n7y79289"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.1-linux-arm64.tar.gz"; + sha256 = "17gbcnwxns69azxncj06nj4l92j0j397cj87zhw5171w1gmyixaj"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.4-linux-arm64.tar.gz"; @@ -389,16 +389,16 @@ sha256 = "09cdx6hh2lvipnj4fsff66vq8i3fvggs253ik2a8lpajg4xdhswi"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.24.0-linux-arm64.tar.gz"; - sha256 = "15lbnj8jdjb6g442mv87wxw9ahy33574czm5q8wz3fwj4hf6ia7i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.25.0-linux-arm64.tar.gz"; + sha256 = "0vxi0ys989zn4xf24ah72dbb4vdy8alk75vf5grypxg5kz1m0pri"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-linux-arm64.tar.gz"; sha256 = "0b2cc2ybw76h283ir4nl51cf5zbl2bxrcr5iilskqf58b8yfrra0"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v7.0.0-linux-arm64.tar.gz"; - sha256 = "1di7ch1bgmqlpajzmc85pb7hmsyw6kcw6wawx0l0r8a539q89i96"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.0.0-linux-arm64.tar.gz"; + sha256 = "1bjakx4a19a5drw0vz6p6xkz19cj2mpzzaldrnfhkynjx80ifvap"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz"; @@ -413,8 +413,8 @@ sha256 = "1k2qlakyvdqz0fadbabdjf9yg3jm4357z46cvqxahyyminvkxa60"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.19.1-linux-arm64.tar.gz"; - sha256 = "0y0szv0mk97p5rw0khqzhfdjg91gdwqf00kjrx0wb0arhsqzf5hw"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.20.1-linux-arm64.tar.gz"; + sha256 = "1xdzw4s6cwfkjp7qmb491d7gpfzgw4da6a7cyy601z4xwcf51dd0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.3-linux-arm64.tar.gz"; @@ -479,36 +479,36 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.117.0-darwin-arm64.tar.gz"; - sha256 = "0slxzic4yrpl6pxqmhb75iis3rircjl5pbjrd4dcm4q03haisjj7"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.118.0-darwin-arm64.tar.gz"; + sha256 = "02xqhb46r2p0fny9gib7km7x5681bbpxfsl7sri8ic166d1in1xc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.16.0-darwin-arm64.tar.gz"; - sha256 = "19mcmznkyg6rs85d170xly2n8h7cclq88h8c1dv1jak1hnx6yl4j"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.17.1-darwin-arm64.tar.gz"; + sha256 = "0gv24hh81hh0h1dbigqafp3wfi35van6ias4j7cmdjj5saf5xwvh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.1.0-darwin-arm64.tar.gz"; - sha256 = "0zsch3dj2bcajxjivz1xjbiby6v6lb2axqq9y3nx8q6l6wnn1hsa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v7.2.0-darwin-arm64.tar.gz"; + sha256 = "0dydbqff9rd7f8ys2imjz3rf3c4y1248zmrbhsr78jywdw1h7fa3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.55.2-darwin-arm64.tar.gz"; - sha256 = "1fnnq29rfg8z5z127b2kqz34r9c4vwcw4jgsgvhw3d6yds083i0n"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.56.0-darwin-arm64.tar.gz"; + sha256 = "1qhsc01rbgvq25w7m2rjvbfg5fr3x8s3gi1z0vaz5m75znd0kbh8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.1-darwin-arm64.tar.gz"; - sha256 = "0669w7ywzd7mhh2l725zfxg8xavsanwzxfv99n3y2w5za33aaz1f"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v6.8.2-darwin-arm64.tar.gz"; + sha256 = "1cipjd1bf5c92y4w02hd7jnnnirbm5drqhg8gsycq60cmnd3xh30"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.2-darwin-arm64.tar.gz"; - sha256 = "16sv847ymz60s8p5p7am2lclrinlhh9f5bch3721ap86acxyh2i4"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.3.3-darwin-arm64.tar.gz"; + sha256 = "0a1aibs654xbcdm8kdcjjrg55fb0yh819d52zz3h6hpg40bahqcx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.37.1-darwin-arm64.tar.gz"; - sha256 = "0s3d9jpwwrkxcbpn5jb18g6kpcxx6ky4jv4h3k0jlqa1ddkm9sap"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.38.0-darwin-arm64.tar.gz"; + sha256 = "0qqi6jld80i5clr189ysw1rhfxp50sp4cy6lh6s74px4fqqzf4ym"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.78.0-darwin-arm64.tar.gz"; - sha256 = "1rjdrzi37g2pwslk7npyv15pmdmllwfhq576ilk987z3z7z3plhs"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.79.0-darwin-arm64.tar.gz"; + sha256 = "1j7kxxcgysxfzyfy9a5jb3f0dcw8kq39i145cnjh5887bqxqmnvb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.50.0-darwin-arm64.tar.gz"; @@ -519,8 +519,8 @@ sha256 = "1m53gzviimjcr3dl0pydafa6dl1r0q6ih1gwhm7lvgpll300wl1q"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.29.0-darwin-arm64.tar.gz"; - sha256 = "0p7v06n1zqv4czbrc7i41lmhjn0ypazji1gngrx5x3r1dc3c4bpk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v5.30.0-darwin-arm64.tar.gz"; + sha256 = "07ybs8rg5hdkz0f7d72znpflc5im1sp7nk3qqdmw11wszn63wsrz"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.11.3-darwin-arm64.tar.gz"; @@ -531,8 +531,8 @@ sha256 = "0r32xy57ggpg5mlcrcvb0vrksfix3bsf2jdib1z2h3dydgczl2n6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.29.0-darwin-arm64.tar.gz"; - sha256 = "04bsf97vbp0r9zp7x3xpfcx2h8f3pckilqnc353kr2bf566vam25"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.30.1-darwin-arm64.tar.gz"; + sha256 = "1ph5vg8097y6p1zcpkz3glcrf9jn2zr23c7q9yca0rcl3lqq58mx"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.4-darwin-arm64.tar.gz"; @@ -547,16 +547,16 @@ sha256 = "1054c8cici744kyf817q8fk89ljcijxi7g5vi9080w4j6hxmabvn"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.24.0-darwin-arm64.tar.gz"; - sha256 = "0749qxzi2pg0y0f25xw2fkyh9cx6q9lzllqfzfahi97wckr5wl25"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.25.0-darwin-arm64.tar.gz"; + sha256 = "19vfyx279w7ac513k2sbb97h6174kzwgmhksyj3py67a7jihlfrp"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.1-darwin-arm64.tar.gz"; sha256 = "0wafcf9vw32yrpj9qmffhbxn08602br6n06mjyvcjm25mg8iwb4p"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v7.0.0-darwin-arm64.tar.gz"; - sha256 = "18ch0d32ggy7bx2gmyhz3lnimwy5431n6fwmmbzy66792pcxn9k2"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.0.0-darwin-arm64.tar.gz"; + sha256 = "15n4nsx25hnc9gfwnj3iq2f0m7y6v4sh74cwsn3ndq16drybif54"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz"; @@ -571,8 +571,8 @@ sha256 = "1zkf12nagsaxz8k8163fqd4yd6dhizlj6hqakllx7i9np6410wyx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.19.1-darwin-arm64.tar.gz"; - sha256 = "074aq7lxni6zxpqc77qkhc69nnwkx5plpwk0wcps6r23mhc32ia0"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.20.1-darwin-arm64.tar.gz"; + sha256 = "1jcmks38msh8b9v2lrq1vzb7njyjswbqxk4773cjfmpyxjk3dmh0"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.3-darwin-arm64.tar.gz"; From f0bbf8191c48f7fae6c0e6021d6cf905bb9d60eb Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 4 Jun 2024 10:46:32 -0500 Subject: [PATCH 202/219] gleam: 1.2.0 -> 1.2.1 --- pkgs/development/compilers/gleam/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gleam/default.nix b/pkgs/development/compilers/gleam/default.nix index e61a42f4efeb..e672fb33b46b 100644 --- a/pkgs/development/compilers/gleam/default.nix +++ b/pkgs/development/compilers/gleam/default.nix @@ -12,13 +12,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-P0IHO/rO3uHpSfWX+GVuMGuzux1ObGiNsSCCVP+wv5k="; + hash = "sha256-J3FqaKEeK+Xy8Ri5j7+K+4wpvNeMUHSfj2O68XBPlYs="; }; nativeBuildInputs = [ git pkg-config ]; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoHash = "sha256-5KraSw/CtYZ4Al8VQszvuL/ubEVeQOppRRH5SQ8tsA0="; + cargoHash = "sha256-l0LFgmsk87mCVu1UiaFtP3mO01CDV3xTz4Kv+l6AAWw="; passthru.updateScript = nix-update-script { }; From 358d78734395792832c7f8cafc5f467356e644fb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 15:56:36 +0000 Subject: [PATCH 203/219] odin: dev-2024-05 -> dev-2024-06 --- pkgs/development/compilers/odin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/odin/default.nix b/pkgs/development/compilers/odin/default.nix index 5cb6818c6ba8..735af826232b 100644 --- a/pkgs/development/compilers/odin/default.nix +++ b/pkgs/development/compilers/odin/default.nix @@ -13,13 +13,13 @@ let inherit (llvmPackages) stdenv; in stdenv.mkDerivation rec { pname = "odin"; - version = "dev-2024-05"; + version = "dev-2024-06"; src = fetchFromGitHub { owner = "odin-lang"; repo = "Odin"; rev = version; - hash = "sha256-JGTC+Gi5mkHQHvd5CmEzrhi1muzWf1rUN4f5FT5K5vc="; + hash = "sha256-Ba+244L855y+XzLcaf1fgQhHVDv2Q77GPapRAYmCQfg="; }; nativeBuildInputs = [ From 251b389efa1a83cb54bdb2563b3e9a1223b8c8cb Mon Sep 17 00:00:00 2001 From: Ilan Joselevich Date: Tue, 4 Jun 2024 19:34:32 +0300 Subject: [PATCH 204/219] jnv: remove no longer needed dependencies --- pkgs/by-name/jn/jnv/package.nix | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index bbb7822133e2..4e9899bf64ae 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -1,9 +1,6 @@ { lib , rustPlatform , fetchFromGitHub -, autoconf -, automake -, libtool }: rustPlatform.buildRustPackage rec { pname = "jnv"; @@ -18,13 +15,6 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-qpVRq6RbrDZDSJkLQ5Au9j2mWXp3gn7QBe3nRmIVK8c="; - nativeBuildInputs = [ - autoconf - automake - libtool - rustPlatform.bindgenHook - ]; - meta = with lib; { description = "Interactive JSON filter using jq"; mainProgram = "jnv"; From abf9d35cfbb8b01fe90ea43f8a7591055eb1c74d Mon Sep 17 00:00:00 2001 From: Lovis Rentsch Date: Tue, 4 Jun 2024 18:50:56 +0200 Subject: [PATCH 205/219] nu_plugin_net: 1.4.0 -> 1.4.1 The plugins for nushell must be built with the same version as the current shell, so I want to update it to use the current nushell version that is in the 24.05 and unstable branches (0.93.0). --- pkgs/shells/nushell/plugins/net.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/nushell/plugins/net.nix b/pkgs/shells/nushell/plugins/net.nix index 23729360e83a..8386810a194d 100644 --- a/pkgs/shells/nushell/plugins/net.nix +++ b/pkgs/shells/nushell/plugins/net.nix @@ -14,11 +14,11 @@ rustPlatform.buildRustPackage { src = fetchFromGitHub { owner = "fennewald"; repo = "nu_plugin_net"; - rev = "a84d72290f513397a359581b9447a4e638ce60c9"; - hash = "sha256-uKLYTRR2tThSvwWbvEePOLZ9ehNPfCYruZxTKSIxpEA="; + rev = "60d315afb19c3c673409db796a4cc7a240058605"; + hash = "sha256-izIxV2rFxZ1Om6NNaofNpc5prtN/lsw8dC4DyKEQ+v8="; }; - cargoHash = "sha256-BsCOej31vfTf+Wca4+AjxkhXz6wpMRFJmGBsUqOj2U0="; + cargoHash = "sha256-nBxcxADyvPgGrfkW8eBq/wmB2Slq+YGJV2IlxuuCgCg="; nativeBuildInputs = [ rustPlatform.bindgenHook From 5f5563347d58e4935d3d6f0c931ad2a9e97b499c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 17:13:24 +0000 Subject: [PATCH 206/219] tile38: 1.32.2 -> 1.33.0 --- pkgs/servers/geospatial/tile38/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/geospatial/tile38/default.nix b/pkgs/servers/geospatial/tile38/default.nix index 705fa6b9e726..53f9baafc082 100644 --- a/pkgs/servers/geospatial/tile38/default.nix +++ b/pkgs/servers/geospatial/tile38/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tile38"; - version = "1.32.2"; + version = "1.33.0"; src = fetchFromGitHub { owner = "tidwall"; repo = pname; rev = version; - sha256 = "sha256-caOdcPVp1WonAK7QIvG34BxhOH7OGprWQmXEo+nsGKQ="; + sha256 = "sha256-07Yp64JaIyKD4WrwUKOIupin8tdN2iL72Yf6l5PSIg0="; }; - vendorHash = "sha256-20zN5ts1jsCDyAolwuygHvkXJdbqGYwSdXh2CY6T1mk="; + vendorHash = "sha256-nnamNwowRPWQBKUMg800bFgijv8iHbdh/wUwTfX0NcY="; subPackages = [ "cmd/tile38-cli" "cmd/tile38-server" ]; From 2f7fc57af2f6cf6a3c94651bd94612c62ded8805 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 17:13:40 +0000 Subject: [PATCH 207/219] vals: 0.37.1 -> 0.37.2 --- pkgs/tools/security/vals/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vals/default.nix b/pkgs/tools/security/vals/default.nix index b7b1012ad277..6a6a8bff389b 100644 --- a/pkgs/tools/security/vals/default.nix +++ b/pkgs/tools/security/vals/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "vals"; - version = "0.37.1"; + version = "0.37.2"; src = fetchFromGitHub { rev = "v${version}"; owner = "helmfile"; repo = pname; - sha256 = "sha256-POFxoGUbcasEvFdovZ1RER+yxLzg9owyKjWcr1zI+nc="; + sha256 = "sha256-L0T0Lu5UP/KG2jdJfw5lM6/FagZUpMLGNWyf4tktzmQ="; }; - vendorHash = "sha256-Yzab4Y6ETOZM5zL/5fQSzqNFi51YOgDjsL53efW1vvk="; + vendorHash = "sha256-mu1653sH4DMOitzI5HDX4cguCtw+j81kaA4LwKizTJk="; ldflags = [ "-s" From 57433b2d0bcccbef52375cbdde7c1c8e3b8e5378 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 17:17:50 +0000 Subject: [PATCH 208/219] vdrPlugins.softhddevice: 2.3.1 -> 2.3.2 --- pkgs/applications/video/vdr/softhddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index e4dc348fa740..b116b0b6e3c9 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-hg4zx3M5X56u3AqG8Aj9DDDB/V0w4EiU9EAz8Qe+NVY="; + sha256 = "sha256-nPIEj4DzHUOkwbwUk06Yv4lIGGn6d/C3kmK7EoaL6kE="; rev = "v${version}"; }; From a062b23ad1c276bfd86312146df92919a05d66c3 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Tue, 4 Jun 2024 21:24:57 +0400 Subject: [PATCH 209/219] tile38: migrate to by-name --- .../tile38/default.nix => by-name/ti/tile38/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{servers/geospatial/tile38/default.nix => by-name/ti/tile38/package.nix} (100%) diff --git a/pkgs/servers/geospatial/tile38/default.nix b/pkgs/by-name/ti/tile38/package.nix similarity index 100% rename from pkgs/servers/geospatial/tile38/default.nix rename to pkgs/by-name/ti/tile38/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9f0fb9cc21a..e7da2bb15a54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26765,8 +26765,6 @@ with pkgs; pg_tileserv = callPackage ../servers/geospatial/pg_tileserv { }; - tile38 = callPackage ../servers/geospatial/tile38 { }; - ### OS-SPECIFIC airbuddy = callPackage ../os-specific/darwin/airbuddy { }; From d1f07e63820121bde6b939be7cfafbef2ea9939d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phan=20Kochen?= Date: Mon, 3 Jun 2024 12:59:05 +0200 Subject: [PATCH 210/219] nixos/acme: allow setting security.acme.defaults.server = null to keep old accounts directory The accounts directory is based on the hash of the settings. https://github.com/NixOS/nixpkgs/pull/270221 changed the default of security.acme.defaults.server from null to the default letsencrypt URL however as an unwanted side effect this means the accounts directory changes and the ACME module will create a new a new account. This can cause issues with people using CAA records that pin the account ID or people who have datacenter-scale NixOS deployments We allow setting this option to null again for people who want to keep the old account and migrate at their own leisure. Fixes https://github.com/NixOS/nixpkgs/issues/316608 Co-authored-by: Arian van Putten --- nixos/modules/security/acme/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 5ffafdc37fef..83581d02840e 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -545,7 +545,7 @@ let }; server = mkOption { - type = types.str; + type = types.nullOr types.str; inherit (defaultAndText "server" "https://acme-v02.api.letsencrypt.org/directory") default defaultText; example = "https://acme-staging-v02.api.letsencrypt.org/directory"; description = '' From f8439331dc74c7f4d1603c510352a07b2771b273 Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Tue, 4 Jun 2024 20:07:14 +0200 Subject: [PATCH 211/219] doc/release-notes: Add note about backwards compatibility in ACME module MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Stéphan Kochen --- nixos/doc/manual/release-notes/rl-2405.section.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 072d4d7f779a..165e3e13a78e 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -429,6 +429,16 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - `screen`'s module has been cleaned, and will now require you to set `programs.screen.enable` in order to populate `screenrc` and add the program to the environment. +- `security.acme.defaults.server` now has a default value instead of `null`. + This effectively uses the same server, the Let's Encrypt production server, + but makes the default explicit, instead of relying on the Lego default. + + A side effect of this is that the directory in which account data is stored + changes and the ACME module will request a new account and new certificates + for all domains. This may cause issues if you pin an `acccounturl` in a CAA + DNS record. To avoid this, you + may set `security.acme.defaults.server = null` to keep the old hashes. + - `security.pam.sshAgentAuth.enable` now requires `services.openssh.authorizedKeysFiles` to be non-empty, which is the case when `services.openssh.enable` is true. Previously, `pam_ssh_agent_auth` silently failed to work. From 562f6f6176efcff4580417fad80d789ac09e716b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 18:26:14 +0000 Subject: [PATCH 212/219] openvas-scanner: 23.3.1 -> 23.3.2 --- pkgs/by-name/op/openvas-scanner/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix index 9ca1d240ba8f..48d78c9a002f 100644 --- a/pkgs/by-name/op/openvas-scanner/package.nix +++ b/pkgs/by-name/op/openvas-scanner/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation rec { pname = "openvas-scanner"; - version = "23.3.1"; + version = "23.3.2"; src = fetchFromGitHub { owner = "greenbone"; repo = "openvas-scanner"; rev = "refs/tags/v${version}"; - hash = "sha256-0vcGKC979bJLhq/9e+DYaRrsUktjMyMuZNqZYK6BCWQ="; + hash = "sha256-KlWO5Cik380pHWC4Lo7eE47z0tNcnbmHIO0J07UrYlg="; }; nativeBuildInputs = [ From 0ff4d009fa6ba16251a32854426894cc969cfacb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 4 Jun 2024 18:31:59 +0000 Subject: [PATCH 213/219] stackit-cli: 0.7.0 -> 0.8.0 --- pkgs/by-name/st/stackit-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix index 9b42ee570840..3b98ecdd069d 100644 --- a/pkgs/by-name/st/stackit-cli/package.nix +++ b/pkgs/by-name/st/stackit-cli/package.nix @@ -12,16 +12,16 @@ buildGoModule rec { pname = "stackit-cli"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "stackitcloud"; repo = "stackit-cli"; rev = "v${version}"; - hash = "sha256-grwfljZlXjtNHwf6Zgu/SKC2Agmtj63ixmT6KVBGpiM="; + hash = "sha256-+E+GEjlytspTfe057GbEiwZXGedrnGC6uwJBFpO0J7I="; }; - vendorHash = "sha256-VcIPLAiZjO1M+vB9CeilVyFVWKo88isrve2APmCZdN8="; + vendorHash = "sha256-/JYkfGYJNk3xi6tvaY26tO4lkSI/cdB3+J+NnVBOCBE="; subPackages = [ "." ]; From 7c39d372f7164831a1506501dae51c8ab1a161a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 4 Jun 2024 20:50:06 +0200 Subject: [PATCH 214/219] nixos/plasma6: make print-manager depend on cups --- nixos/modules/services/desktop-managers/plasma6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 83f6b5bc0ea1..cf51f6025506 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -142,7 +142,6 @@ in { okular kate khelpcenter - print-manager dolphin dolphin-plugins spectacle @@ -168,12 +167,13 @@ in { ) kio-extras-kf5 ] - # Optional hardware support features + # Optional and hardware support features ++ lib.optionals config.hardware.bluetooth.enable [bluedevil bluez-qt pkgs.openobex pkgs.obexftp] ++ lib.optional config.networking.networkmanager.enable plasma-nm ++ lib.optional config.hardware.pulseaudio.enable plasma-pa ++ lib.optional config.services.pipewire.pulse.enable plasma-pa ++ lib.optional config.powerManagement.enable powerdevil + ++ lib.optional config.services.printing.enable print-manager ++ lib.optional config.services.colord.enable colord-kde ++ lib.optional config.services.hardware.bolt.enable plasma-thunderbolt ++ lib.optional config.services.samba.enable kdenetwork-filesharing From c856c204193bfe7380ed3512f234dc5073d70b4b Mon Sep 17 00:00:00 2001 From: Kiskae Date: Tue, 4 Jun 2024 16:33:46 +0200 Subject: [PATCH 215/219] linuxPackages.nvidiaPackages.legacy_470: 470.239.06 -> 470.256.02 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index bc4cd53b1394..54a584c7e692 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -120,11 +120,11 @@ rec { # Last one supporting Kepler architecture legacy_470 = generic { - version = "470.239.06"; - sha256_64bit = "sha256-fXTKrBQKBDLXnr6OQzDceW85un3UCz/NYd92AYG/nMw="; - sha256_aarch64 = "sha256-NZj8OLQ0N7y3V7UBamLyJE8AbI3alZJD1weNjnssuNs="; - settingsSha256 = "sha256-2YTk6DaoB8Qvob9/ohtHXuDhxGO9O/SUwlXXbLSgJP0="; - persistencedSha256 = "sha256-wLrkfD8MQ8sMODE+yEnWg/1ETxYVWOqNsIj1dY+5yjc="; + version = "470.256.02"; + sha256_64bit = "sha256-1kUYYt62lbsER/O3zWJo9z6BFowQ4sEFl/8/oBNJsd4="; + sha256_aarch64 = "sha256-e+QvE+S3Fv3JRqC9ZyxTSiCu8gJdZXSz10gF/EN6DY0="; + settingsSha256 = "sha256-kftQ4JB0iSlE8r/Ze/+UMnwLzn0nfQtqYXBj+t6Aguk="; + persistencedSha256 = "sha256-iYoSib9VEdwjOPBP1+Hx5wCIMhW8q8cCHu9PULWfnyQ="; }; # Last one supporting x86 From 272895a00c7eeaba303f2ca887e7ca0ea8eac83f Mon Sep 17 00:00:00 2001 From: znaniye Date: Tue, 4 Jun 2024 16:08:29 -0300 Subject: [PATCH 216/219] ols: 0-unstable-2024-05-22 -> 0-unstable-2024-06-04 --- pkgs/development/tools/ols/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ols/default.nix b/pkgs/development/tools/ols/default.nix index 2823cdc3b45a..af950773c06d 100644 --- a/pkgs/development/tools/ols/default.nix +++ b/pkgs/development/tools/ols/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation { pname = "ols"; - version = "0-unstable-2024-05-22"; + version = "0-unstable-2024-06-04"; src = fetchFromGitHub { owner = "DanielGavin"; repo = "ols"; - rev = "a2f333bfbdd187aa7463ae230f7a617f6bccb611"; - hash = "sha256-sM8UkfuzQib0L8mUhmtVZAjbZKA07aY2YLvooj3zdc0="; + rev = "5805fd0b688446eeb23528497972b9f934208f1a"; + hash = "sha256-zvojGIxMGawddWx5vnBQMTybz+jL9LXfaShbof7wwq0="; }; passthru.updateScript = unstableGitUpdater { From ba96c1f7e5a7cdd6dac19d2936981e9313792cf3 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 4 Jun 2024 20:18:50 +0100 Subject: [PATCH 217/219] doc: fix make-disk-image.nix example --- doc/build-helpers/images/makediskimage.section.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/doc/build-helpers/images/makediskimage.section.md b/doc/build-helpers/images/makediskimage.section.md index e50479c4e83e..3edfa906aa6a 100644 --- a/doc/build-helpers/images/makediskimage.section.md +++ b/doc/build-helpers/images/makediskimage.section.md @@ -85,14 +85,14 @@ let in make-disk-image { inherit pkgs lib; - config = evalConfig { + inherit (evalConfig { modules = [ { fileSystems."/" = { device = "/dev/vda"; fsType = "ext4"; autoFormat = true; }; boot.grub.device = "/dev/vda"; } ]; - }; + }) config; format = "qcow2"; onlyNixStore = false; partitionTableType = "legacy+gpt"; @@ -104,5 +104,3 @@ in memSize = 2048; # Qemu VM memory size in megabytes. Defaults to 1024M. } ``` - - From 85a3f9b3da1c8ded9ea9024001e5fab33f746ba8 Mon Sep 17 00:00:00 2001 From: hdhog Date: Tue, 4 Jun 2024 15:54:42 +0400 Subject: [PATCH 218/219] terraform-providers.harbor: init at v3.10.10 --- .../cluster/terraform-providers/providers.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2428750c6961..c23bd6e7372e 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -508,6 +508,15 @@ "spdx": "MPL-2.0", "vendorHash": null }, + "harbor": { + "hash": "sha256-Pv4Eoswmx+FVVq6jqP69bCMrUmt5persxdrtvY9N79I=", + "homepage": "https://registry.terraform.io/providers/goharbor/harbor", + "owner": "goharbor", + "repo": "terraform-provider-harbor", + "rev": "v3.10.10", + "spdx": "MIT", + "vendorHash": "sha256-1zaC82m8ylkz4lSocDVoXjF6yWWEL4He0lIKXs/7VtE=" + }, "hcloud": { "hash": "sha256-D7RBrpOxfSfeip7z+mAkWBjSTVnnM/MfN7Qvl/E+nA0=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", From eb042ccd8d2000c4bfc51351212589491d242a16 Mon Sep 17 00:00:00 2001 From: diniamo <55629891+diniamo@users.noreply.github.com> Date: Wed, 5 Jun 2024 01:35:39 +0200 Subject: [PATCH 219/219] steamPackages.steamcmd: add mainProgram, fix fetch url to use an archive (#312753) Co-authored-by: Sandro --- pkgs/games/steam/steamcmd.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/games/steam/steamcmd.nix b/pkgs/games/steam/steamcmd.nix index 1c834f1c2ea6..69d5cd8a7863 100644 --- a/pkgs/games/steam/steamcmd.nix +++ b/pkgs/games/steam/steamcmd.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation { version = "20180104"; # According to steamcmd_linux.tar.gz mtime src = fetchurl { - url = "https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz"; - sha256 = "0z0y0zqvhydmfc9y9vg5am0vz7m3gbj4l2dwlrfz936hpx301gyf"; + url = "https://web.archive.org/web/20240521141411/https://steamcdn-a.akamaihd.net/client/installer/steamcmd_linux.tar.gz"; + hash = "sha256-zr8ARr/QjPRdprwJSuR6o56/QVXl7eQTc7V5uPEHHnw="; }; # The source tarball does not have a single top-level directory. @@ -37,8 +37,9 @@ stdenv.mkDerivation { ''; meta = with lib; { - description = "Steam command-line tools"; homepage = "https://developer.valvesoftware.com/wiki/SteamCMD"; + description = "Steam command-line tools"; + mainProgram = "steamcmd"; platforms = platforms.linux; license = licenses.unfreeRedistributable; maintainers = with maintainers; [ tadfisher ];