From 6ce550e2bbf9521d2caa12f0ef935d700ce191f1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 25 Sep 2024 10:46:35 +0200
Subject: [PATCH] python312Packages.e3-core: 22.5.0 -> 22.6.0

Diff: AdaCore/e3-core@refs/tags/v22.5.0...v22.6.0

Changelog: https://github.com/AdaCore/e3-core/releases/tag/v22.6.0
---
 .../e3-core/0001-use-distro-over-ld.patch     | 42 -------------------
 .../python-modules/e3-core/default.nix        | 30 ++++++-------
 2 files changed, 15 insertions(+), 57 deletions(-)
 delete mode 100644 pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch

diff --git a/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch b/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch
deleted file mode 100644
index 15548b7aec1c..000000000000
--- a/pkgs/development/python-modules/e3-core/0001-use-distro-over-ld.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 189681bbfb703a7026ca7bbb3b21ef554807b144 Mon Sep 17 00:00:00 2001
-From: tali auster <taliauster@gmail.com>
-Date: Wed, 15 Nov 2023 12:15:34 -0700
-Subject: [PATCH] use distro over ld
-
-The `ld` module (linux distribution) was renamed to `distro`, presumably
-so as not to subsume binutils name.
-
----
- setup.py              | 2 +-
- src/e3/os/platform.py | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index c32f46f..de1ada6 100644
---- a/setup.py
-+++ b/setup.py
-@@ -25,7 +25,7 @@ for p in ("darwin", "linux", "linux2", "win32"):
-     platform_string = ":sys_platform=='%s'" % p
-     extras_require[platform_string] = ["psutil"]
-     if p in ("linux", "linux2"):
--        extras_require[platform_string].append("ld")
-+        extras_require[platform_string].append("distro")
- 
- # Get e3 version from the VERSION file.
- version_file = os.path.join(os.path.dirname(__file__), "VERSION")
-diff --git a/src/e3/os/platform.py b/src/e3/os/platform.py
-index 2d4e174..a9d12d3 100644
---- a/src/e3/os/platform.py
-+++ b/src/e3/os/platform.py
-@@ -78,7 +78,7 @@ class SystemInfo:
- 
-         # Fetch linux distribution info on linux OS
-         if cls.uname.system == "Linux":  # linux-only
--            import ld
-+            import distro as ld
- 
-             cls.ld_info = {
-                 "name": ld.name(),
--- 
-2.40.1
-
diff --git a/pkgs/development/python-modules/e3-core/default.nix b/pkgs/development/python-modules/e3-core/default.nix
index a6538d67eb25..9f37786ba4d6 100644
--- a/pkgs/development/python-modules/e3-core/default.nix
+++ b/pkgs/development/python-modules/e3-core/default.nix
@@ -1,18 +1,19 @@
 {
+  lib,
+  stdenv,
   autoPatchelfHook,
   buildPythonPackage,
   colorama,
   distro,
   fetchFromGitHub,
-  lib,
   packaging,
   psutil,
   python-dateutil,
+  pythonOlder,
   pyyaml,
-  requests,
   requests-cache,
   requests-toolbelt,
-  stdenv,
+  requests,
   setuptools,
   stevedore,
   tqdm,
@@ -20,38 +21,37 @@
 
 buildPythonPackage rec {
   pname = "e3-core";
-  version = "22.5.0";
+  version = "22.6.0";
   pyproject = true;
 
+  disabled = pythonOlder "3.6";
+
   src = fetchFromGitHub {
     owner = "AdaCore";
     repo = "e3-core";
     rev = "refs/tags/v${version}";
-    hash = "sha256-7csZYohU89uavSMPOKGJ8HClmtiweGSghyR7QgFfSY8=";
+    hash = "sha256-6rClGDo8KhBbOg/Rw0nVISVtOAACf5cwSafNInlBGCw=";
   };
 
-  patches = [ ./0001-use-distro-over-ld.patch ];
+  build-system = [ setuptools ];
 
-  nativeBuildInputs = [
-    autoPatchelfHook
-    setuptools
-  ];
+  nativeBuildInputs = [ autoPatchelfHook ];
 
-  propagatedBuildInputs =
+  dependencies =
     [
       colorama
       packaging
-      pyyaml
       python-dateutil
+      pyyaml
       requests
       requests-cache
       requests-toolbelt
-      tqdm
       stevedore
+      tqdm
     ]
     ++ lib.optional stdenv.hostPlatform.isLinux [
-      # See setup.py:24. These are required only on Linux. Darwin has its own set
-      # of requirements.
+      # See https://github.com/AdaCore/e3-core/blob/v22.6.0/pyproject.toml#L37-L42
+      # These are required only on Linux. Darwin has its own set of requirements
       psutil
       distro
     ];