From 523ef8787cfe8df53277309e50798434361f9522 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sun, 16 Jul 2023 04:20:00 +0000 Subject: [PATCH 01/51] tiny: 0.10.0 -> 0.11.0 Diff: https://github.com/osa1/tiny/compare/v0.10.0...v0.11.0 Changelog: https://github.com/osa1/tiny/raw/v0.11.0/CHANGELOG.md --- .../networking/irc/tiny/Cargo.lock.patch | 11 +++++++++++ pkgs/applications/networking/irc/tiny/default.nix | 13 ++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/networking/irc/tiny/Cargo.lock.patch diff --git a/pkgs/applications/networking/irc/tiny/Cargo.lock.patch b/pkgs/applications/networking/irc/tiny/Cargo.lock.patch new file mode 100644 index 000000000000..775a7b717869 --- /dev/null +++ b/pkgs/applications/networking/irc/tiny/Cargo.lock.patch @@ -0,0 +1,11 @@ +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1535,7 +1535,7 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" + + [[package]] + name = "tiny" +-version = "0.10.0" ++version = "0.11.0" + dependencies = [ + "clap", + "dirs", diff --git a/pkgs/applications/networking/irc/tiny/default.nix b/pkgs/applications/networking/irc/tiny/default.nix index 4d7f5b0ca36c..519d1dad76f0 100644 --- a/pkgs/applications/networking/irc/tiny/default.nix +++ b/pkgs/applications/networking/irc/tiny/default.nix @@ -12,16 +12,18 @@ rustPlatform.buildRustPackage rec { pname = "tiny"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "osa1"; repo = pname; rev = "v${version}"; - sha256 = "177d1x4z0mh0p7c5ldq70cn1j3pac50d8cil2ni50hl49c3x6yy1"; + hash = "sha256-oOaLQh9gJlurHi9awoRh4wQnXwkuOGJLnGQA6di6k1Q="; }; - cargoSha256 = "05q3f1wp48mwkz8n0102rwb6jzrgpx3dlbxzf3zcw8r1mblgzim1"; + cargoPatches = [ ./Cargo.lock.patch ]; + + cargoHash = "sha256-wUBScLNRNAdDZ+HpQjYiExgPJnE9cxviooHePbJI13Q="; nativeBuildInputs = lib.optional stdenv.isLinux pkg-config; buildInputs = lib.optionals dbusSupport [ dbus ] @@ -30,6 +32,11 @@ rustPlatform.buildRustPackage rec { buildFeatures = lib.optional notificationSupport "desktop-notifications"; + checkFlags = [ + # flaky test + "--skip=tests::config::parsing_tab_configs" + ]; + meta = with lib; { description = "A console IRC client"; homepage = "https://github.com/osa1/tiny"; From 42ebc1025a5ca0e421fcc79f75e8f1b47215e93a Mon Sep 17 00:00:00 2001 From: Henner Zeller Date: Sun, 16 Jul 2023 17:28:29 -0700 Subject: [PATCH 02/51] timg: 1.5.0 -> 1.5.1 Release notes: https://github.com/hzeller/timg/releases/tag/v1.5.1 --- pkgs/tools/graphics/timg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/tools/graphics/timg/default.nix index 23ce5ff68ba7..765b830e297a 100644 --- a/pkgs/tools/graphics/timg/default.nix +++ b/pkgs/tools/graphics/timg/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "timg"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "hzeller"; repo = "timg"; rev = "v${version}"; - hash = "sha256-1zv5+62roS0iSVXa1QXGKuO0Qd6D3e3tZD2HZ5czRRk="; + hash = "sha256-hGQL6MAsaSVV/w5fDKAcd4KIBuh2pvl3D2QUzi/aeG0="; }; buildInputs = [ From 5a4e1c0f2a086c436b43679e4bf8a767a3e211fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 10:45:35 +0000 Subject: [PATCH 03/51] thedesk: 24.1.2 -> 24.1.3 --- pkgs/applications/misc/thedesk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/thedesk/default.nix b/pkgs/applications/misc/thedesk/default.nix index bfb20c5ccbdd..5d704acb2351 100644 --- a/pkgs/applications/misc/thedesk/default.nix +++ b/pkgs/applications/misc/thedesk/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "thedesk"; - version = "24.1.2"; + version = "24.1.3"; src = fetchurl { url = "https://github.com/cutls/TheDesk/releases/download/v${version}/${pname}_${version}_amd64.deb"; - sha256 = "sha256-0EvJ60yTRi3R0glgI8l3r7mxR76McDA1x5aF6WQDbdU="; + sha256 = "sha256-Fq+kDdNR7G0Fbi++OFGxYbgFFOnpdzxy0JVh5t/i8hs="; }; nativeBuildInputs = [ From 6dc07a318fb753c8be0bc9a68b9d609794aae7da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 10:46:42 +0000 Subject: [PATCH 04/51] nats-server: 2.9.19 -> 2.9.20 --- pkgs/servers/nats-server/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nats-server/default.nix b/pkgs/servers/nats-server/default.nix index e20b36a5a192..7225f8d11e58 100644 --- a/pkgs/servers/nats-server/default.nix +++ b/pkgs/servers/nats-server/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "nats-server"; - version = "2.9.19"; + version = "2.9.20"; src = fetchFromGitHub { owner = "nats-io"; repo = pname; rev = "v${version}"; - hash = "sha256-CiDvDnnUR/jaEWU+bceH6uIr9QBtsAz+6vnQjT3sNQQ="; + hash = "sha256-RRWn1xPvYkDL+81/JOAW+K8I2ezq+z65KiJPYMrF7Sw="; }; - vendorHash = "sha256-m/15F0BHCAEcNlRf71jJP5bjrrqRgX/CQm8SddpTkYw="; + vendorHash = "sha256-INzCHNr469LajEggVpVZ0Kj0zpe7GwX26af2C/7zx7o="; doCheck = false; From 7a9d01d44c0ebfb00fb314f05fa2755888a0e18f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 11:15:14 +0000 Subject: [PATCH 05/51] seqkit: 2.4.0 -> 2.5.0 --- pkgs/applications/science/biology/seqkit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/biology/seqkit/default.nix b/pkgs/applications/science/biology/seqkit/default.nix index 598c8248bfb4..e785d6c25f3f 100644 --- a/pkgs/applications/science/biology/seqkit/default.nix +++ b/pkgs/applications/science/biology/seqkit/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "seqkit"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "shenwei356"; repo = "seqkit"; rev = "v${version}"; - sha256 = "sha256-v2Z94UDuXnT7eVFX+uLSxXR34eIBzRm1bHwD7gO9SVA="; + sha256 = "sha256-pk4HNtG2x3zZ+GEH5MNn/XPNSmx8zGWbVYPGCYIZucs="; }; - vendorHash = "sha256-dDMSwZnTWC60zvPDvUT+9T/mUUrhW0Itn87XO/+Ef2Q="; + vendorHash = "sha256-54kb9Na76+CgW61SnXu7EfO0InH/rjliNRcH2M/gxII="; meta = with lib; { description = "cross-platform and ultrafast toolkit for FASTA/Q file manipulation"; From 1dafcf11b3c9044ef237c2649136c0e83f205090 Mon Sep 17 00:00:00 2001 From: fomichevmi Date: Mon, 17 Jul 2023 13:21:37 +0200 Subject: [PATCH 06/51] riemann-c-client: fix sources location The algernon repo in github is no longer available, so switching it to one of the mirrors which contains the same archive --- pkgs/tools/misc/riemann-c-client/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/riemann-c-client/default.nix b/pkgs/tools/misc/riemann-c-client/default.nix index 1a81372d7f60..777e310ac44c 100644 --- a/pkgs/tools/misc/riemann-c-client/default.nix +++ b/pkgs/tools/misc/riemann-c-client/default.nix @@ -1,14 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, file , protobufc }: +{ lib, stdenv, fetchFromGitea, autoreconfHook, pkg-config, file , protobufc }: stdenv.mkDerivation rec { pname = "riemann-c-client"; version = "1.10.5"; - src = fetchFromGitHub { + src = fetchFromGitea { + domain = "git.madhouse-project.org"; owner = "algernon"; repo = "riemann-c-client"; rev = "riemann-c-client-${version}"; - sha256 = "sha256-LuI9XFDPx0qw/+kkpXd0FOMESERAp31R1+ttkGuJnPA="; + sha256 = "1w4wi5mr0vgbsx8pv9s08i409qqlfivsa979zyq4miyga1f3vqif"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - homepage = "https://github.com/algernon/riemann-c-client"; + homepage = "https://git.madhouse-project.org/algernon/riemann-c-client"; description = "A C client library for the Riemann monitoring system"; license = licenses.gpl3; maintainers = with maintainers; [ pradeepchhetri ]; From 167a5853acbe8b2e4699d68b0d11bb2cdbf01b5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 12:45:54 +0000 Subject: [PATCH 07/51] python310Packages.webargs: 8.2.0 -> 8.3.0 --- pkgs/development/python-modules/webargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/webargs/default.nix b/pkgs/development/python-modules/webargs/default.nix index b69ff310a271..91d62cf849b8 100644 --- a/pkgs/development/python-modules/webargs/default.nix +++ b/pkgs/development/python-modules/webargs/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "webargs"; - version = "8.2.0"; + version = "8.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - hash = "sha256-mdaJQMRS4HcmSFoV/vQ/EviubAxbORvLp2Bl1FJ/uF0="; + hash = "sha256-yrIHlBsGhsTQhsgjYy3c1DQxUWRDQaMvz1C46qceMcc="; }; pythonImportsCheck = [ From a88798a9907dbd61bcd7780e079cc6b75ef13374 Mon Sep 17 00:00:00 2001 From: COLAMAroro Date: Mon, 17 Jul 2023 14:57:47 +0200 Subject: [PATCH 08/51] pulsar: 1.106.0 -> 1.107.1 --- pkgs/applications/editors/pulsar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/pulsar/default.nix b/pkgs/applications/editors/pulsar/default.nix index fe850a8f427f..0cdc2d81e75b 100644 --- a/pkgs/applications/editors/pulsar/default.nix +++ b/pkgs/applications/editors/pulsar/default.nix @@ -23,13 +23,13 @@ let pname = "pulsar"; - version = "1.106.0"; + version = "1.107.1"; sourcesPath = { x86_64-linux.tarname = "Linux.${pname}-${version}.tar.gz"; - x86_64-linux.hash = "sha256-Wd0z6kHd6qZgrgZBxZQjwVC1dDqYtJ94L7aAnbuJoO8="; + x86_64-linux.hash = "sha256-stY/sutbFVWQuN6C/tkT/G5MMVypgm3Um78jk8RHF6k="; aarch64-linux.tarname = "ARM.Linux.${pname}-${version}-arm64.tar.gz"; - aarch64-linux.hash = "sha256-Xadjqw8PRrq0ksif6te0gxn8xeYTCYnJcsrezfl2SYs="; + aarch64-linux.hash = "sha256-umL60+FJKT8ThnzxgzzVzsY0nhJwsNF4YvrKoruxz7U="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); additionalLibs = lib.makeLibraryPath [ From db975582f12570b51ab856f33499ed6a56c7b8cb Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 17 Jul 2023 09:33:35 -0400 Subject: [PATCH 09/51] cargo-local-registry: 0.2.5 -> 0.2.6 Diff: https://github.com/dhovart/cargo-local-registry/compare/0.2.5...0.2.6 Changelog: https://github.com/dhovart/cargo-local-registry/releases/tag/0.2.6 --- .../development/tools/rust/cargo-local-registry/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-local-registry/default.nix b/pkgs/development/tools/rust/cargo-local-registry/default.nix index 782610812c5e..54217bd39ec3 100644 --- a/pkgs/development/tools/rust/cargo-local-registry/default.nix +++ b/pkgs/development/tools/rust/cargo-local-registry/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-local-registry"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "dhovart"; repo = "cargo-local-registry"; rev = version; - hash = "sha256-3xp0LLk3MpL54PMGLHTAKcsM6fwMxB8LOdN0Xcap/xA="; + hash = "sha256-2tSO82XRCUekEBrd9wDzxeg2r2C+F9wgz3ffYFG7+q8="; }; - cargoHash = "sha256-HknfcJfOQ40ecpKM8GGbquRxLQTEGyRFkwXhsjrl8FA="; + cargoHash = "sha256-vxdQLfr4G73MpPrrcbcQRZGbTHJztUP3FwShj6zFhEY="; nativeBuildInputs = [ curl From 529febf315c3dc45a745b1326f0234633a1f92f3 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 17 Jul 2023 13:57:53 +0000 Subject: [PATCH 10/51] wishlist: 0.11.0 -> 0.12.0 Signed-off-by: Carlos Alexandro Becker --- pkgs/servers/wishlist/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/wishlist/default.nix b/pkgs/servers/wishlist/default.nix index ed487a739647..5b9e8b28b40c 100644 --- a/pkgs/servers/wishlist/default.nix +++ b/pkgs/servers/wishlist/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wishlist"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "wishlist"; rev = "v${version}"; - sha256 = "sha256-O2ciXaWH2QSoqDTnDxmqwgK/BM5WHye8JHfw9+zZxZ4="; + sha256 = "65V+Ge2QHLqRb4oiSF5Pbtpw70duIAcVmrp+tZCML2A="; }; - vendorHash = "sha256-wZugmCP3IouZ9pw3NEAZcoqdABMGTVi/IcithQjVFW4="; + vendorHash = "sha256-qz+OOqpvybBd7JlQmspIQKlBvTnFvMlyv+k00yO9rt8="; doCheck = false; @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://github.com/charmbracelet/wishlist"; changelog = "https://github.com/charmbracelet/wishlist/releases/tag/v${version}"; license = licenses.mit; - maintainers = with maintainers; [ penguwin ]; + maintainers = with maintainers; [ caarlos0 penguwin ]; }; } From ff6db138bb780f58c1ee83c177636d04ba8be23d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 14:00:45 +0000 Subject: [PATCH 11/51] plantuml: 1.2023.9 -> 1.2023.10 --- pkgs/tools/misc/plantuml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index df5ef187e730..0c31eb9e6253 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2023.9"; + version = "1.2023.10"; pname = "plantuml"; src = fetchurl { url = "https://github.com/plantuml/plantuml/releases/download/v${version}/plantuml-pdf-${version}.jar"; - sha256 = "sha256-/X3eKLl+nXkWIjMB3w9oKBMfEJvdIdrleaYQMFJoXK0="; + sha256 = "sha256-/+B16MQ5fzaRS/SjyMgiUsC+8Y7McyuS3IEMRgtY7jQ="; }; nativeBuildInputs = [ makeWrapper ]; From 2383c38e4e80c0869b019053dfab668a2771c4d3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 14:16:20 +0000 Subject: [PATCH 12/51] python311Packages.unearth: 0.9.1 -> 0.9.2 --- pkgs/development/python-modules/unearth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/unearth/default.nix b/pkgs/development/python-modules/unearth/default.nix index d88c8c391cb7..cf9e95e41bb2 100644 --- a/pkgs/development/python-modules/unearth/default.nix +++ b/pkgs/development/python-modules/unearth/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "unearth"; - version = "0.9.1"; + version = "0.9.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-cgWDKwhwBdG3RpA6U1yn0NtTgcH2Id3AApBSTVav0hc="; + hash = "sha256-hF9LVzOHTOO0JyEm3kluq+AKSa1nj90E1ILR533u1CU="; }; nativeBuildInputs = [ From 9fb59f211deac5980b25638f08ecdbc4e227ac22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 14:17:18 +0000 Subject: [PATCH 13/51] libjwt: 1.15.3 -> 1.16.0 --- pkgs/development/libraries/libjwt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libjwt/default.nix b/pkgs/development/libraries/libjwt/default.nix index 3f9632bbe03d..4d2c11601135 100644 --- a/pkgs/development/libraries/libjwt/default.nix +++ b/pkgs/development/libraries/libjwt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libjwt"; - version = "1.15.3"; + version = "1.16.0"; src = fetchFromGitHub { owner = "benmcollins"; repo = "libjwt"; rev = "v${version}"; - sha256 = "sha256-as4tqvRY559Q2R3s4GZHovqsCboXNz/NcV5lo+qCeOk="; + sha256 = "sha256-5hbmEen31lB6Xdv5WU+8InKa0+1OsuB8QG0jVa1+a2w="; }; buildInputs = [ jansson openssl ]; From f86bdb48b7a8a91d89292ed21a3ec2881ebc0d08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 14:52:54 +0000 Subject: [PATCH 14/51] python310Packages.looseversion: 1.2.0 -> 1.3.0 --- pkgs/development/python-modules/looseversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/looseversion/default.nix b/pkgs/development/python-modules/looseversion/default.nix index 84c64a3d54e0..19b5d10ca0e1 100644 --- a/pkgs/development/python-modules/looseversion/default.nix +++ b/pkgs/development/python-modules/looseversion/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "looseversion"; - version = "1.2.0"; + version = "1.3.0"; format = "flit"; src = fetchPypi { inherit version pname; - sha256 = "sha256-xk5xwLKQMGg7Tqda7kMdstJcTm5TNZDlISnx2eUd4gQ="; + sha256 = "sha256-695l8/a7lTGoEBbG/vPrlaYRga3Ee3+UnpwOpHkRZp4="; }; nativeCheckInputs = [ From 2fd1640d60014b501933fc1e5e851639ed3640b4 Mon Sep 17 00:00:00 2001 From: Hugh O'Brien Date: Mon, 17 Jul 2023 11:02:12 -0400 Subject: [PATCH 15/51] urbit: 2.10 -> 2.11 --- pkgs/misc/urbit/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index 865a72a78209..81dd6b81badc 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -10,15 +10,15 @@ let in stdenv.mkDerivation rec { pname = "urbit"; - version = "2.10"; + version = "2.11"; src = fetchzip { url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz"; sha256 = { - x86_64-linux = "sha256-Bf0XDuGSBq8z9zouPQJyi/ZPEE6RzXb9+HCls89MR8Q="; - aarch64-linux = "sha256-Ecmc41X4AM3xigBvJGyWkIFxXM3vy+uK9p2M93UUJiY="; - x86_64-darwin = "sha256-eQSbzcP612LxOxdj9THPzyLtJwAthygjsSSct7vk1fc="; - aarch64-darwin = "sha256-VIXD8WHwAgRCLDZg1H5KmuiIqQMziWR6/4XxvSYtmTs="; + x86_64-linux = "sha256-k2zmcjZ9NXmwZf93LIAg1jx4IRprKUgdkvwzxEOKWDY="; + aarch64-linux = "sha256-atMBXyXwavpSDTZxUnXIq+NV4moKGRWLaFTM9Kuzt94="; + x86_64-darwin = "sha256-LSJ9jVY3fETlpRAkyUWa/2vZ5xAFmmMssvbzUfIBY/4="; + aarch64-darwin = "sha256-AViUt2N+YCgMWOcv3ZI0GfdYVOiRLbhseQ7TTq4zCiQ="; }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; From 0b1845d417992f6419f416b0548e769855013a8f Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 17 Jul 2023 11:17:28 -0400 Subject: [PATCH 16/51] typer: init at unstable-2023-02-08 https://github.com/maaslalani/typer --- pkgs/applications/misc/typer/default.nix | 27 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/typer/default.nix diff --git a/pkgs/applications/misc/typer/default.nix b/pkgs/applications/misc/typer/default.nix new file mode 100644 index 000000000000..ebd274125e6e --- /dev/null +++ b/pkgs/applications/misc/typer/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "typer"; + version = "unstable-2023-02-08"; + + src = fetchFromGitHub { + owner = "maaslalani"; + repo = "typer"; + rev = "02aa80b3be8a6c2c9d08d9a56b3fe784adf00933"; + hash = "sha256-J3wTqWxHEQz1AAt7DfUmpgc7wmfILBtyHuDrmqN96fI="; + }; + + vendorHash = "sha256-t4zim6WhqGAf1zHmmbJbpVvQcE/aoNL7ZLdjU7f3rp8="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Typing test in your terminal"; + homepage = "https://github.com/maaslalani/typer"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2f30496fdd6..c91f871608c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35415,6 +35415,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + typer = callPackage ../applications/misc/typer { }; + ueberzug = with python3Packages; toPythonApplication ueberzug; ueberzugpp = darwin.apple_sdk_11_0.callPackage ../tools/graphics/ueberzugpp { }; From b673a2eaeba61b331b475078eb244d9a3a28ecfe Mon Sep 17 00:00:00 2001 From: Evan Goode Date: Mon, 17 Jul 2023 11:22:04 -0400 Subject: [PATCH 17/51] python310Packages.tidalapi: 0.7.1 -> 0.7.2 This release fixes a critical bug; version 0.7.1 has not worked with the current version of the Tidal API for a couple weeks: https://github.com/tamland/python-tidal/issues/146 0.7.2 also changes the packaging method from setuptools to pyproject. --- pkgs/development/python-modules/tidalapi/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix index 7d9ac9a6044a..87e84a43b916 100644 --- a/pkgs/development/python-modules/tidalapi/default.nix +++ b/pkgs/development/python-modules/tidalapi/default.nix @@ -3,19 +3,24 @@ , buildPythonPackage , fetchPypi , python-dateutil +, poetry-core , requests }: buildPythonPackage rec { pname = "tidalapi"; - version = "0.7.1"; - format = "setuptools"; + version = "0.7.2"; + format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-ttOjw6VXR36QL/GUQXjpPWrE617Bmdt0piUsA4O5W/g="; + hash = "sha256-CyyvzhuDB9XgroeP+WPTJIufT3VU9fD6Pg2Q1prB0Mo="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ requests python-dateutil From 8a0d4e5106ea4bf0d9dae020fe049251e3ff3a29 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 17 Jul 2023 11:37:01 -0400 Subject: [PATCH 18/51] confetty: init at unstable-2022-11-05 https://github.com/maaslalani/confetty --- pkgs/applications/misc/confetty/default.nix | 27 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/misc/confetty/default.nix diff --git a/pkgs/applications/misc/confetty/default.nix b/pkgs/applications/misc/confetty/default.nix new file mode 100644 index 000000000000..77269ef85354 --- /dev/null +++ b/pkgs/applications/misc/confetty/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule { + pname = "confetty"; + version = "unstable-2022-11-05"; + + src = fetchFromGitHub { + owner = "maaslalani"; + repo = "confetty"; + rev = "6c6f1b5b605f78c3ed3bab2d2a1357c0dd794221"; + hash = "sha256-1BAszv9I2JDflWyHuAlbJo7+oI7BI/TL10uFIYa8mLk="; + }; + + vendorHash = "sha256-RymdnueY674Zd231O8CIw/TEIDaWDzc+AaI6yk9hFgc="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Confetti in your TTY"; + homepage = "https://github.com/maaslalani/confetty"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2f30496fdd6..51e0982ff867 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -509,6 +509,8 @@ with pkgs; crc = callPackage ../applications/networking/cluster/crc { }; + confetty = callPackage ../applications/misc/confetty { }; + confy = callPackage ../applications/misc/confy { }; coordgenlibs = callPackage ../development/libraries/coordgenlibs { }; From ae910ed9b8b6fd040c452a968c8cd0dc0b2f5c75 Mon Sep 17 00:00:00 2001 From: SEKUN Date: Mon, 17 Jul 2023 16:10:00 +0000 Subject: [PATCH 19/51] papermc: 1.19.3.375 -> 1.20.1.83 --- pkgs/games/papermc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 930b4462a7bd..2fa4545362da 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "papermc"; - version = "1.19.3.375"; + version = "1.20.1.83"; jar = let mcVersion = lib.versions.pad 3 version; buildNum = builtins.elemAt (lib.versions.splitVersion version) 3; in fetchurl { url = "https://papermc.io/api/v2/projects/paper/versions/${mcVersion}/builds/${buildNum}/downloads/paper-${mcVersion}-${buildNum}.jar"; - sha256 = "sha256-NAl4+mCkO6xQQpIx2pd9tYX2N8VQa+2dmFwyBNbDa10="; + sha256 = "sha256-HQpc3MOXa1wkXqgm9ciQj04FUIyuupnYiu+2RZ/sXE4="; }; preferLocalBuild = true; From e6dc17c315d747f810be36cb7de87b7e55c96cf5 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Mon, 17 Jul 2023 10:35:18 -0700 Subject: [PATCH 20/51] signalbackup-tools: 20230707 -> 20230716 Diff: https://github.com/bepaald/signalbackup-tools/compare/20230707...20230716 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 01224267867b..b460527660d5 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230707"; + version = "20230716"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-kVXkcAhDpwc6/d5iXMJ3Z31p9REqWUvSimE8p+OD8aU="; + hash = "sha256-k2QY+7mEXqvDzO0xv3XxQdhDje4iCPVOUybWnONLMTM="; }; postPatch = '' From 52ba084db960522411d9427b32804ba371ffd9ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 17:38:32 +0000 Subject: [PATCH 21/51] imgproxy: 3.18.1 -> 3.18.2 --- pkgs/servers/imgproxy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 02e16a1b0faa..88dacb73986d 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -3,12 +3,12 @@ buildGoModule rec { pname = "imgproxy"; - version = "3.18.1"; + version = "3.18.2"; src = fetchFromGitHub { owner = pname; repo = pname; - hash = "sha256-gtCDeWQLXdhNc5Gn9020ib0IZxjVkHnOUHNf1vqsc0k="; + hash = "sha256-iMzaeB086VohyzUJqYxdnGi0grosrJD1H0AgK5A75XM="; rev = "v${version}"; }; From 655d4aae458c5b70fd1083ac80ef7c06f7976578 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 17:44:10 +0000 Subject: [PATCH 22/51] okta-aws-cli: 1.0.2 -> 1.1.0 --- pkgs/tools/admin/okta-aws-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/okta-aws-cli/default.nix b/pkgs/tools/admin/okta-aws-cli/default.nix index 18bf3f04eebe..38a2d42ac0a4 100644 --- a/pkgs/tools/admin/okta-aws-cli/default.nix +++ b/pkgs/tools/admin/okta-aws-cli/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "okta-aws-cli"; - version = "1.0.2"; + version = "1.1.0"; subPackages = [ "cmd/okta-aws-cli" ]; @@ -10,7 +10,7 @@ buildGoModule rec { owner = "okta"; repo = "okta-aws-cli"; rev = "v${version}"; - sha256 = "sha256-gC5/KwtawVfCx6C5kP0/ZesEzn9XxrPX/X8E8Mb/KUE="; + sha256 = "sha256-TRS1+msrp+Wd+9FhQSErZGvfpcRA5ltNKIyVHLveMOo="; }; vendorHash = "sha256-AJmQxMRj602yodzIdhZV+R22KxnEIbT9iSz/5G5T6r8="; From 5aa2794e179ece6066a20b7af8487960111709d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Reyrol?= Date: Mon, 17 Jul 2023 20:03:39 +0200 Subject: [PATCH 23/51] sozu: 0.15.1 -> 0.15.2 --- pkgs/servers/sozu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sozu/default.nix b/pkgs/servers/sozu/default.nix index 18179efcfde9..971377f99840 100644 --- a/pkgs/servers/sozu/default.nix +++ b/pkgs/servers/sozu/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "sozu"; - version = "0.15.1"; + version = "0.15.2"; src = fetchFromGitHub { owner = "sozu-proxy"; repo = pname; rev = version; - hash = "sha256-/0scNFOWDbL5SaXOC+/DGFE5OgJx1WkdruM+yFV6n1M="; + hash = "sha256-6CuBJUMymnqNx/675PeBuZNhYYh9HtU99J1LYO2+Rxc="; }; - cargoHash = "sha256-SVfAo7jsYIhgYHP4pity62TU1aGoH6E8UysJ/Gw+rDk="; + cargoHash = "sha256-c/TC8Mn9UFIymkXxD02iB6E3kKyeuKDgvlgapiV0Nco="; nativeBuildInputs = [ protobuf ]; From 4be0901a28000af08dba62912d73ac62ffd89294 Mon Sep 17 00:00:00 2001 From: figsoda Date: Mon, 17 Jul 2023 15:00:47 -0400 Subject: [PATCH 24/51] runme: 1.4.1 -> 1.5.0 Diff: https://github.com/stateful/runme/compare/v1.4.1...v1.5.0 Changelog: https://github.com/stateful/runme/releases/tag/v1.5.0 --- pkgs/development/tools/misc/runme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/runme/default.nix b/pkgs/development/tools/misc/runme/default.nix index f6f9ac052d74..e4bf6f0ee3cf 100644 --- a/pkgs/development/tools/misc/runme/default.nix +++ b/pkgs/development/tools/misc/runme/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "runme"; - version = "1.4.1"; + version = "1.5.0"; src = fetchFromGitHub { owner = "stateful"; repo = "runme"; rev = "v${version}"; - hash = "sha256-VA5YgPq/zr3yN59VyrFoIlr/Utvq1P7wyPdsXpyFdxQ="; + hash = "sha256-tUeNgG54+gx0DT+0TvwCcLv5auV442pO+ulyuDLshsg="; }; vendorHash = "sha256-BJhda5mE5f4kvi8CLjgMJYjdUS3vsUSwmHhTW/AVKCI="; From 1179c6c3705509ba25bd35196fca507d2a227bd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 19:21:24 +0000 Subject: [PATCH 25/51] bosh-cli: 7.3.0 -> 7.3.1 --- pkgs/applications/networking/cluster/bosh-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix index 791df5177d8e..06b503181912 100644 --- a/pkgs/applications/networking/cluster/bosh-cli/default.nix +++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix @@ -8,13 +8,13 @@ buildGoModule rec { pname = "bosh-cli"; - version = "7.3.0"; + version = "7.3.1"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o/JhfS2VkN5qzZglFN1YNSZV2A2LowNouQee4Tv2dFc="; + sha256 = "sha256-bCZuX4c/ltnq1se/tbqQmWBc7/6IRUWqSNg7T3pFl3k="; }; vendorHash = null; From 907421e622cee1a3436b5e57dd9aa4a814b60d49 Mon Sep 17 00:00:00 2001 From: oluceps Date: Tue, 18 Jul 2023 03:52:12 +0800 Subject: [PATCH 26/51] dae: 0.2.0 -> 0.2.1 --- pkgs/tools/networking/dae/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/dae/default.nix b/pkgs/tools/networking/dae/default.nix index fa4f1608fefb..1c1cf2a3fab4 100644 --- a/pkgs/tools/networking/dae/default.nix +++ b/pkgs/tools/networking/dae/default.nix @@ -5,17 +5,17 @@ }: buildGoModule rec { pname = "dae"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "daeuniverse"; repo = pname; rev = "v${version}"; - sha256 = "sha256-J2FFD6/+Of1UcBmgzlAfmX5QvEgJY4P1EttlNaqW4P0="; + sha256 = "sha256-+x9yqqlSj7mKT7A9yUaJJzRH8FR9pev3S2BzpXvnPu0="; fetchSubmodules = true; }; - vendorHash = "sha256-2KKlbhJtoHUa02juXuS1QgvDD5LA5Tg/f0hNFscLJIQ="; + vendorHash = "sha256-8Pqt2rVtekgARcP0m9pwPO/ftffVkdwvQAcjrd1EI8g="; proxyVendor = true; From 6bfa54365ba1e1be09a5545dcf91b55fdf08b41a Mon Sep 17 00:00:00 2001 From: SubhrajyotiSen Date: Tue, 18 Jul 2023 01:33:08 +0530 Subject: [PATCH 27/51] maestro: 1.30.0 -> 1.30.3 --- pkgs/development/mobile/maestro/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/mobile/maestro/default.nix b/pkgs/development/mobile/maestro/default.nix index d027efd859ea..a06988aa1931 100644 --- a/pkgs/development/mobile/maestro/default.nix +++ b/pkgs/development/mobile/maestro/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "maestro"; - version = "1.30.0"; + version = "1.30.3"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${version}/maestro.zip"; - sha256 = "1z9mrkxwfkp07z1k3kdgsda4dpb3hl3wa8mn0vwy3avh0k3my0px"; + sha256 = "0y7qcm9f235xvfsavngsw650b3ibmzff2bf32axgp9w06bwfh8rq"; }; dontUnpack = true; From 25a4bfde79494db8a64ebecfdd3320d153034197 Mon Sep 17 00:00:00 2001 From: Kirill Radzikhovskyy Date: Mon, 17 Jul 2023 21:47:20 +1000 Subject: [PATCH 28/51] python3Packages.pyramid-chameleon: unmark broken --- pkgs/development/python-modules/pyramid_chameleon/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/pyramid_chameleon/default.nix b/pkgs/development/python-modules/pyramid_chameleon/default.nix index f4031db0d95e..69862bdfe554 100644 --- a/pkgs/development/python-modules/pyramid_chameleon/default.nix +++ b/pkgs/development/python-modules/pyramid_chameleon/default.nix @@ -47,7 +47,6 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Chameleon template compiler for pyramid"; homepage = "https://github.com/Pylons/pyramid_chameleon"; license = licenses.bsd0; From 9858973daddbccb53a926265a5458e7e81791f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Schr=C3=B6der?= Date: Mon, 17 Jul 2023 23:41:44 +0200 Subject: [PATCH 29/51] nixos/vaultwarden: Fix Markdown syntax of link The typo was introduced in 1d41cff3dc4c8f37bb5841f51fcbff705e169178 --- nixos/modules/services/security/vaultwarden/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index 98ab8595bddf..d22e6b5b40cd 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -121,7 +121,7 @@ in { The available configuration options can be found in [the environment template file](https://github.com/dani-garcia/vaultwarden/blob/${vaultwarden.version}/.env.template). - See ()[#opt-services.vaultwarden.environmentFile) for how + See [](#opt-services.vaultwarden.environmentFile) for how to set up access to the Admin UI to invite initial users. ''; }; From 2cd443b691ce9bc9f3cb22b5207c9c7c8538e17d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 22:03:28 +0000 Subject: [PATCH 30/51] recyclarr: 5.1.0 -> 5.1.1 --- pkgs/tools/video/recyclarr/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/video/recyclarr/default.nix b/pkgs/tools/video/recyclarr/default.nix index 1ad38489c555..02f2da598d98 100644 --- a/pkgs/tools/video/recyclarr/default.nix +++ b/pkgs/tools/video/recyclarr/default.nix @@ -26,10 +26,10 @@ let or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-aEcinTJlO++rTeyqGJea0TWtleH6fyooA8RhT0Qj24c="; - arm64-linux_hash = "sha256-9Gyk09zAGzahP8FCGxj037vaK8h++3M5R2Qqop99Gs4="; - x64-osx_hash = "sha256-c87eOZBz+RtbIi+dlXKKVMyPI8JqYDuiaL4xOkDRFn0="; - arm64-osx_hash = "sha256-zSHgLXRDB6UA7V0LFgLq9ChqB40IHIJJxRqAYyVFlB8="; + x64-linux_hash = "sha256-LSnMXNXQDx45AlQi1IBbMQBBgMc0gJsSa0GV5G5UBPk="; + arm64-linux_hash = "sha256-KkWAPXHaGCc8hsAMohbO7R0ZcfySlu1z+dRjNICaH+Y="; + x64-osx_hash = "sha256-cFerz4g2hPcIqOAeIURD06v6Wr+Rs0xpMHYmG8xl250="; + arm64-osx_hash = "sha256-Kl7lcJUaNeJ/xyd4Fh0f5Li8AyxrcQQgDSfxB3j2L1g="; }."${arch}-${os}_hash"; libPath = { @@ -40,7 +40,7 @@ let in stdenv.mkDerivation rec { pname = "recyclarr"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "https://github.com/recyclarr/recyclarr/releases/download/v${version}/recyclarr-${os}-${arch}.tar.xz"; From 38176f81b00c02317d9d1cfdf52ff2e27f174202 Mon Sep 17 00:00:00 2001 From: Jack Connors Date: Mon, 17 Jul 2023 18:39:42 +0300 Subject: [PATCH 31/51] vintagestory: add support for experimental .net 7 build Future versions (1.19+) will be built exclusively on .net 7, see: https://www.vintagestory.at/blog.html/news/v1186-stable-security-patch-r360/ and https://www.vintagestory.at/blog.html/news/v1186-rc2-hunting-the-performance-leak-r359/ This change crates the foundations for suporting .net 7 going forward and adds an override option to enable the experimental .net 7 build Co-authored-by: Artturin --- pkgs/games/vintagestory/default.nix | 47 +++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 9 deletions(-) diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index 2b82426b57cf..b8b478b8ae73 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -13,20 +13,39 @@ , libGLU , SDL2 , freealut +, libglvnd +, pipewire +, libpulseaudio +, experimental ? false +, dotnet-runtime_7 }: stdenv.mkDerivation rec { pname = "vintagestory"; - version = "1.18.6"; + version = if experimental then "1.18.6" else "1.18.6"; + + src = + if experimental + then + (fetchurl { + url = "https://cdn.vintagestory.at/gamefiles/net7/vs_client_linux-x64_${version}.tar.gz"; + sha256 = "sha256-h4TyMDFid3eB6oPJix92/tmS0v+Ox6CFSRyn/JRNbxg="; + }) + else + (fetchurl { + url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; + sha256 = "sha256-Sa5R/Msg36pKRpZJXXJgM4lcCADJX9x81fMnTD3tjAI="; + }); - src = fetchurl { - url = "https://cdn.vintagestory.at/gamefiles/stable/vs_archive_${version}.tar.gz"; - sha256 = "sha256-Sa5R/Msg36pKRpZJXXJgM4lcCADJX9x81fMnTD3tjAI="; - }; nativeBuildInputs = [ makeWrapper copyDesktopItems ]; - buildInputs = [ mono ]; + buildInputs = + if experimental then [ + dotnet-runtime_7 + ] else [ + mono + ]; runtimeLibs = lib.makeLibraryPath ([ gtk2 @@ -36,6 +55,9 @@ stdenv.mkDerivation rec { libGLU SDL2 freealut + libglvnd + pipewire + libpulseaudio ] ++ (with xorg; [ libX11 libXi @@ -43,7 +65,7 @@ stdenv.mkDerivation rec { desktopItems = makeDesktopItem { name = "vintagestory"; - desktopName = "Vintage Story"; + desktopName = if experimental then "Vintage Story Experimental .net 7" else "Vintage Story"; exec = "vintagestory"; icon = "vintagestory"; comment = "Innovate and explore in a sandbox world"; @@ -61,14 +83,21 @@ stdenv.mkDerivation rec { runHook postInstall ''; - preFixup = '' + preFixup = (if experimental then '' + makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory \ + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --add-flags $out/share/vintagestory/Vintagestory.dll + makeWrapper ${dotnet-runtime_7}/bin/dotnet $out/bin/vintagestory-server \ + --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ + --add-flags $out/share/vintagestory/VintagestoryServer.dll + '' else '' makeWrapper ${mono}/bin/mono $out/bin/vintagestory \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ --add-flags $out/share/vintagestory/Vintagestory.exe makeWrapper ${mono}/bin/mono $out/bin/vintagestory-server \ --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ --add-flags $out/share/vintagestory/VintagestoryServer.exe - + '') + '' find "$out/share/vintagestory/assets/" -not -path "*/fonts/*" -regex ".*/.*[A-Z].*" | while read -r file; do local filename="$(basename -- "$file")" ln -sf "$filename" "''${file%/*}"/"''${filename,,}" From 5e586714147b4160b4d1762d67f6400dfe5eee80 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 18 Jul 2023 00:36:06 +0300 Subject: [PATCH 32/51] vintagestory: add gigglesquid as maintainer --- pkgs/games/vintagestory/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/vintagestory/default.nix b/pkgs/games/vintagestory/default.nix index b8b478b8ae73..40b3e1077248 100644 --- a/pkgs/games/vintagestory/default.nix +++ b/pkgs/games/vintagestory/default.nix @@ -108,6 +108,6 @@ stdenv.mkDerivation rec { description = "An in-development indie sandbox game about innovation and exploration"; homepage = "https://www.vintagestory.at/"; license = licenses.unfree; - maintainers = with maintainers; [ artturin ]; + maintainers = with maintainers; [ artturin gigglesquid ]; }; } From 3297ece10cb7cdcc5c166f2fdaeb8fc5f84d3ec6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jul 2023 00:24:09 +0000 Subject: [PATCH 33/51] cri-o-unwrapped: 1.27.0 -> 1.27.1 --- 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 7b5a26975f3b..ad48ae1e0d8c 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.27.0"; + version = "1.27.1"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-ZFt8KcEJ7iN2JgKbOGDgpq0+pjlxEU7V9GSX+c3VnbY="; + sha256 = "sha256-29lA497DTJ1AOqcfbgUCYcBqB8WUWWXBMqFOpyx93wY="; }; vendorHash = null; From e3932a3040ee82717ca0c17afc29c97378629c21 Mon Sep 17 00:00:00 2001 From: rewine Date: Tue, 18 Jul 2023 09:28:51 +0800 Subject: [PATCH 34/51] pineapple-pictures: support wayland fix: Could not find the Qt platform plugin "wayland" in "" --- pkgs/applications/graphics/pineapple-pictures/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 61dca70c2a50..131dd4457d58 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchFromGitHub , qtsvg +, qtwayland , qttools , exiv2 , wrapQtAppsHook @@ -27,6 +28,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtsvg + qtwayland exiv2 ]; From a22d4de3a5989afcbcee9d7ef1ffa592e6b8818e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Jul 2023 23:19:17 +0000 Subject: [PATCH 35/51] erigon: 2.48.0 -> 2.48.1 --- pkgs/applications/blockchains/erigon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index 2dd063e3eeef..a68e230c2446 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.48.0"; + version = "2.48.1"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-L2uQJdC0Z5biv//QzgjPpygsk8GlUoQsSNH4Cp5TvhU="; + hash = "sha256-ApVsrK1Di6d3WBj/VIUcYJBceFDTeNfsXYPRfbytvZg="; fetchSubmodules = true; }; - vendorHash = "sha256-wzA75+BL5Fm6X13dF/ou7qvMEdeaImmSs2lypH4hOTY="; + vendorHash = "sha256-bsPeEAhvuT5GIpYMoyPyh0BHMDKyKjBiVnYLjtF4Mkc="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: From 9a654c1e64286e7f23de9d8bdcefa26f92ca46d4 Mon Sep 17 00:00:00 2001 From: Zach Mitchell Date: Sat, 15 Jul 2023 11:43:58 -0600 Subject: [PATCH 36/51] Add zmitchell to maintainers --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b0db7947afdb..b59117cebab8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -18414,6 +18414,13 @@ githubId = 1108325; name = "Théo Zimmermann"; }; + zmitchell = { + name = "Zach Mitchell"; + email = "zmitchell@fastmail.com"; + matrix = "@zmitchell:matrix.org"; + github = "zmitchell"; + githubId = 10246891; + }; zoedsoupe = { github = "zoedsoupe"; githubId = 44469426; From 40b2fa5ead8f28a37ac2ba04bb78868cf458703b Mon Sep 17 00:00:00 2001 From: Zach Mitchell Date: Fri, 14 Jul 2023 17:06:03 -0600 Subject: [PATCH 37/51] python3Packages.duct-py: init at 0.6.4 --- .../python-modules/duct-py/default.nix | 38 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/python-modules/duct-py/default.nix diff --git a/pkgs/development/python-modules/duct-py/default.nix b/pkgs/development/python-modules/duct-py/default.nix new file mode 100644 index 000000000000..6a79305e90b5 --- /dev/null +++ b/pkgs/development/python-modules/duct-py/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "duct-py"; + version = "0.6.4"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "oconnor663"; + repo = "duct.py"; + rev = version; + hash = "sha256-4ja/SQ9R/SbKlf3NqKxLi+Fl/4JI0Fl/zG9EmTZjWZc="; + }; + + pythonImportsCheck = [ "duct" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTests = [ + # This test completely empties the environment then tries to run a Python command. + # The test then fails because it can't find the `python` executable. It's unclear + # how this test even passes _outside_ of Nix. + "test_full_env" + ]; + + meta = with lib; { + description = "A Python library for running child processes"; + homepage = "https://github.com/oconnor663/duct.py"; + license = licenses.mit; + maintainers = with maintainers; [ zmitchell ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53deb9b9b89c..ed372697c7c4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3137,6 +3137,8 @@ self: super: with self; { duckduckgo-search = callPackage ../development/python-modules/duckduckgo-search { }; + duct-py = callPackage ../development/python-modules/duct-py { }; + duecredit = callPackage ../development/python-modules/duecredit { }; duet = callPackage ../development/python-modules/duet { }; From 5107d158ab05cb3ccac57ce224c23375e05d4aeb Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 18 Jul 2023 08:52:35 +0800 Subject: [PATCH 38/51] msgpack-c: use finalAttrs pattern --- pkgs/development/libraries/msgpack-c/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/msgpack-c/default.nix b/pkgs/development/libraries/msgpack-c/default.nix index ded03015f39f..fed8cee33231 100644 --- a/pkgs/development/libraries/msgpack-c/default.nix +++ b/pkgs/development/libraries/msgpack-c/default.nix @@ -6,14 +6,14 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "msgpack-c"; version = "6.0.0"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; - rev = "refs/tags/c-${version}"; + rev = "refs/tags/c-${finalAttrs.version}"; hash = "sha256-TfC37QKwqvHxsLPgsEqJYkb7mpRQekbntbBPV4v4FO8="; }; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DMSGPACK_BUILD_EXAMPLES=OFF" # examples are not installed even if built - ] ++ lib.optional (!doCheck) "-DMSGPACK_BUILD_TESTS=OFF"; + ] ++ lib.optional (!finalAttrs.doCheck) "-DMSGPACK_BUILD_TESTS=OFF"; checkInputs = [ gtest @@ -37,8 +37,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MessagePack implementation for C"; homepage = "https://github.com/msgpack/msgpack-c"; - changelog = "https://github.com/msgpack/msgpack-c/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/msgpack/msgpack-c/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.boost; maintainers = with maintainers; [ nickcao ]; }; -} +}) From a268072f4ec055d0e96cd05f4642e0871b5b15c5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 18 Jul 2023 08:53:24 +0800 Subject: [PATCH 39/51] msgpack-cxx: use finalAttrs pattern --- pkgs/development/libraries/msgpack-cxx/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/msgpack-cxx/default.nix b/pkgs/development/libraries/msgpack-cxx/default.nix index 50f7b1ed5595..198593df5018 100644 --- a/pkgs/development/libraries/msgpack-cxx/default.nix +++ b/pkgs/development/libraries/msgpack-cxx/default.nix @@ -6,14 +6,14 @@ , zlib }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "msgpack-cxx"; version = "6.1.0"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; - rev = "refs/tags/cpp-${version}"; + rev = "refs/tags/cpp-${finalAttrs.version}"; hash = "sha256-VqzFmm3MmMhWyooOsz1d9gwwbn/fnnxpkCFwqKR6los="; }; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DMSGPACK_BUILD_DOCS=OFF" # docs are not installed even if built - ] ++ lib.optional doCheck "-DMSGPACK_BUILD_TESTS=ON"; + ] ++ lib.optional finalAttrs.doCheck "-DMSGPACK_BUILD_TESTS=ON"; checkInputs = [ zlib @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { meta = with lib; { description = "MessagePack implementation for C++"; homepage = "https://github.com/msgpack/msgpack-c"; - changelog = "https://github.com/msgpack/msgpack-c/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/msgpack/msgpack-c/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = licenses.boost; maintainers = with maintainers; [ nickcao ]; }; -} +}) From 775b0efe7b107e9a7363d439917f266a364eb84b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jul 2023 01:56:27 +0000 Subject: [PATCH 40/51] prometheus-nginxlog-exporter: 1.10.0 -> 1.11.0 --- pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix index 1df55296217d..8c8964ec093f 100644 --- a/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginxlog-exporter.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nginxlog_exporter"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "martin-helmich"; repo = "prometheus-nginxlog-exporter"; rev = "v${version}"; - sha256 = "sha256-W+cLJUsg49Fwo2IsJjo0QZ0NLNy/H7E35Yjr7bsHAkQ="; + sha256 = "sha256-UkXrVHHHZ9mEgsMUcHu+wI6NZFw4h3X4atDBjpBcz8E="; }; - vendorSha256 = "sha256-Bdyk+yNVcxPDzxJQSE34HJCryWQSXa8748gJ5Fu+gP4="; + vendorHash = "sha256-RzqfmP1d3zqageiGSr+CxSJQxAXmOKRCwj/7KO2f3EE="; subPackages = [ "." ]; From 87f1c4f3f32c42ab35e8ce9be50fae068b3c4d99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jul 2023 02:17:11 +0000 Subject: [PATCH 41/51] cargo-espflash: 2.0.0 -> 2.0.1 --- pkgs/development/tools/rust/cargo-espflash/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-espflash/default.nix b/pkgs/development/tools/rust/cargo-espflash/default.nix index 1439e9598783..f0774b2fd033 100644 --- a/pkgs/development/tools/rust/cargo-espflash/default.nix +++ b/pkgs/development/tools/rust/cargo-espflash/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "cargo-espflash"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espflash"; rev = "v${version}"; - hash = "sha256-3E0OC8DVP2muLyoN4DQfrdnK+idQEm7IpaA/CUIyYnU="; + hash = "sha256-PYW5OM3pbmROeGkbGiLhnVGrYq6xn3B1Z4sbIjtAPlk="; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { SystemConfiguration ]; - cargoHash = "sha256-8VIAmmtaQoIvD7wN+W3yUM0CEDadOQrv1wnJ4/AWKFA="; + cargoHash = "sha256-gTehRP9Ct150n3Kdz+NudJcKGeOCT059McrXURhy2iQ="; passthru.updateScript = nix-update-script { }; From 5ea3d52bd6c1d2cd3e745232dac898706c4d4e08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jul 2023 02:47:48 +0000 Subject: [PATCH 42/51] tbls: 1.68.0 -> 1.68.1 --- pkgs/tools/misc/tbls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/tbls/default.nix b/pkgs/tools/misc/tbls/default.nix index cbc42444af38..6b1e7a2d8667 100644 --- a/pkgs/tools/misc/tbls/default.nix +++ b/pkgs/tools/misc/tbls/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "tbls"; - version = "1.68.0"; + version = "1.68.1"; src = fetchFromGitHub { owner = "k1LoW"; repo = "tbls"; rev = "v${version}"; - hash = "sha256-qFPTDyljSKWim8sZbDM5OZ4sHL4csqXxit4UdMnOTxs="; + hash = "sha256-z5tDPXz6Z6oPzWIp4gapNLwm+0VrwCGNIXsFu94Zn08="; }; - vendorHash = "sha256-Xxoe+8MKwZPPapTILHAIegGPBn8vaAjU5bZrd8RvazE="; + vendorHash = "sha256-V6TF7Q+9XxBeSVXlotu8tUrNCWDr80BZsQcVSBGikl8="; CGO_CFLAGS = [ "-Wno-format-security" ]; From 1881de655849efc0e1ae42da7c1416d049eb4190 Mon Sep 17 00:00:00 2001 From: JesusMtnez Date: Tue, 18 Jul 2023 05:56:33 +0200 Subject: [PATCH 43/51] raycast: 1.55.1 -> 1.55.2 --- pkgs/os-specific/darwin/raycast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/raycast/default.nix b/pkgs/os-specific/darwin/raycast/default.nix index 2f925b5fbc60..2116237ad666 100644 --- a/pkgs/os-specific/darwin/raycast/default.nix +++ b/pkgs/os-specific/darwin/raycast/default.nix @@ -6,12 +6,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "raycast"; - version = "1.55.1"; + version = "1.55.2"; src = fetchurl { name = "Raycast.dmg"; url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal"; - hash = "sha256-LklPE08OnrDQbHSYLplzVs8IkkuVrjq2fsBDCRD4dv0="; + hash = "sha256-O+9dSXmkNxeY0Rvjn7dcStk/cqmM4y+lrXa5MymYUcY="; }; dontPatch = true; From 3e7753c8e9bfa0d43f9af78ec6d990bd88d48dee Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 03:14:12 +0000 Subject: [PATCH 44/51] terraform-providers.digitalocean: 2.28.1 -> 2.29.0 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 7eda46592e0b..370bb30aa186 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -300,11 +300,11 @@ "vendorHash": "sha256-BpXhKjfxyCLdGRHn1GexW0MoLj4/C6Bn7scZ76JARxQ=" }, "digitalocean": { - "hash": "sha256-XKNQdsbh8+iq1N+pwlByFwdm6IlfEsgnT3q/l8SiHvU=", + "hash": "sha256-CnakqGO/adv44knzp3Q5nC17tD+ZpOEFqfQXPk20klg=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.28.1", + "rev": "v2.29.0", "spdx": "MPL-2.0", "vendorHash": null }, From 51a1351d0e7f1ea9fc74ae18fc6c3a8d20c57df6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 03:15:02 +0000 Subject: [PATCH 45/51] terraform-providers.gitlab: 16.1.0 -> 16.1.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 370bb30aa186..65454ce98388 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -436,11 +436,11 @@ "vendorHash": null }, "gitlab": { - "hash": "sha256-SHc1Mz1JsmNqTjfuJ4Ncll7fh5ruoRXNUAQRfFlibog=", + "hash": "sha256-3Ph+Z4RI4K+OLc7c7f3JQH4UYRRVV6dM6R0TgkJf+yQ=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v16.1.0", + "rev": "v16.1.1", "spdx": "MPL-2.0", "vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc=" }, From 0db56a3f3033b3b7c4aa00f6c8cccd872580a2de Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 03:19:43 +0000 Subject: [PATCH 46/51] terraform-providers.google: 4.73.1 -> 4.73.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 65454ce98388..4c606e8c7920 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -445,12 +445,12 @@ "vendorHash": "sha256-XgGNz+yP+spRA2+qFxwiZFcBRv2GQWhiYY9zoC8rZPc=" }, "google": { - "hash": "sha256-FlBTLc3QUsPAO1OIr8aOlb7ppePsAjtKKrBOTS+JYFI=", + "hash": "sha256-yRI5dJbJNjaMPKWKNWH+/oq7vkVt8NI8jfO8Z5QrcTE=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.73.1", + "rev": "v4.73.2", "spdx": "MPL-2.0", "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A=" }, From f925c283afd63c6d93263d32dbf0668b281eb88c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 03:21:13 +0000 Subject: [PATCH 47/51] terraform-providers.gridscale: 1.21.0 -> 1.21.1 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 4c606e8c7920..c3cbf02be817 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -483,11 +483,11 @@ "vendorHash": "sha256-gY15FJb1svy2AxXs6ZOmZX5o3oXIokzf5hXlFlx1cXU=" }, "gridscale": { - "hash": "sha256-u0NX1hoawEVbmj2Id6qvb8GYgH/u3cbgWZ/b+2nBYNM=", + "hash": "sha256-Xs3eWLwsHFTvuH0rUroB6lkzusjUiH3ajt6ila9v/9M=", "homepage": "https://registry.terraform.io/providers/gridscale/gridscale", "owner": "gridscale", "repo": "terraform-provider-gridscale", - "rev": "v1.21.0", + "rev": "v1.21.1", "spdx": "MPL-2.0", "vendorHash": null }, From 5c2c70be4405cb1756940b686126ad884e5fc322 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 03:21:19 +0000 Subject: [PATCH 48/51] terraform-providers.google-beta: 4.73.1 -> 4.73.2 --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c3cbf02be817..56f50a9197fa 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -455,12 +455,12 @@ "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A=" }, "google-beta": { - "hash": "sha256-GYX0tmNut04NbpqbfXCy/5Rabn3leWf1VH+yGHTsCek=", + "hash": "sha256-GE7Y07w9wQ7HHGSxoWV23skAEU444cSTHLD+g1XS/Ow=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.73.1", + "rev": "v4.73.2", "spdx": "MPL-2.0", "vendorHash": "sha256-X+7UZM0iZzG7LvaK6nKXF3taKIiJfhWRmY1q1Uz9M4A=" }, From 04146b0debc2c4b9fe9a063663915607c21d8118 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 03:23:48 +0000 Subject: [PATCH 49/51] terraform-providers.signalfx: 7.0.0 -> 8.0.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 56f50a9197fa..47c6519430be 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1016,13 +1016,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "signalfx": { - "hash": "sha256-mG3JUf7OASLvsfD7jk1p4CQRfrDj/TNnUKD1SzHQqEA=", + "hash": "sha256-ez9mmgzurLPBya6eJW2iWNtiTt8yg63Yavf6xiplZ9w=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v7.0.0", + "rev": "v8.0.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-JE6gg32TmpEHxskJjFaqeg0tfR463fUUnwKzc0O08eo=" + "vendorHash": "sha256-PQU4VC5wHcB70UkZaRT8jtz+qOAONU2SxtRrTmml9vY=" }, "skytap": { "hash": "sha256-JII4czazo6Di2sad1uFHMKDO2gWgZlQE8l/+IRYHQHU=", From 0ec6cf5107516ecdd53ee5d2a7486d3b4fd80d6a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 18 Jul 2023 03:24:41 +0000 Subject: [PATCH 50/51] terraform-providers.spotinst: 1.125.1 -> 1.126.0 --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 47c6519430be..a1cd69bc9f65 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1052,13 +1052,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-YX0NTJ8T+HVrSiRC0WkA+SVakQ+ggVx/7JYvf3SkmPM=", + "hash": "sha256-fnWSDapAJXnNG1DHribLcRpMgGHke5EhmuQQjaj6sWE=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.125.1", + "rev": "v1.126.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-cT/85DbG5U/JPA+rgJ2BhxJA90KBKjg+X+glREiezAg=" + "vendorHash": "sha256-2SUCMdZRkAU97HFKEAKe5ryB+NB55aR/5k5K3p/digI=" }, "stackpath": { "hash": "sha256-7KQUddq+M35WYyAIAL8sxBjAaXFcsczBRO1R5HURUZg=", From 083a9cb41fcc9058d669e9aa6960cd8b2f1c36ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 18 Jul 2023 03:46:13 +0000 Subject: [PATCH 51/51] erlang_25: 25.3.2.3 -> 25.3.2.4 --- pkgs/development/interpreters/erlang/25.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/erlang/25.nix b/pkgs/development/interpreters/erlang/25.nix index b6e69bc3fcd8..a3cb5166ef1b 100644 --- a/pkgs/development/interpreters/erlang/25.nix +++ b/pkgs/development/interpreters/erlang/25.nix @@ -1,6 +1,6 @@ { mkDerivation }: mkDerivation { - version = "25.3.2.3"; - sha256 = "TX63ju8WxqA+cBKg/0veYL0XtVgf4s/BlaNY5Pjuybw="; + version = "25.3.2.4"; + sha256 = "U0hzGrLcJZndCGXz/4b9yXy21QGXbKAtc01H1QnwO4A="; }