From 32263858d897e70b8be62e6e70044d5337fa019c Mon Sep 17 00:00:00 2001 From: puzzlewolf Date: Thu, 19 Oct 2023 15:28:28 +0200 Subject: [PATCH 1/2] python311Packages.pysequoia: 0.1.14 -> 0.1.20 --- .../python-modules/pysequoia/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix index ffc7486cf20a..c35412383016 100644 --- a/pkgs/development/python-modules/pysequoia/default.nix +++ b/pkgs/development/python-modules/pysequoia/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, fetchFromGitLab +, fetchPypi , pkg-config , rustPlatform , cargo @@ -15,20 +15,18 @@ buildPythonPackage rec { pname = "pysequoia"; - version = "0.1.14"; + version = "0.1.20"; format = "pyproject"; - src = fetchFromGitLab { - owner = "sequoia-pgp"; - repo = "pysequoia"; - rev = "v${version}"; - hash = "sha256-63kUUxZTG33cB/IiD4AiDpLOI6Uew/fETgqhaGc7zp0="; + src = fetchPypi { + inherit pname version; + hash = "sha256-KavsLp17e4ckX11B0pefiQ1Hma/O9x0VY/uVPiJm4Fs="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-S/j3bGgU46nvVQFs35ih05teVEIJrFN4Ryq4B7rLFDE="; + hash = "sha256-7Lw6gR6o2HJ/zyG4b0wz4nmU2AIIAhyK9zaQ6w+/RgE="; }; nativeBuildInputs = [ @@ -54,6 +52,7 @@ buildPythonPackage rec { meta = with lib; { description = "This library provides OpenPGP facilities in Python through the Sequoia PGP library"; + downloadPage = "https://codeberg.org/wiktor/pysequoia"; homepage = "https://sequoia-pgp.gitlab.io/pysequoia"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; From 49dc08e4bc03f970cb919fa98cf9dff0f53e7edc Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 21 Oct 2023 10:29:56 +0300 Subject: [PATCH 2/2] python311Packages.pysequoia: mark as broken on Darwin --- pkgs/development/python-modules/pysequoia/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/pysequoia/default.nix b/pkgs/development/python-modules/pysequoia/default.nix index c35412383016..4e48f1c49dd1 100644 --- a/pkgs/development/python-modules/pysequoia/default.nix +++ b/pkgs/development/python-modules/pysequoia/default.nix @@ -11,6 +11,7 @@ , pcsclite , stdenv , darwin +, libiconv }: buildPythonPackage rec { @@ -46,6 +47,7 @@ buildPythonPackage rec { ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreFoundation darwin.apple_sdk.frameworks.Security + libiconv ]; pythonImportsCheck = [ "pysequoia" ]; @@ -56,5 +58,7 @@ buildPythonPackage rec { homepage = "https://sequoia-pgp.gitlab.io/pysequoia"; license = licenses.asl20; maintainers = with maintainers; [ doronbehar ]; + # Broken since the 0.1.20 update according to ofborg. The errors are not clear... + broken = stdenv.isDarwin; }; }