From 1629803b6799bc3f822412ccec4c1b9aa2b7a5c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 5 Sep 2023 12:39:57 +0000 Subject: [PATCH 01/35] rabbitmq-server: 3.12.3 -> 3.12.4 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index f64183684074..8d3a490c45e1 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -38,12 +38,12 @@ in stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.12.3"; + version = "3.12.4"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - hash = "sha256-ZtfybHy6gsLcUz5LGTQrzG/a8x+s6ZkIQsiFC845NC0="; + hash = "sha256-9D59IZl7zYJzkSYuFcA6IPttCI9SjacE/l04cUh3An8="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; From c64ea820ed10877969df06dc22f5f22996101959 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Tue, 5 Sep 2023 18:38:57 -0400 Subject: [PATCH 02/35] SDL2_ttf: use Harfbuzz from nixpkgs The vendored Harfbuzz fails to build with clang 16. Use the one from nixpkgs, which does. --- pkgs/development/libraries/SDL2_ttf/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 66f53949c245..d2dd8d53929e 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, libGL }: +{ lib, stdenv, pkg-config, darwin, fetchurl, SDL2, freetype, harfbuzz, libGL }: stdenv.mkDerivation rec { pname = "SDL2_ttf"; @@ -9,11 +9,12 @@ stdenv.mkDerivation rec { sha256 = "sha256-ncce2TSHUhsQeixKnKa/Q/ti9r3dXCawVea5FBiiIFM="; }; - configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; + configureFlags = [ "--disable-harfbuzz-builtin" ] + ++ lib.optionals stdenv.isDarwin [ "--disable-sdltest" ]; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ SDL2 freetype ] + buildInputs = [ SDL2 freetype harfbuzz ] ++ lib.optional (!stdenv.isDarwin) libGL ++ lib.optional stdenv.isDarwin darwin.libobjc; From f458e46ef0226818204d7b7f027c0a5d8ae7ff36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Sep 2023 19:03:24 +0000 Subject: [PATCH 03/35] aws-nuke: 2.24.2 -> 2.25.0 --- pkgs/tools/admin/aws-nuke/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/tools/admin/aws-nuke/default.nix index c3f6cb2da5c2..6f1a0ea0da3f 100644 --- a/pkgs/tools/admin/aws-nuke/default.nix +++ b/pkgs/tools/admin/aws-nuke/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "aws-nuke"; - version = "2.24.2"; + version = "2.25.0"; src = fetchFromGitHub { owner = "rebuy-de"; repo = pname; rev = "v${version}"; - hash = "sha256-Zy+ULmGDUK4KGMJ5PXTyT8CSp0nC71AW/4Udl2ElOCg="; + hash = "sha256-Yc9GXdcSKPvwddh+QU2/pBC0XIqA53wpd0VNKOqppbU="; }; - vendorHash = "sha256-srQuR9ZoTjZR1XfewFv7wF188Q5FggMdicm71v6MY/8="; + vendorHash = "sha256-FZ92JoyPYysYhl7iQZ8X32BDyNKL1UbOgq7EhHyqb5A="; overrideModAttrs = _: { preBuild = '' From 17aa5aa573a79e77021b5849c716d3cce9ebdbc6 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 7 Sep 2023 10:09:52 +1000 Subject: [PATCH 04/35] dnglab: 0.5.0 -> 0.5.2 --- pkgs/tools/graphics/dnglab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/dnglab/default.nix b/pkgs/tools/graphics/dnglab/default.nix index eafed87ba1f8..cb865e51a9c5 100644 --- a/pkgs/tools/graphics/dnglab/default.nix +++ b/pkgs/tools/graphics/dnglab/default.nix @@ -4,16 +4,16 @@ }: rustPlatform.buildRustPackage rec { pname = "dnglab"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "dnglab"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4uTpCBzBBkcpVBVZMOBD6f9ut71OuUNQ5+AkaQcU86M="; + sha256 = "sha256-jkOkkcMFK1RLY8Hn/bMMuMZtyGwnwGdm0os8QKhcWqo="; }; - cargoSha256 = "sha256-WvXQNDYvR6s4M2Hlpqwq1/wFQYW2QU/ngQimKOFkhOQ="; + cargoSha256 = "sha256-qwhOJxFYRJC51dKB1pi/WVJs7H955jM6KmKbxsAScDI="; postInstall = '' rm $out/bin/benchmark $out/bin/identify From cada87887538ad501b3a777723d38ed322e12627 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Thu, 7 Sep 2023 10:34:06 +1000 Subject: [PATCH 05/35] epstool: 3.08 -> 3.09 --- pkgs/tools/graphics/epstool/default.nix | 8 +++----- pkgs/tools/graphics/epstool/gcc43.patch | 20 -------------------- 2 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 pkgs/tools/graphics/epstool/gcc43.patch diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix index 6910f458a17d..cdb1f75cb2c3 100644 --- a/pkgs/tools/graphics/epstool/default.nix +++ b/pkgs/tools/graphics/epstool/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.08"; + version = "3.09"; pname = "epstool"; src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}+repack.orig.tar.gz"; - sha256 = "1pfgqbipwk36clhma2k365jkpvyy75ahswn8jczzys382jalpwgk"; + url = "http://ftp.de.debian.org/debian/pool/main/e/epstool/epstool_${version}.orig.tar.xz"; + hash = "sha256-HoUknRpE+UGLH5Wjrr2LB4TauOSd62QXrJuZbKCPYBE="; }; makeFlags = [ @@ -19,8 +19,6 @@ stdenv.mkDerivation rec { make EPSTOOL_ROOT=$out install ''; - patches = [ ./gcc43.patch ]; - meta = with lib; { description = "A utility to create or extract preview images in EPS files, fix bounding boxes and convert to bitmaps"; homepage = "http://pages.cs.wisc.edu/~ghost/gsview/epstool.htm"; diff --git a/pkgs/tools/graphics/epstool/gcc43.patch b/pkgs/tools/graphics/epstool/gcc43.patch deleted file mode 100644 index 398ce08c5182..000000000000 --- a/pkgs/tools/graphics/epstool/gcc43.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- epstool-3.08.orig/src/epstool.c 2005-06-10 04:41:00.000000000 -0500 -+++ epstool-3.08/src/epstool.c 2009-02-16 20:55:43.186140029 -0600 -@@ -2824,7 +2824,7 @@ - code = -1; - } - if ((code==0) && stdout_name && (hChildStdoutWr == -1)) { -- handle = open(stdout_name, O_WRONLY | O_CREAT); -+ handle = open(stdout_name, O_WRONLY | O_CREAT, 0644); - hChildStdoutWr = dup2(handle, 1); - if (handle != -1) - close(handle); -@@ -2832,7 +2832,7 @@ - code = -1; - } - if ((code==0) && stderr_name && (hChildStderrWr == -1)) { -- handle = open(stderr_name, O_WRONLY | O_CREAT); -+ handle = open(stderr_name, O_WRONLY | O_CREAT, 0644); - hChildStderrWr = dup2(handle, 2); - if (handle != -1) - close(handle); From 87cf41e15445ef06cf13d9abe67a38dfc5cce63f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Sep 2023 04:47:30 +0000 Subject: [PATCH 06/35] vault: 1.14.1 -> 1.14.2 --- pkgs/tools/security/vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 666a8ff4271c..19d525cc5883 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.14.1"; + version = "1.14.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "sha256-3/oGuK+n0NGDdRYb+c0QNbJrCD2MBQDXWUDpdGsOY2k="; + sha256 = "sha256-c3WoSowF1Z0E9L8DdfOeiluYJzVnzltujE3tKlrLvPQ="; }; - vendorHash = "sha256-W5XsUWb3uZGX7RAQQMy67j9LM3KiEl/+XZAGDKTRwd0="; + vendorHash = "sha256-2NUB9PLYZr4dnWpuYXkTTII4cRT79zLVU+C9z1GKDxk="; subPackages = [ "." ]; From fd61211eea97b43f34403190ab4f5cbb1cb50679 Mon Sep 17 00:00:00 2001 From: Adriano Barbosa Date: Thu, 7 Sep 2023 08:30:05 -0400 Subject: [PATCH 07/35] nextcloud-client 3.9.3 -> 3.9.4 --- pkgs/applications/networking/nextcloud-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/nextcloud-client/default.nix b/pkgs/applications/networking/nextcloud-client/default.nix index adce1d4801f8..0699a9ffb236 100644 --- a/pkgs/applications/networking/nextcloud-client/default.nix +++ b/pkgs/applications/networking/nextcloud-client/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.9.3"; + version = "3.9.4"; outputs = [ "out" "dev" ]; @@ -33,7 +33,7 @@ mkDerivation rec { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "sha256-9DfQZ3AFyiUKwt8IqAgjQlQ2XJtwkLEtPM5+VH+x/6c="; + sha256 = "sha256-h8lOstl085haesmCmzq2o0OlQrO5U/mfGngQunynIuQ="; }; patches = [ From 456392478fc7491973802a61ab6c3dbd33b732f7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Sep 2023 20:32:59 +0000 Subject: [PATCH 08/35] libcef: 116.0.15 -> 116.0.20 --- pkgs/development/libraries/libcef/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix index b9d31c6fd874..3863710f3c8c 100644 --- a/pkgs/development/libraries/libcef/default.nix +++ b/pkgs/development/libraries/libcef/default.nix @@ -66,16 +66,16 @@ let projectArch = "x86_64"; }; }; - platforms."aarch64-linux".sha256 = "0ij7y0whlq8g1sskbhirbw3ngbp95k1in2pi9kjhb9flydjwxq8g"; - platforms."x86_64-linux".sha256 = "0dyv1ddsakxi51a7iwmy006mx27gvjq49i45difkmjv6mw9s2fw9"; + platforms."aarch64-linux".sha256 = "0xzgcnh45x3sqg0jndp9g08zy9bvzvmvfz8imj12j55vkm6f7kl6"; + platforms."x86_64-linux".sha256 = "1942mwlyrz5pxlx9kcnz85rqbz8q8slkivx0001z30l7a6pizgg5"; platformInfo = builtins.getAttr stdenv.targetPlatform.system platforms; in stdenv.mkDerivation rec { pname = "cef-binary"; - version = "116.0.15"; - gitRevision = "0b8c265"; - chromiumVersion = "116.0.5845.111"; + version = "116.0.20"; + gitRevision = "d6abd3c"; + chromiumVersion = "116.0.5845.180"; src = fetchurl { url = "https://cef-builds.spotifycdn.com/cef_binary_${version}+g${gitRevision}+chromium-${chromiumVersion}_${platformInfo.platformStr}_minimal.tar.bz2"; From f2792826225b199169aac2b5e5e785f1e54a517c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 00:52:39 +0000 Subject: [PATCH 09/35] btcpayserver: 1.11.3 -> 1.11.4 --- pkgs/applications/blockchains/btcpayserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/btcpayserver/default.nix b/pkgs/applications/blockchains/btcpayserver/default.nix index 1802c7cf8969..afb8547afc17 100644 --- a/pkgs/applications/blockchains/btcpayserver/default.nix +++ b/pkgs/applications/blockchains/btcpayserver/default.nix @@ -6,13 +6,13 @@ buildDotnetModule rec { pname = "btcpayserver"; - version = "1.11.3"; + version = "1.11.4"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-fs8GAE/beiFLUNBI+r8h08a2TYSY9fYQYGvxBOtClgg="; + sha256 = "sha256-PJhc+Kv/iZ73DkM9KXzujTsIc071wqn/NKhuUPs/7dA="; }; projectFile = "BTCPayServer/BTCPayServer.csproj"; From d2f89d16da066e87fc3779359c711db3bf583279 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 04:11:39 +0000 Subject: [PATCH 10/35] signal-cli: 0.12.0 -> 0.12.1 --- .../networking/instant-messengers/signal-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index a606b3f130ef..41a977d41cd6 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.12.0"; + version = "0.12.1"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}-Linux.tar.gz"; - hash = "sha256-PMLc0o+zwtdtY2p5z5xwdcawNKddenr64vmC+dxrw+Y="; + hash = "sha256-pxDSAVh/zg3hCuTlSuilgD4VKe1CPSG/ZLl0TF1nc1I="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; From 225048f694ac317dd46d4741303697cccc58d678 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 04:17:38 +0000 Subject: [PATCH 11/35] xray: 1.8.3 -> 1.8.4 --- pkgs/tools/networking/xray/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/xray/default.nix b/pkgs/tools/networking/xray/default.nix index d40754cd7911..6d810aaee62e 100644 --- a/pkgs/tools/networking/xray/default.nix +++ b/pkgs/tools/networking/xray/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "xray"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - hash = "sha256-j7lIRGO+hUYAM/FWCb8cNoh6lXXE0ZboWA/Hmi9w/Bc="; + hash = "sha256-Hu0BP4BzoELRjJ8WdF3JS/ffxd3bpH+kauWqaMh/o1I="; }; - vendorHash = "sha256-sBbidDvsYvFg3EqsA59MYZULim/LbrZcInixiKfwqqQ="; + vendorHash = "sha256-ihTOKtppOTYdulzwIwD8oWaS2OPs+QCdqPTvqucw7xY="; nativeBuildInputs = [ makeWrapper ]; From 89ff90cc5e93f225d4148e38ac8ee6d154369887 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Sep 2023 04:20:00 +0000 Subject: [PATCH 12/35] aws-nuke: install completions --- pkgs/tools/admin/aws-nuke/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/tools/admin/aws-nuke/default.nix index 6f1a0ea0da3f..50ca3697c446 100644 --- a/pkgs/tools/admin/aws-nuke/default.nix +++ b/pkgs/tools/admin/aws-nuke/default.nix @@ -1,6 +1,7 @@ { lib , buildGoModule , fetchFromGitHub +, installShellFiles }: buildGoModule rec { @@ -16,6 +17,8 @@ buildGoModule rec { vendorHash = "sha256-FZ92JoyPYysYhl7iQZ8X32BDyNKL1UbOgq7EhHyqb5A="; + nativeBuildInputs = [ installShellFiles ]; + overrideModAttrs = _: { preBuild = '' go generate ./... @@ -26,6 +29,13 @@ buildGoModule rec { subPackages = [ "." ]; + postInstall = '' + installShellCompletion --cmd aws-nuke \ + --bash <($out/bin/aws-nuke completion bash) \ + --fish <($out/bin/aws-nuke completion fish) \ + --zsh <($out/bin/aws-nuke completion zsh) + ''; + meta = with lib; { description = "Nuke a whole AWS account and delete all its resources"; homepage = "https://github.com/rebuy-de/aws-nuke"; From 8c2225cf4d983dfeae4f5284c447d309e4e71b99 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Sep 2023 04:20:00 +0000 Subject: [PATCH 13/35] aws-nuke: add ldflags --- pkgs/tools/admin/aws-nuke/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/tools/admin/aws-nuke/default.nix index 50ca3697c446..5091a8c8d88e 100644 --- a/pkgs/tools/admin/aws-nuke/default.nix +++ b/pkgs/tools/admin/aws-nuke/default.nix @@ -29,6 +29,8 @@ buildGoModule rec { subPackages = [ "." ]; + ldflags = [ "-s" "-w" ]; + postInstall = '' installShellCompletion --cmd aws-nuke \ --bash <($out/bin/aws-nuke completion bash) \ From f56a09ea12b94a0628d83647ecc9a253e5fefc25 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Sep 2023 04:20:00 +0000 Subject: [PATCH 14/35] signal-cli: add changelog to meta --- .../networking/instant-messengers/signal-cli/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 41a977d41cd6..32e47a3616c6 100644 --- a/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/AsamK/signal-cli"; description = "Command-line and dbus interface for communicating with the Signal messaging service"; + changelog = "https://github.com/AsamK/signal-cli/blob/v${version}/CHANGELOG.md"; license = licenses.gpl3; maintainers = with maintainers; [ ivan ]; platforms = platforms.all; From 9e58685b9c3ef347fd91cc477b0a08fc207b4f58 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 8 Sep 2023 04:20:00 +0000 Subject: [PATCH 15/35] aws-nuke: add changelog to meta --- pkgs/tools/admin/aws-nuke/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/tools/admin/aws-nuke/default.nix index 5091a8c8d88e..2529cbc21a6b 100644 --- a/pkgs/tools/admin/aws-nuke/default.nix +++ b/pkgs/tools/admin/aws-nuke/default.nix @@ -41,6 +41,7 @@ buildGoModule rec { meta = with lib; { description = "Nuke a whole AWS account and delete all its resources"; homepage = "https://github.com/rebuy-de/aws-nuke"; + changelog = "https://github.com/rebuy-de/aws-nuke/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ grahamc ]; }; From 131d3cb085f239e5b8fb17bfac237ab9dcd59cd4 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 8 Sep 2023 11:23:57 +0200 Subject: [PATCH 16/35] python310Packages.tensorflow-datasets: 4.9.2 -> 4.9.3 --- .../python-modules/tensorflow-datasets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-datasets/default.nix b/pkgs/development/python-modules/tensorflow-datasets/default.nix index 1d60c09c6a82..3fd7a441106d 100644 --- a/pkgs/development/python-modules/tensorflow-datasets/default.nix +++ b/pkgs/development/python-modules/tensorflow-datasets/default.nix @@ -48,13 +48,13 @@ buildPythonPackage rec { pname = "tensorflow-datasets"; - version = "4.9.2"; + version = "4.9.3"; src = fetchFromGitHub { owner = "tensorflow"; repo = "datasets"; rev = "refs/tags/v${version}"; - hash = "sha256-FKquhuk5hVBH9Im2RrIwgmosgqkoJHj0ESR2BmAOlbI="; + hash = "sha256-ZXCcXChrWqs0FAK5Fe8cD+MuJpWa9Dwo/ny5fOX2lKU="; }; patches = [ From e1a29104a2ba6d97b6cecc051d8e8c1122d62009 Mon Sep 17 00:00:00 2001 From: mdarocha Date: Fri, 8 Sep 2023 21:08:04 +0200 Subject: [PATCH 17/35] fsautocomplete: 0.62.0 -> 0.63.0 --- pkgs/development/tools/fsautocomplete/default.nix | 4 ++-- pkgs/development/tools/fsautocomplete/deps.nix | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/fsautocomplete/default.nix b/pkgs/development/tools/fsautocomplete/default.nix index aaa117622705..18075335664a 100644 --- a/pkgs/development/tools/fsautocomplete/default.nix +++ b/pkgs/development/tools/fsautocomplete/default.nix @@ -5,13 +5,13 @@ let in buildDotnetModule rec { pname = "fsautocomplete"; - version = "0.62.0"; + version = "0.63.0"; src = fetchFromGitHub { owner = "fsharp"; repo = "FsAutoComplete"; rev = "v${version}"; - sha256 = "sha256-pU/XGZZScbS2OiExLry4e9Oto9LrYr7j99y9+hRc+BU="; + sha256 = "sha256-Or7KjJVi0N8edO+Q8bBCNrNAE974ClJfXT7Co8YXWjI="; }; nugetDeps = ./deps.nix; diff --git a/pkgs/development/tools/fsautocomplete/deps.nix b/pkgs/development/tools/fsautocomplete/deps.nix index 4fed6a4f6d3e..3a5d1da615cd 100644 --- a/pkgs/development/tools/fsautocomplete/deps.nix +++ b/pkgs/development/tools/fsautocomplete/deps.nix @@ -41,6 +41,8 @@ (fetchNuGet { pname = "Fake.Tools.Git"; version = "5.23.1"; sha256 = "0cg1sbp7zl1d18cjhbs94ix8580hr6gyaxjw17q246lbaj9bfg8l"; }) (fetchNuGet { pname = "fantomas"; version = "6.1.0"; sha256 = "0qk983ybs66infm6q60qsn6sl9i17i6rjavsygcld6w3vfzza9kx"; }) (fetchNuGet { pname = "Fantomas.Client"; version = "0.9.0"; sha256 = "1zixwk61fyk7y9q6f8266kwxi6byr8fmyp1lf57qhbbvhq2waj9d"; }) + (fetchNuGet { pname = "Fantomas.Core"; version = "6.2.0"; sha256 = "07yl2hr06zk1nl66scm24di3nf1zbrnd6329prwirnv370rz4q92"; }) + (fetchNuGet { pname = "Fantomas.FCS"; version = "6.2.0"; sha256 = "1hhsa7hbxsm2d8ap4sqzwlzjmf4wsgg74i731rprr0nshjvd8ic7"; }) (fetchNuGet { pname = "FParsec"; version = "1.1.1"; sha256 = "01s3zrxl9kfx0264wy0m555pfx0s0z165n4fvpgx63jlqwbd8m04"; }) (fetchNuGet { pname = "FSharp.Analyzers.SDK"; version = "0.11.0"; sha256 = "0djgbxnygmpdkrw923z2vgirs5kamrvf94ls7pvnk43c52xlb0pf"; }) (fetchNuGet { pname = "FSharp.Compiler.Service"; version = "43.7.400"; sha256 = "1sdc63vyplw02s5wzrly1kdsmhb144arj57q22yggigmsrhzqlag"; }) @@ -117,6 +119,8 @@ (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.4.0"; sha256 = "1smx30nq22plrn2mw4wb5vfgxk6hyx12b60c4wabmpnr81lq3nzv"; }) (fetchNuGet { pname = "Microsoft.NET.StringTools"; version = "17.6.3"; sha256 = "0g5jdg0jp844a2ygwlm04igsxkrihqcq2rpmfx722nrv3vrk0r0z"; }) (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "7.0.4"; sha256 = "0afmivk3m0hmwsiqnl87frzi7g57aiv5fwnjds0icl66djpb6zsm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "5.0.0"; sha256 = "0z3qyv7qal5irvabc8lmkh58zsl42mrzd1i0sssvzhv4q4kl3cg6"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.3"; sha256 = "0hc4d4d4358g5192mf8faijwk0bpf9pjwcfd3h85sr67j0zhj6hl"; }) (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies.net461"; version = "1.0.3"; sha256 = "1jcc552rwpaybd2ql0b31063ayj70sd3k6qqpf850xmqbyg2hlmx"; }) (fetchNuGet { pname = "Microsoft.SourceLink.AzureRepos.Git"; version = "1.1.1"; sha256 = "059c8i2vybprn63sw2jr7xma4yyl2syx6hzygfdpr0zd5jlgy9rz"; }) @@ -186,6 +190,7 @@ (fetchNuGet { pname = "System.Reflection.Metadata"; version = "7.0.0"; sha256 = "1wilasn2qmj870h2bhw348lspamm7pbinpb4m89icg113510l00v"; }) (fetchNuGet { pname = "System.Reflection.MetadataLoadContext"; version = "6.0.0"; sha256 = "1ijfiqpi3flp5g9amridhjjmzz6md1c6pnxx5h7pdbiqqx9rwrpk"; }) (fetchNuGet { pname = "System.Resources.Extensions"; version = "6.0.0"; sha256 = "1h73gps9ffw77vys4zwgm78fgackqw6a7rjrg75mmx79vdw1shgw"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.1"; sha256 = "03ch4d2acf6q037a4njxpll2kkx3dwzlg07yxr4z5m6j1kqgmm27"; }) (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "6.0.0"; sha256 = "0qm741kh4rh57wky16sq4m0v05fxmkjjr87krycf5vp9f0zbahbc"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "6.0.0"; sha256 = "0a678bzj8yxxiffyzy60z2w1nczzpi8v97igr4ip3byd2q89dv58"; }) (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) From f91277e5b2da7a8709130edf35eb48ba6326ff15 Mon Sep 17 00:00:00 2001 From: Flakebi Date: Fri, 8 Sep 2023 21:47:55 +0200 Subject: [PATCH 18/35] salt: 3006.2 -> 3006.3 Changelog: https://docs.saltproject.io/en/latest/topics/releases/3006.3.html --- pkgs/tools/admin/salt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 1af08922edce..aa654d522a52 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -11,12 +11,12 @@ python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3006.2"; + version = "3006.3"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-+I0aJeIw2co9/eE9rdRmB6KxdQq1WoY1nFpCUedx8Wc="; + hash = "sha256-flP7zETEn41uZ8sZytoGOADKKe1/Fa+XJSdTGqhW5Cs="; }; patches = [ From fe569ae8348864daff80ad91c535908c44b81680 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Sep 2023 21:26:49 +0000 Subject: [PATCH 19/35] python310Packages.mkdocs-jupyter: 0.24.1 -> 0.24.2 --- pkgs/development/python-modules/mkdocs-jupyter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mkdocs-jupyter/default.nix b/pkgs/development/python-modules/mkdocs-jupyter/default.nix index fb0640719d5a..92470b9b4903 100644 --- a/pkgs/development/python-modules/mkdocs-jupyter/default.nix +++ b/pkgs/development/python-modules/mkdocs-jupyter/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "mkdocs-jupyter"; - version = "0.24.1"; + version = "0.24.2"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "mkdocs_jupyter"; inherit version; - hash = "sha256-lncDf7fpMSaPPfdZn8CCjCYSR989FXW87TILqLfR1G0="; + hash = "sha256-XgwQnVNdSHlyMHGbaUH00I3pWno8lb8VhmLEEvwVyy4="; }; postPatch = '' From d53bc44bf8cd28409a1d7aa1cb21f47447c34547 Mon Sep 17 00:00:00 2001 From: kashw2 Date: Sat, 9 Sep 2023 11:23:16 +1000 Subject: [PATCH 20/35] swc: 0.91.68 -> 0.91.69 --- pkgs/development/tools/swc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/swc/default.nix b/pkgs/development/tools/swc/default.nix index b71594de7224..afb4ad5d5899 100644 --- a/pkgs/development/tools/swc/default.nix +++ b/pkgs/development/tools/swc/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "swc"; - version = "0.91.68"; + version = "0.91.69"; env = { # swc depends on nightly features @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage rec { src = fetchCrate { pname = "swc_cli"; inherit version; - sha256 = "sha256-SLVXh+8oBcq/pKHB5mMLPOR4J3Xlns5eNs8mo2qh/30="; + sha256 = "sha256-8zbxE1qkEWeSYt2L5PElZeJPRuK4Yiooy8xDmCD/PYw="; }; - cargoSha256 = "sha256-nYMy4OtzNymzan/xZ6Ekx9QL+6AOtciI+sLl4f2Owy0="; + cargoSha256 = "sha256-kRsRUOvDMRci3bN5NfhiLCWojNkSuLz3K4BfKfGYc7g="; buildFeatures = [ "swc_core/plugin_transform_host_native" ]; From c4603d974646018d972abe3e85efb36f1d5d70c4 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 8 Sep 2023 22:01:22 -0400 Subject: [PATCH 21/35] python310Packages.pyfluidsynth: init at 1.3.2 --- .../python-modules/pyfluidsynth/default.nix | 55 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/development/python-modules/pyfluidsynth/default.nix diff --git a/pkgs/development/python-modules/pyfluidsynth/default.nix b/pkgs/development/python-modules/pyfluidsynth/default.nix new file mode 100644 index 000000000000..1e837b67129a --- /dev/null +++ b/pkgs/development/python-modules/pyfluidsynth/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchPypi +, setuptools +, wheel +, numpy +, fluidsynth +, stdenv +, fetchpatch +}: + +buildPythonPackage rec { + pname = "pyfluidsynth"; + version = "1.3.2"; + format = "pyproject"; + + src = fetchPypi { + pname = "pyFluidSynth"; + inherit version; + hash = "sha256-+i5oOXV4UG6z4rQGuguOP0mHo7V7fJZZRwOnJKB1VfQ="; + }; + + patches = [ + # fixes error: Unknown integer parameter 'synth.sample-rate' + # https://github.com/nwhitehead/pyfluidsynth/pull/44 + (fetchpatch { + name = "add-fluid-synth-get-status-and-fix-some-typing-bugs.patch"; + url = "https://github.com/nwhitehead/pyfluidsynth/commit/1b31ca6ab00930dbb515c4cc00bb31a65578b7c0.patch"; + hash = "sha256-ZCqy7aIv5iAAJrWOD7e538xltj11gy5fakIXnAbUsu8="; + }) + ]; + + nativeBuildInputs = [ + setuptools + wheel + ]; + + propagatedBuildInputs = [ + numpy + ]; + + pythonImportsCheck = [ "fluidsynth" ]; + + postPatch = '' + sed -Ezi fluidsynth.py -e \ + 's|lib = .*\\\n[^\n]*|lib = "${lib.getLib fluidsynth}/lib/libfluidsynth${stdenv.hostPlatform.extensions.sharedLibrary}"|' + ''; + + meta = with lib; { + description = "Python bindings for FluidSynth, a MIDI synthesizer that uses SoundFont instruments"; + homepage = "https://github.com/nwhitehead/pyfluidsynth"; + license = licenses.lgpl21Plus; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b9bb387ae83e..239e5716d9a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8212,6 +8212,8 @@ self: super: with self; { pyflick = callPackage ../development/python-modules/pyflick { }; + pyfluidsynth = callPackage ../development/python-modules/pyfluidsynth { }; + pyfreedompro = callPackage ../development/python-modules/pyfreedompro { }; pygments-style-github = callPackage ../development/python-modules/pygments-style-github { }; From 91ba9e809f55c12b66d29740963dadc75bb6ffdc Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 8 Sep 2023 21:16:39 -0400 Subject: [PATCH 22/35] upiano: init at 0.1.2 https://github.com/eliasdorneles/upiano --- pkgs/by-name/up/upiano/package.nix | 38 ++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 pkgs/by-name/up/upiano/package.nix diff --git a/pkgs/by-name/up/upiano/package.nix b/pkgs/by-name/up/upiano/package.nix new file mode 100644 index 000000000000..d13ff18bd425 --- /dev/null +++ b/pkgs/by-name/up/upiano/package.nix @@ -0,0 +1,38 @@ +{ lib +, python3 +, fetchFromGitHub +}: + +python3.pkgs.buildPythonApplication rec { + pname = "upiano"; + version = "0.1.2"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "eliasdorneles"; + repo = "upiano"; + rev = "v${version}"; + hash = "sha256-5WhflvUCjzW4ZJ+PLUTMbKcUnQa3ChkDjl0R5YvjBWk="; + forceFetchGit = true; + fetchLFS = true; + }; + + nativeBuildInputs = [ + python3.pkgs.poetry-core + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pyfluidsynth + textual + ]; + + pythonImportsCheck = [ "upiano" ]; + + meta = with lib; { + description = "A Piano in your terminal"; + homepage = "https://github.com/eliasdorneles/upiano"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + mainProgram = "upiano"; + }; +} From e71a2ba9f9b83264a2fd40992ff9a5dc1c998b16 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 9 Sep 2023 10:21:36 +0800 Subject: [PATCH 23/35] helm-docs: 1.11.0 -> 1.11.1 --- pkgs/applications/networking/cluster/helm-docs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helm-docs/default.nix b/pkgs/applications/networking/cluster/helm-docs/default.nix index 3a09148394f7..657d428912dd 100644 --- a/pkgs/applications/networking/cluster/helm-docs/default.nix +++ b/pkgs/applications/networking/cluster/helm-docs/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helm-docs"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "norwoodj"; repo = "helm-docs"; rev = "v${version}"; - sha256 = "sha256-476ZhjRwHlNJFkHzY8qQ7WbAUUpFNSoxXLGX9esDA/E="; + hash = "sha256-4o3hdqaW/AtegKStMKVerE3dRr3iZxQ+Lm2Aj3aOy98="; }; - vendorSha256 = "sha256-xXwunk9rmzZEtqmSo8biuXnAjPp7fqWdQ+Kt9+Di9N8="; + vendorHash = "sha256-6byD8FdeqdRDNUZFZ7FUUdyTuFOO8s3rb6YPGKdwLB8="; subPackages = [ "cmd/helm-docs" ]; ldflags = [ From b10f3bc430c17b725451e8b34a022f17c509875f Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 9 Sep 2023 16:16:33 +0800 Subject: [PATCH 24/35] dabet: 3.0.0 -> 3.0.1 --- pkgs/tools/misc/dabet/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/dabet/default.nix b/pkgs/tools/misc/dabet/default.nix index 3440a6e561b3..da7cbce191c2 100644 --- a/pkgs/tools/misc/dabet/default.nix +++ b/pkgs/tools/misc/dabet/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "dabet"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "annaaurora"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B5z2RUkvztnGCKeVsjp/yzrI8m/6mjBB0DS1yhFZhM4="; + hash = "sha256-BYE+GGwf84zENf+lPS98OzZQbXxd7kykWL+B3guyVNI="; }; - cargoSha256 = "sha256-v1lc2quqxuNUbBQHaTtIDUPPTMyz8nj+TNCdSjrfrOA="; + cargoHash = "sha256-kguQmCXP5+E6e8CSKP18faa93VKToU2pcQixDOBrd+8="; meta = with lib; { description = "Print the duration between two times"; From 2d689f2a0ebc824dfef68264bf737ae1ef5c9dc6 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 9 Sep 2023 17:16:32 +0800 Subject: [PATCH 25/35] cargo-risczero: 0.14.0 -> 0.17.0 --- pkgs/development/tools/rust/cargo-risczero/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-risczero/default.nix b/pkgs/development/tools/rust/cargo-risczero/default.nix index 2f50f62aab90..1bb68d7bbd98 100644 --- a/pkgs/development/tools/rust/cargo-risczero/default.nix +++ b/pkgs/development/tools/rust/cargo-risczero/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-risczero"; - version = "0.14.0"; + version = "0.17.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-uZz0jJ3klaOrqzJ0BUVDHxl7lv6vt0GT6RgQuJeyeyk="; + hash = "sha256-UXCZ4l45zcyn2AnfDW6dNdEnXCWL2waNwDTbermgS6M="; }; - cargoSha256 = "sha256-t++3+Ijn1ykjMcMsdoe/1xfaji+DQvhyiFe6M/Bpbt0="; + cargoHash = "sha256-KkV+ZQAPegbeZKj3ixDSFQEyKwkKeMYceSc27xGtQms="; nativeBuildInputs = [ pkg-config From ac692af932113f357217ae0d7d2c1449a1a4bafb Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sat, 9 Sep 2023 12:24:51 +0200 Subject: [PATCH 26/35] treewide: fix pythonImportsCheck typos --- pkgs/development/python-modules/cson/default.nix | 2 +- .../development/python-modules/django-admin-datta/default.nix | 4 ++-- pkgs/development/python-modules/opcua-widgets/default.nix | 2 +- pkgs/development/python-modules/python-ndn/default.nix | 2 +- pkgs/development/python-modules/speg/default.nix | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/cson/default.nix b/pkgs/development/python-modules/cson/default.nix index c05ad78240c0..4c1b63946ad2 100644 --- a/pkgs/development/python-modules/cson/default.nix +++ b/pkgs/development/python-modules/cson/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ speg ]; - pythonImportChecks = [ "cson" ]; + pythonImportsCheck = [ "cson" ]; meta = with lib; { description = "A python parser for the Coffeescript Object Notation (CSON)"; diff --git a/pkgs/development/python-modules/django-admin-datta/default.nix b/pkgs/development/python-modules/django-admin-datta/default.nix index 795a86d34bf2..44be722da51a 100644 --- a/pkgs/development/python-modules/django-admin-datta/default.nix +++ b/pkgs/development/python-modules/django-admin-datta/default.nix @@ -24,8 +24,8 @@ buildPythonPackage rec { # no tests doCheck = false; - pythonImportCheck = [ - "admin-datta" + pythonImportsCheck = [ + "admin_datta" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/opcua-widgets/default.nix b/pkgs/development/python-modules/opcua-widgets/default.nix index 386ced76a918..3034cb8fcc0f 100644 --- a/pkgs/development/python-modules/opcua-widgets/default.nix +++ b/pkgs/development/python-modules/opcua-widgets/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { asyncua ]; - pythonImportChecks = [ "opcua-widgets" ]; + pythonImportsCheck = [ "uawidgets" ]; #This test is broken, when updating this package check if the test was fixed. doCheck = false; diff --git a/pkgs/development/python-modules/python-ndn/default.nix b/pkgs/development/python-modules/python-ndn/default.nix index 60cde865ae00..4f7307f155e0 100644 --- a/pkgs/development/python-modules/python-ndn/default.nix +++ b/pkgs/development/python-modules/python-ndn/default.nix @@ -42,7 +42,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportChecks = [ "ndn" ]; + pythonImportsCheck = [ "ndn" ]; meta = with lib; { description = "An NDN client library with AsyncIO support"; diff --git a/pkgs/development/python-modules/speg/default.nix b/pkgs/development/python-modules/speg/default.nix index 83bdc1e5b046..5c969f55b168 100644 --- a/pkgs/development/python-modules/speg/default.nix +++ b/pkgs/development/python-modules/speg/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { extension = "zip"; }; - pythonImportChecks = [ "speg" ]; + pythonImportsCheck = [ "speg" ]; # checks fail for seemingly spurious reasons doCheck = false; From 89869ccfe6a4f1ab7031fb922cbe7681464ce845 Mon Sep 17 00:00:00 2001 From: Tungsten842 <886724vf@anonaddy.me> Date: Sat, 9 Sep 2023 22:03:18 +0200 Subject: [PATCH 27/35] sdrangel: 7.15.2 -> 7.15.4 --- pkgs/applications/radio/sdrangel/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/radio/sdrangel/default.nix b/pkgs/applications/radio/sdrangel/default.nix index 6fd4774df75b..5cd8819445b3 100644 --- a/pkgs/applications/radio/sdrangel/default.nix +++ b/pkgs/applications/radio/sdrangel/default.nix @@ -41,22 +41,24 @@ , qtwebengine , rtl-sdr , serialdv +, sdrplay , sgp4 , soapysdr-with-plugins , uhd , wrapQtAppsHook , zlib +, withSDRplay ? false }: stdenv.mkDerivation (finalAttrs: { pname = "sdrangel"; - version = "7.15.2"; + version = "7.15.4"; src = fetchFromGitHub { owner = "f4exb"; repo = "sdrangel"; rev = "v${finalAttrs.version}"; - hash = "sha256-Yvf0LJu7YbXhW3i0fd5R2KVn2dkx484AZ0XaWhjozFE="; + hash = "sha256-oSFnoNmoXvdb5lpx/j3DVVhOfbsDZlGNZNcvud1w8Ks="; }; nativeBuildInputs = [ @@ -108,7 +110,8 @@ stdenv.mkDerivation (finalAttrs: { soapysdr-with-plugins uhd zlib - ]; + ] + ++ lib.optionals withSDRplay [ sdrplay ]; cmakeFlags = [ "-DAPT_DIR=${aptdec}" From cfd4aea3ccb84cdb808f0a402a6cdc42da84f3fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 9 Sep 2023 11:40:02 -0700 Subject: [PATCH 28/35] poetry: fix build on x86_64-darwin The poetry-core patches don't apply to version 1.7.0. The only dependency of poetry that requires them is deepdiff, so we disable its tests for now. --- pkgs/tools/package-management/poetry/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/package-management/poetry/default.nix b/pkgs/tools/package-management/poetry/default.nix index beb1a98bb6a1..4d4a98491cb9 100644 --- a/pkgs/tools/package-management/poetry/default.nix +++ b/pkgs/tools/package-management/poetry/default.nix @@ -10,6 +10,9 @@ let poetry = self.callPackage ./unwrapped.nix { }; # version overrides required by poetry and its plugins + deepdiff = super.deepdiff.overridePythonAttrs (old: rec { + doCheck = false; + }); poetry-core = super.poetry-core.overridePythonAttrs (old: rec { version = "1.7.0"; src = fetchFromGitHub { @@ -18,6 +21,7 @@ let rev = version; hash = "sha256-OfY2zc+5CgOrgbiPVnvMdT4h1S7Aek8S7iThl6azmsk="; }; + patches = [ ]; }); } // (plugins self); }; From 2a9c9bb5fe87591555d05ea1480b40c279d874d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Sep 2023 23:00:28 +0000 Subject: [PATCH 29/35] storj-uplink: 1.86.2 -> 1.87.3 --- pkgs/applications/networking/sync/storj-uplink/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index ba22a71eebd3..0d2aad3c81e1 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -5,18 +5,18 @@ buildGoModule rec { pname = "storj-uplink"; - version = "1.86.2"; + version = "1.87.3"; src = fetchFromGitHub { owner = "storj"; repo = "storj"; rev = "v${version}"; - hash = "sha256-peWcgME+OCa9feNKLtTmZIGCpNxl+EdQfYDXV2BbclI="; + hash = "sha256-16h7PzZVFnaHMyODLk9tSrW8OiXQlcuDobANG1ZQVxs="; }; subPackages = [ "cmd/uplink" ]; - vendorHash = "sha256-sBez/IQzRIGQdOXr4Ikxh+dT8IQxtbxau5vo9VqGJvE="; + vendorHash = "sha256-gskOhLdrRzbvZwuOlm04fjeSXhNr/cqVGejEPZVtuBk="; meta = with lib; { description = "Command-line tool for Storj"; From a3f9f41fb870ac75e8eb640e3a956a9fbb2486a7 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 9 Sep 2023 23:00:30 +0000 Subject: [PATCH 30/35] storj-uplink: add ldflags --- pkgs/applications/networking/sync/storj-uplink/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/sync/storj-uplink/default.nix b/pkgs/applications/networking/sync/storj-uplink/default.nix index 0d2aad3c81e1..65b9630fd5a0 100644 --- a/pkgs/applications/networking/sync/storj-uplink/default.nix +++ b/pkgs/applications/networking/sync/storj-uplink/default.nix @@ -18,6 +18,8 @@ buildGoModule rec { vendorHash = "sha256-gskOhLdrRzbvZwuOlm04fjeSXhNr/cqVGejEPZVtuBk="; + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Command-line tool for Storj"; homepage = "https://storj.io"; From fd3d2deac0ea154ae2c68318d92b93bf798df186 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 9 Sep 2023 19:59:20 -0400 Subject: [PATCH 31/35] rsonpath: 0.7.0 -> 0.7.1 Diff: https://github.com/v0ldek/rsonpath/compare/v0.7.0...v0.7.1 Changelog: https://github.com/v0ldek/rsonpath/blob/v0.7.1/CHANGELOG.md --- pkgs/development/tools/misc/rsonpath/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/rsonpath/default.nix b/pkgs/development/tools/misc/rsonpath/default.nix index 7a1e9ac6d4e7..448b48ea700d 100644 --- a/pkgs/development/tools/misc/rsonpath/default.nix +++ b/pkgs/development/tools/misc/rsonpath/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "rsonpath"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "v0ldek"; repo = "rsonpath"; rev = "v${version}"; - hash = "sha256-VzHp5xMzAzo8ZCQyFCb1Igb0deJuZX+PIfs/oIy/zR0="; + hash = "sha256-ip5phYOoUm7I0SsnfXVGzgt+OFXjXKt4hiFjH3nkacA="; }; - cargoHash = "sha256-bnG95BgK41YJABqEGAbxg+gHoOksWc9nTChK7aCFK2E="; + cargoHash = "sha256-T2aR3PCQ5BcJZ+Aw/yLJ6vbLxkrKrNnsZkXwo0G9BZE="; buildNoDefaultFeatures = !withSimd; From 1daab5ecaf2908d63f6167413c28c2b510a7a495 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Sep 2023 00:42:27 +0000 Subject: [PATCH 32/35] gci: 0.11.0 -> 0.11.1 --- pkgs/development/tools/gci/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/gci/default.nix b/pkgs/development/tools/gci/default.nix index 5ce37c9773c5..d89f648ac941 100644 --- a/pkgs/development/tools/gci/default.nix +++ b/pkgs/development/tools/gci/default.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "gci"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "daixiang0"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EBklnsZR8VwM89BztligZBDapmgyKuI9Ns8EFFo3ai8="; + sha256 = "sha256-qNkSAbVhX4P+DqCtxXSnxYjZwq/nMYsDpEif+q1oTIA="; }; vendorHash = "sha256-g7htGfU6C2rzfu8hAn6SGr0ZRwB8ZzSf9CgHYmdupE8="; From f1e11899defd59e409c0cfd3738d2026ef4cfb3a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Sep 2023 05:05:22 +0000 Subject: [PATCH 33/35] go2rtc: 1.6.2 -> 1.7.0 --- pkgs/tools/video/go2rtc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/video/go2rtc/default.nix b/pkgs/tools/video/go2rtc/default.nix index ec787a0b1daf..9a9da5c49f32 100644 --- a/pkgs/tools/video/go2rtc/default.nix +++ b/pkgs/tools/video/go2rtc/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "go2rtc"; - version = "1.6.2"; + version = "1.7.0"; src = fetchFromGitHub { owner = "AlexxIT"; repo = "go2rtc"; rev = "refs/tags/v${version}"; - hash = "sha256-LKaVspv9R2N7og+3gb/vZuiWzWt1w+LEQ1Sk737+O7c="; + hash = "sha256-o4sxVvDQfJELlA1addsvojkosGMx+/5jrGqPfeYtPUs="; }; - vendorHash = "sha256-C2bRSzLp86aMF3UIGJ2G5WXvUaLjyhqzPsQkDSI0qb0="; + vendorHash = "sha256-Nv89Fo88bzLrG7PbaGEBM52N81WmGoCiogZNB/FsrcA="; buildFlagArrays = [ "-trimpath" From 220b395b7f671cc5637752af6e8643d3215b36a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Sep 2023 01:13:23 +0000 Subject: [PATCH 34/35] protoc-gen-go-vtproto: 0.4.0 -> 0.5.0 --- pkgs/development/tools/protoc-gen-go-vtproto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix b/pkgs/development/tools/protoc-gen-go-vtproto/default.nix index 3adab620534b..d24ab86538af 100644 --- a/pkgs/development/tools/protoc-gen-go-vtproto/default.nix +++ b/pkgs/development/tools/protoc-gen-go-vtproto/default.nix @@ -4,13 +4,13 @@ }: buildGoModule rec { pname = "protoc-gen-go-vtproto"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "vtprotobuf"; rev = "v${version}"; - sha256 = "sha256-WtiXoQWjjFf+TP2zpAXNH05XdcrLSpw3S0TG4lkzp2E="; + sha256 = "sha256-2DpL8CYl0MWpr7TBJPwDlgKvOoa5RrVwMjOxrEP5Wio="; }; vendorHash = "sha256-JpSVO8h7+StLG9/dJQkmrIlh9zIHABoqP1hq+X5ajVs="; From f49b186df24d55d8d16040a1c8b90a14ede76eb2 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 9 Sep 2023 17:11:50 -0300 Subject: [PATCH 35/35] tcsh: migrate to by-name --- pkgs/{shells/tcsh/default.nix => by-name/tc/tcsh/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{shells/tcsh/default.nix => by-name/tc/tcsh/package.nix} (100%) diff --git a/pkgs/shells/tcsh/default.nix b/pkgs/by-name/tc/tcsh/package.nix similarity index 100% rename from pkgs/shells/tcsh/default.nix rename to pkgs/by-name/tc/tcsh/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 57e8701d4265..7f5b28d073f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15396,8 +15396,6 @@ with pkgs; scponly = callPackage ../shells/scponly { }; - tcsh = callPackage ../shells/tcsh { }; - rush = callPackage ../shells/rush { }; xonsh = callPackage ../shells/xonsh/wrapper.nix { };