From 074c84c777c84764839088fc916f324a1bb560f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 22 Sep 2022 07:49:04 +0000
Subject: [PATCH 1/2] python310Packages.msal: 1.18.0 -> 1.19.0

---
 pkgs/development/python-modules/msal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix
index b4b47c5268e9..32e0aebd62f9 100644
--- a/pkgs/development/python-modules/msal/default.nix
+++ b/pkgs/development/python-modules/msal/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "msal";
-  version = "1.18.0";
+  version = "1.19.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-V2r1WGYDi2DtvLMdgxMlob2CQe0nIYbigylo/UcX0gI=";
+    sha256 = "sha256-ZeMp1py/5Iuz3TI2se+OTMkfhpY3YGwYTiJ+htKwYp0=";
   };
 
   propagatedBuildInputs = [

From 32c7454af4ab5fb764168e3a6430431e6708dd1a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 22 Sep 2022 12:52:09 +0200
Subject: [PATCH 2/2] python310Packages.msal: update substituteInPlace

- disable on older Python releases
---
 .../python-modules/msal/default.nix           | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix
index 32e0aebd62f9..f50818f5587d 100644
--- a/pkgs/development/python-modules/msal/default.nix
+++ b/pkgs/development/python-modules/msal/default.nix
@@ -1,19 +1,21 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchPypi
-, lib
-
-# pythonPackages
 , pyjwt
+, pythonOlder
 , requests
 }:
 
 buildPythonPackage rec {
   pname = "msal";
   version = "1.19.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ZeMp1py/5Iuz3TI2se+OTMkfhpY3YGwYTiJ+htKwYp0=";
+    hash = "sha256-ZeMp1py/5Iuz3TI2se+OTMkfhpY3YGwYTiJ+htKwYp0=";
   };
 
   propagatedBuildInputs = [
@@ -21,21 +23,21 @@ buildPythonPackage rec {
     requests
   ];
 
-  # we already have cryptography included, version bounds are causing issues
   postPatch = ''
     substituteInPlace setup.py \
-      --replace "PyJWT[crypto]>=1.0.0,<3" "PyJWT" \
-      --replace "cryptography>=0.6,<38" "cryptography"
+      --replace "PyJWT[crypto]>=1.0.0,<3" "PyJWT"
   '';
 
   # Tests assume Network Connectivity:
   # https://github.com/AzureAD/microsoft-authentication-library-for-python/blob/e2958961e8ec16d0af4199f60c36c3f913497e48/tests/test_authority.py#L73
   doCheck = false;
 
-  pythonImportsCheck = [ "msal" ];
+  pythonImportsCheck = [
+    "msal"
+  ];
 
   meta = with lib; {
-    description = "The Microsoft Authentication Library (MSAL) for Python library enables your app to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect";
+    description = "Library to access the Microsoft Cloud by supporting authentication of users with Microsoft Azure Active Directory accounts (AAD) and Microsoft Accounts (MSA) using industry standard OAuth2 and OpenID Connect";
     homepage = "https://github.com/AzureAD/microsoft-authentication-library-for-python";
     license = licenses.mit;
     maintainers = with maintainers; [ kamadorueda ];