From ea95a42ccdabbf5f262491f85a4eacb2fa3a03e0 Mon Sep 17 00:00:00 2001
From: StarrFox <StarrFox6312@gmail.com>
Date: Sat, 25 May 2024 21:29:40 -0500
Subject: [PATCH 1/2] python3Packages.import-expression: 1.1.4 -> 1.1.5

---
 .../import-expression/default.nix             | 20 ++++++-------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix
index 4dc6d053154d..5415d3db5989 100644
--- a/pkgs/development/python-modules/import-expression/default.nix
+++ b/pkgs/development/python-modules/import-expression/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchFromGitHub,
+  fetchPypi,
   fetchpatch,
   pytestCheckHook,
   astunparse,
@@ -9,23 +9,15 @@
 }:
 buildPythonPackage rec {
   pname = "import-expression";
-  version = "1.1.4";
+  version = "1.1.5";
   pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "ioistired";
-    repo = "import-expression-parser";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-mll2NePB7fthzltLOk6D9BgaDpH6GaW4psqcGun/0qM=";
+  src = fetchPypi {
+    inherit version;
+    pname = "import_expression";
+    hash = "sha256-mVlYj8/I3LFEoHJRds/vbCjH2x/C1oNiUCXmh1FtQME=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/ioistired/import-expression-parser/commit/3daf968c3163b64685aa529740e132f0df5ab262.patch";
-      hash = "sha256-2Ubv3onor2D26udZbDDMb3iNLopEIRnIcO/X6WUVmJU=";
-    })
-  ];
-
   nativeBuildInputs = [ setuptools ];
   propagatedBuildInputs = [ astunparse ];
   nativeCheckInputs = [ pytestCheckHook ];

From ad43b9c0cf4bd6584c80f50b5388b366ae489621 Mon Sep 17 00:00:00 2001
From: StarrFox <StarrFox6312@gmail.com>
Date: Sun, 26 May 2024 20:02:42 -0500
Subject: [PATCH 2/2] python3Packages.import-expression: update legacy
 attributes

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

diff --git a/pkgs/development/python-modules/import-expression/default.nix b/pkgs/development/python-modules/import-expression/default.nix
index 5415d3db5989..3407aa277152 100644
--- a/pkgs/development/python-modules/import-expression/default.nix
+++ b/pkgs/development/python-modules/import-expression/default.nix
@@ -18,8 +18,8 @@ buildPythonPackage rec {
     hash = "sha256-mVlYj8/I3LFEoHJRds/vbCjH2x/C1oNiUCXmh1FtQME=";
   };
 
-  nativeBuildInputs = [ setuptools ];
-  propagatedBuildInputs = [ astunparse ];
+  build-system = [ setuptools ];
+  dependencies = [ astunparse ];
   nativeCheckInputs = [ pytestCheckHook ];
   pytestFlagsArray = [ "tests.py" ];