From 101ffd27a08e50f9cb056d93691d7b34074797de Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Sat, 11 May 2024 02:17:39 +0000 Subject: [PATCH 1/2] python311Packages.python3-gnutls: switch to pyproject, unbreak --- pkgs/development/python-modules/python3-gnutls/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python3-gnutls/default.nix b/pkgs/development/python-modules/python3-gnutls/default.nix index 72f695326d75..abd08b9f55b1 100644 --- a/pkgs/development/python-modules/python3-gnutls/default.nix +++ b/pkgs/development/python-modules/python3-gnutls/default.nix @@ -1,10 +1,10 @@ { lib, fetchFromGitHub, substituteAll, buildPythonPackage, isPy3k, gnutls -, twisted, pyopenssl, service-identity }: +, twisted, pyopenssl, service-identity, setuptools }: buildPythonPackage rec { pname = "python3-gnutls"; version = "3.1.9"; - format = "setuptools"; + pyproject = true; disabled = !isPy3k; @@ -15,6 +15,8 @@ buildPythonPackage rec { hash = "sha256-18T8bAHlNERHobsspUFvSC6ulN55nrFFb5aqNwU8T00="; }; + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ twisted pyopenssl service-identity ]; patches = [ From fe8fac541d2be5e86b79bc186b2de5e19a74dc81 Mon Sep 17 00:00:00 2001 From: annalee <168274788+annaleeleaves@users.noreply.github.com> Date: Sat, 11 May 2024 02:18:37 +0000 Subject: [PATCH 2/2] python312Packages.python3-gnutls: 3.1.9 -> 3.1.10 https://github.com/AGProjects/python3-gnutls/releases/tag/release-3.1.10 --- pkgs/development/python-modules/python3-gnutls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python3-gnutls/default.nix b/pkgs/development/python-modules/python3-gnutls/default.nix index abd08b9f55b1..6adaf3c03393 100644 --- a/pkgs/development/python-modules/python3-gnutls/default.nix +++ b/pkgs/development/python-modules/python3-gnutls/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "python3-gnutls"; - version = "3.1.9"; + version = "3.1.10"; pyproject = true; disabled = !isPy3k; @@ -11,8 +11,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "AGProjects"; repo = "python3-gnutls"; - rev = "324b78f7cd3d9fe58c89c7f0b2bf94199bd6a6e5"; # version not tagged - hash = "sha256-18T8bAHlNERHobsspUFvSC6ulN55nrFFb5aqNwU8T00="; + rev = "refs/tags/release-${version}"; + hash = "sha256-AdFRF3ZlkkAoSm5rvf/09FSYIo7SsZ38sD2joOLyukA="; }; nativeBuildInputs = [ setuptools ];