From b2f5fd526644948a0d8c544a54e31b371edd9c3c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 26 Dec 2023 14:10:21 +0000 Subject: [PATCH 001/133] khronos-ocl-icd-loader: 2022.01.04 -> 2023.12.14 --- pkgs/development/libraries/khronos-ocl-icd-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index 37c007db20b4..b98909847369 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "khronos-ocl-icd-loader"; - version = "2022.01.04"; + version = "2023.12.14"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; rev = "v${version}"; - sha256 = "sha256-T2tBoN0yv41W+UksFABVjsetdkXlnEFUINfxumGgC04="; + sha256 = "sha256-/4ixQAwJpygdg+qtR1ccBlz8hmtYYxRgUV5dlJabsg8="; }; patches = lib.optional withTracing ./tracing.patch; From d87e452c512f2ddcfd91153df4a4a1d3ed70c61f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Dec 2023 08:42:11 +0000 Subject: [PATCH 002/133] xarchiver: 0.5.4.21 -> 0.5.4.22 --- pkgs/tools/archivers/xarchiver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/xarchiver/default.nix b/pkgs/tools/archivers/xarchiver/default.nix index 1de4e91ead73..9c0f4685fa0f 100644 --- a/pkgs/tools/archivers/xarchiver/default.nix +++ b/pkgs/tools/archivers/xarchiver/default.nix @@ -2,14 +2,14 @@ coreutils, zip, unzip, p7zip, unar, gnutar, bzip2, gzip, lhasa, wrapGAppsHook }: stdenv.mkDerivation rec { - version = "0.5.4.21"; + version = "0.5.4.22"; pname = "xarchiver"; src = fetchFromGitHub { owner = "ib"; repo = "xarchiver"; rev = version; - sha256 = "sha256-pYrF9fyEbay+iboL9EuoTETTI3RTcgv3yeVtAWvAe1Q="; + sha256 = "sha256-wB1l1OcLK9rh6cpcDprXZBXLXRSwBFV9aueBI57kjJI="; }; nativeBuildInputs = [ intltool pkg-config makeWrapper wrapGAppsHook ]; From 5e1a456a8dbf3cb3f68b2063ba388bcd00947b93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Dec 2023 14:56:03 +0000 Subject: [PATCH 003/133] spring-boot-cli: 3.2.0 -> 3.2.1 --- pkgs/development/tools/spring-boot-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index fe4780176a67..a2fe5608860b 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "spring-boot-cli"; - version = "3.2.0"; + version = "3.2.1"; src = fetchzip { url = "mirror://maven/org/springframework/boot/${finalAttrs.pname}/${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}-bin.zip"; - hash = "sha256-C9hWIH6lFDa9dzH5iYZlawt+7SSPt3gxcXM62qd0zbo="; + hash = "sha256-hZexasMid9yZqTyX7LouTg44rG7WO/KU+CmAtSdpc2Q="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; From e3be1786626f61a66bff2c4388a815374a8909fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Dec 2023 15:54:44 +0000 Subject: [PATCH 004/133] swagger-codegen: 2.4.34 -> 2.4.38 --- pkgs/tools/networking/swagger-codegen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix index b89ffdd2862c..27ea4ff2d517 100644 --- a/pkgs/tools/networking/swagger-codegen/default.nix +++ b/pkgs/tools/networking/swagger-codegen/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - version = "2.4.34"; + version = "2.4.38"; pname = "swagger-codegen"; jarfilename = "${pname}-cli-${version}.jar"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/swagger/${pname}-cli/${version}/${jarfilename}"; - sha256 = "sha256-OgaKWX9nUqhpgpdMlTiNk0AyBb2glnlYX5Ua03hDWBQ="; + sha256 = "sha256-ECfOEr4JRCv/i/7YuQvj2s5sKBS1Ja0N8C7eTKoGUx4="; }; dontUnpack = true; From 9e65510cc4354e8491efecfb9dc4be410d162b55 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 30 Dec 2023 17:14:30 +0000 Subject: [PATCH 005/133] thanos: 0.32.5 -> 0.33.0 --- pkgs/servers/monitoring/thanos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/thanos/default.nix b/pkgs/servers/monitoring/thanos/default.nix index 156bd4a6ec23..5e69845ae654 100644 --- a/pkgs/servers/monitoring/thanos/default.nix +++ b/pkgs/servers/monitoring/thanos/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "thanos"; - version = "0.32.5"; + version = "0.33.0"; src = fetchFromGitHub { owner = "thanos-io"; repo = "thanos"; rev = "refs/tags/v${version}"; - hash = "sha256-A4bDCyvctHmDBYzvWpeEO4u6KhoICN7BbRQK4aZCbIA="; + hash = "sha256-AM4gJmUea8/Rfg7i4yTIK1ie+8MHz0M+ZG2F//wYHNA="; }; - vendorHash = "sha256-ZjkMvbWq96Rte9WoxAWzeouVA/6mBqanvY9yHr9F5MM="; + vendorHash = "sha256-JLj0HhcT4Hlc/FpYNGasqbfNz4cV12UueCYuXjamxks="; doCheck = true; From f56e01f1af29df2113c312c8cfa2596dcb44e3a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Dec 2023 02:56:08 +0000 Subject: [PATCH 006/133] zrok: 0.4.18 -> 0.4.20 --- pkgs/tools/networking/zrok/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/zrok/default.nix b/pkgs/tools/networking/zrok/default.nix index 74fb313d9fc7..62c20a60d905 100644 --- a/pkgs/tools/networking/zrok/default.nix +++ b/pkgs/tools/networking/zrok/default.nix @@ -14,14 +14,14 @@ let }.${system} or throwSystem; hash = { - x86_64-linux = "sha256-vAX7vx13eHyPuDe4q5b8dQD90l5bbnncMGlXnegumxM="; - aarch64-linux = "sha256-6x/E0uAPFOsuoJ/ePLV483M07Rqj5pkcpETOVq9RXKU="; - armv7l-linux = "sha256-UlpqoKfjyGLNKvSrXqqsiiq/wTlfmBmPfynDoFT/nuQ="; + x86_64-linux = "sha256-YbDeGyJpRq7Gd4ieTiyi310Mzw8lIHDixZ0Cq+ZFTI8="; + aarch64-linux = "sha256-rc9fvgGuETPnT0w3eRCOxk8py/4wegK+76+Ob+WuSGg="; + armv7l-linux = "sha256-xiGXOxNmpenyoQS4cqYP70veGe9ZixFtQz7Lze1Xs50="; }.${system} or throwSystem; in stdenv.mkDerivation (finalAttrs: { pname = "zrok"; - version = "0.4.18"; + version = "0.4.20"; src = fetchzip { url = "https://github.com/openziti/zrok/releases/download/v${finalAttrs.version}/zrok_${finalAttrs.version}_${plat}.tar.gz"; From d58b352bdc2ab1f359e4887a73e06fc38e94b442 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Dec 2023 06:03:29 +0000 Subject: [PATCH 007/133] flrig: 2.0.04 -> 2.0.05 --- pkgs/applications/radio/flrig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/flrig/default.nix b/pkgs/applications/radio/flrig/default.nix index e660f0c9da7b..83c28d47f7bb 100644 --- a/pkgs/applications/radio/flrig/default.nix +++ b/pkgs/applications/radio/flrig/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.0.04"; + version = "2.0.05"; pname = "flrig"; src = fetchurl { url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz"; - sha256 = "sha256-+AcQ7l1RXFDVVraYySBUE/+ZCyCOMiM2L4LyRXFquUc="; + sha256 = "sha256-Mc3AJfBdtIn9m6CH602Mj4UWj8OqnPlf5IiwLXgMYrA="; }; buildInputs = [ From e891cb762a8ee5e6429efc2d81ec8c0b9f42f811 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Dec 2023 07:03:48 +0000 Subject: [PATCH 008/133] python311Packages.python-sql: 1.4.2 -> 1.4.3 --- pkgs/development/python-modules/python-sql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-sql/default.nix b/pkgs/development/python-modules/python-sql/default.nix index 424c1635f91a..2605080729c7 100644 --- a/pkgs/development/python-modules/python-sql/default.nix +++ b/pkgs/development/python-modules/python-sql/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "python-sql"; - version = "1.4.2"; + version = "1.4.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-stuHXGcgwblayCyD6lLOu5RMQHvmii7wN8zdi6ucxTw="; + hash = "sha256-YmC+/4NaNdOgrsTx2jUbC+nKoaDZSmy6lAp82Nz2Ymk="; }; nativeCheckInputs = [ From 214608c8a5c68aef141a4ef38558022d57f617da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 31 Dec 2023 07:34:05 +0000 Subject: [PATCH 009/133] worker: 4.12.1 -> 5.0.0 --- pkgs/by-name/wo/worker/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/wo/worker/package.nix b/pkgs/by-name/wo/worker/package.nix index 772efc7015ed..564a5ae59143 100644 --- a/pkgs/by-name/wo/worker/package.nix +++ b/pkgs/by-name/wo/worker/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "worker"; - version = "4.12.1"; + version = "5.0.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/worker-${finalAttrs.version}.tar.gz"; - hash = "sha256-11tSOVuGuCU0IvqpEKiKvUZj9DtjWJErLpM8IsTtvcs="; + hash = "sha256-iEfHl3eDBkLpvI/WKBEO21briu5Ikv9YA4NSVZXos44="; }; buildInputs = [ libX11 ]; From 639ea32054290c9b270c05dad2ecfe1afd063b0a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Jan 2024 06:06:35 +0000 Subject: [PATCH 010/133] mbuffer: 20230301 -> 20231216 --- pkgs/tools/misc/mbuffer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index ec4157fb37ca..548fdefc098b 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "mbuffer"; - version = "20230301"; + version = "20231216"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "sha256-U/diCd7AD6soPcC8UyKw5jRrCdou27ZDWi1Kj0glLQE="; + sha256 = "sha256-Sif2YhoG5/PdGohGR51rIuMhJgPzv4JaDoyTlAv3aJw="; }; buildInputs = [ From e773e43b4cfa3433bd39f4d16a0d62f9b77bcb6a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Jan 2024 12:50:24 +0000 Subject: [PATCH 011/133] mdk-sdk: 0.23.1 -> 0.24.0 --- pkgs/development/libraries/mdk-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mdk-sdk/default.nix b/pkgs/development/libraries/mdk-sdk/default.nix index 1bf8992f948c..711833cbda8a 100644 --- a/pkgs/development/libraries/mdk-sdk/default.nix +++ b/pkgs/development/libraries/mdk-sdk/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "mdk-sdk"; - version = "0.23.1"; + version = "0.24.0"; src = fetchurl { url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux-x64.tar.xz"; - hash = "sha256-qC6FL76MJZ2XrrYePQFpWk5VPLTeoRd5ns93AK3iZjw="; + hash = "sha256-kRihFM2+vPg6OAL4ARz0dLLUvAFvZsbrCu5TBI6b2RI="; }; nativeBuildInputs = [ autoPatchelfHook ]; From 491e1b3fd99535f5db8ae552cb4d5a6d2ad322b7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Jan 2024 15:24:29 +0000 Subject: [PATCH 012/133] tinyssh: 20230101 -> 20240101 --- pkgs/tools/networking/tinyssh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tinyssh/default.nix b/pkgs/tools/networking/tinyssh/default.nix index a6f7b77be91f..41a9b1fcc87c 100644 --- a/pkgs/tools/networking/tinyssh/default.nix +++ b/pkgs/tools/networking/tinyssh/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tinyssh"; - version = "20230101"; + version = "20240101"; src = fetchFromGitHub { owner = "janmojzis"; repo = "tinyssh"; rev = "refs/tags/${version}"; - hash = "sha256-yEqPrLp14AF0L1QLoIcBhTphmd6qVzOB9EVW0Miy8yM="; + hash = "sha256-wO0fGr+pU+Y5YCZMRGNOZ6pJeCUIc64TzmRAaQCnBxk="; }; preConfigure = '' From cd7dc1e241298728c929fb86f2bb27ede5df878b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 1 Jan 2024 15:53:29 +0000 Subject: [PATCH 013/133] liquibase: 4.24.0 -> 4.25.1 --- pkgs/development/tools/database/liquibase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix index 4880659c0438..b9928c41ba60 100644 --- a/pkgs/development/tools/database/liquibase/default.nix +++ b/pkgs/development/tools/database/liquibase/default.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation rec { pname = "liquibase"; - version = "4.24.0"; + version = "4.25.1"; src = fetchurl { url = "https://github.com/liquibase/liquibase/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-bs9jinW1AbeYGJ2oJOFn8p25NHcYYQnyVJUIxiZtCyo="; + hash = "sha256-iyt6qOx1XU7lL6AhDNKiRP0W7WlfxKciRVYpUHdtKlY="; }; nativeBuildInputs = [ makeWrapper ]; From d8f20e7c7bb922d695876cc8040c8515167c8989 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Jan 2024 05:57:35 +0000 Subject: [PATCH 014/133] besu: 23.10.2 -> 23.10.3 --- pkgs/applications/blockchains/besu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/besu/default.nix b/pkgs/applications/blockchains/besu/default.nix index bf1e4ced669a..482ac61efe62 100644 --- a/pkgs/applications/blockchains/besu/default.nix +++ b/pkgs/applications/blockchains/besu/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "besu"; - version = "23.10.2"; + version = "23.10.3"; src = fetchurl { url = "https://hyperledger.jfrog.io/artifactory/${pname}-binaries/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-JVgYpcYGejiqi1ZdjzKkmhcqdTah03BnO7t19UgmPCw="; + sha256 = "sha256-c8g0zzLHu+JV19jMfKXR6w34QwuRFJNcjc86Z1sqy8I="; }; nativeBuildInputs = [ makeWrapper ]; From 225bfa37ab9d79db8d8c0dffbcfcfc0620b930be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Jan 2024 06:57:18 +0000 Subject: [PATCH 015/133] snd: 23.9 -> 24.0 --- pkgs/applications/audio/snd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix index fd0d0f3971f2..777b452792cc 100644 --- a/pkgs/applications/audio/snd/default.nix +++ b/pkgs/applications/audio/snd/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "snd"; - version = "23.9"; + version = "24.0"; src = fetchurl { url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; - sha256 = "sha256-2iuY0kjLEVKTK4N1s+mBEt7+RlbK4rm6RFpWq08i6RY="; + sha256 = "sha256-DU7AtPoLH+WXXsmree8GbHePvNYmPP7MxYSfhEzgOtU="; }; nativeBuildInputs = [ pkg-config ]; From e7b537ab95bf3505a38b222f009bdbb0a5f03e3f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 2 Jan 2024 19:01:24 +0000 Subject: [PATCH 016/133] media-downloader: 4.1.0 -> 4.2.0 --- pkgs/applications/video/media-downloader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/media-downloader/default.nix b/pkgs/applications/video/media-downloader/default.nix index 26620b25957d..2b9244186e76 100644 --- a/pkgs/applications/video/media-downloader/default.nix +++ b/pkgs/applications/video/media-downloader/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "media-downloader"; - version = "4.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "mhogomchungu"; repo = "media-downloader"; rev = finalAttrs.version; - hash = "sha256-x2uM4z4nQd761aj8PVlFH0MbWzwWRiR7ItzLQVOc1Zw="; + hash = "sha256-hQLrs4RyHUtcG03h0nCn3uMsHEskGKMVwUkcssGZQLs="; }; nativeBuildInputs = [ From adbb20330e6323654e964f5af11d9a39f993c97b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 3 Jan 2024 05:59:06 +0000 Subject: [PATCH 017/133] bootstrap-studio: 6.5.1 -> 6.6.0 --- pkgs/development/web/bootstrap-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/bootstrap-studio/default.nix b/pkgs/development/web/bootstrap-studio/default.nix index 796095e109a5..2ba780245668 100644 --- a/pkgs/development/web/bootstrap-studio/default.nix +++ b/pkgs/development/web/bootstrap-studio/default.nix @@ -2,10 +2,10 @@ let pname = "bootstrap-studio"; - version = "6.5.1"; + version = "6.6.0"; src = fetchurl { url = "https://releases.bootstrapstudio.io/${version}/Bootstrap%20Studio.AppImage"; - sha256 = "sha256-mx9KkMwFzdjhzofr+4l7MTerGfSSsI8+z8jmaoV8uvo="; + sha256 = "sha256-kXYptuLmhYJ3YiKtfIMiOs4zssJ1+v+JgDHWVtbWQ+Y="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; in From d4bbe4eed54827cb1ea8cfc63fda1cbd07235f91 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 4 Jan 2024 20:59:43 +0000 Subject: [PATCH 018/133] schemacrawler: 16.20.7 -> 16.20.8 --- pkgs/development/tools/schemacrawler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/schemacrawler/default.nix b/pkgs/development/tools/schemacrawler/default.nix index 4328965c3cc3..5093011ca3dd 100644 --- a/pkgs/development/tools/schemacrawler/default.nix +++ b/pkgs/development/tools/schemacrawler/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "schemacrawler"; - version = "16.20.7"; + version = "16.20.8"; src = fetchzip { url = "https://github.com/schemacrawler/SchemaCrawler/releases/download/v${finalAttrs.version}/schemacrawler-${finalAttrs.version}-bin.zip"; - hash = "sha256-5TyciQVrJhu8RlT6feHEH9H43fi1NWJX1dGipebf46k="; + hash = "sha256-uNk85AqdctxelImyx06yCsY15AxMFEEclOyao6Hu89A="; }; nativeBuildInputs = [ makeWrapper ]; From 25a0bb5863e27d75e3be1e37a372a924073e5558 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 03:03:23 +0000 Subject: [PATCH 019/133] telepresence2: 2.15.1 -> 2.17.0 --- pkgs/tools/networking/telepresence2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/telepresence2/default.nix b/pkgs/tools/networking/telepresence2/default.nix index 60d74926fe9e..49f44f52bc5f 100644 --- a/pkgs/tools/networking/telepresence2/default.nix +++ b/pkgs/tools/networking/telepresence2/default.nix @@ -27,13 +27,13 @@ let in buildGoModule rec { pname = "telepresence2"; - version = "2.15.1"; + version = "2.17.0"; src = fetchFromGitHub { owner = "telepresenceio"; repo = "telepresence"; rev = "v${version}"; - hash = "sha256-67a5e7Lun/mlRwRoD6eomQpgUXqzAUx8IS7Mv86j6Gw="; + hash = "sha256-wmoOBoMjPCNJGg86Cl2V4izZQDiZjNzwErvWMYY1MGk="; }; propagatedBuildInputs = [ @@ -47,7 +47,7 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - vendorHash = "sha256-/13OkcLJI/q14tyFsynL5ZAIITH1w9XWpzRqZoJJesE="; + vendorHash = "sha256-rTlMd56iBSBLTRYJlKHWmYyyeBtNk2WQ3hrPJl9dMYI="; ldflags = [ "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" From ea9e098b7e9805271ee1129ed5382093c6d57ff7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 04:17:31 +0000 Subject: [PATCH 020/133] ultrastardx: 2023.12.0 -> 2024.1.0 --- pkgs/games/ultrastardx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 40c2f54c601a..7364b0a5e5b3 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation rec { pname = "ultrastardx"; - version = "2023.12.0"; + version = "2024.1.0"; src = fetchFromGitHub { owner = "UltraStar-Deluxe"; repo = "USDX"; rev = "v${version}"; - hash = "sha256-BR2TZMg5Xr8K2IEpQBbkR3SkyBQUXdYABjVOoe6GnJc="; + hash = "sha256-pyX2zQiCp9lHSV1sGz0GaM5jTaBtyw50I6bFVbSm5S4="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; From 916feb4a3dfcff643d77377cbf7e19175032c16e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 04:28:23 +0000 Subject: [PATCH 021/133] leptonica: 1.84.0 -> 1.84.1 --- pkgs/development/libraries/leptonica/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/leptonica/default.nix b/pkgs/development/libraries/leptonica/default.nix index 08921c2ca3c0..12cd3f074fcb 100644 --- a/pkgs/development/libraries/leptonica/default.nix +++ b/pkgs/development/libraries/leptonica/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "leptonica"; - version = "1.84.0"; + version = "1.84.1"; src = fetchurl { url = "https://github.com/DanBloomberg/${pname}/releases/download/${version}/${pname}-${version}.tar.gz"; - hash = "sha256-QqApMSod8M1WQBlal5voG/ZiMOFTFkysRWR4RU5yBtU="; + hash = "sha256-Kz4SVLHMo4HnfIGbWcqZd0/0NTAgm5rrUR4dRliKZPY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; From 0600edc49773a5cfb90f55a67d51c02707e328ed Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 05:19:02 +0000 Subject: [PATCH 022/133] debianutils: 5.15 -> 5.16 --- pkgs/by-name/de/debianutils/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/de/debianutils/package.nix b/pkgs/by-name/de/debianutils/package.nix index 8f27316e483b..9d7952c8d379 100644 --- a/pkgs/by-name/de/debianutils/package.nix +++ b/pkgs/by-name/de/debianutils/package.nix @@ -8,14 +8,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "debianutils"; - version = "5.15"; + version = "5.16"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "debianutils"; rev = "debian/${finalAttrs.version}"; - hash = "sha256-o9HPiJCKcTJSoVDCjUcYPkqa6wnAuvCFOFhPdPSKS3A="; + hash = "sha256-v0sEk0xnFjWsBoDBge57kbANn8afP2EAImgwFihq7bI="; }; nativeBuildInputs = [ From ee887b1a8ae443ab1944e8af08abed6452413ca7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 05:30:02 +0000 Subject: [PATCH 023/133] gwyddion: 2.64 -> 2.65 --- pkgs/applications/science/chemistry/gwyddion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/gwyddion/default.nix b/pkgs/applications/science/chemistry/gwyddion/default.nix index 5794d7077af9..7c1312f27f25 100644 --- a/pkgs/applications/science/chemistry/gwyddion/default.nix +++ b/pkgs/applications/science/chemistry/gwyddion/default.nix @@ -21,10 +21,10 @@ in stdenv.mkDerivation rec { pname = "gwyddion"; - version = "2.64"; + version = "2.65"; src = fetchurl { url = "mirror://sourceforge/gwyddion/gwyddion-${version}.tar.xz"; - sha256 = "sha256-FDL4XDHH6WYF47OsnhxpM7s7YadutiCDjcJKCF8ZlCw="; + sha256 = "sha256-kRX7CoPJY8YkYNode5g0OCyWmL+5sM8puCmk9ZE2nqM="; }; nativeBuildInputs = [ pkg-config file ]; From ff54529c314acf4feb8083f1f6b8f585ff33bc42 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 06:17:10 +0000 Subject: [PATCH 024/133] miniupnpd: 2.3.3 -> 2.3.4 --- pkgs/tools/networking/miniupnpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix index 8264b54d28c0..622384f196a4 100644 --- a/pkgs/tools/networking/miniupnpd/default.nix +++ b/pkgs/tools/networking/miniupnpd/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "miniupnpd"; - version = "2.3.3"; + version = "2.3.4"; src = fetchurl { url = "https://miniupnp.tuxfamily.org/files/miniupnpd-${version}.tar.gz"; - sha256 = "sha256-b9cBn5Nv+IxB58gi9G8QtRvXLWZZePZYZIPedbMMNr8="; + sha256 = "sha256-5zAzSPyKxCfefwTw7rdX1J3Mg2cxHuJYJVLDj11toIo="; }; buildInputs = [ iptables-legacy libuuid openssl ]; From af1666dc2ea5050e625f6e6528e4480be1dfd405 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 07:43:22 +0000 Subject: [PATCH 025/133] swaks: 20201014.0 -> 20240103.0 --- pkgs/tools/networking/swaks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/swaks/default.nix b/pkgs/tools/networking/swaks/default.nix index da53407e3cc7..471cc74d9d7f 100644 --- a/pkgs/tools/networking/swaks/default.nix +++ b/pkgs/tools/networking/swaks/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "swaks"; - version = "20201014.0"; + version = "20240103.0"; src = fetchurl { url = "https://www.jetmore.org/john/code/swaks/files/${pname}-${version}.tar.gz"; - sha256 = "0c2sx4nrh4whsqzj6m5ay8d7yqan3aqgg436p8jb25bs91ykn2pv"; + sha256 = "sha256-DlMbTRZAWIAucmaxT03BiXCZ0Jb5MIIN4vm16wjc2+g="; }; nativeBuildInputs = [ makeWrapper ]; From dd99326063ff4c68990610d710b04c2045f1c224 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 08:39:12 +0000 Subject: [PATCH 026/133] openxr-loader: 1.0.32 -> 1.0.33 --- pkgs/development/libraries/openxr-loader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 32544bc327bc..3c739d30d386 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.32"; + version = "1.0.33"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-Np91NevE0XiFSZ27cpwAUjm0XY2/IuugGDcfG17aV2c="; + sha256 = "sha256-26CRpxiTfZOq6sQSl0H53UmYzPY/6mP33EPObdkwnQs="; }; nativeBuildInputs = [ cmake python3 pkg-config ]; From 0d9fa804c1e002c373ef5f7f0b5c13f22c394193 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 5 Jan 2024 09:13:27 +0000 Subject: [PATCH 027/133] glooctl: 1.15.18 -> 1.15.19 --- pkgs/applications/networking/cluster/glooctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index d3b7a9e1a003..bdb256c28fb8 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.15.18"; + version = "1.15.19"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-oHwo0I3OFfilLg2tlL0EycTo6BC7LYbzg7dxgfz/XeI="; + hash = "sha256-Tv+S0DnYOabtAVrb7W+VHzugGu2Dm2fBYsoz/DwR4xg="; }; vendorHash = "sha256-MrTiZCvYUmdX4sK85jeeQpUupvitH6PfbQ+RfwELaV4="; From a4f9304bc158b0ee7ffaa183a8655e32cb49b517 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jan 2024 01:02:22 +0000 Subject: [PATCH 028/133] vivaldi: 6.5.3206.48 -> 6.5.3206.50 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 881bd35bbd28..13430a882dcc 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -24,7 +24,7 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "6.5.3206.48"; + version = "6.5.3206.50"; suffix = { aarch64-linux = "arm64"; @@ -34,8 +34,8 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb"; hash = { - aarch64-linux = "sha256-laerVZWB9kNozy0MxYAPXbTjcfgvr+jL18NMP5u7ST0="; - x86_64-linux = "sha256-3gRvPSSyJapqay6nePlMA1R/tfFI75mHi+mx3f+wfjQ="; + aarch64-linux = "sha256-8Ozhad6aRskhhNqtUQFYLT14JHZnhLnHtuB+SmtwL8g="; + x86_64-linux = "sha256-hpWPDnnJGx2pokR1JFe3Uuq299HvsnjKMyg89wAo53I="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From ceb58ead72110d2d06336d51a155719542dfd8e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jan 2024 04:36:03 +0000 Subject: [PATCH 029/133] xml-tooling-c: 3.0.4 -> 3.2.4 --- pkgs/development/libraries/xml-tooling-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xml-tooling-c/default.nix b/pkgs/development/libraries/xml-tooling-c/default.nix index 8a415a4df77c..f58f50b4a72f 100644 --- a/pkgs/development/libraries/xml-tooling-c/default.nix +++ b/pkgs/development/libraries/xml-tooling-c/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "xml-tooling-c"; - version = "3.0.4"; + version = "3.2.4"; src = fetchgit { url = "https://git.shibboleth.net/git/cpp-xmltooling.git"; rev = version; - sha256 = "0frj4w70l06nva6dvdcivgm1ax69rqbjdzzbgp0sxhiqhddslbas"; + sha256 = "sha256-FQ109ahOSWj3hvaxu1r/0FTpCuWaLgSEKM8NBio+wqU="; }; buildInputs = [ boost curl openssl log4shib xercesc xml-security-c ]; From f2e62b74e159e52f5519953e9b7cb5233c68f675 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jan 2024 05:13:31 +0000 Subject: [PATCH 030/133] bacnet-stack: 1.3.1 -> 1.3.2 --- pkgs/tools/networking/bacnet-stack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/bacnet-stack/default.nix b/pkgs/tools/networking/bacnet-stack/default.nix index 6a514939aacf..d5f126c19bbb 100644 --- a/pkgs/tools/networking/bacnet-stack/default.nix +++ b/pkgs/tools/networking/bacnet-stack/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bacnet-stack"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "bacnet-stack"; repo = "bacnet-stack"; rev = "bacnet-stack-${version}"; - sha256 = "sha256-Uq55zrcP8jBKklmT2AZfL8gkplm/wwSDAh/yXd1jydc="; + sha256 = "sha256-hgUntojq10gYoY/inO46MzwK6o2q8ELKTaJbAbCx8Vc="; }; hardeningDisable = [ "all" ]; From 2b46e6cbc7f4c73f6178b8f9f16a0f0417452046 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jan 2024 06:55:31 +0000 Subject: [PATCH 031/133] xfe: 1.45 -> 1.46 --- pkgs/applications/file-managers/xfe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/file-managers/xfe/default.nix b/pkgs/applications/file-managers/xfe/default.nix index 5ac0f5e3abab..ffad141bdafa 100644 --- a/pkgs/applications/file-managers/xfe/default.nix +++ b/pkgs/applications/file-managers/xfe/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "xfe"; - version = "1.45"; + version = "1.46"; src = fetchurl { url = "mirror://sourceforge/xfe/xfe-${version}.tar.xz"; - sha256 = "sha256-RmvVUzqCsRRwXgC4Yabt46uFHnL0XFWncQfXDG+owDc="; + sha256 = "sha256-80rtoetmipDObW8BHL2US7305Jo5TFrQrIg6DzLoR/k="; }; nativeBuildInputs = [ pkg-config intltool ]; From d05a864db230e7b7442e4ea42506988bcf8ce01d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jan 2024 07:54:36 +0000 Subject: [PATCH 032/133] avrdudess: 2.14 -> 2.15 --- pkgs/applications/misc/avrdudess/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/avrdudess/default.nix b/pkgs/applications/misc/avrdudess/default.nix index e4047e26b846..1a59729ae9a7 100644 --- a/pkgs/applications/misc/avrdudess/default.nix +++ b/pkgs/applications/misc/avrdudess/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "avrdudess"; - version = "2.14"; + version = "2.15"; src = fetchurl { - url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.14/AVRDUDESS-2.14-portable.zip"; - sha256 = "sha256-x3xcsJLBJVO8XdV4OUveZ4KLqN5z/z0FsNLbGHSNoHs="; + url = "https://github.com/ZakKemble/AVRDUDESS/releases/download/v2.15/AVRDUDESS-2.15-portable.zip"; + sha256 = "sha256-TILveSFlZOzkd7XpW6haWZzrWTb7f/GMoj+fHNEJYLA="; }; nativeBuildInputs = [ unzip ]; From cfc399c3994015e4ef8a1e8a3842026d150ff1ff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 6 Jan 2024 11:03:03 +0000 Subject: [PATCH 033/133] praat: 6.4.01 -> 6.4.03 --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index bb43ae075dcc..a2b7b1c7effe 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "praat"; - version = "6.4.01"; + version = "6.4.03"; src = fetchFromGitHub { owner = "praat"; repo = "praat"; rev = "v${finalAttrs.version}"; - hash = "sha256-6g9oDPcJpI/udX+GKyCUkv+mjGoTbHU2YfTYaTVRwu4="; + hash = "sha256-eiZBe/tBX5ax23jsj1AY9O2BBLvEyiDQ6WS1ZtOBQNU="; }; nativeBuildInputs = [ From 24e77d6afa38010664003acca9ae9f34492d1658 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 01:34:36 +0000 Subject: [PATCH 034/133] blocky: 0.22 -> 0.23 --- pkgs/applications/networking/blocky/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/blocky/default.nix b/pkgs/applications/networking/blocky/default.nix index 3f299be447ad..6d2bf82cbb7f 100644 --- a/pkgs/applications/networking/blocky/default.nix +++ b/pkgs/applications/networking/blocky/default.nix @@ -6,20 +6,20 @@ buildGoModule rec { pname = "blocky"; - version = "0.22"; + version = "0.23"; src = fetchFromGitHub { owner = "0xERR0R"; repo = pname; rev = "v${version}"; - hash = "sha256-iU7fpTn8sPtglZfqLJ6fVYbHtYp0jqItSpJsvN4iKE8="; + hash = "sha256-IB5vi+nFXbV94YFtY2eMKTgzUgX8q8i8soSrso2zaD4="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorHash = "sha256-PnqpDAbHCs1wFudYy+nyG+p/E6ig7ZuhbuU4CFFoiyk="; + vendorHash = "sha256-h1CkvI7M1kt2Ix3D8+gDl97CFElV+0/9Eram1burOaM="; ldflags = [ "-s" "-w" "-X github.com/0xERR0R/blocky/util.Version=${version}" ]; From b0c4d13f4e6bfab349ac832d73504436e2e02a12 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 02:54:28 +0000 Subject: [PATCH 035/133] gtkcord4: 0.0.16-1 -> 0.0.17 --- pkgs/applications/audio/gtkcord4/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/gtkcord4/default.nix b/pkgs/applications/audio/gtkcord4/default.nix index 1a4001d670d7..efa17257be02 100644 --- a/pkgs/applications/audio/gtkcord4/default.nix +++ b/pkgs/applications/audio/gtkcord4/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "gtkcord4"; - version = "0.0.16-1"; + version = "0.0.17"; src = fetchFromGitHub { owner = "diamondburned"; repo = pname; rev = "v${version}"; - hash = "sha256-GDQ11X202RIoJUZ2eJ9ukHalhXtKYn9C8lcvAzzaB+4="; + hash = "sha256-fvY55N7AyCasT1Nxi37AtbyGQ4qC/764WgfCmwFa1YQ="; }; nativeBuildInputs = [ @@ -56,7 +56,7 @@ buildGoModule rec { install -D -m 444 internal/icons/hicolor/scalable/apps/logo.svg $out/share/icons/hicolor/scalable/apps/gtkcord4.svg ''; - vendorHash = "sha256-ZQBYi5t6ntukoHP2FtwpZrpFd7b2opPC8tOSU9j3jUM="; + vendorHash = "sha256-dMrdbUAU87wmnRDlJukG6w4PZ2DKx2v68gxNW5Ewijk="; meta = with lib; { description = "GTK4 Discord client in Go, attempt #4"; From 66a1f4700fec7731e1ef980bf3b08b94d2900204 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 03:27:33 +0000 Subject: [PATCH 036/133] sudo-font: 0.80 -> 0.81 --- pkgs/data/fonts/sudo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 874aeb4c4b55..ec079295a9ca 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "sudo-font"; - version = "0.80"; + version = "0.81"; src = fetchzip { url = "https://github.com/jenskutilek/sudo-font/releases/download/v${version}/sudo.zip"; - hash = "sha256-PUqWwWvi9k7Aj6L7NjlrBMFeRHKDUF5yX4efvi0nywI="; + hash = "sha256-qc26xHM9P9+lsPE9j5UY4f0hIb5PjlCSy+jm0zEFj2g="; }; installPhase = '' From d70f541fcb517bba69f2a5fedd6e7aa35b9fce5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 04:46:37 +0000 Subject: [PATCH 037/133] grizzly: 0.2.0 -> 0.3.0 --- pkgs/tools/misc/grizzly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/grizzly/default.nix b/pkgs/tools/misc/grizzly/default.nix index fa96cf1b1c05..2c80068c06c4 100644 --- a/pkgs/tools/misc/grizzly/default.nix +++ b/pkgs/tools/misc/grizzly/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "grizzly"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromGitHub { owner = "grafana"; repo = pname; rev = "v${version}"; - hash = "sha256-6z/6QZlCm4mRMKAVzLnOokv8ib7Y/7a17ojjMfeoJ4w="; + hash = "sha256-Yc15mD21Ohga7Pw+iowegkI2DWbKIZOZQ2vkKOdsKUk="; }; - vendorHash = "sha256-DDYhdRPcD5hfSW9nRmCWpsrVmIEU1sBoVvFz5Begx8w="; + vendorHash = "sha256-8myfB2LKDPUCFV9GBSXrBo9E+WrCOCm0ZHKTQ1dEb9U="; subPackages = [ "cmd/grr" ]; From 12d74fb0615d0c958dc39585c469ca627e60e886 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 05:12:42 +0000 Subject: [PATCH 038/133] hilbish: 2.1.2 -> 2.2.1 --- pkgs/shells/hilbish/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/hilbish/default.nix b/pkgs/shells/hilbish/default.nix index f5450e1da5c3..57b7abc59e25 100644 --- a/pkgs/shells/hilbish/default.nix +++ b/pkgs/shells/hilbish/default.nix @@ -2,19 +2,19 @@ buildGoModule rec { pname = "hilbish"; - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "Rosettea"; repo = "Hilbish"; rev = "v${version}"; - hash = "sha256-OEuriFnVDS0POXoPeUk4IcLtV3JAMLDM2apDxmjg5cQ="; + hash = "sha256-pXl0emLY+W0DkW4HONv3qVZzCEZnx/SX3MjyBajsosg="; fetchSubmodules = true; }; subPackages = [ "." ]; - vendorHash = "sha256-Kiy1JR3X++naY2XNLpnGujrNQt7qlL0zxv8E96cHmHo="; + vendorHash = "sha256-nE+THN+Q7Ze36c0nd3oROoFPLIzH/kw9qBwMxv+j9uE="; ldflags = [ "-s" From 0e6e068f89d4398b730d7123044200b52d426237 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 06:17:35 +0000 Subject: [PATCH 039/133] jackett: 0.21.1468 -> 0.21.1510 --- pkgs/servers/jackett/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index 7d3000b409ab..7c5110e29154 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -9,13 +9,13 @@ buildDotnetModule rec { pname = "jackett"; - version = "0.21.1468"; + version = "0.21.1510"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha512-URVuhMjls3M453ogzrmZmditqOJAuM46erckUd75NKwp/44bPlZgoHvorNeuOxOwnEafYDoo+ExuWv9EiYAjUA=="; + hash = "sha512-isoKpyxrjr+Kq+Ni7+suQDSWEhTieDzFpdFsf7oxm3+9J2/ziHgh7qfiaaicwqIjSnfUhykvXqAGzrf/Yc/+7g=="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; From c7ef5c0bf48f1868b5579a8622b28eaf747308f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 7 Jan 2024 07:51:46 +0000 Subject: [PATCH 040/133] libcint: 5.4.0 -> 6.1.0 --- pkgs/development/libraries/libcint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index e90078b0c840..f9345c74d9e4 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "libcint"; - version = "5.4.0"; + version = "6.1.0"; src = fetchFromGitHub { owner = "sunqm"; repo = "libcint"; rev = "v${version}"; - hash = "sha256-U+ZlD/I7RHtdYNbFhAmeU4qREe45dYJDIAC3Bup2tr0="; + hash = "sha256-qcVVp+81S3Y0fxDWA/PWQeFT2g0N6tIHNUaOHSru2GA="; }; nativeBuildInputs = [ cmake ]; From dbe38b2877f935728db4a1aa6e475750c4cb4fbc Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sun, 7 Jan 2024 18:04:34 +0100 Subject: [PATCH 041/133] libcint: fix tests on darwin, set platforms --- pkgs/development/libraries/libcint/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/libraries/libcint/default.nix b/pkgs/development/libraries/libcint/default.nix index f9345c74d9e4..3d8cf70b0db6 100644 --- a/pkgs/development/libraries/libcint/default.nix +++ b/pkgs/development/libraries/libcint/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation rec { hash = "sha256-qcVVp+81S3Y0fxDWA/PWQeFT2g0N6tIHNUaOHSru2GA="; }; + postPatch = '' + sed -i 's/libcint.so/libcint${stdenv.hostPlatform.extensions.sharedLibrary}/g' testsuite/*.py + ''; + nativeBuildInputs = [ cmake ]; buildInputs = [ blas ]; cmakeFlags = [ @@ -46,5 +50,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/sunqm/libcint/blob/master/ChangeLog"; license = licenses.bsd2; maintainers = with maintainers; [ drewrisinger ]; + platforms = platforms.unix; }; } From fadeddc6db24e8681f3e0232800ad79552987926 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jan 2024 10:11:02 +0000 Subject: [PATCH 042/133] fortran-fpm: 0.9.0 -> 0.10.0 --- pkgs/tools/package-management/fortran-fpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/fortran-fpm/default.nix b/pkgs/tools/package-management/fortran-fpm/default.nix index d8adb9249006..0945b0c67e32 100644 --- a/pkgs/tools/package-management/fortran-fpm/default.nix +++ b/pkgs/tools/package-management/fortran-fpm/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "fortran-fpm"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { url = "https://github.com/fortran-lang/fpm/releases/download/v${version}/fpm-${version}.F90"; - sha256 = "sha256-VWs4g7odtv1iyZunFD8el+u0CXKcQgnwOqPG/JcMzj8="; + sha256 = "sha256-SOVj23Sva5OW6+Sme9NxIQ4uqMbis8wjDmgYPOdQlCI="; }; dontUnpack = true; From d3763eeb08d2ecb1115c8ff00bddf8c801bd929a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 9 Jan 2024 15:43:04 +0000 Subject: [PATCH 043/133] libhdhomerun: 20220303 -> 20231214 --- pkgs/development/libraries/libhdhomerun/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index 96b8e3c02937..c6fb327d0d2a 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "libhdhomerun"; - version = "20220303"; + version = "20231214"; src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "sha256-HlT/78LUiTkRUB2jHmYrnQY+bBiv4stcZlMyUnelSpc="; + sha256 = "sha256-VSoQLoqiq8xBYJDewvb4DaWfl/kfV5aOnp17PcAF268="; }; postPatch = lib.optionalString stdenv.isDarwin '' From e133b24ddf11f8173dd02c5632e917e115dc2363 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 Jan 2024 05:09:21 +0000 Subject: [PATCH 044/133] memcached: 1.6.22 -> 1.6.23 --- pkgs/servers/memcached/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix index a8beb4d4bed5..6ad1343645e8 100644 --- a/pkgs/servers/memcached/default.nix +++ b/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.22"; + version = "1.6.23"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "sha256-NHg6kKTM90xBBwhf2Stoh0nSOyds/a2fBOT3JaBdHKc="; + sha256 = "sha256-hbAzSQT0QClqaFzP2nXw9FF7+JIquO+m0MSzySw1TUw="; }; configureFlags = [ From 6e3e1403f1ade925bba5d93a36d1a7c703c83ec2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jan 2024 10:05:20 +0100 Subject: [PATCH 045/133] python311Packages.sentry-sdk: 1.39.0 -> 1.39.2 Changelog: https://github.com/getsentry/sentry-python/blob/1.39.2/CHANGELOG.md --- pkgs/development/python-modules/sentry-sdk/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index a4027953796b..11d1df937702 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -37,7 +37,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.39.0"; + version = "1.39.2"; pyproject = true; disabled = pythonOlder "3.7"; @@ -46,7 +46,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = "refs/tags/${version}"; - hash = "sha256-tYfnQ6L91KrRCR32dgzcDtA7eO+LHRAHBklxU8cXkK8="; + hash = "sha256-MC+9w53fsC5XB7CR9SS+z4bu2GgxkqdeYWERhk8lhcA="; }; nativeBuildInputs = [ @@ -133,11 +133,12 @@ buildPythonPackage rec { disabledTests = [ # Issue with the asseration "test_auto_enabling_integrations_catches_import_error" + "test_default_release" ]; disabledTestPaths = [ # Varius integration tests fail every once in a while when we - # upgrade depencies, so don't bother testing them. + # upgrade dependencies, so don't bother testing them. "tests/integrations/" ] ++ lib.optionals (stdenv.buildPlatform != "x86_64-linux") [ # test crashes on aarch64 From 73a415c765b3dbb6873d43d4e5a001595168ac49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Jan 2024 18:43:34 +0100 Subject: [PATCH 046/133] python311Packages.maison: 1.4.2 -> 1.4.3 Diff: https://github.com/dbatten5/maison/compare/refs/tags/v1.4.2...v1.4.3 Changelog: https://github.com/dbatten5/maison/releases/tag/v1.4.3 --- pkgs/development/python-modules/maison/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/maison/default.nix b/pkgs/development/python-modules/maison/default.nix index 79be6d7b5bc7..d28c5cc6c69d 100644 --- a/pkgs/development/python-modules/maison/default.nix +++ b/pkgs/development/python-modules/maison/default.nix @@ -6,25 +6,31 @@ , pydantic , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , toml }: buildPythonPackage rec { pname = "maison"; - version = "1.4.2"; + version = "1.4.3"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "dbatten5"; repo = "maison"; rev = "refs/tags/v${version}"; - hash = "sha256-XNo7QS8BCYzkDozLW0T+KMQPI667lDTCFtOqKq9q3hw="; + hash = "sha256-2hUmk91wr5o2cV3un2nMoXDG+3GT7SaIOKY+QaZY3nw="; }; + pythonRelaxDeps = [ + "pydantic" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -47,6 +53,5 @@ buildPythonPackage rec { changelog = "https://github.com/dbatten5/maison/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; - broken = versionAtLeast pydantic.version "2"; }; } From e7d59de9817689bd5632a07bf9f36950f9d77d7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 15 Jan 2024 20:46:59 +0100 Subject: [PATCH 047/133] python311Packages.yamlfix: 1.13.0 -> 1.16.0 Diff: https://github.com/lyz-code/yamlfix/compare/refs/tags/1.13.0...1.16.0 Changelog: https://github.com/lyz-code/yamlfix/blob/1.16.0/CHANGELOG.md --- .../python-modules/yamlfix/default.nix | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix index 122a39d82615..26b39ed87ed5 100644 --- a/pkgs/development/python-modules/yamlfix/default.nix +++ b/pkgs/development/python-modules/yamlfix/default.nix @@ -3,7 +3,8 @@ , click , fetchFromGitHub , maison -, pdm-pep517 +, pdm-backend +, pytest-freezegun , pytest-xdist , pytestCheckHook , pythonOlder @@ -13,21 +14,21 @@ buildPythonPackage rec { pname = "yamlfix"; - version = "1.13.0"; - format = "pyproject"; + version = "1.16.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "lyz-code"; - repo = pname; + repo = "yamlfix"; rev = "refs/tags/${version}"; - hash = "sha256-GoCQtanQHYOFrhRvZjzk/cCPnUFwYUAclZuYGZfNg5E="; + hash = "sha256-nadyBIzXHbWm0QvympRaYU38tuPJ3TPJg8EbvVv+4L0="; }; nativeBuildInputs = [ setuptools - pdm-pep517 + pdm-backend ]; propagatedBuildInputs = [ @@ -37,14 +38,39 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pytest-freezegun pytest-xdist pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + pythonImportsCheck = [ "yamlfix" ]; + disabledTests = [ + # AssertionError: assert ... Fixed in... + "test_check_one_file_no_changes" + "test_config_parsing" + "test_corrects_code_from_stdin" + "test_corrects_one_file" + "test_corrects_three_files" + "test_empty_list_inline_comment_indentation" + "test_find_files" + "test_fix_code_converts_non_valid_false_booleans" + "test_ignores_correct_files" + "test_include_exclude_files" + "test_read_prefixed_environment_variables" + "test_section_whitelines" + "test_whitelines" + "test_sequence_style_env_enum_parsing" + "test_verbose_option" + "test_enforcing_flow_style_together_with_adjustable_newlines" + ]; + meta = with lib; { description = "Python YAML formatter that keeps your comments"; homepage = "https://github.com/lyz-code/yamlfix"; From 14f2fb813733cd3bb76c876485cdbbf7d020e32e Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Tue, 19 Dec 2023 08:58:12 +0100 Subject: [PATCH 048/133] python3Packages.wagtail: relax django-taggit dependency --- pkgs/development/python-modules/wagtail/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index f2f924b5c124..8c61599fc5dd 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -37,7 +37,8 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8" \ - --replace "draftjs_exporter>=2.1.5,<3.0" "draftjs_exporter>=2.1.5,<6.0" + --replace "draftjs_exporter>=2.1.5,<3.0" "draftjs_exporter>=2.1.5,<6.0" \ + --replace "django-taggit>=2.0,<5.0" "django-taggit>=2.0,<6.0" ''; propagatedBuildInputs = [ @@ -64,7 +65,9 @@ buildPythonPackage rec { # on wagtail (wagtail-factories) doCheck = false; - passthru.tests.wagtail = callPackage ./tests.nix {}; + passthru.tests.wagtail = callPackage ./tests.nix { }; + + pythonImportsCheck = [ "wagtail" ]; meta = with lib; { description = "A Django content management system focused on flexibility and user experience"; From 101794f0b40f4e965ff71440fc579eba2490d40b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jan 2024 09:23:46 +0100 Subject: [PATCH 049/133] python311Packages.ruyaml: refactor --- .../python-modules/ruyaml/default.nix | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/ruyaml/default.nix b/pkgs/development/python-modules/ruyaml/default.nix index e5b2108831df..38e33e5fe33f 100644 --- a/pkgs/development/python-modules/ruyaml/default.nix +++ b/pkgs/development/python-modules/ruyaml/default.nix @@ -11,32 +11,23 @@ buildPythonPackage rec { pname = "ruyaml"; version = "0.91.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "pycontribs"; - repo = pname; - rev = "v${version}"; - sha256 = "0gxvwry7n1gczxkjzyfrr3fammllkvnnamja4yln8xrg3n1h89al"; + repo = "ruyaml"; + rev = "refs/tags/v${version}"; + hash = "sha256-A37L/voBrn2aZ7xT8+bWdZJxbWRjnxbstQtSyUeN1sA="; }; - patches = [ - (fetchpatch { - name = "remove-setuptools-scm-git-archive-from-setupcfg.patch"; - url = "https://github.com/pycontribs/ruyaml/commit/8922dd826cbb97b29e9826b00fb28a65d584e985.patch"; - includes = [ "setup.cfg" ]; - hash = "sha256-XAsORoPvYRElHswlZ4S377UwuJNCU1JuCz5iyFXoXOQ="; - }) - + postPatch = '' # https://github.com/pycontribs/ruyaml/pull/107 - (fetchpatch { - name = "remove-setuptools-scm-git-archive-from-pyproject.patch"; - url = "https://github.com/pycontribs/ruyaml/commit/4d605bf63f799696c8ba3c1f0a0f505db0ca33ce.patch"; - hash = "sha256-X6HWXBot5ZIo+odoSHhXMb03tgpQfRw/Ze8nFgH43ZI="; - }) - ]; + substituteInPlace pyproject.toml \ + --replace '"pip >= 19.3.1",' "" \ + --replace '"setuptools_scm_git_archive >= 1.1",' "" + ''; nativeBuildInputs = [ setuptools-scm @@ -61,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "YAML 1.2 loader/dumper package for Python"; homepage = "https://ruyaml.readthedocs.io/"; + changelog = "https://github.com/pycontribs/ruyaml/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 65f78dbaa0dfeacff7d4d8d5124babd53276fa30 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 Jan 2024 09:29:57 +0100 Subject: [PATCH 050/133] python311Packages.ruyaml: disable failing tests --- pkgs/development/python-modules/ruyaml/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/python-modules/ruyaml/default.nix b/pkgs/development/python-modules/ruyaml/default.nix index 38e33e5fe33f..4131200f2276 100644 --- a/pkgs/development/python-modules/ruyaml/default.nix +++ b/pkgs/development/python-modules/ruyaml/default.nix @@ -49,6 +49,13 @@ buildPythonPackage rec { "ruyaml" ]; + disabledTests = [ + # Assertion error + "test_issue_60" + "test_issue_60_1" + "test_issue_61" + ]; + meta = with lib; { description = "YAML 1.2 loader/dumper package for Python"; homepage = "https://ruyaml.readthedocs.io/"; From 6425843adacfa1f8a61f3e0fc3e903f333cc1f94 Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Tue, 16 Jan 2024 10:56:11 +0100 Subject: [PATCH 051/133] python3Packages.wagtail: relax willow dependency --- pkgs/development/python-modules/wagtail/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix index 8c61599fc5dd..0e7bf3a3f185 100644 --- a/pkgs/development/python-modules/wagtail/default.nix +++ b/pkgs/development/python-modules/wagtail/default.nix @@ -38,7 +38,8 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "beautifulsoup4>=4.8,<4.12" "beautifulsoup4>=4.8" \ --replace "draftjs_exporter>=2.1.5,<3.0" "draftjs_exporter>=2.1.5,<6.0" \ - --replace "django-taggit>=2.0,<5.0" "django-taggit>=2.0,<6.0" + --replace "django-taggit>=2.0,<5.0" "django-taggit>=2.0,<6.0" \ + --replace "Willow[heif]>=1.6.2,<1.7" "Willow[heif]>=1.6.2,<2" ''; propagatedBuildInputs = [ From 7294b8e7600993117c5d93d67a4f4009a9d55f5a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 11:58:05 +0100 Subject: [PATCH 052/133] python311Packages.environs: 10.1.0 -> 10.3.0 Diff: https://github.com/sloria/environs/compare/refs/tags/10.1.0...10.3.0 Changelog: https://github.com/sloria/environs/blob/10.3.0/CHANGELOG.md --- pkgs/development/python-modules/environs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix index 529c940dd45c..8c179349e18e 100644 --- a/pkgs/development/python-modules/environs/default.nix +++ b/pkgs/development/python-modules/environs/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "environs"; - version = "10.1.0"; + version = "10.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "sloria"; repo = "environs"; rev = "refs/tags/${version}"; - hash = "sha256-G9dgOugmFRHSLlmVHs2H5XyF3UKghAGtuzTWn4IB4dI="; + hash = "sha256-D6Kp8aHiUls7+cACJ3DwrS4OftA5uMbAu4l5IyR4F5U="; }; nativeBuildInputs = [ From ca13da7173881ed8ea890edc5cea23291efb3c23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 12:49:06 +0100 Subject: [PATCH 053/133] python311Packages.marshmallow: 3.20.1 -> 3.20.2 Diff: https://github.com/marshmallow-code/marshmallow/compare/refs/tags/3.20.1...3.20.2 Changelog: https://github.com/marshmallow-code/marshmallow/blob/3.20.2/CHANGELOG.rst --- pkgs/development/python-modules/marshmallow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index bbe9c9bf157d..6b09a0e97dfe 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.20.1"; + version = "3.20.2"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "marshmallow-code"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-sPYiup7ontnubtBxv+rIT0up4IHPJNCUlH9J4FlHsss="; + hash = "sha256-z6Quf6uTelGwB/uYayVXtVmculwaoI5LL8I0kKiM/e8="; }; propagatedBuildInputs = [ From 922b1b02c6701cf0c15807ab555949ae4ab11947 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 12:57:35 +0100 Subject: [PATCH 054/133] python311Packages.marshmallow: refactor --- pkgs/development/python-modules/marshmallow/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 6b09a0e97dfe..880e3c869aab 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -6,22 +6,27 @@ , pytz , simplejson , packaging +, setuptools }: buildPythonPackage rec { pname = "marshmallow"; version = "3.20.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "marshmallow-code"; - repo = pname; + repo = "marshmallow"; rev = "refs/tags/${version}"; hash = "sha256-z6Quf6uTelGwB/uYayVXtVmculwaoI5LL8I0kKiM/e8="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ packaging ]; From edf111a2f22ff6200a0de67e08759791dcbbc83f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 12:58:02 +0100 Subject: [PATCH 055/133] python311Packages.marshmallow-polyfield: refactor --- .../marshmallow-polyfield/default.nix | 21 ++++++++++++------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 24d117eb322e..81eed71d3016 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -4,22 +4,32 @@ , marshmallow , pythonOlder , pytestCheckHook +, setuptools }: buildPythonPackage rec { pname = "marshmallow-polyfield"; version = "5.10"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "Bachmann1234"; - repo = pname; - rev = "v${version}"; + repo = "marshmallow-polyfield"; + rev = "refs/tags/v${version}"; hash = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ="; }; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "--cov=marshmallow_polyfield" "" + ''; + + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ marshmallow ]; @@ -28,11 +38,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.cfg \ - --replace "--cov=marshmallow_polyfield" "" - ''; - pythonImportsCheck = [ "marshmallow" ]; From 75f193f9e840f0b8664588ce5bb87311ff91b04b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 13:51:46 +0100 Subject: [PATCH 056/133] python311Packages.token-bucket: add patch to replace imp --- .../python-modules/token-bucket/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/token-bucket/default.nix b/pkgs/development/python-modules/token-bucket/default.nix index 497d10d84fe8..0805ee9dea39 100644 --- a/pkgs/development/python-modules/token-bucket/default.nix +++ b/pkgs/development/python-modules/token-bucket/default.nix @@ -2,14 +2,16 @@ , stdenv , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "token-bucket"; version = "0.3.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -20,11 +22,24 @@ buildPythonPackage rec { hash = "sha256-dazqJRpC8FUHOhgKFzDnIl5CT2L74J2o2Hsm0IQf4Cg="; }; + patches = [ + # Replace imp with importlib, https://github.com/falconry/token-bucket/pull/24 + (fetchpatch { + name = "remove-imp.patch"; + url = "https://github.com/falconry/token-bucket/commit/10a3c9f4de00f4933349f66b4c72b6c96db6e766.patch"; + hash = "sha256-Hk5+i3xzeA3F1kXRaRarWT9mff2lT2WNmTfTZvYzGYI="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace "'pytest-runner'" "" ''; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; From f68cad2d0a048a7c5b115291c4d531ce46870c32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 17 Jan 2024 14:05:26 +0100 Subject: [PATCH 057/133] gitea: 1.21.3 -> 1.21.4 https://github.com/go-gitea/gitea/releases/tag/v1.21.4 --- pkgs/applications/version-management/gitea/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix index 124e3eff217a..66f2f4e82ef3 100644 --- a/pkgs/applications/version-management/gitea/default.nix +++ b/pkgs/applications/version-management/gitea/default.nix @@ -20,12 +20,12 @@ buildGoModule rec { pname = "gitea"; - version = "1.21.3"; + version = "1.21.4"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; - hash = "sha256-tJC9p7++lb3lD0yYR4qAtFOTRBQK2SkNCD6Tk+g9M78="; + hash = "sha256-bkRI2m7aHrQH5wQbm4MoygrF5da7j4i8Qd/aoMJbhS0="; }; vendorHash = null; From 3320050e547216ec227003263c8a04aeebd8b2cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 17:19:16 +0100 Subject: [PATCH 058/133] python312Packages.strenum: patch vendorized versioneer --- .../python-modules/strenum/default.nix | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/strenum/default.nix b/pkgs/development/python-modules/strenum/default.nix index b7d2661ce2c8..b3ae130af270 100644 --- a/pkgs/development/python-modules/strenum/default.nix +++ b/pkgs/development/python-modules/strenum/default.nix @@ -1,14 +1,16 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "strenum"; version = "0.4.15"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,6 +21,15 @@ buildPythonPackage rec { hash = "sha256-LrDLIWiV/zIbl7CwKh7DAy4LoLyY7+hfUu8nqduclnA="; }; + patches = [ + # Replace SafeConfigParser and readfp, https://github.com/milanmeu/aioaseko/pull/6 + (fetchpatch { + name = "replace-safeconfigparser.patch"; + url = "https://github.com/irgeek/StrEnum/commit/896bef1b7e4a50c8b53d90c8d2fb5c0164f08ecd.patch"; + hash = "sha256-dmmEzhy17huclo1wOubpBUDc2L7vqEU5b/6a5loM47A="; + }) + ]; + postPatch = '' substituteInPlace setup.py \ --replace '"pytest-runner"' "" @@ -26,6 +37,10 @@ buildPythonPackage rec { --replace " --cov=strenum --cov-report term-missing --black --pylint" "" ''; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -35,7 +50,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "MOdule for enum that inherits from str"; + description = "Module for enum that inherits from str"; homepage = "https://github.com/irgeek/StrEnum"; changelog = "https://github.com/irgeek/StrEnum/releases/tag/v${version}"; license = with licenses; [ mit ]; From b8b2a1737d5c32e9f40d388f1c93bea6dc49d90a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 17:29:37 +0100 Subject: [PATCH 059/133] python311Packages.spyse-python: refactor --- .../python-modules/spyse-python/default.nix | 35 +++++++++++-------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/spyse-python/default.nix b/pkgs/development/python-modules/spyse-python/default.nix index 0064454a1eaf..56ffdfe8c080 100644 --- a/pkgs/development/python-modules/spyse-python/default.nix +++ b/pkgs/development/python-modules/spyse-python/default.nix @@ -7,32 +7,23 @@ , pythonOlder , requests , responses +, setuptools }: buildPythonPackage rec { pname = "spyse-python"; version = "2.2.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "spyse-com"; - repo = pname; - rev = "v${version}"; - sha256 = "041k0037anwaxp2mh7mdk8rdsw9hdr3arigyyqfxfn35x8j41c3k"; + repo = "spyse-python"; + rev = "refs/tags/v${version}"; + hash = "sha256-c7BAJOplWNcd9v7FrEZuMHHdMpqtHljF7YpbdQYAMxA="; }; - propagatedBuildInputs = [ - requests - dataclasses-json - responses - limiter - ]; - - # Tests requires an API token - doCheck = false; - patches = [ # Update limiter import and rate limit, https://github.com/spyse-com/spyse-python/pull/11 (fetchpatch { @@ -45,11 +36,26 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ --replace "'dataclasses~=0.6'," "" \ + --replace "dataclasses-json~=0.5.4" "dataclasses-json>=0.5.4" \ --replace "responses~=0.13.3" "responses>=0.13.3" \ --replace "limiter~=0.1.2" "limiter>=0.1.2" \ --replace "requests~=2.26.0" "requests>=2.26.0" ''; + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + dataclasses-json + responses + limiter + ]; + + # Tests requires an API token + doCheck = false; + pythonImportsCheck = [ "spyse" ]; @@ -57,6 +63,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for spyse.com API"; homepage = "https://github.com/spyse-com/spyse-python"; + changelog = "https://github.com/spyse-com/spyse-python/releases/tag/v${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 5419ff5c8e12bd01c1e15053a609016c30a5e0d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 17 Jan 2024 19:42:04 +0100 Subject: [PATCH 060/133] python311Packages.pygitguardian: relax marshmallow-dataclass constraint --- pkgs/development/python-modules/pygitguardian/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/pygitguardian/default.nix b/pkgs/development/python-modules/pygitguardian/default.nix index 3d3590a37104..ad97cd944250 100644 --- a/pkgs/development/python-modules/pygitguardian/default.nix +++ b/pkgs/development/python-modules/pygitguardian/default.nix @@ -5,6 +5,7 @@ , marshmallow-dataclass , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , requests , responses , setuptools @@ -26,7 +27,12 @@ buildPythonPackage rec { hash = "sha256-ybl6QOLb1xE6v0D1C2wKMsSU+r2gWzj24Q4pPIMBsCY="; }; + pythonRelaxDeps = [ + "marshmallow-dataclass" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; From 3740662d2eefdeebc0dcca0f0da9a78496e09f1e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jan 2024 08:07:57 +0000 Subject: [PATCH 061/133] spicedb-zed: 0.15.2 -> 0.16.2 --- pkgs/servers/spicedb/zed.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/spicedb/zed.nix b/pkgs/servers/spicedb/zed.nix index 34cad4f20940..636992786891 100644 --- a/pkgs/servers/spicedb/zed.nix +++ b/pkgs/servers/spicedb/zed.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "zed"; - version = "0.15.2"; + version = "0.16.2"; src = fetchFromGitHub { owner = "authzed"; repo = "zed"; rev = "v${version}"; - hash = "sha256-e9jgRvQ8eYy6eqweqQIyjEKZ4cfEq5DwGXBvBXB2Wk8="; + hash = "sha256-MxIeQ8WbTEH342EA03irjpDjfZZyc0sau2hOZOGT27w="; }; - vendorHash = "sha256-VRWhhXgBnIkwkakhERm2iSKidPnk0e4iTXXJpJz4cRM="; + vendorHash = "sha256-KhtT0v0FJiOvYUhN/rBYxbkUKs0DdIc5HwlhVUAi9cA="; meta = with lib; { description = "Command line for managing SpiceDB"; From b1103fe5e86c8f0b70abd08fe2d86c7c6cc89a90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jan 2024 15:43:34 +0100 Subject: [PATCH 062/133] python311Packages.marshmallow-polyfield: 5.10 -> 5.11 Diff: https://github.com/Bachmann1234/marshmallow-polyfield/compare/refs/tags/v5.10...v5.11 --- .../python-modules/marshmallow-polyfield/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 81eed71d3016..dfdb85ebf9c7 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "marshmallow-polyfield"; - version = "5.10"; + version = "5.11"; pyproject = true; disabled = pythonOlder "3.6"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "Bachmann1234"; repo = "marshmallow-polyfield"; rev = "refs/tags/v${version}"; - hash = "sha256-oF5LBuDK4kqsAcKwidju+wFjigjy4CNbJ6bfWpGO1yQ="; + hash = "sha256-jbpeyih2Ccw1Rk+QcXRO9AfN5B/DhZmxa/M6FzXHqqs="; }; postPatch = '' From 1f173b827206716931a879bff5bb8b42e28ae79e Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Thu, 18 Jan 2024 17:07:54 +0100 Subject: [PATCH 063/133] python311Packages.cysignals: revert to cython 0.29 for the moment --- .../python-modules/cysignals/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix index fe0ca2e17a09..b64d3f8d7174 100644 --- a/pkgs/development/python-modules/cysignals/default.nix +++ b/pkgs/development/python-modules/cysignals/default.nix @@ -1,8 +1,9 @@ { lib , autoreconfHook +, fetchpatch , fetchPypi , buildPythonPackage -, cython_3 +, cython , pariSupport ? true, pari # for interfacing with the PARI/GP signal handler }: @@ -18,6 +19,14 @@ buildPythonPackage rec { hash = "sha256-Dx4yHlWgf5AchqNqHkSX9v+d/nAGgdATCjjDbk6yOMM="; }; + patches = [ + # https://github.com/sagemath/cysignals/pull/193 + (fetchpatch { + url = "https://github.com/sagemath/cysignals/commit/474179c87ab0ff562fdfd2471b02797e4bdd3148.diff"; + sha256 = "sha256-qEAmf4kU+QDI/JPFNjQMZIjMBk8dnaLmOpagIBMsh7w="; + }) + ]; + # explicit check: # build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE" hardeningDisable = [ @@ -34,7 +43,7 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - cython_3 + cython ] ++ lib.optionals pariSupport [ # When cysignals is built with pari, including cysignals into the # buildInputs of another python package will cause cython to link against From 3ae85401f53509980f2be444b8bb5584b23b3125 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Thu, 18 Jan 2024 17:23:28 +0100 Subject: [PATCH 064/133] python311Packages.fpylll: revert to cython 0.29 for the moment --- .../python-modules/fpylll/default.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fpylll/default.nix b/pkgs/development/python-modules/fpylll/default.nix index 2de77cfbd69d..be738b90e198 100644 --- a/pkgs/development/python-modules/fpylll/default.nix +++ b/pkgs/development/python-modules/fpylll/default.nix @@ -1,10 +1,11 @@ { lib , fetchFromGitHub +, fetchpatch , buildPythonPackage # build-system , cysignals -, cython_3 +, cython , pkgconfig , setuptools @@ -30,8 +31,21 @@ buildPythonPackage rec { hash = "sha256-EyReCkVRb3CgzIRal5H13OX/UdwWi+evDe7PoS1qP4A="; }; + # temporarily revert to cython 0.29 + patches = [ + (fetchpatch { + url = "https://github.com/fplll/fpylll/commit/528243c6fa6491c8e9652b99bdf9758766273d66.diff"; + revert = true; + sha256 = "sha256-IRppkESy0CRwARhxBAsZxP6JkTe0M91apG4CTSSYNUU="; + excludes = ["requirements.txt"]; + }) + ]; + postPatch = '' + substituteInPlace requirements.txt --replace "Cython>=3.0" "Cython" + ''; + nativeBuildInputs = [ - cython_3 + cython cysignals pkgconfig setuptools From 369b1aca85fe6d085843d3cc1a342aa8f96d1d5d Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Wed, 17 Jan 2024 16:55:59 +0100 Subject: [PATCH 065/133] python311Packages.cypari2: fix build --- .../development/python-modules/cypari2/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix index 5b5ca31e4d02..5a1096cb1505 100644 --- a/pkgs/development/python-modules/cypari2/default.nix +++ b/pkgs/development/python-modules/cypari2/default.nix @@ -30,20 +30,13 @@ buildPythonPackage rec { }) ]; - # This differs slightly from the default python installPhase in that it pip-installs - # "." instead of "*.whl". - # That is because while the default install phase succeeds to build the package, - # it fails to generate the file "auto_paridecl.pxd". - installPhase = '' - export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" - - # install "." instead of "*.whl" - pip install . --no-index --no-warn-script-location --prefix="$out" --no-cache + preBuild = '' + # generate cythonized extensions (auto_paridecl.pxd is crucial) + ${python.pythonOnBuildForHost.interpreter} setup.py build_ext --inplace ''; nativeBuildInputs = [ pari - python.pythonOnBuildForHost.pkgs.pip ]; buildInputs = [ @@ -56,6 +49,7 @@ buildPythonPackage rec { ]; checkPhase = '' + test -f "$out/${python.sitePackages}/cypari2/auto_paridecl.pxd" make check ''; From 6495f3a331bc057ea3f6af8f4df9814c3972d2a4 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Thu, 4 Jan 2024 14:25:30 +0100 Subject: [PATCH 066/133] bkcrack: 1.5.0 -> 1.6.0 --- pkgs/tools/security/bkcrack/default.nix | 6 ++---- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/bkcrack/default.nix b/pkgs/tools/security/bkcrack/default.nix index e2ed76743c4c..6345cbdc9602 100644 --- a/pkgs/tools/security/bkcrack/default.nix +++ b/pkgs/tools/security/bkcrack/default.nix @@ -2,22 +2,20 @@ , stdenv , fetchFromGitHub , cmake -, openmp }: stdenv.mkDerivation rec { pname = "bkcrack"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "kimci86"; repo = pname; rev = "v${version}"; - hash = "sha256-iyx4mOTr6MHECk9S9zrIAE5pt+cxWnOKS7iQPUyWfzs="; + hash = "sha256-VfPRX9lOPyen8CujiBtTCbD5e7xd9X2OQ1uZ6JWKwtY="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openmp ]; postInstall = '' mkdir -p $out/bin $out/share/licenses/bkcrack diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1696417e444e..30ad1bb99fa0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6629,9 +6629,7 @@ with pkgs; bbe = callPackage ../tools/misc/bbe { }; - bkcrack = callPackage ../tools/security/bkcrack { - inherit (llvmPackages) openmp; - }; + bkcrack = callPackage ../tools/security/bkcrack { }; bdsync = callPackage ../tools/backup/bdsync { }; From 0247cfb75a215cdd13c676be6053f7c49e331f90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jan 2024 23:18:45 +0100 Subject: [PATCH 067/133] python312Packages.json-schema-for-humans: relax dataclasses-json --- .../python-modules/json-schema-for-humans/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix index dfbe2d7d638e..3fa36c938fda 100644 --- a/pkgs/development/python-modules/json-schema-for-humans/default.nix +++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix @@ -11,6 +11,7 @@ , pygments , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook , pytz , pyyaml , requests @@ -19,19 +20,24 @@ buildPythonPackage rec { pname = "json-schema-for-humans"; version = "0.46"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "coveooss"; - repo = pname; + repo = "json-schema-for-humans"; rev = "refs/tags/v${version}"; hash = "sha256-wTO+d0O3SKT2jJ2zNubT2q76PdJ7+kT9RBEw5MMH1yg="; }; + pythonRelaxDeps = [ + "dataclasses-json" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ From f2ca86bc2a905dd74c485c761c29d365a9059bb4 Mon Sep 17 00:00:00 2001 From: happysalada Date: Thu, 18 Jan 2024 17:23:11 -0500 Subject: [PATCH 068/133] python311Packages.pip-tools: disable flaky tests --- pkgs/development/python-modules/pip-tools/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index 1871ce74dd73..154a9c712c5a 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -66,6 +66,8 @@ buildPythonPackage rec { "test_bad_setup_file" # Assertion error "test_compile_recursive_extras" + "test_combine_different_extras_of_the_same_package" + "test_diff_should_not_uninstall" ]; pythonImportsCheck = [ From cb1d8fd1f5df1307c7f968d61466df6302917d63 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jan 2024 23:24:08 +0100 Subject: [PATCH 069/133] python311Packages.dataprep-ml: relax pydantic --- .../python-modules/dataprep-ml/default.nix | 31 ++++++++++++------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/dataprep-ml/default.nix b/pkgs/development/python-modules/dataprep-ml/default.nix index 6af89e238ccd..00a25158bc87 100644 --- a/pkgs/development/python-modules/dataprep-ml/default.nix +++ b/pkgs/development/python-modules/dataprep-ml/default.nix @@ -1,24 +1,28 @@ { lib , buildPythonPackage +, colorlog +, dataclasses-json , fetchPypi -, pythonOlder -, poetry-core +, nltk-data , numpy , pandas +, poetry-core +, pydantic , pydateinfer , python-dateutil +, pythonOlder +, pythonRelaxDepsHook , scipy -, type-infer -, dataclasses-json -, colorlog -, pydantic -, nltk-data , symlinkJoin +, type-infer }: let testNltkData = symlinkJoin { name = "nltk-test-data"; - paths = [ nltk-data.punkt nltk-data.stopwords ]; + paths = [ + nltk-data.punkt + nltk-data.stopwords + ]; }; in buildPythonPackage rec { @@ -35,20 +39,25 @@ buildPythonPackage rec { hash = "sha256-BtnRmj5JtgNdCFowgNdpIZn5vUdw8QYCWneHfDgC4/c="; }; + pythonRelaxDeps = [ + "pydantic" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ + colorlog + dataclasses-json numpy pandas + pydantic pydateinfer python-dateutil scipy type-infer - dataclasses-json - colorlog - pydantic ]; # PyPI tarball has no tests From 2cd5685649d7b2bafb72be0bbe05019f4cc7f29e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jan 2024 23:34:24 +0100 Subject: [PATCH 070/133] python311Packages.stravalib: refactor --- .../python-modules/stravalib/default.nix | 38 +++++++++---------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index df64dbebab50..174c583d0745 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -1,23 +1,23 @@ { lib +, arrow , buildPythonPackage , fetchPypi -, nose -, setuptools -, setuptools-scm -, wheel -, arrow -, requests -, units , pint , pydantic +, pythonOlder , pytz -, six +, requests +, responses +, setuptools +, setuptools-scm }: buildPythonPackage rec { pname = "stravalib"; version = "1.5"; - format = "pyproject"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; @@ -27,31 +27,29 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools setuptools-scm - wheel - ]; - - nativeCheckInputs = [ - nose ]; propagatedBuildInputs = [ arrow - requests - units pint pydantic pytz - six + requests + responses ]; - # tests require network access - # testing strava api + # Tests require network access, testing strava API doCheck = false; + pythonImportsCheck = [ + "stravalib" + ]; + meta = with lib; { description = "Python library for interacting with Strava v3 REST API"; homepage = "https://github.com/stravalib/stravalib"; + changelog = "https://github.com/stravalib/stravalib/releases/tag/v${version}"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ ]; }; } From e927b3b5cbf7e71d869cb44b8d20a6645bb2c99f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jan 2024 23:38:21 +0100 Subject: [PATCH 071/133] python311Packages.stravalib: doesn't support pydantic > 2 https://github.com/stravalib/stravalib/issues/379 --- pkgs/development/python-modules/stravalib/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/stravalib/default.nix b/pkgs/development/python-modules/stravalib/default.nix index 174c583d0745..f7e527eae146 100644 --- a/pkgs/development/python-modules/stravalib/default.nix +++ b/pkgs/development/python-modules/stravalib/default.nix @@ -51,5 +51,7 @@ buildPythonPackage rec { changelog = "https://github.com/stravalib/stravalib/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ ]; + # Support for pydantic > 2, https://github.com/stravalib/stravalib/issues/379 + broken = versionAtLeast pydantic.version "2"; }; } From 4757e347cf870ea62feb0c2d441877d4fcbad192 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 19 Jan 2024 02:05:51 +0100 Subject: [PATCH 072/133] python313: 3.13.0a2 -> 3.13.0a3 https://docs.python.org/3.13/whatsnew/changelog.html#python-3-13-0-alpha-3 --- pkgs/development/interpreters/python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 2674971670fe..7f60ba036c5f 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -109,9 +109,9 @@ in { major = "3"; minor = "13"; patch = "0"; - suffix = "a2"; + suffix = "a3"; }; - hash = "sha256-ttRrRBkMTAJCHraaBC0WsMVUgb3agYxsQW3CRBE6nC0="; + hash = "sha256-IHhMgwTrHGnID5ZuvfB3W+LjfiPfO2JGHuwSqF3Pfq0="; inherit (darwin) configd; inherit passthruFun; }; From ad77eac804d6ef23223f87c7b26ff5a612544ffd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 19 Jan 2024 05:33:53 +0100 Subject: [PATCH 073/133] libfilezilla: unpin gcc12 --- pkgs/top-level/all-packages.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b8239c855a2..f0a62a9bbf8b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22710,11 +22710,9 @@ with pkgs; libfido2 = callPackage ../development/libraries/libfido2 {}; - libfilezilla = - pin-to-gcc12-if-gcc13 - (darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla { - inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices; - }); + libfilezilla = darwin.apple_sdk_11_0.callPackage ../development/libraries/libfilezilla { + inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices; + }; libfishsound = callPackage ../development/libraries/libfishsound { }; From 6346bc8b6b49232231131b039a6f7aaabf55d4bf Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 19 Jan 2024 07:47:23 +0100 Subject: [PATCH 074/133] tinyssh: fix build with clang 16 --- pkgs/tools/networking/tinyssh/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/tinyssh/default.nix b/pkgs/tools/networking/tinyssh/default.nix index 41a9b1fcc87c..47c9ace513e8 100644 --- a/pkgs/tools/networking/tinyssh/default.nix +++ b/pkgs/tools/networking/tinyssh/default.nix @@ -19,6 +19,8 @@ stdenv.mkDerivation rec { echo /share/man > conf-man ''; + env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=implicit-function-declaration"; + DESTDIR = placeholder "out"; meta = with lib; { From 72badb5bef437ab8adcdaea2be3fba85ef07f013 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Jan 2024 08:59:34 +0100 Subject: [PATCH 075/133] python311Packages.betterproto: refactor --- .../python-modules/betterproto/default.nix | 28 ++++++++++++------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index f17fabec994f..38d69c6f8326 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -13,6 +13,7 @@ , pytestCheckHook , pytest-asyncio , pytest-mock +, typing-extensions , tomlkit , grpcio-tools }: @@ -20,21 +21,25 @@ buildPythonPackage rec { pname = "betterproto"; version = "2.0.0b6"; - format = "pyproject"; - disabled = pythonOlder "3.7"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "danielgtaylor"; repo = "python-betterproto"; - rev = "v.${version}"; + rev = "refs/tags/v.${version}"; hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI="; }; - nativeBuildInputs = [ poetry-core ]; + nativeBuildInputs = [ + poetry-core + ]; propagatedBuildInputs = [ grpclib python-dateutil + typing-extensions ]; passthru.optional-dependencies.compiler = [ @@ -43,16 +48,18 @@ buildPythonPackage rec { isort ]; - pythonImportsCheck = [ "betterproto" ]; - nativeCheckInputs = [ + grpcio-tools pydantic - pytestCheckHook pytest-asyncio pytest-mock + pytestCheckHook tomlkit - grpcio-tools - ] ++ passthru.optional-dependencies.compiler; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + + pythonImportsCheck = [ + "betterproto" + ]; # The tests require the generation of code before execution. This requires # the protoc-gen-python_betterproto script from the package to be on PATH. @@ -63,13 +70,14 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Clean, modern, Python 3.6+ code generator & library for Protobuf 3 and async gRPC"; + description = "Code generator & library for Protobuf 3 and async gRPC"; longDescription = '' This project aims to provide an improved experience when using Protobuf / gRPC in a modern Python environment by making use of modern language features and generating readable, understandable, idiomatic Python code. ''; homepage = "https://github.com/danielgtaylor/python-betterproto"; + changelog = "https://github.com/danielgtaylor/python-betterproto/blob/v.${version}/CHANGELOG.md"; license = licenses.mit; maintainers = with maintainers; [ nikstur ]; }; From 87937015847b6ec9052e29eda1bdaeefdfd1f815 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Jan 2024 09:00:20 +0100 Subject: [PATCH 076/133] python311Packages.betterproto: disable failing pydantic tests --- pkgs/development/python-modules/betterproto/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix index 38d69c6f8326..f5cc7d9253ea 100644 --- a/pkgs/development/python-modules/betterproto/default.nix +++ b/pkgs/development/python-modules/betterproto/default.nix @@ -69,6 +69,15 @@ buildPythonPackage rec { ${python.interpreter} -m tests.generate ''; + disabledTestPaths = [ + # https://github.com/danielgtaylor/python-betterproto/issues/530 + "tests/inputs/oneof/test_oneof.py" + ]; + + disabledTests = [ + "test_pydantic_no_value" + ]; + meta = with lib; { description = "Code generator & library for Protobuf 3 and async gRPC"; longDescription = '' From 9e3c863a43d05de134824d947aeb4e50c15dcac7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Jan 2024 09:13:45 +0100 Subject: [PATCH 077/133] python311Packages.sigstore: refactor --- .../python-modules/sigstore/default.nix | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix index ae64e1eb057b..cb58ac7eaeb8 100644 --- a/pkgs/development/python-modules/sigstore/default.nix +++ b/pkgs/development/python-modules/sigstore/default.nix @@ -1,27 +1,21 @@ { lib -, buildPythonPackage -, fetchFromGitHub - -# build-system -, flit-core - -# dependencies , appdirs +, buildPythonPackage , cryptography +, fetchFromGitHub +, flit-core , id , importlib-resources , pydantic , pyjwt , pyopenssl +, pytestCheckHook , requests , rich , securesystemslib , sigstore-protobuf-specs , sigstore-rekor-types , tuf - -# tests -, pytestCheckHook }: buildPythonPackage rec { @@ -32,7 +26,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "sigstore"; repo = "sigstore-python"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-WH6Pme8ZbfW5xqBT056eVJ3HZP1D/lAULtyN6k0uMaA="; }; @@ -67,7 +61,7 @@ buildPythonPackage rec { meta = with lib; { description = "A codesigning tool for Python packages"; homepage = "https://github.com/sigstore/sigstore-python"; - changelog = "https://github.com/sigstore/sigstore-python/blob/${src.rev}/CHANGELOG.md"; + changelog = "https://github.com/sigstore/sigstore-python/blob/${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From df25e98ea6359d32d3287a5022fa1578ef906e76 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Jan 2024 09:29:29 +0100 Subject: [PATCH 078/133] python311Packages.sigstore: disable failing tests --- .../python-modules/sigstore/default.nix | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix index cb58ac7eaeb8..24322a18723e 100644 --- a/pkgs/development/python-modules/sigstore/default.nix +++ b/pkgs/development/python-modules/sigstore/default.nix @@ -6,6 +6,7 @@ , flit-core , id , importlib-resources +, pretend , pydantic , pyjwt , pyopenssl @@ -16,6 +17,7 @@ , sigstore-protobuf-specs , sigstore-rekor-types , tuf +, pythonOlder }: buildPythonPackage rec { @@ -23,6 +25,8 @@ buildPythonPackage rec { version = "2.1.0"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "sigstore"; repo = "sigstore-python"; @@ -51,13 +55,31 @@ buildPythonPackage rec { ]; nativeCheckInputs = [ + pretend pytestCheckHook ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + pythonImportsCheck = [ "sigstore" ]; + disabledTests = [ + # Tests require network access + "test_fail_init_url" + "test_get_identity_token_bad_code" + "test_identity_proof_claim_lookup" + "test_init_url" + "test_production" + "test_sct_verify_keyring" + "test_sign_rekor_entry_consistent" + "test_verification_materials_retrieves_rekor_entry" + "test_verifier" + ]; + meta = with lib; { description = "A codesigning tool for Python packages"; homepage = "https://github.com/sigstore/sigstore-python"; From 38f34c95cbec82aaf4471731ff926b624f096d2f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Jan 2024 09:41:13 +0100 Subject: [PATCH 079/133] python312Packages.aiogithubapi: disable failing tests --- .../python-modules/aiogithubapi/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 3eb23c4a6641..94d2e9042c0d 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "aiogithubapi"; version = "23.11.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; - repo = pname; + repo = "aiogithubapi"; rev = "refs/tags/${version}"; hash = "sha256-SbpfHKD4QJuCe3QG0GTvsffkuFiGPLEUXOVW9f1gyTI="; }; @@ -31,7 +31,8 @@ buildPythonPackage rec { # are not in their focus substituteInPlace pyproject.toml \ --replace 'version = "0"' 'version = "${version}"' \ - --replace 'backoff = "^1.10.0"' 'backoff = "*"' + --replace 'backoff = "^1.10.0"' 'backoff = "*"' \ + --replace 'sigstore = "<2"' 'sigstore = "*"' ''; nativeBuildInputs = [ @@ -55,10 +56,19 @@ buildPythonPackage rec { "--asyncio-mode=auto" ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + pythonImportsCheck = [ "aiogithubapi" ]; + disabledTests = [ + # sigstore.errors.TUFError: Failed to refresh TUF metadata + "test_sigstore" + ]; + meta = with lib; { description = "Python client for the GitHub API"; homepage = "https://github.com/ludeeus/aiogithubapi"; From 5499bfeea5a0979cadf9e04154297a240d66f2a9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Jan 2024 10:18:51 +0100 Subject: [PATCH 080/133] python312Packages.aiogithubapi: enable darwin build --- pkgs/development/python-modules/aiogithubapi/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/aiogithubapi/default.nix b/pkgs/development/python-modules/aiogithubapi/default.nix index 94d2e9042c0d..59367acb041a 100644 --- a/pkgs/development/python-modules/aiogithubapi/default.nix +++ b/pkgs/development/python-modules/aiogithubapi/default.nix @@ -26,6 +26,8 @@ buildPythonPackage rec { hash = "sha256-SbpfHKD4QJuCe3QG0GTvsffkuFiGPLEUXOVW9f1gyTI="; }; + __darwinAllowLocalNetworking = true; + postPatch = '' # Upstream is releasing with the help of a CI to PyPI, GitHub releases # are not in their focus From 46e88f0fd7517d283be97476056581c2ed343093 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 12:19:54 +0000 Subject: [PATCH 081/133] batsignal: 1.6.4 -> 1.8.0 --- pkgs/applications/misc/batsignal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/batsignal/default.nix b/pkgs/applications/misc/batsignal/default.nix index abf3f53e32a8..94a1a45fe107 100644 --- a/pkgs/applications/misc/batsignal/default.nix +++ b/pkgs/applications/misc/batsignal/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "batsignal"; - version = "1.6.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "electrickite"; repo = "batsignal"; rev = version; - sha256 = "sha256-Z5j5tSIF3AZiZjkFFtyyi3hMqWMXtf6ont2CQ/FSEjk="; + sha256 = "sha256-yngd2yP6XtRp8y8ZUd0NISdf8+8wJvpLogrQQMdB0lA="; }; buildInputs = [ libnotify glib ]; From d07b693f03408af236b85fa7744b716aa1786e86 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 19 Jan 2024 20:44:33 +0800 Subject: [PATCH 082/133] pantheon.elementary-code: 7.1.0 -> 7.2.0 https://github.com/elementary/code/compare/7.1.0...7.2.0 --- pkgs/desktops/pantheon/apps/elementary-code/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 5a3233028ce0..9ecf59d2db6f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "elementary-code"; - version = "7.1.0"; + version = "7.2.0"; src = fetchFromGitHub { owner = "elementary"; repo = "code"; rev = version; - sha256 = "sha256-Dtm0+NqDwfn5HUQEYtHTiyrpM3mHp1wUFOGaxH86YUo="; + sha256 = "sha256-6lvn8c+JfbtZQf5dtViosVqtt/RWL6B/MvksXqmCfFs="; }; nativeBuildInputs = [ From aaa2d4b7387c3965d2a8c9060257a51ef13da163 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 19 Jan 2024 08:42:56 -0500 Subject: [PATCH 083/133] llama-cpp: 1848->1892; add static build mode --- pkgs/by-name/ll/llama-cpp/package.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index 379673740aee..637fbc3435cc 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -19,6 +19,8 @@ , openblas , pkg-config , metalSupport ? stdenv.isDarwin && stdenv.isAarch64 && !openclSupport +, patchelf +, static ? true # if false will build the shared objects as well }: let @@ -29,13 +31,13 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "1848"; + version = "1892"; src = fetchFromGitHub { owner = "ggerganov"; repo = "llama.cpp"; rev = "refs/tags/b${finalAttrs.version}"; - hash = "sha256-KuomiKU9c06Ux/ZcqctFdPQykGtjDzArN+tElPJVQ60="; + hash = "sha256-FNyl8bR0rg6cixcqidqzk9rG62+CI/0BNvzHuUkBq1E="; }; postPatch = '' @@ -105,15 +107,26 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ lib.optionals blasSupport [ "-DLLAMA_BLAS=ON" "-DLLAMA_BLAS_VENDOR=OpenBLAS" + ] + ++ lib.optionals (!static) [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) ]; installPhase = '' runHook preInstall mkdir -p $out/bin + ${lib.optionalString (!static) '' + mkdir $out/lib + cp libggml_shared.so $out/lib + cp libllama.so $out/lib + ''} for f in bin/*; do test -x "$f" || continue + ${lib.optionalString (!static) '' + ${patchelf}/bin/patchelf "$f" --set-rpath "$out/lib" + ''} cp "$f" $out/bin/llama-cpp-"$(basename "$f")" done From bec1df4c3855cb59dffacb43ad1d49cf56323f18 Mon Sep 17 00:00:00 2001 From: happysalada Date: Fri, 19 Jan 2024 09:20:43 -0500 Subject: [PATCH 084/133] nsjail: fix build --- pkgs/tools/security/nsjail/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index a92aa5f21041..23b938a83f9a 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation rec { buildInputs = [ libnl protobuf protobufc ]; enableParallelBuilding = true; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" ]; + preBuild = '' makeFlagsArray+=(USER_DEFINES='-DNEWUIDMAP_PATH=${shadow}/bin/newuidmap -DNEWGIDMAP_PATH=${shadow}/bin/newgidmap') ''; From 781b05613f11d143067a101014e150f82632c303 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jan 2024 05:25:28 +0000 Subject: [PATCH 085/133] girara: 0.4.1 -> 0.4.2 --- pkgs/applications/misc/girara/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index d5a0f09e451b..18cfd01229ae 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "girara"; - version = "0.4.1"; + version = "0.4.2"; outputs = [ "out" "dev" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "pwmt"; repo = "girara"; rev = version; - sha256 = "sha256-47ff7NBunVvYlCEQN/LwTRG33aButisVvdwxlh28LUM="; + hash = "sha256-/9pj6gB46sKIilImDGdJ8H7UHip/z5ckZWZnJLw/0YU="; }; nativeBuildInputs = [ From b5fdff1df6c5ed5152a9e5aa8a29efcc634c7a22 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Jan 2024 08:03:49 +0100 Subject: [PATCH 086/133] python311Packages.python-kasa: 0.5.4 -> 0.6.0 Diff: https://github.com/python-kasa/python-kasa/compare/refs/tags/0.5.4...0.6.0 Changelog: https://github.com/python-kasa/python-kasa/blob/0.6.0/CHANGELOG.md --- .../python-modules/python-kasa/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index dd2b64173794..f1b8467bda18 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -1,8 +1,10 @@ { lib +, aiohttp , anyio , async-timeout , asyncclick , buildPythonPackage +, cryptography , fetchFromGitHub , kasa-crypt , orjson @@ -17,16 +19,16 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.5.4"; - format = "pyproject"; + version = "0.6.0"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "python-kasa"; + repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-wGPMrYaTtKkkNW88eyiiciFcBSTRqqChYi6e15WUCHo="; + hash = "sha256-JFd9Ka/96Y4nu2HnL/Waf5EBKb06+7rZdI72F8G472I="; }; nativeBuildInputs = [ @@ -34,9 +36,11 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + aiohttp anyio async-timeout asyncclick + cryptography pydantic ]; From 370cda8344a6cf0a98c0cb6dcb2f4ea31fead016 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 8 Jan 2024 09:48:54 +0000 Subject: [PATCH 087/133] goa: 3.14.1 -> 3.14.4 --- pkgs/development/tools/goa/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/goa/default.nix b/pkgs/development/tools/goa/default.nix index 0290eda782b9..e9a2f398a7bf 100644 --- a/pkgs/development/tools/goa/default.nix +++ b/pkgs/development/tools/goa/default.nix @@ -5,15 +5,15 @@ buildGoModule rec { pname = "goa"; - version = "3.14.1"; + version = "3.14.4"; src = fetchFromGitHub { owner = "goadesign"; repo = "goa"; rev = "v${version}"; - sha256 = "sha256-acF9y0EHjALB+h/mf96MfCUlSTvp3QdhwEbu3gBA/y4="; + hash = "sha256-BwXO03q/vG6DWon0jhGNYckF8DHzaN9RtrX452VC6ls="; }; - vendorHash = "sha256-RI2UMmdFCNo6iE9MnWwsJtholjF4jNbCNNLk8nylgtc="; + vendorHash = "sha256-z4oXiGEcXKZTS57p/3gHhCCUDKh/imNu2n5e6+6BjKg="; subPackages = [ "cmd/goa" ]; From 005cec53888a87e9479a50d339fc374edddc0c4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 18:19:45 +0000 Subject: [PATCH 088/133] cargo-watch: 8.5.1 -> 8.5.2 --- pkgs/development/tools/rust/cargo-watch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-watch/default.nix b/pkgs/development/tools/rust/cargo-watch/default.nix index aadecc823bbe..fe748a7dbeb5 100644 --- a/pkgs/development/tools/rust/cargo-watch/default.nix +++ b/pkgs/development/tools/rust/cargo-watch/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-watch"; - version = "8.5.1"; + version = "8.5.2"; src = fetchFromGitHub { owner = "watchexec"; repo = pname; rev = "v${version}"; - hash = "sha256-MzwifQsOSJt9wq8bhVAY6HqXP4Zs4+a2GcG79PdAiMY="; + hash = "sha256-Vf6BFr8MphaUJoHMtksbbVQb+jha7jowhktQCVFxlxQ="; }; - cargoHash = "sha256-wyyIZ7i1icvD53hnUM4H/kvxj6K/pVzAAvKKp5LzwTE="; + cargoHash = "sha256-skUG1B6TCFEXeQSRwA6vWjXmNifk5bTR4+JESw7CZMo="; buildInputs = lib.optionals stdenv.isDarwin [ Foundation Cocoa ]; From f4c3c9e4eb8082327a5fc1956e7a55f22ecfebcb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 19:10:25 +0000 Subject: [PATCH 089/133] python311Packages.openwebifpy: 4.0.4 -> 4.2.1 --- pkgs/development/python-modules/openwebifpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openwebifpy/default.nix b/pkgs/development/python-modules/openwebifpy/default.nix index 48d5ba86ff75..3d2da5207656 100644 --- a/pkgs/development/python-modules/openwebifpy/default.nix +++ b/pkgs/development/python-modules/openwebifpy/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "openwebifpy"; - version = "4.0.4"; + version = "4.2.1"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-mGCi3nFnyzA+yKD5qtpErXYjOA6liZRiy7qJTbTGGnQ="; + hash = "sha256-dCgbMyyVmYGPV8GyZUrMR+IO8nGoQ//dnmHmhFH2iJo="; }; nativeBuildInputs = [ From 906f27817ecfa4f8a2e23d2ee8fc8ffc73f726ca Mon Sep 17 00:00:00 2001 From: douglaz Date: Thu, 18 Jan 2024 15:35:29 +0000 Subject: [PATCH 090/133] nvidia-x11: fix typo --- pkgs/os-specific/linux/nvidia-x11/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index bd57c19db335..dcfca7f99d26 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -120,7 +120,7 @@ rec { }; legacy_340 = let - # Source cooresponding to https://aur.archlinux.org/packages/nvidia-340xx-dkms + # Source corresponding to https://aur.archlinux.org/packages/nvidia-340xx-dkms aurPatches = fetchFromGitHub { owner = "archlinux-jerry"; repo = "nvidia-340xx"; From e7089d9dcdf67b3c1b548b89272d325f206fcf73 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 19:55:41 +0000 Subject: [PATCH 091/133] python311Packages.r2pipe: 1.8.4 -> 1.8.8 --- pkgs/development/python-modules/r2pipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 67acfee32d73..ab043450e40e 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.8.4"; + version = "1.8.8"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -31,7 +31,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-dy0+q1i/rE+eIQUZXX9S4y2RiOBM0Kc49PqdvtFAE90="; + hash = "sha256-wAOmO5bev1zgPcJoiqKlS4anUKayo8HsncQXM+b1clQ="; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't From 8fa9aa650eea38c8defa35e9e8dabd095256cb7a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 20:31:38 +0000 Subject: [PATCH 092/133] temporal: 1.22.3 -> 1.22.4 --- pkgs/applications/networking/cluster/temporal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix index 63b00032f725..f28d0157c830 100644 --- a/pkgs/applications/networking/cluster/temporal/default.nix +++ b/pkgs/applications/networking/cluster/temporal/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "temporal"; - version = "1.22.3"; + version = "1.22.4"; src = fetchFromGitHub { owner = "temporalio"; repo = "temporal"; rev = "v${version}"; - hash = "sha256-iqJzvnueUnIyu3Z6a5Ht90arHaHgM4COCDdZo7Qvzuk="; + hash = "sha256-M/2Zm9B2VeA2BKcF7A7R1Y7T61VZiU2uKGwxGgdy4Sg="; }; vendorHash = "sha256-Aum5OsdJ69MkP8tXXGWa6IdouX6F4xKjD/ndAqShMhw="; From 7116138c268af44446ccfd18721a7ce19976b105 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jan 2024 20:59:29 +0000 Subject: [PATCH 093/133] python311Packages.thefuzz: 0.20.0 -> 0.22.1 --- pkgs/development/python-modules/thefuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/thefuzz/default.nix b/pkgs/development/python-modules/thefuzz/default.nix index 8d240fe19e3e..1297ef2895c1 100644 --- a/pkgs/development/python-modules/thefuzz/default.nix +++ b/pkgs/development/python-modules/thefuzz/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "thefuzz"; - version = "0.20.0"; + version = "0.22.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ol5JeGscRgPH/G4taea8ZgmCopGWmLU2/4NU4GMcxA0="; + hash = "sha256-cTgDmn7PVA2jI3kthZLvmQKx1563jBR9TyBmTeefNoA="; }; propagatedBuildInputs = [ levenshtein ]; From 20f07b4aa90974a569b313e889c6d21df6612415 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 20 Jan 2024 08:07:06 +0800 Subject: [PATCH 094/133] nixos/emacs: drop custom emacsclient desktop file This custom emacsclient desktop file was added[1] to Nixpkgs when the upstream did not provide one. Since an emacsclient desktop file is provided[2] by the upstream now, we should remove our custom one from Nixpkgs to reduce maintenance burden[3]. Fixes https://github.com/NixOS/nixpkgs/issues/245533 [1]: https://github.com/NixOS/nixpkgs/pull/35896 [2]: https://git.savannah.gnu.org/cgit/emacs.git/commit/etc/emacsclient.desktop?id=1a845a672dc73c8e98e6cb9bb734616e168e60ba [3]: https://git.savannah.gnu.org/cgit/emacs.git/commit/etc/emacsclient.desktop?id=1500e4b4329d4d3d0141263230d74e1b314373b1 --- nixos/modules/services/editors/emacs.nix | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 6f45be6640bc..ff6fd85d8a9b 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -15,25 +15,6 @@ let fi ''; - desktopApplicationFile = pkgs.writeTextFile { - name = "emacsclient.desktop"; - destination = "/share/applications/emacsclient.desktop"; - text = '' - [Desktop Entry] - Name=Emacsclient - GenericName=Text Editor - Comment=Edit text - MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++; - Exec=emacseditor %F - Icon=emacs - Type=Application - Terminal=false - Categories=Development;TextEditor; - StartupWMClass=Emacs - Keywords=Text;Editor; - ''; - }; - in { @@ -102,7 +83,7 @@ in wantedBy = if cfg.startWithGraphical then [ "graphical-session.target" ] else [ "default.target" ]; }; - environment.systemPackages = [ cfg.package editorScript desktopApplicationFile ]; + environment.systemPackages = [ cfg.package editorScript ]; environment.variables.EDITOR = mkIf cfg.defaultEditor (mkOverride 900 "emacseditor"); }; From d2275807afb5842688887b84abe0c6edcb06475a Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Sat, 20 Jan 2024 00:29:25 +0000 Subject: [PATCH 095/133] vscode: 1.85.1 -> 1.85.2 --- pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 9d094c9eaf29..0d1e46eee1b1 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -30,21 +30,21 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1z692zp413vgla0ln04rf2fnx0giy2rgglmi6q1jk9b7wmlrsrh1"; - x86_64-darwin = "00d143mgrx5s7qdsxp93j04wz2xcgm8rkb5gj1a2czjcjvpsyjmv"; - aarch64-linux = "1b5fjxfgjr7rak23kmnapqbbimd6f7q5fjiwbcclxwyl0cqa0d3j"; - aarch64-darwin = "0zv81nj767741i9p2i5ac5ql9pm9snz6lg1zqvvw3rps3d5vwysz"; - armv7l-linux = "11zms120dagscnxrr5xpivcxipbmahf2sy68a4bmcjk1nqnvcsgh"; + x86_64-linux = "0v702nvv971rwv1grp921ys2d1ig0aq0di7idc1lfikl5ka9b4wa"; + x86_64-darwin = "1cz1817gy8kx3pkfn80jdgsxmvfyrwiwbmq9mp0079s1zzcdy31k"; + aarch64-linux = "0bgdiv7nchwlird53r6q5k8ixljaf682w5ki2kx4bgsii83ih4px"; + aarch64-darwin = "0c5hy5z6k8jjdas7hn29wrmrxwixgrb5jdm1vfdbgqg43sslpgm4"; + armv7l-linux = "0h8y7mwfhf0ygnywwapblxgiskp9xjh3lpnvwhwbir3bs3v37bhh"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.85.1"; + version = "1.85.2"; pname = "vscode" + lib.optionalString isInsiders "-insiders"; # This is used for VS Code - Remote SSH test - rev = "0ee08df0cf4527e40edc9aa28f4b5bd38bbff2b2"; + rev = "8b3775030ed1a69b13e4f4c628c612102e30a681"; executableName = "code" + lib.optionalString isInsiders "-insiders"; longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders"; @@ -68,7 +68,7 @@ in src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - sha256 = "06672ynsr7bxzkgdi1ghmrb6ki0y1ypmakk7w51r599vi1bjfnr0"; + sha256 = "1gaq9f4jzdzhfxixb9al5f5pgn1w7lpccacvvy19hq89jzixbix0"; }; }; From c81959c76c25768b6437a8f922d8f3a427094fc9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 01:00:43 +0000 Subject: [PATCH 096/133] python311Packages.datadog: 0.47.0 -> 0.48.0 --- pkgs/development/python-modules/datadog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 9c314e6ea09a..ffcb24c85d9b 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.47.0"; + version = "0.48.0"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-R747LD1wmn9bcJ6xJu1P5sx5d9YY/lwVjdicKp99mRY="; + hash = "sha256-1NZhNYw+f4Afv+FRGPXM8Iub2bH0W4uRBgWWUoPtrWQ="; }; nativeBuildInputs = [ From c692d9eede73e54aaf9776600a9fd1d94d90d1bb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 01:19:30 +0000 Subject: [PATCH 097/133] skopeo: 1.14.0 -> 1.14.1 --- pkgs/development/tools/skopeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index a875bacb36af..cb7d184329cf 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -18,13 +18,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.14.0"; + version = "1.14.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - hash = "sha256-6PSxYM6u727vHf4FP0ju0TAuqj4R4bxQEdyZHvC4qBA="; + hash = "sha256-PYPlhlliqd6j3KbMgelg+spqXOl1ZnA0qd1Xyf8F4wY="; }; outputs = [ "out" "man" ]; From 4b066eda15cba6940410ff6a4c3797837b711a58 Mon Sep 17 00:00:00 2001 From: Raito Bezarius Date: Sat, 20 Jan 2024 02:19:50 +0100 Subject: [PATCH 098/133] azure-cli: `azure-mgmt-devtestlabs` has wrong SRI hash Nix does not care too much about this, but this is problematic for evaluators which are strict, like Tvix. In the future, my wish is that Nix becomes stricter on those SRI hashes as this is somewhat problematic to accept arbitrary padding. --- pkgs/tools/admin/azure-cli/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 9893e9e1e29c..e9fa2e7e7618 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -169,7 +169,7 @@ let }); azure-mgmt-devtestlabs = overrideAzureMgmtPackage super.azure-mgmt-devtestlabs "4.0.0" "zip" - "sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40=r"; + "sha256-WVScTEBo8mRmsQl7V0qOUJn7LNbIvgoAOVsG07KeJ40="; azure-mgmt-loganalytics = overrideAzureMgmtPackage super.azure-mgmt-loganalytics "13.0.0b4" "zip" "sha256-Jm1t7v5vyFjNNM/evVaEI9sXJKNwJk6XAXuJSRSnKHk="; From f38810cdb19eec324df9c9df76564b27accbdff5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 01:43:36 +0000 Subject: [PATCH 099/133] python311Packages.dict2xml: 1.7.3 -> 1.7.4 --- pkgs/development/python-modules/dict2xml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index c032eef5f4e3..6626aa7567bf 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "dict2xml"; - version = "1.7.3"; + version = "1.7.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "delfick"; repo = "python-dict2xml"; rev = "refs/tags/release-${version}"; - hash = "sha256-0Ahc+8pb1gHvcpnYhKAJYLIaQ5Wbp7Q8clzMVcnVdYs="; + hash = "sha256-58sWvdkbt+czo96RUxB2vdOl/wqSU3BNIozSEdixWO8="; }; nativeBuildInputs = [ From d07fb3e692821e778c75bd86c0a5b0ae8013dcb8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 01:52:48 +0000 Subject: [PATCH 100/133] codux: 15.17.2 -> 15.18.1 --- pkgs/applications/editors/codux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/codux/default.nix b/pkgs/applications/editors/codux/default.nix index 846050ae561f..0b94ce4337e8 100644 --- a/pkgs/applications/editors/codux/default.nix +++ b/pkgs/applications/editors/codux/default.nix @@ -5,11 +5,11 @@ let pname = "codux"; - version = "15.17.2"; + version = "15.18.1"; src = fetchurl { url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage"; - sha256 = "sha256-6y3c9SbRxGhfND0bsMh0yYs7Dy8B23VSjj4qQ/2eBos="; + sha256 = "sha256-/U3byPCaeDIFoZX3TY+FbIZQWALOoDEwEtNg6RH86GM="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 0a28604b512b11e3c883826a16f8674bc5b14474 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 02:42:04 +0000 Subject: [PATCH 101/133] pmtiles: 1.12.0 -> 1.13.0 --- pkgs/by-name/pm/pmtiles/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix index ffb24053f090..e7bb80a56f46 100644 --- a/pkgs/by-name/pm/pmtiles/package.nix +++ b/pkgs/by-name/pm/pmtiles/package.nix @@ -1,16 +1,16 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "pmtiles"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "protomaps"; repo = "go-pmtiles"; rev = "v${version}"; - hash = "sha256-8gd6p4AAevtRkb/IZAXfxz8lioySf3s8lT6moi1IoWc="; + hash = "sha256-Zxf8o0+Vc4l8XV9vYGEWxXSr+KyzTqZNxbgaZtkJ+JQ="; }; - vendorHash = "sha256-gLFwGEUeH41bObG32MZznF7clct3h2GEvdZ2/KIiVb4="; + vendorHash = "sha256-Y32vDgF7BNjSyGtwgsJdoRy2gGDfhTKtYpSjTjp5dnI="; ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ]; From 3921a42c60f2f75caa0d9155d09d0623921f898e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 03:36:45 +0000 Subject: [PATCH 102/133] pict-rs: 0.5.0 -> 0.5.1 --- pkgs/servers/web-apps/pict-rs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/pict-rs/default.nix b/pkgs/servers/web-apps/pict-rs/default.nix index 00975cc95fec..9a73f738e194 100644 --- a/pkgs/servers/web-apps/pict-rs/default.nix +++ b/pkgs/servers/web-apps/pict-rs/default.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage rec { pname = "pict-rs"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitea { domain = "git.asonix.dog"; owner = "asonix"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0NlLCUOg7Uk10MCjeqJCTcNidLPddkIBBl5mO8yXCAY="; + sha256 = "sha256-m0je0SfyjeMDJP/OTx41Goc6mcNavnlSDBZS5Uqw0p0="; }; - cargoHash = "sha256-IyVt+O+ISjJ2R//Na7z0HhDB6bGO/+Qpq34y1NUSufU="; + cargoHash = "sha256-O92m3Va8BAPZyDc4arufSkeHxGC8QpwOPx9FAG0A+TE="; # needed for internal protobuf c wrapper library PROTOC = "${protobuf}/bin/protoc"; From 7eea7beafd27a90eec82f31f7f8799dd168d4d67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 04:10:53 +0000 Subject: [PATCH 103/133] zfs-replicate: 3.1.4 -> 3.2.3 --- pkgs/tools/backup/zfs-replicate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index b5cd6b9e50c2..20a02fc72167 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "zfs_replicate"; - version = "3.1.4"; + version = "3.2.3"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-mRINo20/uFlWtP5W7w+D2E9o89hlAsqZmBjuv0qWP9k="; + hash = "sha256-uzA8cQTUWAGLEhISZhaU6hNe9xcsF9jPZ1ETOi1XIFc="; }; postPatch = '' From f4029e21d65ca25f97150f44dd06d650bc192694 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 04:15:33 +0000 Subject: [PATCH 104/133] awscli2: 2.15.0 -> 2.15.12 --- pkgs/tools/admin/awscli2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix index 6a9d9396df17..feeb438df681 100644 --- a/pkgs/tools/admin/awscli2/default.nix +++ b/pkgs/tools/admin/awscli2/default.nix @@ -41,14 +41,14 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli2"; - version = "2.15.0"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.15.12"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-02KGaYMVlNFPhWBhRIgwhm7FcwT7cBxKv6HDXjqpn5s="; + hash = "sha256-1qvtImffj35+J9mPVLCgJE3porpF4DnlsRBW0ihzg10="; }; postPatch = '' From cdd6a1411563df3f04268f8154371d8a262f5827 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 05:00:13 +0000 Subject: [PATCH 105/133] php81Extensions.relay: 0.6.8 -> 0.7.0 --- .../php-packages/relay/default.nix | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix index d21667aa0622..ee393c91d568 100644 --- a/pkgs/development/php-packages/relay/default.nix +++ b/pkgs/development/php-packages/relay/default.nix @@ -13,42 +13,42 @@ }: let - version = "0.6.8"; + version = "0.7.0"; hashes = { "aarch64-darwin" = { platform = "darwin-arm64"; hash = { - "8.0" = "sha256-DDn5JcRux8DN1728cqMWL7eMwueiY+jO/+fw2+ND394="; - "8.1" = "sha256-4r954EKFUA45G55MpnnKcYONCNe45dIffiygs6r8OOI="; - "8.2" = "sha256-qB2IWSsyAKzbUxjt2nz5uLp7PkgPPna1mEBqvz8oTHc="; - "8.3" = "sha256-0s+4zNknH8lEfGS8oU3JjVEuX3mZEo9AULE0hlv11mQ="; + "8.0" = "sha256-pd/9TWZPgAfmVM0/QVYRHu5k4gANcxCSnfAl38irO0Y="; + "8.1" = "sha256-OpxE/nu8MZedTmKGQeyJm36pyyHlRpW11avuGcnGP68="; + "8.2" = "sha256-+CMPdXZotUr43Qda1FwGpuWPEE1K4RuBNE9fiokAtoY="; + "8.3" = "sha256-lbKVxOd5gK5VDGnJ42w7L5DFKsBQDZXgEZLR/Y0gP88="; }; }; "aarch64-linux" = { platform = "debian-aarch64+libssl3"; hash = { - "8.0" = "sha256-tLrampq1BBrhC+F/v2vcNBJp+16wzjHC8CGFKSswPUo="; - "8.1" = "sha256-DQG3maP9ImwSCTEmP152l5wr7A964lg9kNFAmVQhPqA="; - "8.2" = "sha256-3Ygb2J+MFL+H1zsepBaQKg/ybqgXVwFWt2QrNRctT8o="; - "8.3" = "sha256-MKpN09+Ai9NFARUEL+pkxQxbpRpFTx78als8ViXMdB8="; + "8.0" = "sha256-NfeC3p0YLYz3NbjzjMRRuzMsnYe9JRwlBjddAG2WV7g="; + "8.1" = "sha256-kvO0PE3BSgFSfe1zHh3WnygQfVV+5V0YFfClBim1Kj4="; + "8.2" = "sha256-illxRqqwMKVNAp6BD+mktKDccM7B/Q1W1KF9UB6aMUQ="; + "8.3" = "sha256-QdB7g+ePJU8qt/BVo1CFnQ2vfkqR29WueBy3dLOOaR0="; }; }; "x86_64-darwin" = { platform = "darwin-x86-64"; hash = { - "8.0" = "sha256-jYnhJowVgryKSec+rOfyBiH2gZyasr1h1I+sjPiLods="; - "8.1" = "sha256-VKvVo6so0NOfiq7JjnanBEUDa1Iqmkn9egKnOJSCHTg="; - "8.2" = "sha256-WXWhSljy199UbZiEjfC50XvnKfVEU54lPa6e2+jCqiQ="; - "8.3" = "sha256-CrJoONSm0aXlBWjsRqAJC39qB4tHkMuLAvM5d847DsE="; + "8.0" = "sha256-rd3pt2N22bF4a8OOwksI7KJjR91IoxHwk3LcKuHSpV0="; + "8.1" = "sha256-Y/moZrBe4rooQBSQKS8vPCTjviHKy4O7d4T1kD3udC4="; + "8.2" = "sha256-H3EWFk/ZmE+fSU98nLHyq1p1vtU/TYp28OzNLox6kYY="; + "8.3" = "sha256-vZTarrauo7U2JLOXUCwmu2h+vBtWZpm0Q39KkuLyVgY="; }; }; "x86_64-linux" = { platform = "debian-x86-64+libssl3"; hash = { - "8.0" = "sha256-kzPlotJWsUIhYUFUwcXEBGv5eNfCNLDNgrs+IqZPH5c="; - "8.1" = "sha256-QBnKHXBW2XpD4GvphzyMPiIrOfs9pzyG2Fv/VyV+h9k="; - "8.2" = "sha256-yk+dkULtWVIccKurBdT96HOPbW8Q9l44iYpAAcoZYog="; - "8.3" = "sha256-MpMupGFGxipghoA57EOytSsDsm9b25rc/VPIza+QMfM="; + "8.0" = "sha256-jq/nHC9IGevYBqbM08nF71P9jH6z4NB8s1NdjHOfXQA="; + "8.1" = "sha256-vbFONNHpuSTQsZMrAIdGEoBl5ySchcFkSuhW5uZKbWg="; + "8.2" = "sha256-mXUAMkxwtuPZbIyCybBcxpmaBplr5h59pZEdgJ3PWtA="; + "8.3" = "sha256-YL0P8GtFkV0cmJX1y6wd/HtA0LFzeuOcKDLUCagxHxE="; }; }; }; From 5cf38a5f35d58379ed7fad229fbd821ae23db1c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 05:07:27 +0000 Subject: [PATCH 106/133] extism-cli: 0.3.9 -> 1.0.1 --- pkgs/development/tools/extism-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/extism-cli/default.nix b/pkgs/development/tools/extism-cli/default.nix index 3ac24cb22936..d403a551d3c8 100644 --- a/pkgs/development/tools/extism-cli/default.nix +++ b/pkgs/development/tools/extism-cli/default.nix @@ -7,18 +7,18 @@ buildGoModule rec { pname = "extism-cli"; - version = "0.3.9"; + version = "1.0.1"; src = fetchFromGitHub { owner = "extism"; repo = "cli"; rev = "refs/tags/v${version}"; - hash = "sha256-t53VJOc1umIwPyS6hkAm+u9KsKiYas4iRrlraofJSEY="; + hash = "sha256-+8/xyHL+Dvm8Z5DXk1VkmFYP7Gg/YadIyc3xI9L0Jow="; }; modRoot = "./extism"; - vendorHash = "sha256-Ukbg2CG2qeLmM9HijKXZY/fEY2QfJXTyaTIsEDT5W6E="; + vendorHash = "sha256-kJnYp4X4dzkpXw0j7CI3Q3GdCQrCzslZxz2/IkVPqMk="; nativeBuildInputs = [ installShellFiles ]; From e636c0dad77e6a728f47ec0ac44fcd32c214b874 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 20 Jan 2024 06:08:21 +0100 Subject: [PATCH 107/133] libhdhomerun: refactor Co-authored-by: Nicholas Sielicki --- .../libraries/libhdhomerun/default.nix | 15 +++--- .../nixos-darwin-no-fat-dylib.patch | 52 +++++++++++++++++++ 2 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch diff --git a/pkgs/development/libraries/libhdhomerun/default.nix b/pkgs/development/libraries/libhdhomerun/default.nix index c6fb327d0d2a..558e6d6fa894 100644 --- a/pkgs/development/libraries/libhdhomerun/default.nix +++ b/pkgs/development/libraries/libhdhomerun/default.nix @@ -10,30 +10,33 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.silicondust.com/hdhomerun/libhdhomerun_${version}.tgz"; - sha256 = "sha256-VSoQLoqiq8xBYJDewvb4DaWfl/kfV5aOnp17PcAF268="; + hash = "sha256-VSoQLoqiq8xBYJDewvb4DaWfl/kfV5aOnp17PcAF268="; }; - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace Makefile \ - --replace "-arch x86_64" "-arch ${stdenv.hostPlatform.darwinArch}" - ''; + patches = [ + ./nixos-darwin-no-fat-dylib.patch + ]; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' + runHook preInstall + mkdir -p $out/{bin,lib,include/hdhomerun} install -Dm444 libhdhomerun${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib install -Dm555 hdhomerun_config $out/bin cp *.h $out/include/hdhomerun + + runHook postInstall ''; meta = with lib; { description = "Implements the libhdhomerun protocol for use with Silicondust HDHomeRun TV tuners"; homepage = "https://www.silicondust.com/support/linux"; license = licenses.lgpl21Only; + maintainers = with maintainers; [ sielicki titanous ]; platforms = platforms.unix; - maintainers = [ maintainers.titanous ]; }; } diff --git a/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch b/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch new file mode 100644 index 000000000000..99c389a19434 --- /dev/null +++ b/pkgs/development/libraries/libhdhomerun/nixos-darwin-no-fat-dylib.patch @@ -0,0 +1,52 @@ +From 6b9ed19d7874b88b7db5b740dac3dcd7dcda6c8c Mon Sep 17 00:00:00 2001 +From: Nicholas Sielicki +Date: Sat, 25 Nov 2023 13:54:39 -0600 +Subject: [PATCH] nixos-darwin-no-fat-dylib + +Signed-off-by: Nicholas Sielicki +--- + Makefile | 24 ++++-------------------- + 1 file changed, 4 insertions(+), 20 deletions(-) + +diff --git a/Makefile b/Makefile +index 1d8fb9f..35c7d15 100644 +--- a/Makefile ++++ b/Makefile +@@ -42,30 +42,14 @@ LIBSRCS += hdhomerun_video.c + + ifeq ($(OS),Darwin) + +-TARGET_X64 := -target x86_64-apple-macos10.11 +-TARGET_ARM64 := -target arm64-apple-macos11 +- + all : hdhomerun_config libhdhomerun.dylib + +-hdhomerun_config_x64 : hdhomerun_config.c $(LIBSRCS) +- $(CC) $(TARGET_X64) $(CFLAGS) $+ $(LDFLAGS) -o $@ +- $(STRIP) $@ +- +-hdhomerun_config_arm64 : hdhomerun_config.c $(LIBSRCS) +- $(CC) $(TARGET_ARM64) $(CFLAGS) $+ $(LDFLAGS) -o $@ ++hdhomerun_config: hdhomerun_config.c $(LIBSRCS) ++ $(CC) $(CFLAGS) $+ $(LDFLAGS) -o $@ + $(STRIP) $@ + +-hdhomerun_config : hdhomerun_config_x64 hdhomerun_config_arm64 +- lipo -create -output hdhomerun_config hdhomerun_config_x64 hdhomerun_config_arm64 +- +-libhdhomerun_x64.dylib : $(LIBSRCS) +- $(CC) $(TARGET_X64) $(CFLAGS) -DDLL_EXPORT -fPIC -dynamiclib $+ $(LDFLAGS) -o $@ +- +-libhdhomerun_arm64.dylib : $(LIBSRCS) +- $(CC) $(TARGET_ARM64) $(CFLAGS) -DDLL_EXPORT -fPIC -dynamiclib $+ $(LDFLAGS) -o $@ +- +-libhdhomerun.dylib : libhdhomerun_x64.dylib libhdhomerun_arm64.dylib +- lipo -create -output libhdhomerun.dylib libhdhomerun_x64.dylib libhdhomerun_arm64.dylib ++libhdhomerun.dylib : $(LIBSRCS) ++ $(CC) $(CFLAGS) -DDLL_EXPORT -fPIC -dynamiclib $+ $(LDFLAGS) -o $@ + + else + +-- +2.42.0 + From 98c69a922b472c67f79902537925c7859cf58727 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 20 Jan 2024 06:17:23 +0100 Subject: [PATCH 108/133] mythtv: enable parallel building --- pkgs/applications/video/mythtv/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 7ea9a532a725..0f355577a6a4 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -43,6 +43,8 @@ mkDerivation rec { configureFlags = [ "--dvb-path=${linuxHeaders}/include" ]; + enableParallelBuilding = true; + meta = with lib; { homepage = "https://www.mythtv.org/"; description = "Open Source DVR"; From 07f610799d280808e2d2ab43da4413cf412f876a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 06:21:01 +0000 Subject: [PATCH 109/133] arxiv-latex-cleaner: 1.0.1 -> 1.0.3 --- pkgs/by-name/ar/arxiv-latex-cleaner/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix index c1f4a8a3d75b..d2d75a2d284a 100644 --- a/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix +++ b/pkgs/by-name/ar/arxiv-latex-cleaner/package.nix @@ -5,13 +5,13 @@ }: python3Packages.buildPythonApplication rec { pname = "arxiv-latex-cleaner"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "google-research"; repo = "arxiv-latex-cleaner"; - rev = "v${version}"; - hash = "sha256-1IWSDKEoAM4hBKAEEcPq7X89WYDprifDL2GTEJQtdcQ="; + rev = "refs/tags/v${version}"; + hash = "sha256-kM1eCzXipJ6GuYFA9Na2C0HtwHLotmE63nyUZ+9wkkk="; }; propagatedBuildInputs = with python3Packages; [ From 35af3daa7d713d144b48cb9b213de7d7c0effa2e Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sat, 20 Jan 2024 14:42:31 +0800 Subject: [PATCH 110/133] clipcat: 0.16.1 -> 0.16.2 Diff: https://github.com/xrelkd/clipcat/compare/v0.16.1...v0.16.2 --- pkgs/applications/misc/clipcat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/clipcat/default.nix b/pkgs/applications/misc/clipcat/default.nix index 8de62f1a2296..f7c4ad677102 100644 --- a/pkgs/applications/misc/clipcat/default.nix +++ b/pkgs/applications/misc/clipcat/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "clipcat"; - version = "0.16.1"; + version = "0.16.2"; src = fetchFromGitHub { owner = "xrelkd"; repo = pname; rev = "v${version}"; - hash = "sha256-SqA8UjKTBtkE1IkWGeshI8KBHr86V9r/+YvFZNJ6Oq8="; + hash = "sha256-01vjCs9ktDrULPL8IZraMPpa5+cw8vLtt4cKHKxHjK4="; }; - cargoHash = "sha256-KU3kXqy9zL7GQdSsCNW7jcsxdTuRXjJyDtBpmgoXi6E="; + cargoHash = "sha256-9L6w7adoQflOW5vxkIJf4FLF7xACx36sKaSPjJAtt3Y="; nativeBuildInputs = [ protobuf From 968731b42daeba4d372485c57588a017eb7f5907 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 06:48:54 +0000 Subject: [PATCH 111/133] ytt: 0.46.3 -> 0.47.0 --- pkgs/development/tools/ytt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 1df8887afe68..fc050ab9c9b6 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ytt"; - version = "0.46.3"; + version = "0.47.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-K2+5NplyQuvc78NnNDiQhfrewqn84jDbiAyN8J9iTm0="; + sha256 = "sha256-aoKgXagCygK4pzRHw5Nf8LCzpzZd2X77th9tJA5f1aA="; }; vendorHash = null; From 4bf464b846c8b64c4bdbdb458026b06dc9a3290a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 18 Jan 2024 09:29:28 +0100 Subject: [PATCH 112/133] python311Packages.boto3-stubs: 1.34.20 -> 1.34.21 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 85a58ae3711c..e9c8124f0445 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.20"; + version = "1.34.21"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-QxhR6oK4WW+PpJ3nAUVUrg8vosxqCVRFl4ejuTh5bGg="; + hash = "sha256-noltqNrX9+GeFmfRaCEmT2TR/p/qUfBUCV5cWM0PZNU="; }; nativeBuildInputs = [ From 31525a95e3ef3f4f6236e01cb718b30208213eb9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 08:14:49 +0100 Subject: [PATCH 113/133] python311Packages.boto3-stubs: 1.34.21 -> 1.34.23 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index e9c8124f0445..f2d1d8ff1f8c 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -365,14 +365,14 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.21"; + version = "1.34.23"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-noltqNrX9+GeFmfRaCEmT2TR/p/qUfBUCV5cWM0PZNU="; + hash = "sha256-VNez2P7s72huTjRfNBvkxZGsjcxkExn7aSCudhuAt4Q="; }; nativeBuildInputs = [ From 2cebfbaa9f3284246ac9c10ab8d662dd8585179d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 08:15:22 +0100 Subject: [PATCH 114/133] python311Packages.botocore-stubs: 1.34.21 -> 1.34.23 --- pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix index a8164c800530..7dfb8dc31994 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.34.21"; + version = "1.34.23"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-xc3pikb8lNUNTs1GXdXGRQEiHJT+KJWmBt5cReyDdkM="; + hash = "sha256-aSfRj6JrFOhTJXO/BmIEDb+OOUOg9uNTEhziVXnlyUI="; }; nativeBuildInputs = [ From a0b5c9221fa24b00cfadecfd5e7790ce90b161ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 08:16:16 +0100 Subject: [PATCH 115/133] python311Packages.gitignore-parser: 0.1.10 -> 0.1.11 Diff: https://github.com/mherrmann/gitignore_parser/compare/refs/tags/v0.1.10...v0.1.11 Changelog: https://github.com/mherrmann/gitignore_parser/releases/tag/v0.1.11 --- pkgs/development/python-modules/gitignore-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/gitignore-parser/default.nix b/pkgs/development/python-modules/gitignore-parser/default.nix index 7f3b41b5899e..f2ec15a1444f 100644 --- a/pkgs/development/python-modules/gitignore-parser/default.nix +++ b/pkgs/development/python-modules/gitignore-parser/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "gitignore-parser"; - version = "0.1.10"; + version = "0.1.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "mherrmann"; repo = "gitignore_parser"; rev = "refs/tags/v${version}"; - hash = "sha256-uILXtozXRTOJeVpF1lpM19xaibebiwIMyHzdrlnfoec="; + hash = "sha256-y8A8OLgJccYWvKTJs7um8RwFFM0CswbwRojknBmk3TY="; }; nativeCheckInputs = [ From a40ba77503d3beea1bf9640893584daf57f643cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 08:18:06 +0100 Subject: [PATCH 116/133] python311Packages.gitignore-parser: refactor --- .../python-modules/gitignore-parser/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/gitignore-parser/default.nix b/pkgs/development/python-modules/gitignore-parser/default.nix index f2ec15a1444f..50239a9b2653 100644 --- a/pkgs/development/python-modules/gitignore-parser/default.nix +++ b/pkgs/development/python-modules/gitignore-parser/default.nix @@ -2,13 +2,14 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, setuptools , unittestCheckHook }: buildPythonPackage rec { pname = "gitignore-parser"; version = "0.1.11"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,6 +20,10 @@ buildPythonPackage rec { hash = "sha256-y8A8OLgJccYWvKTJs7um8RwFFM0CswbwRojknBmk3TY="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ unittestCheckHook ]; From 82c8d58710edb3ed11951bf13e1e5165b5a2f79d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jan 2024 07:19:47 +0000 Subject: [PATCH 117/133] vcmi: 1.4.2 -> 1.4.4 --- pkgs/games/vcmi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/vcmi/default.nix b/pkgs/games/vcmi/default.nix index fc4ac89fb1b9..d528e5be1807 100644 --- a/pkgs/games/vcmi/default.nix +++ b/pkgs/games/vcmi/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "vcmi"; - version = "1.4.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "vcmi"; repo = "vcmi"; rev = version; - hash = "sha256-C8WzEidTanWKPI/J2bEsi7sTMhn+FmykC55EsXZLLQ0="; + hash = "sha256-BUphJqIZkxhPGsiK9ubG3oL9ak2ekFze8chdK28qX3o="; }; nativeBuildInputs = [ From 6d1b499c70e4a62c52f50660b68a18ada0cb6b0f Mon Sep 17 00:00:00 2001 From: GetPsyched Date: Sat, 30 Dec 2023 01:19:37 +0530 Subject: [PATCH 118/133] mgitstatus: init at 2.2 --- pkgs/by-name/mg/mgitstatus/package.nix | 36 ++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 pkgs/by-name/mg/mgitstatus/package.nix diff --git a/pkgs/by-name/mg/mgitstatus/package.nix b/pkgs/by-name/mg/mgitstatus/package.nix new file mode 100644 index 000000000000..894a21cad75d --- /dev/null +++ b/pkgs/by-name/mg/mgitstatus/package.nix @@ -0,0 +1,36 @@ +{ fetchFromGitHub +, lib +, stdenvNoCC +, testers +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "mgitstatus"; + version = "2.2"; + + src = fetchFromGitHub { + owner = "fboender"; + repo = "multi-git-status"; + rev = finalAttrs.version; + hash = "sha256-jzoX7Efq9+1UdXQdhLRqBlhU3cBrk5AZblg9AYetItg="; + }; + + installFlags = [ + "PREFIX=$(out)" + ]; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + version = "v${finalAttrs.version}"; + }; + + meta = with lib; { + description = "Show uncommitted, untracked and unpushed changes for multiple Git repos"; + downloadPage = "https://github.com/fboender/multi-git-status/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/fboender/multi-git-status"; + license = licenses.mit; + maintainers = with maintainers; [ getpsyched ]; + mainProgram = "mgitstatus"; + platforms = platforms.all; + }; +}) From a9f63b6f1ab26363bb863d9caceeb5e78401a7cb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 08:22:28 +0100 Subject: [PATCH 119/133] python311Packages.habluetooth: 2.1.0 -> 2.2.0 Diff: https://github.com/Bluetooth-Devices/habluetooth/compare/refs/tags/v2.1.0...v2.2.0 Changelog: https://github.com/Bluetooth-Devices/habluetooth/blob/v2.2.0/CHANGELOG.md --- pkgs/development/python-modules/habluetooth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/habluetooth/default.nix b/pkgs/development/python-modules/habluetooth/default.nix index 9e347d9a1553..bdb5311e3c75 100644 --- a/pkgs/development/python-modules/habluetooth/default.nix +++ b/pkgs/development/python-modules/habluetooth/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "habluetooth"; - version = "2.1.0"; + version = "2.2.0"; pyproject = true; disabled = pythonOlder "3.10"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = "habluetooth"; rev = "refs/tags/v${version}"; - hash = "sha256-oPdKmaj2wKgOQw7QYwOQc8efcNtQiGryZgNJ+bbB6L8="; + hash = "sha256-iFMs4FXl82ZkOKNad0XY8Ci9gHwdkyzP5LiYJ4/uyzY="; }; postPatch = '' From 0d2443f2914048cf5f5a6cc9783b80443a10b6e7 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 20 Jan 2024 08:29:05 +0100 Subject: [PATCH 120/133] khronos-ocl-icd-loader: refactor --- .../libraries/khronos-ocl-icd-loader/default.nix | 12 +++++++----- .../libraries/khronos-ocl-icd-loader/tracing.patch | 13 ------------- 2 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix index b98909847369..57fe21a27c7b 100644 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix +++ b/pkgs/development/libraries/khronos-ocl-icd-loader/default.nix @@ -1,26 +1,28 @@ { lib, stdenv, fetchFromGitHub, opencl-headers, cmake, withTracing ? false }: stdenv.mkDerivation rec { - pname = "khronos-ocl-icd-loader"; + pname = "opencl-icd-loader"; version = "2023.12.14"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; rev = "v${version}"; - sha256 = "sha256-/4ixQAwJpygdg+qtR1ccBlz8hmtYYxRgUV5dlJabsg8="; + hash = "sha256-/4ixQAwJpygdg+qtR1ccBlz8hmtYYxRgUV5dlJabsg8="; }; - patches = lib.optional withTracing ./tracing.patch; - nativeBuildInputs = [ cmake ]; buildInputs = [ opencl-headers ]; + cmakeFlags = [ + (lib.cmakeBool "OCL_ICD_ENABLE_TRACE" withTracing) + ]; + meta = with lib; { description = "Official Khronos OpenCL ICD Loader"; homepage = "https://github.com/KhronosGroup/OpenCL-ICD-Loader"; license = licenses.asl20; - platforms = platforms.linux; maintainers = with maintainers; [ davidtwco ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch b/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch deleted file mode 100644 index cef22457e5a1..000000000000 --- a/pkgs/development/libraries/khronos-ocl-icd-loader/tracing.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/loader/icd.h b/loader/icd.h -index 34751e9..01a33fd 100644 ---- a/loader/icd.h -+++ b/loader/icd.h -@@ -123,7 +123,7 @@ void khrIcdContextPropertiesGetPlatform( - cl_platform_id *outPlatform); - - // internal tracing macros --#if 0 -+#if 1 - #include - #define KHR_ICD_TRACE(...) \ - do \ From a5e54cece9c64b0e02bc0aa4f998382be7a21f2b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 08:31:54 +0100 Subject: [PATCH 121/133] python311Packages.aioopenexchangerates: 0.4.5 -> 0.4.6 Diff: https://github.com/MartinHjelmare/aioopenexchangerates/compare/refs/tags/v0.4.5...v0.4.6 Changelog: https://github.com/MartinHjelmare/aioopenexchangerates/blob/v0.4.6/CHANGELOG.md --- .../python-modules/aioopenexchangerates/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix index 1cfee59a0003..744a940957b6 100644 --- a/pkgs/development/python-modules/aioopenexchangerates/default.nix +++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioopenexchangerates"; - version = "0.4.5"; + version = "0.4.6"; pyproject = true; disabled = pythonOlder "3.9"; @@ -21,11 +21,12 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aioopenexchangerates"; rev = "refs/tags/v${version}"; - hash = "sha256-4mvd5G4qpebocg74Kz/+XtJovDnGJJYPigyhke9YDjA="; + hash = "sha256-6lgjblCyc4NSnw+nlCH0SKV7f9aa4qcfa7v9pgzusKo="; }; postPatch = '' substituteInPlace pyproject.toml \ + --replace 'pydantic = "^1.9"' 'pydantic = "*"' \ --replace " --cov=aioopenexchangerates --cov-report=term-missing:skip-covered" "" ''; From 56666dfffdf116fde73d84f5a89df5fc6c3d23a8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 08:37:09 +0100 Subject: [PATCH 122/133] python311Packages.datadog: refactor --- pkgs/development/python-modules/datadog/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index ffcb24c85d9b..1375dd7e780a 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "datadog"; version = "0.48.0"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; From 1c1e99f922336929ca5edd610cf20048ffaca28a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 08:44:55 +0100 Subject: [PATCH 123/133] tell-me-your-secrets: relax pandas --- pkgs/tools/security/tell-me-your-secrets/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/tell-me-your-secrets/default.nix b/pkgs/tools/security/tell-me-your-secrets/default.nix index c01308e0de6e..a85a62fdfcc3 100644 --- a/pkgs/tools/security/tell-me-your-secrets/default.nix +++ b/pkgs/tools/security/tell-me-your-secrets/default.nix @@ -6,7 +6,7 @@ python3.pkgs.buildPythonApplication rec { pname = "tell-me-your-secrets"; version = "2.4.2"; - format = "pyproject"; + pyproject = true; src = fetchFromGitHub { owner = "valayDave"; @@ -17,6 +17,7 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "gitignore-parser" + "pandas" ]; nativeBuildInputs = with python3.pkgs; [ From ab8c456db872a5652ba83f8e2e10693acd26498e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 08:47:15 +0100 Subject: [PATCH 124/133] python311Packages.dict2xml: refactor --- pkgs/development/python-modules/dict2xml/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix index 6626aa7567bf..62fb5caa8efb 100644 --- a/pkgs/development/python-modules/dict2xml/default.nix +++ b/pkgs/development/python-modules/dict2xml/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "dict2xml"; version = "1.7.4"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; From adbb849cd197f2c0da28f6e35d217cb9c1428278 Mon Sep 17 00:00:00 2001 From: marble Date: Sun, 7 Jan 2024 21:46:36 +0100 Subject: [PATCH 125/133] elf2nucleus: init at 0.1.0 --- maintainers/maintainer-list.nix | 6 ++++ pkgs/by-name/el/elf2nucleus/package.nix | 39 +++++++++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/by-name/el/elf2nucleus/package.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9d7ca48ec832..a3da2c02e436 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11363,6 +11363,12 @@ githubId = 1651325; name = "maralorn"; }; + marble = { + email = "nixpkgs@computer-in.love"; + github = "cyber-murmel"; + githubId = 30078229; + name = "marble"; + }; marcovergueira = { email = "vergueira.marco@gmail.com"; github = "marcovergueira"; diff --git a/pkgs/by-name/el/elf2nucleus/package.nix b/pkgs/by-name/el/elf2nucleus/package.nix new file mode 100644 index 000000000000..c6cafbfc4578 --- /dev/null +++ b/pkgs/by-name/el/elf2nucleus/package.nix @@ -0,0 +1,39 @@ +{ + installShellFiles +, fetchFromGitHub +, lib +, micronucleus +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "elf2nucleus"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "kpcyrd"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-FAIOtGfGow+0DrPPEBEfvaiinNZLQlGWKJ4DkMj63OA="; + }; + + cargoSha256 = "sha256-IeQnI6WTzxSI/VzoHtVukZtB1jX98wzLOT01NMLD5wQ="; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = [ micronucleus ]; + + postInstall = '' + installShellCompletion --cmd elf2nucleus \ + --bash <($out/bin/elf2nucleus --completions bash) \ + --fish <($out/bin/elf2nucleus --completions fish) \ + --zsh <($out/bin/elf2nucleus --completions zsh) + ''; + + meta = with lib; { + description = "Integrate micronucleus into the cargo buildsystem, flash an AVR firmware from an elf file"; + homepage = "https://github.com/kpcyrd/elf2nucleus"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.marble ]; + }; +} From ca1c132b741cc0695814f4b2c0c1649775cdec45 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 10:08:33 +0100 Subject: [PATCH 126/133] python311Packages.reproject: refactor --- pkgs/development/python-modules/reproject/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/reproject/default.nix b/pkgs/development/python-modules/reproject/default.nix index 488a045211a1..bbab3a462dbb 100644 --- a/pkgs/development/python-modules/reproject/default.nix +++ b/pkgs/development/python-modules/reproject/default.nix @@ -4,7 +4,7 @@ , astropy-healpix , buildPythonPackage , cloudpickle -, cython +, cython_3 , dask , fetchPypi , fsspec @@ -21,9 +21,9 @@ buildPythonPackage rec { pname = "reproject"; version = "0.13.0"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchPypi { inherit pname version; @@ -37,7 +37,7 @@ buildPythonPackage rec { nativeBuildInputs = [ astropy-extension-helpers - cython + cython_3 numpy oldest-supported-numpy setuptools-scm @@ -75,6 +75,7 @@ buildPythonPackage rec { description = "Reproject astronomical images"; downloadPage = "https://github.com/astropy/reproject"; homepage = "https://reproject.readthedocs.io"; + changelog = "https://github.com/astropy/reproject/releases/tag/v${version}"; license = licenses.bsd3; maintainers = with maintainers; [ smaret ]; }; From 693308a6a9955289f94c2e10075588584329c242 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 10:15:20 +0100 Subject: [PATCH 127/133] python311Packages.niaaml: refactor --- .../python-modules/niaaml/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/niaaml/default.nix b/pkgs/development/python-modules/niaaml/default.nix index 4a4f175a8943..bc5d712913b8 100644 --- a/pkgs/development/python-modules/niaaml/default.nix +++ b/pkgs/development/python-modules/niaaml/default.nix @@ -5,28 +5,34 @@ , numpy , pandas , poetry-core -, scikit-learn -, toml-adapt , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook +, scikit-learn +, toml-adapt }: buildPythonPackage rec { pname = "niaaml"; version = "1.1.12"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "lukapecnik"; repo = "NiaAML"; - rev = version; + rev = "refs/tags/${version}"; hash = "sha256-GAUXEkUOD04DQtRG/RAeeeLmenBd25h18Lmrxbm4X3A="; }; + pythonRelaxDeps = [ + "pandas" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook toml-adapt ]; @@ -54,6 +60,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python automated machine learning framework"; homepage = "https://github.com/lukapecnik/NiaAML"; + changelog = "https://github.com/lukapecnik/NiaAML/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; From ae0fb9d8ee92d5dbd677fae13ff34f7710d6d017 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 10:15:57 +0100 Subject: [PATCH 128/133] python311Packages.niaclass: refactor --- .../python-modules/niaclass/default.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/niaclass/default.nix b/pkgs/development/python-modules/niaclass/default.nix index 89d8ae746aed..eca766c67a0f 100644 --- a/pkgs/development/python-modules/niaclass/default.nix +++ b/pkgs/development/python-modules/niaclass/default.nix @@ -5,28 +5,34 @@ , numpy , pandas , poetry-core -, scikit-learn -, toml-adapt , pytestCheckHook , pythonOlder +, pythonRelaxDepsHook +, scikit-learn +, toml-adapt }: buildPythonPackage rec { pname = "niaclass"; version = "0.1.4"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "lukapecnik"; repo = "NiaClass"; rev = "refs/tags/${version}"; - sha256 = "sha256-md1e/cOIOQKoB760E5hjzjCsC5tS1CzgqAPTeVtrmuo="; + hash = "sha256-md1e/cOIOQKoB760E5hjzjCsC5tS1CzgqAPTeVtrmuo="; }; + pythonRelaxDeps = [ + "pandas" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook toml-adapt ]; @@ -42,7 +48,7 @@ buildPythonPackage rec { toml-adapt -path pyproject.toml -a change -dep scikit-learn -ver X ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook ]; @@ -53,6 +59,7 @@ buildPythonPackage rec { meta = with lib; { description = "A framework for solving classification tasks using Nature-inspired algorithms"; homepage = "https://github.com/lukapecnik/NiaClass"; + changelog = "https://github.com/lukapecnik/NiaClass/releases/tag/${version}"; license = licenses.mit; maintainers = with maintainers; [ firefly-cpp ]; }; From 10c9931a52e6097714a2ddbe3f8aba24efe37dbf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 10:16:12 +0100 Subject: [PATCH 129/133] python311Packages.nianet: refactor --- pkgs/development/python-modules/nianet/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/nianet/default.nix b/pkgs/development/python-modules/nianet/default.nix index 4adca2e5b701..d91f278a5906 100644 --- a/pkgs/development/python-modules/nianet/default.nix +++ b/pkgs/development/python-modules/nianet/default.nix @@ -9,26 +9,27 @@ , pythonOlder , scikit-learn , toml-adapt +, tomli , torch }: buildPythonPackage rec { pname = "nianet"; version = "1.1.4"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "SasoPavlic"; - repo = pname; - rev = "version_${version}"; + repo = "nianet"; + rev = "refs/tags/version_${version}"; sha256 = "sha256-FZipl6Z9AfiL6WH0kvUn8bVxt8JLdDVlmTSqnyxe0nY="; }; nativeBuildInputs = [ - toml-adapt poetry-core + toml-adapt ]; propagatedBuildInputs = [ @@ -44,8 +45,9 @@ buildPythonPackage rec { toml-adapt -path pyproject.toml -a change -dep torch -ver X ''; - checkInputs = [ + nativeCheckInputs = [ pytestCheckHook + tomli ]; pythonImportsCheck = [ From 612113bce4bb04d43ce89814b0ec1bdfa40f6ab2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 10:30:32 +0100 Subject: [PATCH 130/133] python311Packages.python-benedict: refactor --- .../python-modules/python-benedict/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 65a27c9b53cf..604edb59d038 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -16,6 +16,7 @@ , pythonRelaxDepsHook , pyyaml , requests +, setuptools , six , toml , xlrd @@ -25,19 +26,20 @@ buildPythonPackage rec { pname = "python-benedict"; version = "0.33.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "fabiocaccamo"; - repo = pname; + repo = "python-benedict"; rev = "refs/tags/${version}"; hash = "sha256-SJBU7jMnyLBdWQPQ/UGbVklKUOrCM3fMnOkXKHQnyPI="; }; nativeBuildInputs = [ pythonRelaxDepsHook + setuptools ]; pythonRelaxDeps = [ @@ -70,6 +72,8 @@ buildPythonPackage rec { disabledTests = [ # Tests require network access "test_from_base64_with_valid_url_valid_content" + "test_from_html_with_valid_file_valid_content" + "test_from_html_with_valid_url_valid_content" "test_from_json_with_valid_url_valid_content" "test_from_pickle_with_valid_url_valid_content" "test_from_plist_with_valid_url_valid_content" From b4fbd30eead6c2aab54fdce1aa734ad62bed71d6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 10:44:43 +0100 Subject: [PATCH 131/133] python311Packages.python-benedict: 0.33.0 -> 0.33.1 Changelog: https://github.com/fabiocaccamo/python-benedict/blob/0.33.1/CHANGELOG.md --- .../python-benedict/default.nix | 77 ++++++++++++++----- 1 file changed, 58 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/python-benedict/default.nix b/pkgs/development/python-modules/python-benedict/default.nix index 604edb59d038..9b6ffe4e0fe8 100644 --- a/pkgs/development/python-modules/python-benedict/default.nix +++ b/pkgs/development/python-modules/python-benedict/default.nix @@ -7,6 +7,7 @@ , openpyxl , orjson , phonenumbers +, beautifulsoup4 , pytestCheckHook , python-dateutil , python-decouple @@ -17,7 +18,6 @@ , pyyaml , requests , setuptools -, six , toml , xlrd , xmltodict @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.33.0"; + version = "0.33.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -34,40 +34,79 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = "python-benedict"; rev = "refs/tags/${version}"; - hash = "sha256-SJBU7jMnyLBdWQPQ/UGbVklKUOrCM3fMnOkXKHQnyPI="; + hash = "sha256-QRWyMqHW4C3+718mgp9z/dQ1loesm0Vaf2TzW3yqF3A="; }; + pythonRelaxDeps = [ + "boto3" + ]; + nativeBuildInputs = [ pythonRelaxDepsHook setuptools ]; - pythonRelaxDeps = [ - "boto3" - ]; - propagatedBuildInputs = [ - boto3 - ftfy - mailchecker - openpyxl - phonenumbers - python-dateutil python-fsutil python-slugify - pyyaml requests - toml - xlrd - xmltodict ]; + passthru.optional-dependencies = { + all = [ + beautifulsoup4 + boto3 + ftfy + mailchecker + openpyxl + phonenumbers + python-dateutil + pyyaml + toml + xlrd + xmltodict + ]; + html = [ + beautifulsoup4 + xmltodict + ]; + io = [ + beautifulsoup4 + openpyxl + pyyaml + toml + xlrd + xmltodict + ]; + parse = [ + ftfy + mailchecker + phonenumbers + python-dateutil + ]; + s3 = [ + boto3 + ]; + toml = [ + toml + ]; + xls = [ + openpyxl + xlrd + ]; + xml = [ + xmltodict + ]; + yaml = [ + pyyaml + ]; + }; + nativeCheckInputs = [ orjson pytestCheckHook python-decouple - six - ]; + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); disabledTests = [ # Tests require network access From e0fad19e61e0eeb4330a570a30556e9df83fc492 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Jan 2024 11:10:52 +0100 Subject: [PATCH 132/133] python311Packages.pymilvus: 2.3.3 -> 2.3.5 Diff: https://github.com/milvus-io/pymilvus/compare/refs/tags/v2.3.3...v2.3.5 Changelog: https://github.com/milvus-io/pymilvus/releases/tag/v2.3.5 --- .../python-modules/pymilvus/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pymilvus/default.nix b/pkgs/development/python-modules/pymilvus/default.nix index f62b039bbb45..c98654ef8732 100644 --- a/pkgs/development/python-modules/pymilvus/default.nix +++ b/pkgs/development/python-modules/pymilvus/default.nix @@ -5,12 +5,14 @@ , gitpython , grpcio , grpcio-testing +, minio , mmh3 , pandas +, pyarrow , pytestCheckHook -, python , pythonOlder , pythonRelaxDepsHook +, requests , scikit-learn , setuptools-scm , ujson @@ -19,19 +21,20 @@ buildPythonPackage rec { pname = "pymilvus"; - version = "2.3.3"; - format = "pyproject"; + version = "2.3.5"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "milvus-io"; - repo = pname; + repo = "pymilvus"; rev = "refs/tags/v${version}"; - hash = "sha256-qnm6JaeF2Li2NgVGZ6yJ2yz1n3pVZqkF4Ee+q4v/kdA="; + hash = "sha256-OKvaJyy6v79wcE9T0v2KwOBKShhDE8g0adIWce0bESs="; }; pythonRelaxDeps = [ + "environs" "grpcio" ]; @@ -45,8 +48,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ environs grpcio + minio mmh3 pandas + pyarrow + requests ujson ]; From 76724dbc576b6087c5ec2c18dbdfa57762fdff15 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 19 Jan 2024 13:06:57 +0100 Subject: [PATCH 133/133] mailmanPackages,python3.pkgs.django-mailman3: add NixOS test to passthru.tests --- pkgs/development/python-modules/django-mailman3/default.nix | 3 +++ pkgs/servers/mail/mailman/hyperkitty.nix | 3 +++ pkgs/servers/mail/mailman/mailman-hyperkitty.nix | 3 +++ pkgs/servers/mail/mailman/package.nix | 3 +++ pkgs/servers/mail/mailman/postorius.nix | 4 +++- pkgs/servers/mail/mailman/web.nix | 3 +++ 6 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/django-mailman3/default.nix b/pkgs/development/python-modules/django-mailman3/default.nix index 6803c26b01c5..026788caf646 100644 --- a/pkgs/development/python-modules/django-mailman3/default.nix +++ b/pkgs/development/python-modules/django-mailman3/default.nix @@ -12,6 +12,7 @@ , django , pytest-django , pytestCheckHook +, nixosTests }: buildPythonPackage rec { @@ -46,6 +47,8 @@ buildPythonPackage rec { "django_mailman3" ]; + passthru.tests = { inherit (nixosTests) mailman; }; + meta = with lib; { description = "Django library for Mailman UIs"; homepage = "https://gitlab.com/mailman/django-mailman3"; diff --git a/pkgs/servers/mail/mailman/hyperkitty.nix b/pkgs/servers/mail/mailman/hyperkitty.nix index 9c335f11820d..d52964f3a1a2 100644 --- a/pkgs/servers/mail/mailman/hyperkitty.nix +++ b/pkgs/servers/mail/mailman/hyperkitty.nix @@ -2,6 +2,7 @@ , python3 , fetchPypi , fetchpatch +, nixosTests }: with python3.pkgs; @@ -66,6 +67,8 @@ buildPythonPackage rec { --settings=hyperkitty.tests.settings_test hyperkitty ''; + passthru.tests = { inherit (nixosTests) mailman; }; + meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Archiver for GNU Mailman v3"; diff --git a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix index 13f01c9919f0..dfec900b0214 100644 --- a/pkgs/servers/mail/mailman/mailman-hyperkitty.nix +++ b/pkgs/servers/mail/mailman/mailman-hyperkitty.nix @@ -2,6 +2,7 @@ , python3 , fetchPypi , mailman +, nixosTests }: with python3.pkgs; @@ -39,6 +40,8 @@ buildPythonPackage rec { "mailman_hyperkitty" ]; + passthru.tests = { inherit (nixosTests) mailman; }; + meta = with lib; { description = "Mailman archiver plugin for HyperKitty"; homepage = "https://gitlab.com/mailman/mailman-hyperkitty"; diff --git a/pkgs/servers/mail/mailman/package.nix b/pkgs/servers/mail/mailman/package.nix index 6edfeacf8999..1069c6332306 100644 --- a/pkgs/servers/mail/mailman/package.nix +++ b/pkgs/servers/mail/mailman/package.nix @@ -4,6 +4,7 @@ , fetchPypi , postfix , lynx +, nixosTests }: with python3.pkgs; @@ -78,6 +79,8 @@ buildPythonPackage rec { # 'runner' scripts. dontWrapPythonPrograms = true; + passthru.tests = { inherit (nixosTests) mailman; }; + meta = { homepage = "https://www.gnu.org/software/mailman/"; description = "Free software for managing electronic mail discussion and newsletter lists"; diff --git a/pkgs/servers/mail/mailman/postorius.nix b/pkgs/servers/mail/mailman/postorius.nix index 14a31b59da4c..de1951ce15c1 100644 --- a/pkgs/servers/mail/mailman/postorius.nix +++ b/pkgs/servers/mail/mailman/postorius.nix @@ -1,4 +1,4 @@ -{ lib, python3, fetchPypi }: +{ lib, python3, fetchPypi, nixosTests }: with python3.pkgs; @@ -17,6 +17,8 @@ buildPythonPackage rec { # Tries to connect to database. doCheck = false; + passthru.tests = { inherit (nixosTests) mailman; }; + meta = with lib; { homepage = "https://docs.mailman3.org/projects/postorius"; description = "Web-based user interface for managing GNU Mailman"; diff --git a/pkgs/servers/mail/mailman/web.nix b/pkgs/servers/mail/mailman/web.nix index 21fa64085d57..e9ef718d84f1 100644 --- a/pkgs/servers/mail/mailman/web.nix +++ b/pkgs/servers/mail/mailman/web.nix @@ -1,5 +1,6 @@ { lib, python3, fetchPypi, fetchpatch , sassc, hyperkitty, postorius +, nixosTests }: with python3.pkgs; @@ -45,6 +46,8 @@ buildPythonPackage rec { "--suffix PATH : ${lib.makeBinPath [ sassc ]}" ]; + passthru.tests = { inherit (nixosTests) mailman; }; + meta = with lib; { homepage = "https://gitlab.com/mailman/mailman-web"; description = "Django project for Mailman 3 web interface";