From 9885467840c88a2d2084b2c8ede10f4704c8e39f Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 22 Jan 2025 13:27:06 +0800 Subject: [PATCH] Use upstream uri-bytestring It's fixed now: https://github.com/Soostone/uri-bytestring/pull/64#issuecomment-2606030276 --- cabal.project.common | 6 ------ cabal.project.freeze | 1 - ghcup.cabal | 6 +++--- stack.yaml | 3 +-- 4 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 cabal.project.freeze diff --git a/cabal.project.common b/cabal.project.common index 7ef48936..f02fbbcb 100644 --- a/cabal.project.common +++ b/cabal.project.common @@ -25,12 +25,6 @@ if os(mingw32) if impl(ghc >= 9.4) constraints: language-c >= 0.9.3 - -source-repository-package - type: git - location: https://github.com/hasufell/uri-bytestring.git - tag: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 - package libarchive flags: -system-libarchive diff --git a/cabal.project.freeze b/cabal.project.freeze deleted file mode 100644 index 3e8d6c3b..00000000 --- a/cabal.project.freeze +++ /dev/null @@ -1 +0,0 @@ -index-state: hackage.haskell.org 2024-12-03T03:14:47Z diff --git a/ghcup.cabal b/ghcup.cabal index c06e0e4e..37b4e7a2 100644 --- a/ghcup.cabal +++ b/ghcup.cabal @@ -119,7 +119,7 @@ common app-common-depends , text ^>=2.0 || ^>=2.1 , time >=1.9.3 && <1.15 , unordered-containers ^>=0.2 - , uri-bytestring ^>=0.3.2.2 + , uri-bytestring ^>=0.4.0.0 , utf8-string ^>=1.0 , vector >=0.12 && <0.14 , versions >=6.0.5 && <6.1 @@ -251,7 +251,7 @@ library , transformers ^>=0.5 || ^>=0.6 , unliftio-core ^>=0.2.0.1 , unordered-containers ^>=0.2.10.0 - , uri-bytestring ^>=0.3.2.2 + , uri-bytestring ^>=0.4.0.0 , utf8-string ^>=1.0 , vector >=0.12 && <0.14 , versions >=6.0.5 && <6.1 @@ -494,7 +494,7 @@ test-suite ghcup-test , quickcheck-arbitrary-adt ^>=0.3.1.0 , text ^>=2.0 || ^>=2.1 , time >=1.9.3 && <1.15 - , uri-bytestring ^>=0.3.2.2 + , uri-bytestring ^>=0.4.0.0 , versions >=6.0.5 && <6.1 if os(windows) diff --git a/stack.yaml b/stack.yaml index b4720d68..c0ef1109 100644 --- a/stack.yaml +++ b/stack.yaml @@ -13,9 +13,8 @@ extra-deps: - variant-1.0@sha256:a3c819560424f59285a09f3ebd762f3a328163d109b5da55c4c54b6626f58c97,2180 - xz-5.6.3 - zlib-0.6.3.0@sha256:96d388c95a98d6db94b74053130c00aea3c8c8ee041b5594bbe09242f1714356,5465 + - uri-bytestring-0.4.0.0 - xz-clib-5.6.3 - - github: hasufell/uri-bytestring - commit: 4fb5ed14b500c192e6e7a97f6b2b1eb478806001 allow-newer: true