From f3009dd57d0011bfaf30fe6325a0befb6672ca65 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 Dec 2022 12:28:14 +0000
Subject: [PATCH 1/2] python310Packages.python3-saml: 1.14.0 -> 1.15.0

---
 pkgs/development/python-modules/python3-saml/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix
index dca35089f45f..f1674627744e 100644
--- a/pkgs/development/python-modules/python3-saml/default.nix
+++ b/pkgs/development/python-modules/python3-saml/default.nix
@@ -3,14 +3,14 @@ isodate, lxml, xmlsec, freezegun }:
 
 buildPythonPackage rec {
   pname = "python3-saml";
-  version = "1.14.0";
+  version = "1.15.0";
   disabled = !isPy3k;
 
   src = fetchFromGitHub {
     owner = "onelogin";
     repo = "python3-saml";
-    rev = "v${version}";
-    sha256 = "sha256-TAfVXh1fSKhNn/lsi7elq4wFyKCxCtCYUTrnH3ytBTw=";
+    rev = "refs/tags/v${version}";
+    sha256 = "sha256-xPPR2z3h8RpoAROpKpu9ZoDxGq5Stm9wQVt4Stj/6fg=";
   };
 
   postPatch = ''

From 3bc282bec23b595f1d5c84d983e861827132a489 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 30 Dec 2022 15:38:54 +0100
Subject: [PATCH 2/2] python310Packages.python3-saml: add changelog to meta

- disable on unsupported Python releases
---
 .../python-modules/python3-saml/default.nix   | 38 ++++++++++++-------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/python3-saml/default.nix b/pkgs/development/python-modules/python3-saml/default.nix
index f1674627744e..18850603810a 100644
--- a/pkgs/development/python-modules/python3-saml/default.nix
+++ b/pkgs/development/python-modules/python3-saml/default.nix
@@ -1,33 +1,45 @@
-{ lib, fetchFromGitHub, buildPythonPackage, isPy3k,
-isodate, lxml, xmlsec, freezegun }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, freezegun
+, isodate
+, lxml
+, pythonOlder
+, xmlsec
+}:
 
 buildPythonPackage rec {
   pname = "python3-saml";
   version = "1.15.0";
-  disabled = !isPy3k;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "onelogin";
     repo = "python3-saml";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-xPPR2z3h8RpoAROpKpu9ZoDxGq5Stm9wQVt4Stj/6fg=";
+    hash = "sha256-xPPR2z3h8RpoAROpKpu9ZoDxGq5Stm9wQVt4Stj/6fg=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "lxml<4.7.1" "lxml<5"
-  '';
-
   propagatedBuildInputs = [
-    isodate lxml xmlsec
+    isodate
+    lxml
+    xmlsec
   ];
 
-  checkInputs = [ freezegun ];
-  pythonImportsCheck = [ "onelogin.saml2" ];
+  checkInputs = [
+    freezegun
+  ];
+
+  pythonImportsCheck = [
+    "onelogin.saml2"
+  ];
 
   meta = with lib; {
-    description = "OneLogin's SAML Python Toolkit for Python 3";
+    description = "OneLogin's SAML Python Toolkit";
     homepage = "https://github.com/onelogin/python3-saml";
+    changelog = "https://github.com/SAML-Toolkits/python3-saml/blob/v${version}/changelog.md";
     license = licenses.mit;
     maintainers = with maintainers; [ zhaofengli ];
   };