From e2d65abf3e63740f70a9ae7a548525dba1f66e88 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Wed, 28 Aug 2024 00:27:01 +0800 Subject: [PATCH] Migrate ghcup-gen to 'variant' --- ghcup-gen/Generate.hs | 2 +- ghcup-gen/Main.hs | 2 +- ghcup-gen/Validate.hs | 2 +- ghcup-gen/ghcup-gen.cabal | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ghcup-gen/Generate.hs b/ghcup-gen/Generate.hs index a35dd7d..bb853b6 100644 --- a/ghcup-gen/Generate.hs +++ b/ghcup-gen/Generate.hs @@ -36,7 +36,7 @@ import Data.Maybe import Data.List import Data.Map.Strict ( Map ) import Data.Versions -import Haskus.Utils.Variant.Excepts +import Data.Variant.Excepts import System.Exit import System.FilePath import System.IO diff --git a/ghcup-gen/Main.hs b/ghcup-gen/Main.hs index 5e33b89..abf05ea 100644 --- a/ghcup-gen/Main.hs +++ b/ghcup-gen/Main.hs @@ -23,7 +23,7 @@ import Data.Maybe import Data.Semigroup ( (<>) ) #endif import Options.Applicative hiding ( style ) -import Haskus.Utils.Variant.Excepts +import Data.Variant.Excepts import System.Console.Pretty import System.Environment import System.Exit diff --git a/ghcup-gen/Validate.hs b/ghcup-gen/Validate.hs index 97a474a..c69fea5 100644 --- a/ghcup-gen/Validate.hs +++ b/ghcup-gen/Validate.hs @@ -33,7 +33,7 @@ import Data.Containers.ListUtils ( nubOrd ) import Data.IORef import Data.List import Data.Versions -import Haskus.Utils.Variant.Excepts +import Data.Variant.Excepts import Optics import System.FilePath import System.Exit diff --git a/ghcup-gen/ghcup-gen.cabal b/ghcup-gen/ghcup-gen.cabal index bae4af6..458c56c 100644 --- a/ghcup-gen/ghcup-gen.cabal +++ b/ghcup-gen/ghcup-gen.cabal @@ -52,7 +52,7 @@ executable ghcup-gen , deepseq ^>=1.4 , filepath ^>=1.4.2.1 , ghcup ^>=0.1.19.0 - , haskus-utils-variant ^>=3.3 + , variant ^>=1.0 , libarchive ^>=3.0.3.0 , megaparsec >=8.0.0 && <9.3 , mtl ^>=2.2