From 6b6ce221e0c7d21a37f2813831235717b491439a Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Fri, 12 Nov 2021 00:57:39 +0100 Subject: [PATCH] Use patched haskus-utils-variant, fixing applicative instance --- cabal.project | 6 ++++++ ghcup.cabal | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cabal.project b/cabal.project index 99ea20b..ab8c30a 100644 --- a/cabal.project +++ b/cabal.project @@ -12,6 +12,12 @@ constraints: http-io-streams -brotli, any.Cabal ==3.6.2.0, any.aeson >= 2.0.1.0 +source-repository-package + type: git + location: https://github.com/hasufell/packages.git + tag: cc0b4688f8bb374fa92f17c856949de795b56291 + subdir: haskus-utils-variant + package libarchive flags: -system-libarchive diff --git a/ghcup.cabal b/ghcup.cabal index 09d1778..2551735 100644 --- a/ghcup.cabal +++ b/ghcup.cabal @@ -110,7 +110,7 @@ library , disk-free-space ^>=0.1.0.1 , filepath ^>=1.4.2.1 , haskus-utils-types ^>=1.5 - , haskus-utils-variant >=3.0 && <3.2 + , haskus-utils-variant ^>=3.2.1 , libarchive ^>=3.0.3.0 , lzma-static ^>=5.2.5.3 , megaparsec >=8.0.0 && <9.1 @@ -227,7 +227,7 @@ executable ghcup , directory ^>=1.3.6.0 , filepath ^>=1.4.2.1 , ghcup - , haskus-utils-variant >=3.0 && <3.2 + , haskus-utils-variant ^>=3.2.1 , libarchive ^>=3.0.3.0 , megaparsec >=8.0.0 && <9.1 , mtl ^>=2.2