From 933242a56fe7f1e673dafffcbf24d48cd90b67b7 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 2 Jan 2025 21:45:02 +0000 Subject: [PATCH 01/38] rstudio: add patch for Boost 1.86 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I’m not going to bother trying to upstream this trivial fix since they want full copyright assignment and a mailing address; it’s less work for both parties for them to rederive it from scratch if and when they get around to updating Boost themselves. --- pkgs/applications/editors/rstudio/boost-1.86.patch | 13 +++++++++++++ pkgs/applications/editors/rstudio/default.nix | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/editors/rstudio/boost-1.86.patch diff --git a/pkgs/applications/editors/rstudio/boost-1.86.patch b/pkgs/applications/editors/rstudio/boost-1.86.patch new file mode 100644 index 000000000000..ca7ca648e5b6 --- /dev/null +++ b/pkgs/applications/editors/rstudio/boost-1.86.patch @@ -0,0 +1,13 @@ +diff --git a/src/cpp/core/json/JsonRpc.cpp b/src/cpp/core/json/JsonRpc.cpp +index d034ffecd7..4b08486517 100644 +--- a/src/cpp/core/json/JsonRpc.cpp ++++ b/src/cpp/core/json/JsonRpc.cpp +@@ -193,7 +193,7 @@ + + bool JsonRpcResponse::hasAfterResponse() const + { +- return afterResponse_; ++ return !afterResponse_.empty(); + } + + diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 867742d3b785..4df8046de30f 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -5,7 +5,7 @@ fetchFromGitHub, replaceVars, cmake, - boost183, + boost, zlib, openssl, R, @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { buildInputs = [ - boost183 + boost zlib openssl R @@ -131,6 +131,7 @@ stdenv.mkDerivation rec { ./ignore-etc-os-release.patch ./dont-yarn-install.patch ./dont-assume-pandoc-in-quarto.patch + ./boost-1.86.patch ]; postPatch = '' From b30fb4835948d3648e4d2e2ee9665a1586211f9d Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sun, 12 Jan 2025 16:43:55 +0100 Subject: [PATCH 02/38] losslesscut: 3.61.1 -> 3.64.0 --- pkgs/by-name/lo/losslesscut-bin/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/lo/losslesscut-bin/package.nix b/pkgs/by-name/lo/losslesscut-bin/package.nix index 4b7acfdf1ba4..fe4c651b10ed 100644 --- a/pkgs/by-name/lo/losslesscut-bin/package.nix +++ b/pkgs/by-name/lo/losslesscut-bin/package.nix @@ -7,7 +7,7 @@ let pname = "losslesscut"; - version = "3.61.1"; + version = "3.64.0"; metaCommon = with lib; { description = "Swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; @@ -18,22 +18,22 @@ let }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - hash = "sha256-wKhEB+MfOsBvZRTIt3hLofw37+YO+hWKowlSi1OxSAU="; + hash = "sha256-K90cJuJFcIkPuAQusJcOBkZ5PQ8T25q7IFIhtmK+jzc="; inherit (buildPackages) makeWrapper; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-yZYmM533D9VzM+a0bnYz/aqocaEJVFOTgLWjbQGOQR0="; + hash = "sha256-BO2KoYAevbVL0Eix1knvaPVBkWucYI89VkueWYRTcXY="; isAarch64 = false; }; aarch64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-/qa2P0R7xRzDgnPKqkeKN6lrDbPg9WuZ/Nnc51NTzaM="; + hash = "sha256-/M5yafZQDqCoDzHpjZBC80CcL9KMO5lwvyCcq19caRg="; isAarch64 = true; }; x86_64-windows = callPackage ./build-from-windows.nix { inherit pname version metaCommon; - hash = "sha256-0awYmSGxm8M12X0WQftlapRF9m3GGCZivNwBtRjSa4E="; + hash = "sha256-FYrnTiZ5ATT+Y08zceIIHbVM//5Bg2ozIEyC5UxmIno="; }; in ( From ffa605ad6fe263b5eacd6980f43f230e1e912201 Mon Sep 17 00:00:00 2001 From: Petr Zahradnik Date: Sun, 12 Jan 2025 16:44:18 +0100 Subject: [PATCH 03/38] losslesscut: cleaup derivation --- pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix | 2 -- pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix | 8 +++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix index 5aad32368ba7..faf62ceeb2bb 100644 --- a/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix +++ b/pkgs/by-name/lo/losslesscut-bin/build-from-appimage.nix @@ -9,8 +9,6 @@ }: let - pname = "losslesscut"; - src = fetchurl { url = "https://github.com/mifi/lossless-cut/releases/download/v${version}/LosslessCut-linux-x86_64.AppImage"; inherit hash; diff --git a/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix index 88b27dc5236d..c13fc28be9ac 100644 --- a/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix +++ b/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix @@ -10,17 +10,15 @@ metaCommon ? { }, }: -let - pname = "losslesscut"; +stdenvNoCC.mkDerivation { + inherit pname version; + src = fetchurl { url = "https://github.com/mifi/lossless-cut/releases/download/v${version}/LosslessCut-mac-${ if isAarch64 then "arm64" else "x64" }.dmg"; inherit hash; }; -in -stdenvNoCC.mkDerivation { - inherit pname version src; nativeBuildInputs = [ _7zz ]; From 7028b60f82b0283d37c882a3cb68a95c8093890f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Jan 2025 20:44:22 +0100 Subject: [PATCH 04/38] python313Packages.swisshydrodata: 0.2.1 -> 0.2.2 Diff: https://github.com/Bouni/swisshydrodata/compare/refs/tags/0.2.1...0.2.2 Changelog: https://github.com/Bouni/swisshydrodata/releases/tag/0.2.2 --- pkgs/development/python-modules/swisshydrodata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/swisshydrodata/default.nix b/pkgs/development/python-modules/swisshydrodata/default.nix index ea4baa93a311..36be0e125dc0 100644 --- a/pkgs/development/python-modules/swisshydrodata/default.nix +++ b/pkgs/development/python-modules/swisshydrodata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "swisshydrodata"; - version = "0.2.1"; + version = "0.2.2"; pyproject = true; disabled = pythonOlder "3.12"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bouni"; repo = "swisshydrodata"; tag = version; - hash = "sha256-RcVwo61HZ02JEOHsSY/W8j2OTBN25oR2JunLZ5i6yVI="; + hash = "sha256-e3h/FStzhyaI//bRvT57lA6+06hVqhL2aztI115bsvU="; }; build-system = [ setuptools ]; From defd5e954461228b66f663a5c395ed3a84289a22 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Jan 2025 20:46:20 +0100 Subject: [PATCH 05/38] python313Packages.nvdlib: 0.7.7 -> 0.7.9 Diff: https://github.com/Vehemont/nvdlib/compare/refs/tags/v0.7.7...v0.7.9 Changelog: https://github.com/vehemont/nvdlib/releases/tag/v0.7.9 --- pkgs/development/python-modules/nvdlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nvdlib/default.nix b/pkgs/development/python-modules/nvdlib/default.nix index 27f2da32b39f..f9bab733b450 100644 --- a/pkgs/development/python-modules/nvdlib/default.nix +++ b/pkgs/development/python-modules/nvdlib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nvdlib"; - version = "0.7.7"; + version = "0.7.9"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Vehemont"; repo = "nvdlib"; tag = "v${version}"; - hash = "sha256-/UmBNdch9yM6yCVcJbzsCx6om4XlqQa40X/fgEYgRuI="; + hash = "sha256-D4IzY6CZm9jxjupif9VnxI3uPlnhe1/Vsjhs2XX5v1c="; }; nativeBuildInputs = [ setuptools ]; From 27b13cf0edc9403c02fb265250cf37a857a5bfb6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Jan 2025 20:47:05 +0100 Subject: [PATCH 06/38] python313Packages.dvc-data: 3.16.7 -> 3.16.8 Diff: https://github.com/iterative/dvc-data/compare/refs/tags/3.16.7...3.16.8 Changelog: https://github.com/iterative/dvc-data/releases/tag/3.16.8 --- pkgs/development/python-modules/dvc-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix index 6808c3279a59..cde321fc1306 100644 --- a/pkgs/development/python-modules/dvc-data/default.nix +++ b/pkgs/development/python-modules/dvc-data/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "3.16.7"; + version = "3.16.8"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc-data"; tag = version; - hash = "sha256-HT+IcfUA1QMkWhQKNwjKexzG04WJj+WTyHV+15DDoCI="; + hash = "sha256-lm8GU3Mu+i+9uop5Wdam0kGDzXCeAhzq4/P5WcWj/oQ="; }; build-system = [ setuptools-scm ]; From b7e44445d484aa48ae400e1039dadcdc06e52050 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Jan 2025 20:48:00 +0100 Subject: [PATCH 07/38] python313Packages.bc-detect-secrets: 1.5.33 -> 1.5.34 Diff: https://github.com/bridgecrewio/detect-secrets/compare/refs/tags/1.5.33...1.5.34 --- pkgs/development/python-modules/bc-detect-secrets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bc-detect-secrets/default.nix b/pkgs/development/python-modules/bc-detect-secrets/default.nix index a2b71972dbaa..03d022d12ce8 100644 --- a/pkgs/development/python-modules/bc-detect-secrets/default.nix +++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "bc-detect-secrets"; - version = "1.5.33"; + version = "1.5.34"; pyproject = true; disabled = pythonOlder "3.8"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bridgecrewio"; repo = "detect-secrets"; tag = version; - hash = "sha256-z/mjZcC1ZXebDWXlYvcdxDk+HoZ0gctfJSpQSkIbQmA="; + hash = "sha256-i03xAtdZUnKvhZTMw4AmavdGRC9hSf5FpdroJC/UQaU="; }; build-system = [ setuptools ]; From c8dd764384edce43c6717d51a4e24079981370e8 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 15 Jan 2025 08:39:48 +0100 Subject: [PATCH 08/38] systemctl-tui: 0.3.9 -> 0.3.10 Diff: https://github.com/rgwood/systemctl-tui/compare/refs/tags/v0.3.9...v0.3.10 Changelog: https://github.com/rgwood/systemctl-tui/releases/tag/v0.3.10 --- pkgs/by-name/sy/systemctl-tui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix index bef931fc92f4..8a1d05f3338c 100644 --- a/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/pkgs/by-name/sy/systemctl-tui/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "systemctl-tui"; - version = "0.3.9"; + version = "0.3.10"; src = fetchFromGitHub { owner = "rgwood"; repo = "systemctl-tui"; tag = "v${version}"; - hash = "sha256-LuE0+HxTWROFbqEqqM6464U236/7qxed7xMUkSNUK68="; + hash = "sha256-7I4PM4ZQVtDESfchX0/HGu0Y94BxMCLNIrPw8bSokCQ="; }; - cargoHash = "sha256-R1JV5Hp10I9DO6I2k8sQC2IXJ+U7iJ2iAzb391e895c="; + cargoHash = "sha256-Ur1/3AAN55doW8xyeoeuU6C1KvjTQQjooCl9WVDAGuM="; nativeInstallCheckInputs = [ versionCheckHook From 8bf6e4724e9b9b7feb405e1c64a6f220642a401c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 08:51:46 +0100 Subject: [PATCH 09/38] python313Packages.tencentcloud-sdk-python: 3.0.1302 -> 3.0.1303 Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1302...3.0.1303 Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1303/CHANGELOG.md --- .../python-modules/tencentcloud-sdk-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix index 7428efc67e6c..2ca7a0559ce0 100644 --- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "tencentcloud-sdk-python"; - version = "3.0.1302"; + version = "3.0.1303"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "TencentCloud"; repo = "tencentcloud-sdk-python"; tag = version; - hash = "sha256-bK/jdxzp61HFAGfujqjn9ABQXVsvxIWQ5/5Sf6DfE2g="; + hash = "sha256-eXvdFvOiBpOwd7/7SpoOm1aWZmvE1517eJaiEdjFjTo="; }; build-system = [ setuptools ]; From 9f3d3932701cbbd61ec15a96a1a22a1355a457bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 08:52:11 +0100 Subject: [PATCH 10/38] python313Packages.boto3-stubs: 1.35.98 -> 1.35.99 --- 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 ed49decbe4fd..10e2a97f61e9 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -359,7 +359,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.35.98"; + version = "1.35.99"; pyproject = true; disabled = pythonOlder "3.7"; @@ -367,7 +367,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-qdOM6v3XKtpgvfqnLYO1Sflr2CNbOy8JBHU+RRkdaQ0="; + hash = "sha256-MFLj1o4gROL9Xap/D3yXalzIWlKK/2EMO4dKMPHb0/s="; }; build-system = [ setuptools ]; From e12a4d52db9ec4e179af6c935ff2330593119eb9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 08:52:14 +0100 Subject: [PATCH 11/38] python313Packages.botocore-stubs: 1.35.98 -> 1.35.99 --- 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 b935c9e03cc8..10a37ffe1f6d 100644 --- a/pkgs/development/python-modules/botocore-stubs/default.nix +++ b/pkgs/development/python-modules/botocore-stubs/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "botocore-stubs"; - version = "1.35.98"; + version = "1.35.99"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "botocore_stubs"; inherit version; - hash = "sha256-oz9HTo6eNU7X5OR9XvsT1oI01zZjYNY5HG5wljxHdYk="; + hash = "sha256-ZZYmswuZUMLTk4+TjHa/FahUt1n5ZhfcLPQVlPek41I="; }; nativeBuildInputs = [ setuptools ]; From 5ad23741cb123d0d9e55bd1d1282cec098ee3d5f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 08:53:16 +0100 Subject: [PATCH 12/38] checkov: 3.2.352 -> 3.2.353 Diff: https://github.com/bridgecrewio/checkov/compare/refs/tags/3.2.352...3.2.353 Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.353 --- pkgs/development/tools/analysis/checkov/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 356d59e09bec..188c99827c5b 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.2.352"; + version = "3.2.353"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = version; - hash = "sha256-by1oMAhhN+VbWzv2+OfQRBGQXkUn4EST4OWqyoOhdEQ="; + hash = "sha256-rr41j/WwzM4Jo4pO9y1hsBTlQ68Kt+gOzWTE1bQbHEU="; }; patches = [ ./flake8-compat-5.x.patch ]; From afb027ae94c525b28037f2fab7687b616bff451a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:01:36 +0100 Subject: [PATCH 13/38] python313Packages.weatherflow4py: 1.2.0 -> 1.3.1 Diff: https://github.com/jeeftor/weatherflow4py/compare/refs/tags/v1.2.0...v1.3.1 Changelog: https://github.com/jeeftor/weatherflow4py/releases/tag/v1.3.1 --- .../python-modules/weatherflow4py/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weatherflow4py/default.nix b/pkgs/development/python-modules/weatherflow4py/default.nix index a54c38724650..37ea3ba62b0e 100644 --- a/pkgs/development/python-modules/weatherflow4py/default.nix +++ b/pkgs/development/python-modules/weatherflow4py/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "weatherflow4py"; - version = "1.2.0"; + version = "1.3.1"; pyproject = true; disabled = pythonOlder "3.12"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "jeeftor"; repo = "weatherflow4py"; tag = "v${version}"; - hash = "sha256-NOruMysLm0Pu2fsaA/qCNdeCTacomvJ51oqI8V2WFWI="; + hash = "sha256-X5zMxX8PthiqaEIM0/fElGIjeeCey0ossVDKevy1Mnw="; }; build-system = [ poetry-core ]; @@ -44,6 +44,11 @@ buildPythonPackage rec { pythonImportsCheck = [ "weatherflow4py" ]; + disabledTests = [ + # KeyError + "test_convert_json_to_weather_data4" + ]; + meta = with lib; { description = "Module to interact with the WeatherFlow REST API"; homepage = "https://github.com/jeeftor/weatherflow4py"; From 06b291e48293a9015fc521c19bee517a31681b82 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:02:55 +0100 Subject: [PATCH 14/38] python313Packages.twilio: 9.4.2 -> 9.4.3 Diff: https://github.com/twilio/twilio-python/compare/refs/tags/9.4.2...9.4.3 Changelog: https://github.com/twilio/twilio-python/blob/9.4.3/CHANGES.md --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index a249d6b4624a..55dee632e966 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "9.4.2"; + version = "9.4.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; tag = version; - hash = "sha256-U3N/0HrZlv3/AtMtf5hvkBB3nzol83XDGLAa7hdCB2w="; + hash = "sha256-HgV6GEhtwk2smtzdOypucZBX+kj9lfqsY2sZ9Yl7fbM="; }; build-system = [ setuptools ]; From becc6646bd5ac4049ad1e74f56ac308f8b9aced8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:03:19 +0100 Subject: [PATCH 15/38] python313Packages.model-checker: 0.7.1 -> 0.7.3 --- pkgs/development/python-modules/model-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/model-checker/default.nix b/pkgs/development/python-modules/model-checker/default.nix index 8b771d5a3c8a..188f5867fb10 100644 --- a/pkgs/development/python-modules/model-checker/default.nix +++ b/pkgs/development/python-modules/model-checker/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "model-checker"; - version = "0.7.1"; + version = "0.7.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "model_checker"; inherit version; - hash = "sha256-xwF0KCFso1Yno8mUFnVgMbVbhanvANsDtvS/WaUgSwI="; + hash = "sha256-ZADgS+Mtpko+UvPBOo7cv9QVz1MdzFqeB4MRwZK9kkg="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From 39b7e5ff4f11a4c5a43a5bf4411055b1d0e69abc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:04:20 +0100 Subject: [PATCH 16/38] python312Packages.llama-index-vector-stores-qdrant: 0.4.2 -> 0.4.3 --- .../llama-index-vector-stores-qdrant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix index 534ee2b4226a..88eea61c51f1 100644 --- a/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix +++ b/pkgs/development/python-modules/llama-index-vector-stores-qdrant/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "llama-index-vector-stores-qdrant"; - version = "0.4.2"; + version = "0.4.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "llama_index_vector_stores_qdrant"; inherit version; - hash = "sha256-Agy6T02j5sSZZgiI6eSgxLThwEk2oZNYyMygBo6HWug="; + hash = "sha256-J5q+ZeuDlCqHq7g3cipLd8q4OA1jmtvjJ1vt7/kGEQU="; }; build-system = [ poetry-core ]; From 395b6b3dfac0c5b706be889510ed5c79d2dafceb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:05:01 +0100 Subject: [PATCH 17/38] python312Packages.cyclopts: 3.1.5 -> 3.2.0 Diff: https://github.com/BrianPugh/cyclopts/compare/refs/tags/v3.1.5...v3.2.0 Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v3.2.0 --- pkgs/development/python-modules/cyclopts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix index c998852ac3d9..71dea8620e2d 100644 --- a/pkgs/development/python-modules/cyclopts/default.nix +++ b/pkgs/development/python-modules/cyclopts/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "cyclopts"; - version = "3.1.5"; + version = "3.2.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "BrianPugh"; repo = "cyclopts"; tag = "v${version}"; - hash = "sha256-iYlQeBR9xuuiTp9mma5okGdAimnEpKd0x4HvC9OkYq0="; + hash = "sha256-U2H/SyVqoNlKAiim6FieEQw0SKK/b9diP9AjXb8PZjg="; }; build-system = [ From 6839cae9aed05c6d6800ba490959c583d12a73f3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:07:37 +0100 Subject: [PATCH 18/38] python313Packages.archinfo: 9.2.136 -> 9.2.137 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.136...v9.2.137 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index c2ee4acf9e11..22af7df5bbdf 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.136"; + version = "9.2.137"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; tag = "v${version}"; - hash = "sha256-CtYUEttKAwidGEOjW2EfEOK1KQHPzT+tkL5xvntrITQ="; + hash = "sha256-NVOq1yiyjuDVwcgkHS1z2cgG0PipR34hV1DWODhvgtY="; }; build-system = [ setuptools ]; From f50e3c0a092e2be3a244830e58da0c3168a16b90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:07:48 +0100 Subject: [PATCH 19/38] python313Packages.ailment: 9.2.136 -> 9.2.137 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.136...v9.2.137 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 137dc00b07e4..f7fe6970a33a 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.136"; + version = "9.2.137"; pyproject = true; disabled = pythonOlder "3.11"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; tag = "v${version}"; - hash = "sha256-HXm5ERWR/fHIT8PYAOkF0aVWu8fvu2fqG+fGcFTNz+A="; + hash = "sha256-5/dJFjqLIDafjzapsuSNz5YnaA9faDAgkW01tpHUHrA="; }; build-system = [ setuptools ]; From 34df0dde2051967b53cf5edf58f26311de28fdde Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:08:59 +0100 Subject: [PATCH 20/38] python313Packages.pyvex: 9.2.136 -> 9.2.137 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 199dce288baa..db95245c55f1 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.136"; + version = "9.2.137"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-Oa41XTvQDRjDWh820xUBW6I1b1QORi9gKEIcxygqspY="; + hash = "sha256-EEdBG1eZxljN5WDvSDECrL9CoFd7sx+TztawXjaDAW0="; }; build-system = [ setuptools ]; From 1cc67431eb7951907bd951c79f13268511cc0160 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:09:18 +0100 Subject: [PATCH 21/38] python313Packages.claripy: 9.2.136 -> 9.2.137 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.136...v9.2.137 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index b046b736345c..558059d4e083 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.136"; + version = "9.2.137"; pyproject = true; disabled = pythonOlder "3.11"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; tag = "v${version}"; - hash = "sha256-xKd2vRf7ss48rWt4nQusCj38u9i2FvBGB45+tUl3VuI="; + hash = "sha256-XyOowwIHlGKKJ3IAdvr9LAzNA6jr/P1qzscCr9Z2Pmk="; }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail From f92a9791ac63cf39aeb07250ea2dbbbfb180e943 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:10:34 +0100 Subject: [PATCH 22/38] python313Packages.cle: 9.2.136 -> 9.2.137 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.136...v9.2.137 --- pkgs/development/python-modules/cle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 696cd73328e3..db4635ca46d9 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.136"; + version = "9.2.137"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-fdDQtHmCAC+b0Oyd2DEUOCOHOaGjQO46hCfXYcBRlYI="; + hash = "sha256-pvjxP237GUfWh5weGTtIH+RI/vzsg+L2xJvKNTh7ACE="; }; in buildPythonPackage rec { @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-FrfGCDqB9uFhGxptuOMFiMUnII2gEhCvLgf/Nr3Gpik="; + hash = "sha256-nWkzJZXvMj7Pj6A2RgWVZSkXazzmi+exirzYiCchkD8="; }; build-system = [ setuptools ]; From 6a5362f4e3921771af5427535468d0f9fec2dc18 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:17:02 +0100 Subject: [PATCH 23/38] python311Packages.angr: 9.2.136 -> 9.2.137 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.136...v9.2.137 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index c1e40334a9be..3bfeffe564ba 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.136"; + version = "9.2.137"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; tag = "v${version}"; - hash = "sha256-KEAB+dHZlBQuKfsllF1BPg3eqKO9EklIvUU7jy0ljYs="; + hash = "sha256-RIsgE/WE7QEmOIyujLObnpTpUR0GgUbavPmgs9QwakE="; }; postPatch = '' From ed30c8f8fcb60f706943278cc830fbba22db7f50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:21:19 +0100 Subject: [PATCH 24/38] prowler: 5.0.5 -> 5.1.0 Diff: https://github.com/prowler-cloud/prowler/compare/refs/tags/5.0.5...5.1.0 Changelog: https://github.com/prowler-cloud/prowler/releases/tag/5.1.0 --- pkgs/by-name/pr/prowler/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/pr/prowler/package.nix b/pkgs/by-name/pr/prowler/package.nix index 32328b40491b..b44d0f08e49f 100644 --- a/pkgs/by-name/pr/prowler/package.nix +++ b/pkgs/by-name/pr/prowler/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication rec { pname = "prowler"; - version = "5.0.5"; + version = "5.1.0"; pyproject = true; src = fetchFromGitHub { owner = "prowler-cloud"; repo = "prowler"; tag = version; - hash = "sha256-rjx0s+qUnpGQoUlvsEqwlJWZbC8Gb72s9MF0lRvJKZU="; + hash = "sha256-+wMoHzys4iceiQvRvwsl2aSvTYZxeZlKHy7D4xx33aU="; }; pythonRelaxDeps = true; From c463e98472fc9914643b1f60d63875096ac780f1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:23:47 +0100 Subject: [PATCH 25/38] python312Packages.adlfs: 2024.7.0 -> 2024.12.0 Diff: https://github.com/fsspec/adlfs/compare/refs/tags/2024.7.0...2024.12.0 Changelog: https://github.com/fsspec/adlfs/blob/2024.12.0/CHANGELOG.md --- pkgs/development/python-modules/adlfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/adlfs/default.nix b/pkgs/development/python-modules/adlfs/default.nix index 5f82f52dd7da..729323af99ff 100644 --- a/pkgs/development/python-modules/adlfs/default.nix +++ b/pkgs/development/python-modules/adlfs/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "adlfs"; - version = "2024.7.0"; + version = "2024.12.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "fsspec"; repo = "adlfs"; tag = version; - hash = "sha256-V0Uzfj9xuPfLgfILwVbtId+B81w/25cO+G1Y/KOEOyI="; + hash = "sha256-s3nMvaH3YecABnFS7E4XPRWk8GwPVyqb9Qe2ejeXsZI="; }; build-system = [ From e7493a927130ca788a5f2fe572af6dc9c843e3c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:25:20 +0100 Subject: [PATCH 26/38] python312Packages.aio-pika: 9.5.0 -> 9.5.4 Diff: https://github.com/mosquito/aio-pika/compare/refs/tags/9.5.0...9.5.4 Changelog: https://github.com/mosquito/aio-pika/blob/9.5.4/CHANGELOG.md --- pkgs/development/python-modules/aio-pika/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aio-pika/default.nix b/pkgs/development/python-modules/aio-pika/default.nix index be413b5dae74..ad0f385e2048 100644 --- a/pkgs/development/python-modules/aio-pika/default.nix +++ b/pkgs/development/python-modules/aio-pika/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "aio-pika"; - version = "9.5.0"; + version = "9.5.4"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "mosquito"; repo = "aio-pika"; tag = version; - hash = "sha256-4MweCuZbo/XDur9iwM3MT/P75HjEQvMlPI82bDxuol8="; + hash = "sha256-/73bFhhcailC05hn0xW49oFVS6Ezaiohh3ykYOjhQOI="; }; build-system = [ poetry-core ]; From 8e82b73e7bb01895b844bd33b9670d60ea09791b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:30:36 +0100 Subject: [PATCH 27/38] python312Packages.apprise: 1.9.1 -> 1.9.2 Changelog: https://github.com/caronc/apprise/releases/tag/v1.9.2 --- pkgs/development/python-modules/apprise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 7440b2c08109..178eff6a9ed6 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "apprise"; - version = "1.9.1"; + version = "1.9.2"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-eezQLEHYbf/SEbs1zFwGyEbndwQavh0HAfmJmA3kRok="; + hash = "sha256-KQ6xIXAo3VBAgCNxSU1wwbyrkH5mNKd8JjSJ2+T9c6g="; }; nativeBuildInputs = [ installShellFiles ]; From b0849441e1163de93053534afa54f74009fbfa00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:31:28 +0100 Subject: [PATCH 28/38] python312Packages.google-cloud-texttospeech: 2.22.0 -> 2.24.0 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-texttospeech-v2.24.0/packages/google-cloud-texttospeech/CHANGELOG.md --- .../python-modules/google-cloud-texttospeech/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix index 0392ecc409c1..72ef09fd9610 100644 --- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix +++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.22.0"; + version = "2.24.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "google_cloud_texttospeech"; inherit version; - hash = "sha256-y/1VPUDahxxY/2w/gQl8rZ+fDlDm5EcQ0kcthJmpKNI="; + hash = "sha256-yfXzvL5NNF4mcBVTGJD0+ZHXbBnLm2v63A5jxgCxA04="; }; build-system = [ setuptools ]; From 541f8cd4009ffe5ec3ba51e79971a00047a676bf Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:32:59 +0100 Subject: [PATCH 29/38] python312Packages.cerberus: 1.3.6 -> 1.3.7 Diff: https://github.com/pyeve/cerberus/compare/refs/tags/1.3.6...1.3.7 Changelog: https://github.com/pyeve/cerberus/blob/1.3.7/CHANGES.rst --- pkgs/development/python-modules/cerberus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cerberus/default.nix b/pkgs/development/python-modules/cerberus/default.nix index a7e47080e040..159bfc1662aa 100644 --- a/pkgs/development/python-modules/cerberus/default.nix +++ b/pkgs/development/python-modules/cerberus/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cerberus"; - version = "1.3.6"; + version = "1.3.7"; pyproject = true; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "pyeve"; repo = "cerberus"; tag = version; - hash = "sha256-puQcU8USYtylW5XN0VQzG/dizQR24s7+YgrOxIwaDKQ="; + hash = "sha256-KYZpd8adKXahSc/amQHZMFdJtEtZLklZZgwfkYu8/qY="; }; build-system = [ From 6f25957f8bdceae337d344d511cdd2461eb3e108 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:38:55 +0100 Subject: [PATCH 30/38] python312Packages.django-annoying: 0.10.6 -> 0.10.7 Diff: https://github.com/skorokithakis/django-annoying/compare/refs/tags/v0.10.6...v0.10.7 Changelog: https://github.com/skorokithakis/django-annoying/releases/tag/v$version --- .../django-annoying/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/django-annoying/default.nix b/pkgs/development/python-modules/django-annoying/default.nix index bfe0d6f944ba..f244112f0d1b 100644 --- a/pkgs/development/python-modules/django-annoying/default.nix +++ b/pkgs/development/python-modules/django-annoying/default.nix @@ -2,34 +2,28 @@ lib, buildPythonPackage, fetchFromGitHub, - fetchpatch, django, six, pytest-django, + setuptools, pytestCheckHook, }: buildPythonPackage rec { pname = "django-annoying"; - version = "0.10.6"; - format = "setuptools"; + version = "0.10.7"; + pyproject = true; src = fetchFromGitHub { owner = "skorokithakis"; repo = "django-annoying"; - rev = "v${version}"; - hash = "sha256-M1zOLr1Vjf2U0xlW66Mpno+S+b4IKLklN+kYxRaj6cA="; + tag = "v${version}"; + hash = "sha256-lEl9k2DOJUiCxiSp1xWIGsKbZ9iJlNWr3mxTXlKXbt4="; }; - patches = [ - (fetchpatch { - name = "django-4-compatibility.patch"; - url = "https://github.com/skorokithakis/django-annoying/pull/101/commits/51b5bd7bc8bb7a410400667e00d0813603df32bd.patch"; - hash = "sha256-gLRlAtIHHJ85I88af3C3y+ZT+nXrj2KrV7QgOuEqspk="; - }) - ]; + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ django six ]; @@ -44,6 +38,7 @@ buildPythonPackage rec { meta = with lib; { description = "Django application that tries to eliminate annoying things in the Django framework"; homepage = "https://skorokithakis.github.io/django-annoying/"; + changelog = "https://github.com/skorokithakis/django-annoying/releases/tag/v$version"; license = licenses.bsd3; maintainers = with maintainers; [ ambroisie ]; }; From 6e8cb737764cdd46a6cf3a77b1cc049fb73e8217 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:42:24 +0100 Subject: [PATCH 31/38] python312Packages.django-currentuser: 0.6.1 -> 0.8.0 Diff: https://github.com/zsoldosp/django-currentuser/compare/refs/tags/v0.6.1...v0.8.0 Changelog: https://github.com/zsoldosp/django-currentuser/#release-notes --- .../django-currentuser/default.nix | 31 ++++++++++--------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/django-currentuser/default.nix b/pkgs/development/python-modules/django-currentuser/default.nix index 4bbbe4fdb955..d8fa83aaa89b 100644 --- a/pkgs/development/python-modules/django-currentuser/default.nix +++ b/pkgs/development/python-modules/django-currentuser/default.nix @@ -1,33 +1,36 @@ { lib, buildPythonPackage, - fetchFromGitHub, - python, - pythonOlder, django, + fetchFromGitHub, hatchling, pyhamcrest, + python, + pythonOlder, + setuptools, + setuptools-scm, }: -let - version = "0.6.1"; -in -buildPythonPackage { + +buildPythonPackage rec { pname = "django-currentuser"; - inherit version; + version = "0.8.0"; pyproject = true; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "zsoldosp"; repo = "django-currentuser"; - rev = "v${version}"; - hash = "sha256-sxt4ZMkaFANINd1faIA5pqP8UoDMXElM3unsxcJU/ag="; + tag = "v${version}"; + hash = "sha256-buWYVl/nGxzoaDgA6Ds2R/AhGTYpi9JxxO0ER8Vuly4="; }; - disabled = pythonOlder "3.8"; + build-system = [ + setuptools + setuptools-scm + ]; - nativeBuildInputs = [ hatchling ]; - - propagatedBuildInputs = [ django ]; + dependencies = [ django ]; nativeCheckInputs = [ pyhamcrest ]; From 6c9b2755ee7258f198865de1ed71001b8c3fbb60 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:49:21 +0100 Subject: [PATCH 32/38] python312Packages.django-cleanup: 8.1.0 -> 9.0.0 Changelog: https://github.com/un1t/django-cleanup/blob/8.1.0/CHANGELOG.md --- .../python-modules/django-cleanup/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index b2a5a737f3bf..93416a3ee038 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -4,22 +4,28 @@ fetchPypi, django, pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-cleanup"; - version = "8.1.0"; - format = "setuptools"; + version = "9.0.0"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { - inherit pname version; - hash = "sha256-cN+QUHakTnoRGzEZgZmvYz3uCIduGZ5tzjbKjda4sQ8="; + pname = "django_cleanup"; + inherit version; + hash = "sha256-u5+1YKr2KVnIHjH6QIhcNrvVhU1aohuQ3yx+S6YzUx4="; }; + build-system = [ setuptools ]; + nativeCheckInputs = [ django ]; + pythonImportsCheck = [ "django_cleanup" ]; + meta = with lib; { description = "Automatically deletes old file for FileField and ImageField. It also deletes files on models instance deletion"; homepage = "https://github.com/un1t/django-cleanup"; From cde557c774cc475f916dd82095cd9ea2d5c0b67a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 09:52:24 +0100 Subject: [PATCH 33/38] python312Packages.django-cacheops: 7.0.2 -> 7.1 Changelog: https://github.com/Suor/django-cacheops/blob/7.1/CHANGELOG --- .../python-modules/django-cacheops/default.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/django-cacheops/default.nix b/pkgs/development/python-modules/django-cacheops/default.nix index ab29fb9d843c..022a84e057d2 100644 --- a/pkgs/development/python-modules/django-cacheops/default.nix +++ b/pkgs/development/python-modules/django-cacheops/default.nix @@ -15,23 +15,27 @@ pythonOlder, nettools, pkgs, + setuptools, }: buildPythonPackage rec { pname = "django-cacheops"; - version = "7.0.2"; - format = "setuptools"; + version = "7.1"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { - inherit pname version; - hash = "sha256-d6N8c9f6z8cpk2XtZqEr56SH3XRd2GwdM8ouv9OzKHg="; + pname = "django_cacheops"; + inherit version; + hash = "sha256-7Aeau5aFVzIe4gjGJ0ggIxgg+YymN33alx8EmBvCq1I="; }; pythonRelaxDeps = [ "funcy" ]; - propagatedBuildInputs = [ + build-system = [ setuptools ]; + + dependencies = [ django funcy redis From c22c6a55e057ed45d1f2dca21efc6d6f9779097b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 10:03:29 +0100 Subject: [PATCH 34/38] python312Packages.django-bootstrap5: 24.1 -> 24.3 Diff: https://github.com/zostera/django-bootstrap5/compare/v24.1...v24.3 Changelog: https://github.com/zostera/django-bootstrap5/blob/v24.3/CHANGELOG.md --- .../django-bootstrap5/default.nix | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/django-bootstrap5/default.nix b/pkgs/development/python-modules/django-bootstrap5/default.nix index b35c586efa36..5f92f912b217 100644 --- a/pkgs/development/python-modules/django-bootstrap5/default.nix +++ b/pkgs/development/python-modules/django-bootstrap5/default.nix @@ -1,26 +1,21 @@ { lib, - buildPythonPackage, - fetchFromGitHub, - pythonOlder, - - # build-system - setuptools, - setuptools-scm, - - # dependencies - django, - - # tests beautifulsoup4, + buildPythonPackage, + django, + fetchFromGitHub, + jinja2, pillow, pytest-django, pytestCheckHook, + pythonOlder, + setuptools-scm, + setuptools, }: buildPythonPackage rec { pname = "django-bootstrap5"; - version = "24.1"; + version = "24.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -29,7 +24,7 @@ buildPythonPackage rec { owner = "zostera"; repo = "django-bootstrap5"; rev = "v${version}"; - hash = "sha256-JbmwEPkj34tsK3tUtb56FPjU0emwERVXEc4fzlepdXY="; + hash = "sha256-8e0Pi4uSvQhiLYiMgOqWJWDc/KPMXxyU5pnT9jvFZLU="; }; build-system = [ @@ -37,13 +32,19 @@ buildPythonPackage rec { setuptools-scm ]; + dependencies = [ django ]; + + optional-dependencies = { + jinja = [ jinja2 ]; + }; + nativeCheckInputs = [ beautifulsoup4 (django.override { withGdal = true; }) pillow pytest-django pytestCheckHook - ]; + ] ++ lib.flatten (builtins.attrValues optional-dependencies); preCheck = '' export DJANGO_SETTINGS_MODULE=tests.app.settings From 9558f7c2e482c90567b5ec161f02e250a34643a4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 10:11:39 +0100 Subject: [PATCH 35/38] python312Packages.django-autocomplete-light: 3.9.4 -> 3.11.0 Diff: https://github.com/yourlabs/django-autocomplete-light/compare/refs/tags/3.9.4...3.11.0 Changelog: https://github.com/yourlabs/django-autocomplete-light/blob/3.11.0/CHANGELOG --- .../django-autocomplete-light/default.nix | 70 ++++++------------- 1 file changed, 22 insertions(+), 48 deletions(-) diff --git a/pkgs/development/python-modules/django-autocomplete-light/default.nix b/pkgs/development/python-modules/django-autocomplete-light/default.nix index eb83b99d8bef..0faec04d3e78 100644 --- a/pkgs/development/python-modules/django-autocomplete-light/default.nix +++ b/pkgs/development/python-modules/django-autocomplete-light/default.nix @@ -1,74 +1,48 @@ { lib, buildPythonPackage, - fetchFromGitHub, - django, - six, - pytestCheckHook, - django-debug-toolbar, - django-extensions, django-taggit, - django-tagging, - mock, - pytest-django, - selenium, - splinter, - sqlparse, - tenacity, - whitenoise, + django, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { pname = "django-autocomplete-light"; - version = "3.9.4"; - format = "setuptools"; + version = "3.11.0"; + pyproject = true; + + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "yourlabs"; repo = "django-autocomplete-light"; - rev = version; - hash = "sha256-YUiGN6q7ARM/rg7d+ykeDEYZDYjB+DHxMCmdme6QccU="; + tag = version; + hash = "sha256-Lcl14CVmpDoEdEq49sL4GFtWWqFcVoSjOJOBU7oWeH4="; }; - propagatedBuildInputs = [ - django - six - ]; + build-system = [ setuptools ]; + + dependencies = [ django ]; + + optional-dependencies = { + tags = [ django-taggit ]; + # nested = [ django-nested-admin ]; + # genericm2m = [ django-generic-m2m ]; + # gfk = [ django-querysetsequence ]; + }; # Too many un-packaged dependencies doCheck = false; - nativeCheckInputs = [ - pytestCheckHook - django-debug-toolbar - django-extensions - django-taggit - django-tagging - mock - pytest-django - selenium - splinter - sqlparse - tenacity - whitenoise - - # FIXME: not packaged - # django-generic-m2m - # django-gm2m - # django-querysetsequence - # pytest-splinter - # dango-nested-admin - # djhacker - ]; - - # Taken from tox.ini - preCheck = "cd test_project"; - pythonImportsCheck = [ "dal" ]; meta = with lib; { description = "Fresh approach to autocomplete implementations, specially for Django"; homepage = "https://django-autocomplete-light.readthedocs.io"; + changelog = "https://github.com/yourlabs/django-autocomplete-light/blob/${version}/CHANGELOG"; license = licenses.bsd3; maintainers = with maintainers; [ ambroisie ]; }; From 4ff7525200b962293480277c1ae2039b58d9dbd2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 10:19:30 +0100 Subject: [PATCH 36/38] python312Packages.aiohomeconnect: 0.10.0 -> 0.11.0 Diff: https://github.com/MartinHjelmare/aiohomeconnect/compare/refs/tags/v0.10.0...v0.11.0 Changelog: https://github.com/MartinHjelmare/aiohomeconnect/blob/refs/tags/v0.11.0/CHANGELOG.md --- pkgs/development/python-modules/aiohomeconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix index db12e5436701..6e307ef3d118 100644 --- a/pkgs/development/python-modules/aiohomeconnect/default.nix +++ b/pkgs/development/python-modules/aiohomeconnect/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "aiohomeconnect"; - version = "0.10.0"; + version = "0.11.0"; pyproject = true; disabled = pythonOlder "3.11"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "MartinHjelmare"; repo = "aiohomeconnect"; tag = "v${version}"; - hash = "sha256-3ugV0stIUdFlcjN+Z8N4GBrXbjBfZcYZmd3THSS7oZg="; + hash = "sha256-fg3WusrONJtPO/IpHlXzO17C2OuQe28kprXrBG9PqMY="; }; pythonRelaxDeps = [ "httpx" ]; From ed1c058774efb00b71035f1015be609693a17053 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 15 Jan 2025 11:25:37 +0100 Subject: [PATCH 37/38] python312Packages.django-cache-url: 3.2.2 -> 3.4.5 Diff: epicserve/django-cache-url@refs/tags/v3.2.2...v3.4.5 --- .../django-cache-url/default.nix | 30 ++++++++++++------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/django-cache-url/default.nix b/pkgs/development/python-modules/django-cache-url/default.nix index 89fdb9df9d83..6caeb87cb973 100644 --- a/pkgs/development/python-modules/django-cache-url/default.nix +++ b/pkgs/development/python-modules/django-cache-url/default.nix @@ -1,32 +1,42 @@ { lib, buildPythonPackage, + django, fetchFromGitHub, + pytest-cov-stub, pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { - version = "3.2.2"; - format = "setuptools"; pname = "django-cache-url"; + version = "3.4.5"; + pyproject = true; + + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "epicserve"; repo = "django-cache-url"; - rev = "v${version}"; - sha256 = "0fxma2w6zl3cfl6wnynmlmp8snks67ffz4jcq4qmdc65xv1l204l"; + tag = "v${version}"; + hash = "sha256-SjTcBYaFMD8XwIlqOgoJrc30FLrpX+M2ZcvZzA9ou6g="; }; - postPatch = '' - # disable coverage tests - sed -i '/--cov/d' setup.cfg - ''; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = [ + django + pytest-cov-stub + pytestCheckHook + ]; + + pythonImportsCheck = [ "django_cache_url" ]; meta = with lib; { - homepage = "https://github.com/epicserve/django-cache-url"; description = "Use Cache URLs in your Django application"; + homepage = "https://github.com/epicserve/django-cache-url"; + changelog = "https://github.com/epicserve/django-cache-url/blob/v${version}/CHANGELOG.rst"; license = licenses.mit; maintainers = [ ]; }; From 66be3121beec09a41b86feaed85efc94cd4ddab1 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 14 Jan 2025 10:37:48 +0100 Subject: [PATCH 38/38] cloud-hypervisor: backport UB fix in kvm-ioctls VFIO is broken on x86_64 as a result of UB in kvm-ioctls with LLVM 19, which is currently in staging-next. This backports the fix. --- pkgs/by-name/cl/cloud-hypervisor/package.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix index 546d0e231b78..322ab3b48c42 100644 --- a/pkgs/by-name/cl/cloud-hypervisor/package.nix +++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix @@ -20,8 +20,16 @@ rustPlatform.buildRustPackage rec { hash = "sha256-drxJtlvBpkK3I7Ob3+pH4KLUq53GWXe1pmv7CI3bbP4="; }; + cargoPatches = [ + (fetchpatch { + name = "kvm-ioctls-0.19.1.patch"; + url = "https://github.com/cloud-hypervisor/cloud-hypervisor/commit/eaa21946993276434403d41419a34e564935c8e9.patch"; + hash = "sha256-G7B0uGl/RAkwub8x1jNNgBrC0dwq/Gv46XpbtTZWD5M="; + }) + ]; + useFetchCargoVendor = true; - cargoHash = "sha256-wifctp30ApnxtRMlzksoSGrIJUT1cB0p1RBxfyITuZI="; + cargoHash = "sha256-F6ukvSwMHRHXoZKgXEFnTAN1B80GsQDW8iqZAvsREr4="; separateDebugInfo = true;