From a575d59eaaeb5ef3e095eaebf71913225fb72feb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Feb 2024 10:12:26 +0100 Subject: [PATCH 01/25] python311Packages.pyrainbird: 4.0.1 -> 4.0.2 Diff: https://github.com/allenporter/pyrainbird/compare/refs/tags/4.0.1...4.0.2 Changelog: https://github.com/allenporter/pyrainbird/releases/tag/4.0.2 --- pkgs/development/python-modules/pyrainbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index 44d4e83794fa..c7417d7fee28 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { pname = "pyrainbird"; - version = "4.0.1"; + version = "4.0.2"; format = "setuptools"; disabled = pythonOlder "3.10"; @@ -31,7 +31,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-OcCg6Q+FJnmrYf70uNLWTg/tfWVJpiQlnyKfREcP2YM="; + hash = "sha256-4AoxLZv0u8wCG3ihw0JqsqsO5zG5UyP4ebSX99ve8sg="; }; postPatch = '' From 2c57e8e62dc84f41fe91a41833095f66ace30a22 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 18 Feb 2024 10:14:22 +0100 Subject: [PATCH 02/25] python311Packages.pyrainbird: refactor --- .../python-modules/pyrainbird/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pyrainbird/default.nix b/pkgs/development/python-modules/pyrainbird/default.nix index c7417d7fee28..bca013babd9e 100644 --- a/pkgs/development/python-modules/pyrainbird/default.nix +++ b/pkgs/development/python-modules/pyrainbird/default.nix @@ -18,30 +18,32 @@ , requests , requests-mock , responses +, setuptools }: buildPythonPackage rec { pname = "pyrainbird"; version = "4.0.2"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "allenporter"; - repo = pname; + repo = "pyrainbird"; rev = "refs/tags/${version}"; hash = "sha256-4AoxLZv0u8wCG3ihw0JqsqsO5zG5UyP4ebSX99ve8sg="; }; postPatch = '' substituteInPlace pytest.ini \ - --replace "--cov=pyrainbird --cov-report=term-missing" "" - - substituteInPlace setup.cfg \ - --replace "pycryptodome>=3.16.0" "pycryptodome" + --replace-fail "--cov=pyrainbird --cov-report=term-missing" "" ''; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aiohttp-retry ical From 138e97f7e4108b0ac4edc6e5c310223bbf4246ae Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 20 Feb 2024 22:04:32 +0100 Subject: [PATCH 03/25] powerhub: init at 2.0.7 Post exploitation tool based on a web application https://github.com/AdrianVollmer/PowerHub --- pkgs/by-name/po/powerhub/package.nix | 64 ++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 pkgs/by-name/po/powerhub/package.nix diff --git a/pkgs/by-name/po/powerhub/package.nix b/pkgs/by-name/po/powerhub/package.nix new file mode 100644 index 000000000000..220098569966 --- /dev/null +++ b/pkgs/by-name/po/powerhub/package.nix @@ -0,0 +1,64 @@ +{ lib +, fetchFromGitHub +, python3 +}: + +python3.pkgs.buildPythonApplication rec { + pname = "powerhub"; + version = "2.0.7"; + pyproject = true; + + src = fetchFromGitHub { + owner = "AdrianVollmer"; + repo = "PowerHub"; + rev = "refs/tags/${version}"; + hash = "sha256-ejdG/vMINyvToP8GAhRMdp/Jq8rZNBubDbRcg2i05lM="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + setuptools-scm + ]; + + propagatedBuildInputs = with python3.pkgs; [ + cheroot + cryptography + dnspython + flask + flask-socketio + flask-sqlalchemy + importlib-metadata + jinja2 + pyopenssl + python-magic + python-socketio + requests + service-identity + simple-websocket + sqlalchemy + twisted + watchdog + werkzeug + wsgidav + ]; + + # Tests uses XDG + doCheck = false; + + pythonImportsCheck = [ + "powerhub" + ]; + + preCheck = '' + cd tests/helpers + ''; + + meta = with lib; { + description = "Post exploitation tool based on a web application, focusing on bypassing endpoint protection and application whitelisting"; + homepage = "https://github.com/AdrianVollmer/PowerHub"; + changelog = "https://github.com/AdrianVollmer/PowerHub/blob/${version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + mainProgram = "powerhub"; + }; +} From b9b7f34521c942b3070bef8703dfb6bae5fb8e0c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Feb 2024 09:55:59 +0100 Subject: [PATCH 04/25] python311Packages.fastapi-sso: 0.11.0 -> 0.12.1 Diff: https://github.com/tomasvotava/fastapi-sso/compare/refs/tags/0.11.0...0.12.1 Changelog: https://github.com/tomasvotava/fastapi-sso/releases/tag/0.12.1 --- pkgs/development/python-modules/fastapi-sso/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastapi-sso/default.nix b/pkgs/development/python-modules/fastapi-sso/default.nix index e74cfcd72999..bde53ac71325 100644 --- a/pkgs/development/python-modules/fastapi-sso/default.nix +++ b/pkgs/development/python-modules/fastapi-sso/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "fastapi-sso"; - version = "0.11.0"; + version = "0.12.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "tomasvotava"; repo = "fastapi-sso"; rev = "refs/tags/${version}"; - hash = "sha256-bz4rr7h90d/QkBBqQN1pLF8ANhOiq2v0Vv2pjBGpeTs="; + hash = "sha256-/Mt0pmZYsWp/n9YHCy/bFKUPzmoRFB0cHKCNxEfxMLs="; }; postPatch = '' From 26170b5db81547a0c629b7d82165c0721601a7df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 22 Feb 2024 20:33:02 +0000 Subject: [PATCH 05/25] werf: 1.2.292 -> 1.2.294 --- pkgs/applications/networking/cluster/werf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 486bfe5a6429..f61a760115a1 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.292"; + version = "1.2.294"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-jBGAd7He2ap7+IF5Og7J6iBoIoLG8KqxSLcPKogJwP8="; + hash = "sha256-A/Do2UepwV8lmT8qWir7CKR8/YeVKOEoJjvVfj9+wt0="; }; - vendorHash = "sha256-JaAiQC5QnamzUz1hPSldXtZqhTQIlGFGMYhLJd7t3j4="; + vendorHash = "sha256-Fb9drtVITjka83Y8+YSa9fqSBv7O4muMGqV4w3K7+Dg="; proxyVendor = true; From 3cd36fdeec19eb8f5222a5c17bfac30b9e9f28c6 Mon Sep 17 00:00:00 2001 From: ruby0b <106119328+ruby0b@users.noreply.github.com> Date: Fri, 23 Feb 2024 19:31:56 +0100 Subject: [PATCH 06/25] pyload-ng: 0.5.0b3.dev75 -> 0.5.0b3.dev80 --- pkgs/applications/networking/pyload-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/pyload-ng/default.nix b/pkgs/applications/networking/pyload-ng/default.nix index 1f638d43daef..c9f00d3fb76f 100644 --- a/pkgs/applications/networking/pyload-ng/default.nix +++ b/pkgs/applications/networking/pyload-ng/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, nixosTests, python3 }: python3.pkgs.buildPythonApplication rec { - version = "0.5.0b3.dev75"; + version = "0.5.0b3.dev80"; pname = "pyload-ng"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-1lPIKkZESonDaVCnac0iUu/gCqXVDBhNZrk5S0eC6F0="; + hash = "sha256-1vIkEctoj6udowYxFwY42f/zL9Elw2Nl6ZaL2x30k/M="; }; patches = [ From f9bb24b8a2537b2779573b3d3b74b03c913dd1c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 20:45:00 +0000 Subject: [PATCH 07/25] libretro.ppsspp: unstable-2024-02-16 -> unstable-2024-02-23 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 2411b8046b67..7b8316bf5195 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -662,11 +662,11 @@ "src": { "owner": "hrydgard", "repo": "ppsspp", - "rev": "f5450e40eb3f4861451fb98bf9239dacc5aef81e", - "hash": "sha256-Kj0bxp2ValsmoKHP4x8LJ60priLnRAvgtjsUemm0do4=", + "rev": "d5cfcccbeab6c6b6dc7e851724b9ccd8252b2592", + "hash": "sha256-lBzOIQpv0H0/DTCyWpf3tX3d/N9M49djoIwGgDW+S9A=", "fetchSubmodules": true }, - "version": "unstable-2024-02-16" + "version": "unstable-2024-02-23" }, "prboom": { "fetcher": "fetchFromGitHub", From ee6ae28b38fc6d519923b649e518ed081f0a4d9a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 20:45:18 +0000 Subject: [PATCH 08/25] libretro.puae: unstable-2024-02-20 -> unstable-2024-02-22 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 2411b8046b67..0056a0064178 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -693,10 +693,10 @@ "src": { "owner": "libretro", "repo": "libretro-uae", - "rev": "4e8b54dd574eff239b5f4b4e3bc35c40b3a7cdd4", - "hash": "sha256-pBpzzCgZYaA7/+UvwTsKCRseroe98AwRovjIk4Z0fhI=" + "rev": "5f683ae67b998fcadd69fa8f65f2440fa8ef135f", + "hash": "sha256-SvV18vqMf9ZtGzrK3bnE0h2ImYi1QuLi7t+ZO91Lm6Y=" }, - "version": "unstable-2024-02-20" + "version": "unstable-2024-02-22" }, "quicknes": { "fetcher": "fetchFromGitHub", From f47b694cd36fe587a310bb2e86b81ad4980542c4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 20:45:25 +0000 Subject: [PATCH 09/25] libretro.mame2003-plus: unstable-2024-02-16 -> unstable-2024-02-21 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 2411b8046b67..4c738618d801 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -438,10 +438,10 @@ "src": { "owner": "libretro", "repo": "mame2003-plus-libretro", - "rev": "fc987f1913203a41bca7f6fd16e92c83729dd7fc", - "hash": "sha256-Mn0WuzGGxDlUEccC21V0FzRyTAgRoAnLCm5jpz9rkdY=" + "rev": "1a5b4b75e1e178a338f8f3dee3dfd940c8c9a3f2", + "hash": "sha256-6r30iB3LQvtHQh5nv+ZL/hag1j/l/uEpVzkzieLaK80=" }, - "version": "unstable-2024-02-16" + "version": "unstable-2024-02-21" }, "mame2010": { "fetcher": "fetchFromGitHub", From 1a6333bbdeda6fe4c47ad4cd0c4b5b6d1a3ca45a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 23 Feb 2024 23:15:27 +0100 Subject: [PATCH 10/25] python311Packages.pysaml2: 7.4.1 -> 7.5.0 Diff: IdentityPython/pysaml2@refs/tags/v7.4.1...v7.5.0 Changelog: https://github.com/IdentityPython/pysaml2/releases/tag/v7.5.0 --- .../python-modules/pysaml2/default.nix | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/pysaml2/default.nix b/pkgs/development/python-modules/pysaml2/default.nix index b8ace412614c..7f2735642253 100644 --- a/pkgs/development/python-modules/pysaml2/default.nix +++ b/pkgs/development/python-modules/pysaml2/default.nix @@ -3,7 +3,8 @@ , cryptography , defusedxml , fetchFromGitHub -, importlib-resources +, fetchPypi +, paste , poetry-core , pyasn1 , pymongo @@ -11,27 +12,30 @@ , pytestCheckHook , python-dateutil , pythonOlder +, pythonRelaxDepsHook , pytz +, repoze-who , requests , responses , setuptools , substituteAll , xmlschema , xmlsec +, zope-interface }: buildPythonPackage rec { pname = "pysaml2"; - version = "7.4.2"; + version = "7.5.0"; format = "pyproject"; disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "IdentityPython"; - repo = pname; + repo = "pysaml2"; rev = "refs/tags/v${version}"; - hash = "sha256-f8qd1Mfy32CYH9/PshfMMBviDg7OhOPlwz69bPjlYbg="; + hash = "sha256-M/tdKGu6K38TeBZc8/dt376bHhPB0svHB3iis/se0DY="; }; patches = [ @@ -46,8 +50,13 @@ buildPythonPackage rec { sed -i 's/2999\(-.*T\)/2029\1/g' tests/*.xml ''; + pythonRelaxDeps = [ + "xmlschema" + ]; + nativeBuildInputs = [ poetry-core + pythonRelaxDepsHook ]; propagatedBuildInputs = [ @@ -59,10 +68,16 @@ buildPythonPackage rec { requests setuptools xmlschema - ] ++ lib.optionals (pythonOlder "3.9") [ - importlib-resources ]; + passthru.optional-dependencies = { + s2repoze = [ + paste + repoze-who + zope-interface + ]; + }; + nativeCheckInputs = [ pyasn1 pymongo From 4e686dcfbd778c5953467387ee4fe42f4b32e75e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 22:36:43 +0000 Subject: [PATCH 11/25] libretro.flycast: unstable-2024-02-09 -> unstable-2024-02-23 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 2411b8046b67..79d860a00cee 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -307,11 +307,11 @@ "src": { "owner": "flyinghead", "repo": "flycast", - "rev": "44fa364f36c43bed19b055096600f075c656f78c", - "hash": "sha256-UfASq8OXtsfubMUfke7P6HTygM/9fP421IoLQeJvPgY=", + "rev": "bc51aefa9c52981621abf1d3545bff7befa4d01b", + "hash": "sha256-NSCJxex5Rl7sWe2DkJ2aIyPzfdTcwSRb2iI3xpvYiow=", "fetchSubmodules": true }, - "version": "unstable-2024-02-09" + "version": "unstable-2024-02-23" }, "fmsx": { "fetcher": "fetchFromGitHub", From 1becba97637d66a1ede42bb9b14868d13eaafbbe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 24 Feb 2024 00:06:45 +0100 Subject: [PATCH 12/25] python311Packages.tencentcloud-sdk-python: init at 3.0.1094 Tencent Cloud API 3.0 SDK for Python https://github.com/TencentCloud/tencentcloud-sdk-python --- .../tencentcloud-sdk-python/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/tencentcloud-sdk-python/default.nix diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix new file mode 100644 index 000000000000..c91dce1a4c59 --- /dev/null +++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix @@ -0,0 +1,54 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, requests +, setuptools +}: + +buildPythonPackage rec { + pname = "tencentcloud-sdk-python"; + version = "3.0.1094"; + pyproject = true; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "TencentCloud"; + repo = "tencentcloud-sdk-python"; + rev = "refs/tags/${version}"; + hash = "sha256-h2p9auD8bTDbagAmjsmV06Z75I93LB6h+/ZYyt17ow0="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + requests + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "tencentcloud" + ]; + + pytestFlagsArray = [ + # Other tests require credentials + "tests/unit/test_deserialize_warning.py" + "tests/unit/test_import.py" + "tests/unit/test_serialization.py" + ]; + + meta = with lib; { + description = "Tencent Cloud API 3.0 SDK for Python"; + homepage = "https://github.com/TencentCloud/tencentcloud-sdk-python"; + changelog = "https://github.com/TencentCloud/tencentcloud-sdk-python/blob/${version}/CHANGELOG.md"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a94342c01b6e..f4834c7e9db8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14287,6 +14287,8 @@ self: super: with self; { tenacity = callPackage ../development/python-modules/tenacity { }; + tencentcloud-sdk-python = callPackage ../development/python-modules/tencentcloud-sdk-python { }; + tensorboard-data-server = callPackage ../development/python-modules/tensorboard-data-server { }; tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { }; From 34cacf41961e471c2f6ae57dd55cad7e714478a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 23:11:27 +0000 Subject: [PATCH 13/25] libretro.gambatte: unstable-2024-02-09 -> unstable-2024-02-23 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 2411b8046b67..a2eb242f6ed0 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -348,10 +348,10 @@ "src": { "owner": "libretro", "repo": "gambatte-libretro", - "rev": "05c4e10168aa3070b4ea01f7da7ab1c0d4241103", - "hash": "sha256-W/s8FWjFOIcclLkbM5s2+2dcvr+X2My5319SvRo5/lU=" + "rev": "4041d5a6c474d2d01b4cb1e81324b06b51d0147b", + "hash": "sha256-TmPOka3oz5xIFDEsmDbvXXmLmP15FtQdoUZ+FErbqrI=" }, - "version": "unstable-2024-02-09" + "version": "unstable-2024-02-23" }, "genesis-plus-gx": { "fetcher": "fetchFromGitHub", From 090edbf0b4f65deed315426b06c4cdb89ff8e094 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 23 Feb 2024 23:14:10 +0000 Subject: [PATCH 14/25] libretro.genesis-plus-gx: unstable-2024-02-16 -> unstable-2024-02-23 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index 2411b8046b67..b0f34fb3e4fc 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -358,10 +358,10 @@ "src": { "owner": "libretro", "repo": "Genesis-Plus-GX", - "rev": "7aba063778534a78b080a737c0465667ebd66154", - "hash": "sha256-Rx5ymDqYmtovr/IJRY4loUwwWTk8GEs+oviP4YOk6ZI=" + "rev": "b38cdca9036332c1b7b05817432d1fd42d59527b", + "hash": "sha256-5yr64Jy8WxamMknIG9nhIV4BLTZg8k7Q8Lnw8sfmWhk=" }, - "version": "unstable-2024-02-16" + "version": "unstable-2024-02-23" }, "gpsp": { "fetcher": "fetchFromGitHub", From a9db778648cf22419ea7b768016c74a4d8b0b69f Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 24 Feb 2024 05:57:43 +0100 Subject: [PATCH 15/25] llvmPackages_git.libcxxabi: unbreak on x86_64-darwin Co-authored-by: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> --- .../0001-darwin-10.12-mbstate_t-fix.patch | 31 +++++++++++++++++++ .../compilers/llvm/git/libcxx/default.nix | 5 +++ .../compilers/llvm/git/libcxxabi/default.nix | 3 -- 3 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/llvm/git/libcxx/0001-darwin-10.12-mbstate_t-fix.patch diff --git a/pkgs/development/compilers/llvm/git/libcxx/0001-darwin-10.12-mbstate_t-fix.patch b/pkgs/development/compilers/llvm/git/libcxx/0001-darwin-10.12-mbstate_t-fix.patch new file mode 100644 index 000000000000..0a2e8db07391 --- /dev/null +++ b/pkgs/development/compilers/llvm/git/libcxx/0001-darwin-10.12-mbstate_t-fix.patch @@ -0,0 +1,31 @@ +From 9c1cb26c1dd3f92d1c1177e548107d2cd3c5e616 Mon Sep 17 00:00:00 2001 +From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> +Date: Fri, 23 Feb 2024 22:58:58 +0000 +Subject: [PATCH] darwin 10.12 mbstate_t fix + +https://github.com/llvm/llvm-project/issues/64226 + +removes space from +https://github.com/macports/macports-ports/raw/acd8acb171f1658596ed1cf25da48d5b932e2d19/lang/llvm-17/files/0042-mbstate_t-not-defined.patch +so it applies cleanly +--- + include/__mbstate_t.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/include/__mbstate_t.h b/include/__mbstate_t.h +index bfa6d61..5f51112 100644 +--- a/include/__mbstate_t.h ++++ b/include/__mbstate_t.h +@@ -42,6 +42,9 @@ + #elif __has_include() + # include // works on most Unixes + #elif __has_include() ++# if __has_include() ++# include ++# endif + # include // works on Darwin + #elif !defined(_LIBCPP_HAS_NO_WIDE_CHARACTERS) && __has_include_next() + # include_next // fall back to the C standard provider of mbstate_t +-- +2.43.0 + diff --git a/pkgs/development/compilers/llvm/git/libcxx/default.nix b/pkgs/development/compilers/llvm/git/libcxx/default.nix index 9b37a246d920..11f4c6fe5fd1 100644 --- a/pkgs/development/compilers/llvm/git/libcxx/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxx/default.nix @@ -45,6 +45,11 @@ stdenv.mkDerivation rec { chmod -R u+w . ''; + patches = lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [ + # https://github.com/llvm/llvm-project/issues/64226 + ./0001-darwin-10.12-mbstate_t-fix.patch + ]; + postPatch = '' cd ../runtimes ''; diff --git a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix index f2811fa08bb6..8e1979654325 100644 --- a/pkgs/development/compilers/llvm/git/libcxxabi/default.nix +++ b/pkgs/development/compilers/llvm/git/libcxxabi/default.nix @@ -126,8 +126,5 @@ stdenv.mkDerivation rec { # the UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; maintainers = llvm_meta.maintainers ++ [ lib.maintainers.vlstill ]; - # Broken until https://github.com/llvm/llvm-project/issues/64226 is resolved - # We should check if the version is not 10.13 but that is currently broken. - broken = stdenv.isDarwin && stdenv.isx86_64; }; } From f96ed2726446e895a6fe8d986440d9564e83ce7c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 05:20:51 +0000 Subject: [PATCH 16/25] fishPlugins.forgit: 24.01.0 -> 24.02.0 --- pkgs/shells/fish/plugins/forgit.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/fish/plugins/forgit.nix b/pkgs/shells/fish/plugins/forgit.nix index 7d6a89098900..253208d47981 100644 --- a/pkgs/shells/fish/plugins/forgit.nix +++ b/pkgs/shells/fish/plugins/forgit.nix @@ -2,13 +2,13 @@ buildFishPlugin rec { pname = "forgit"; - version = "24.01.0"; + version = "24.02.0"; src = fetchFromGitHub { owner = "wfxr"; repo = "forgit"; rev = version; - hash = "sha256-WHhyllOr/PgR+vlrfMQs/3/d3xpmDylT6BlLCu50a2g="; + hash = "sha256-DoOtrnEJwSxkCZtsVek+3w9RZH7j7LTvdleBC88xyfI="; }; postInstall = '' From 23245398884ad3619e860d4d2aa43f358ed8ec69 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 05:35:37 +0000 Subject: [PATCH 17/25] home-assistant-custom-lovelace-modules.mushroom: 3.4.0 -> 3.4.2 --- .../custom-lovelace-modules/mushroom/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix index 9c1df1db27db..9515fac0792d 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix @@ -5,16 +5,16 @@ buildNpmPackage rec { pname = "mushroom"; - version = "3.4.0"; + version = "3.4.2"; src = fetchFromGitHub { owner = "piitaya"; repo = "lovelace-mushroom"; rev = "v${version}"; - hash = "sha256-XVi+VPOVHfYBlIY9xN7x9Qe1bVw/qS9p8bcRZb0ksE0="; + hash = "sha256-OUcOCBLEU8V+eadHuyA6F0uT8fJLRe1Xd9/X5ULCZVc="; }; - npmDepsHash = "sha256-XtSeO5+RaBCBLmq6paRX9KipkhcEdJhzrQeEDdysZE0="; + npmDepsHash = "sha256-oIee6iJ18EBztje1aw4xzWa1wSIbgau4q0MyVx0T41I="; installPhase = '' runHook preInstall From 9ba19dd9fec14480c3caca2e67b913ab0554b249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christina=20S=C3=B8rensen?= Date: Sat, 24 Feb 2024 07:46:08 +0100 Subject: [PATCH 18/25] maintainers: update cafkafk matrix homeserver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Christina Sørensen --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index eb934d99bc13..dfa04fed4c3a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2989,7 +2989,7 @@ }; cafkafk = { email = "christina@cafkafk.com"; - matrix = "@cafkafk:nixos.dev"; + matrix = "@cafkafk:gitter.im"; name = "Christina Sørensen"; github = "cafkafk"; githubId = 89321978; From ee5bef2e6976f3d67011be40bb647879e1dfe5e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 08:12:38 +0000 Subject: [PATCH 19/25] obs-studio-plugins.obs-shaderfilter: 2.0.0 -> 2.2.2 --- .../video/obs-studio/plugins/obs-shaderfilter.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix index 195b2d6e1769..2016637ccd9e 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-shaderfilter.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "obs-shaderfilter"; - version = "2.0.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-shaderfilter"; rev = version; - sha256 = "sha256-CEe/NUIYhVdvs7/ZvrvuwKPRNofWE+WZxN6yN8RACs8="; + sha256 = "sha256-cz4Qk56e9CC//a+7pz5rcTxPlMwDwSAKfmgMyBZI4mo="; }; nativeBuildInputs = [ cmake ]; From 93679d4d0ab7e22acd71d54e43abce590e7ea40e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?= Date: Sun, 18 Feb 2024 13:43:46 +0100 Subject: [PATCH 20/25] power-profiles-daemon: 0.13 -> 0.20 The upstream original maintainer is not paid anymore to maintain the project and decided to step down. The project has been taken over by the upower team. This is the first release part of this upower team. The integration tests are now relying on the powerprofilectl command: we need to patch the python path of this dependency before running the integration tests instead of doing that during in the fixup phase. Taking advantage of this to remove the PostFixup phase. Not 100% about this move: it's a bit less future proof. --- .../linux/power-profiles-daemon/default.nix | 39 ++++++------------- 1 file changed, 11 insertions(+), 28 deletions(-) diff --git a/pkgs/os-specific/linux/power-profiles-daemon/default.nix b/pkgs/os-specific/linux/power-profiles-daemon/default.nix index e81f42b65a23..dcf146a01fa6 100644 --- a/pkgs/os-specific/linux/power-profiles-daemon/default.nix +++ b/pkgs/os-specific/linux/power-profiles-daemon/default.nix @@ -5,7 +5,6 @@ , mesonEmulatorHook , ninja , fetchFromGitLab -, fetchpatch , libgudev , glib , polkit @@ -21,22 +20,21 @@ , umockdev , systemd , python3 -, wrapGAppsNoGuiHook , nixosTests }: stdenv.mkDerivation rec { pname = "power-profiles-daemon"; - version = "0.13"; + version = "0.20"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; - owner = "hadess"; + owner = "upower"; repo = "power-profiles-daemon"; rev = version; - sha256 = "sha256-ErHy+shxZQ/aCryGhovmJ6KmAMt9OZeQGDbHIkC0vUE="; + sha256 = "sha256-8wSRPR/1ELcsZ9K3LvSNlPcJvxRhb/LRjTIxKtdQlCA="; }; nativeBuildInputs = [ @@ -50,8 +48,6 @@ stdenv.mkDerivation rec { libxml2 # for xmllint for stripping GResources libxslt # for xsltproc for building docs gobject-introspection - wrapGAppsNoGuiHook - python3.pkgs.wrapPython # checkInput but cheked for during the configuring (python3.pythonOnBuildForHost.withPackages (ps: with ps; [ pygobject3 @@ -68,16 +64,16 @@ stdenv.mkDerivation rec { upower glib polkit - python3 # for cli tool - # Duplicate from nativeCheckInputs until https://github.com/NixOS/nixpkgs/issues/161570 is solved - umockdev + # for cli tool + (python3.withPackages (ps: [ + ps.pygobject3 + ])) ]; strictDeps = true; - # for cli tool - pythonPath = [ - python3.pkgs.pygobject3 + checkInputs = [ + umockdev ]; nativeCheckInputs = [ @@ -95,26 +91,13 @@ stdenv.mkDerivation rec { PKG_CONFIG_POLKIT_GOBJECT_1_POLICYDIR = "${placeholder "out"}/share/polkit-1/actions"; - # Avoid double wrapping - dontWrapGApps = true; - postPatch = '' patchShebangs --build \ tests/integration-test.py \ tests/unittest_inspector.py - ''; - postCheck = '' - # Do not contaminate the wrapper with test dependencies. - unset GI_TYPELIB_PATH - unset XDG_DATA_DIRS - ''; - - postFixup = '' - # Avoid double wrapping - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - # Make Python libraries available - wrapPythonProgramsIn "$out/bin" "$pythonPath" + patchShebangs --host \ + src/powerprofilesctl ''; passthru = { From 1da7dfa57d4a380230edba7686a0ffe8a4a31eea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Baylac=20Jacqu=C3=A9?= Date: Sun, 18 Feb 2024 13:46:56 +0100 Subject: [PATCH 21/25] nixosTests.power-profiles-daemon: test profilectl CLI We also take advantage of that change to point to the new dbus canonical names. --- nixos/tests/power-profiles-daemon.nix | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/nixos/tests/power-profiles-daemon.nix b/nixos/tests/power-profiles-daemon.nix index c887cde4b829..8a54d8e8bab8 100644 --- a/nixos/tests/power-profiles-daemon.nix +++ b/nixos/tests/power-profiles-daemon.nix @@ -8,22 +8,22 @@ import ./make-test-python.nix ({ pkgs, ... }: nodes.machine = { pkgs, ... }: { security.polkit.enable = true; services.power-profiles-daemon.enable = true; - environment.systemPackages = [ pkgs.glib ]; + environment.systemPackages = [ pkgs.glib pkgs.power-profiles-daemon ]; }; testScript = '' def get_profile(): return machine.succeed( - """gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \ - --method org.freedesktop.DBus.Properties.Get 'net.hadess.PowerProfiles' 'ActiveProfile' + """gdbus call --system --dest org.freedesktop.UPower.PowerProfiles --object-path /org/freedesktop/UPower/PowerProfiles \ + --method org.freedesktop.DBus.Properties.Get 'org.freedesktop.UPower.PowerProfiles' 'ActiveProfile' """ ) def set_profile(profile): return machine.succeed( - """gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \ - --method org.freedesktop.DBus.Properties.Set 'net.hadess.PowerProfiles' 'ActiveProfile' "<'{profile}'>" + """gdbus call --system --dest org.freedesktop.UPower.PowerProfiles --object-path /org/freedesktop/UPower/PowerProfiles \ + --method org.freedesktop.DBus.Properties.Set 'org.freedesktop.UPower.PowerProfiles' 'ActiveProfile' "<'{profile}'>" """.format( profile=profile ) @@ -42,5 +42,16 @@ import ./make-test-python.nix ({ pkgs, ... }: profile = get_profile() if not "balanced" in profile: raise Exception("Unable to set balanced profile") + + # test powerprofilectl CLI + machine.succeed("powerprofilesctl set power-saver") + profile = get_profile() + if not "power-saver" in profile: + raise Exception("Unable to set power-saver profile with powerprofilectl") + + machine.succeed("powerprofilesctl set balanced") + profile = get_profile() + if not "balanced" in profile: + raise Exception("Unable to set balanced profile with powerprofilectl") ''; }) From aef5e138b1372074083581852c7b30bd850cb340 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 24 Feb 2024 09:35:23 +0000 Subject: [PATCH 22/25] vdrPlugins.softhddevice: 2.0.9 -> 2.1.1 --- pkgs/applications/video/vdr/softhddevice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 3e738e40d486..4d2504f5e5e6 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -14,12 +14,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.0.9"; + version = "2.1.1"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-FyjKMCKPZVtQhb7wBx4Xr6I/kb2QMH/TEE21bw5gcwc="; + sha256 = "sha256-d/Cl0sE4laDdjMhd3xTHcY4OT5tWWCFCvLsNF157+zw="; rev = "v${version}"; }; From 8e8148f624362e60a5adf1b9efcdfcf246047bbc Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 23 Feb 2024 04:20:00 +0000 Subject: [PATCH 23/25] git-absorb: 0.6.11 -> 0.6.12 Diff: https://github.com/tummychow/git-absorb/compare/refs/tags/0.6.11...0.6.12 --- pkgs/applications/version-management/git-absorb/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-absorb/default.nix b/pkgs/applications/version-management/git-absorb/default.nix index b45df5d9a0f6..13dcac9fde6d 100644 --- a/pkgs/applications/version-management/git-absorb/default.nix +++ b/pkgs/applications/version-management/git-absorb/default.nix @@ -2,20 +2,20 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.11"; + version = "0.6.12"; src = fetchFromGitHub { owner = "tummychow"; repo = "git-absorb"; rev = "refs/tags/${version}"; - hash = "sha256-SYBJKnzv2oktWubgm/j6wEeoLSBjGqQVXQf9LOaq+NU="; + hash = "sha256-yHCO1v1d0MUakae16fFVvtKG3rVxU/Cii/G6IKzyebA="; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoHash = "sha256-i2ntM7NTi+hiB7DxEEV+3SXV8sVVWcNanif/wUZ9XvI="; + cargoHash = "sha256-Bx7gH7jSLizG95JyBtziPBby9mF1Nj3CQexIg6gaiM0="; postInstall = '' installManPage Documentation/git-absorb.1 From a65967a12c9e09d23ff50b25785f861ee6af0539 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 19 Feb 2024 05:39:29 +0000 Subject: [PATCH 24/25] nixos/nix: documentation: fix outdated reference to /etc/nix.conf --- nixos/modules/config/nix.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/nix.nix b/nixos/modules/config/nix.nix index 2769d8b25ef6..e6a74bbb73fc 100644 --- a/nixos/modules/config/nix.nix +++ b/nixos/modules/config/nix.nix @@ -1,5 +1,5 @@ /* - Manages /etc/nix.conf. + Manages /etc/nix/nix.conf. See also - ./nix-channel.nix From d01044ecfa9c89a925bebb76cf60f2e3b9cea667 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 7 Jan 2024 12:36:42 +0100 Subject: [PATCH 25/25] zabbix40: drop, no more supported upstream Security/limited support ended in October 2023. https://www.zabbix.com/life_cycle_and_release_policy --- pkgs/servers/monitoring/zabbix/versions.nix | 5 ----- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index d6d7adfb395a..cf4d9bc8508b 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -10,9 +10,4 @@ generic: { sha256 = "sha256-+C5fI+eMJKsynVnVJIYj27x1iFQwaG9Fnho0BXgENQI="; vendorHash = "sha256-oSZBzIUL1yHXk7PnkSAlhI0i89aGMFrFHmbMN9rDAJ0="; }; - - v40 = generic { - version = "4.0.48"; - sha256 = "sha256-WK8Zzkd/s9M7N5Qr2kejtp/f/n1wb5zRSfh0RiI2K+Q="; - }; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 17c06aee1ca9..5a44235de0c3 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1191,6 +1191,7 @@ mapAliases ({ ### Z ### + zabbix40 = throw "'zabbix40' has been removed as it has reached end of life"; # Added 2024-01-07 zinc = zincsearch; # Added 2023-05-28 zkg = throw "'zkg' has been replaced by 'zeek'"; zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1a88014658eb..c3023859f6f6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27341,16 +27341,14 @@ with pkgs; server-mysql = (callPackages ../servers/monitoring/zabbix/server.nix { mysqlSupport = true; }).${version}; server-pgsql = (callPackages ../servers/monitoring/zabbix/server.nix { postgresqlSupport = true; }).${version}; web = (callPackages ../servers/monitoring/zabbix/web.nix {}).${version}; + agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix {}).${version}; # backwards compatibility server = server-pgsql; - } // lib.optionalAttrs ( version != "v40" ) { # agent2 is not supported in v4 - agent2 = (callPackages ../servers/monitoring/zabbix/agent2.nix {}).${version}; }; zabbix60 = recurseIntoAttrs (zabbixFor "v60"); zabbix50 = recurseIntoAttrs (zabbixFor "v50"); - zabbix40 = dontRecurseIntoAttrs (zabbixFor "v40"); zabbix = zabbix60;