From ebf410ef418d3233fd8cce259bb6757d1ddaf786 Mon Sep 17 00:00:00 2001
From: moonshxne <fyzhao@uci.edu>
Date: Fri, 15 Sep 2023 22:00:04 +0800
Subject: [PATCH 1/2] `httpcore`: `setuptools` -> `hatchling` in 0.18.0+

Note that manually overriding the `buildInputs` actually results in:

```sh
last 10 log lines:
       > Executing pythonRemoveTestsDir
       > Finished executing pythonRemoveTestsDir
       > pythonCatchConflictsPhase
       > /nix/store/q2zpnf017gccs9w9mb0ikdqhkf0k5v82-catch_conflicts.py:1: DeprecationWarning: pkg_resources is deprecated as an API. See https://setuptools.pypa.io/en/latest/pkg_resources.html
       >   import pkg_resources
       > Found duplicated packages in closure for dependency 'hatchling':
       >   hatchling 1.18.0 (/nix/store/zjkajhjjz7wis9yvm3gwvphifx3hiav2-python3.10-hatchling-1.18.0/lib/python3.10/site-packages)
       >   hatchling 1.18.0 (/nix/store/2jy9c8hbk8v0rk45zv8680srs1jky977-python3.10-hatchling-1.18.0/lib/python3.10/site-packages)
       >
       > Package duplicates found in closure, see above. Usually this happens if two packages depend on different version of the same dependency.
```
---
 overrides/build-systems.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/overrides/build-systems.json b/overrides/build-systems.json
index 9f6870e4d..2c65132a6 100644
--- a/overrides/build-systems.json
+++ b/overrides/build-systems.json
@@ -7228,7 +7228,18 @@
     "setuptools"
   ],
   "httpcore": [
-    "setuptools"
+    {
+      "buildSystem": "hatch-fancy-pypi-readme",
+      "from": "0.18.0"
+    },
+    {
+      "buildSystem": "hatchling",
+      "from": "0.18.0"
+    },
+    {
+      "buildSystem": "setuptools",
+      "until": "0.18.0"
+    }
   ],
   "httpie": [
     "setuptools"

From ef3fdf7ad9b15fdc4e879e222e38c657a05118f6 Mon Sep 17 00:00:00 2001
From: moonshxne <fyzhao@uci.edu>
Date: Fri, 22 Sep 2023 00:04:36 +0800
Subject: [PATCH 2/2] Order `until` build system entry before `from`

---
 overrides/build-systems.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/overrides/build-systems.json b/overrides/build-systems.json
index 2c65132a6..81f7c7ee5 100644
--- a/overrides/build-systems.json
+++ b/overrides/build-systems.json
@@ -7228,6 +7228,10 @@
     "setuptools"
   ],
   "httpcore": [
+    {
+      "buildSystem": "setuptools",
+      "until": "0.18.0"
+    },
     {
       "buildSystem": "hatch-fancy-pypi-readme",
       "from": "0.18.0"
@@ -7235,10 +7239,6 @@
     {
       "buildSystem": "hatchling",
       "from": "0.18.0"
-    },
-    {
-      "buildSystem": "setuptools",
-      "until": "0.18.0"
     }
   ],
   "httpie": [