From 60be296eb966ddb06390967cb078ea1f101a9848 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 6 Feb 2025 16:01:22 +0100 Subject: [PATCH] cabal2nix: fix missing qualified on a Data.Text import This fixes compilation of cabal2nix with text >= 2.1.2. Resolves #639. --- .../Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs b/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs index 3a4bcdc32..a55adf2f1 100644 --- a/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs +++ b/cabal2nix/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs @@ -19,7 +19,7 @@ import Control.Monad.Fail import Data.Aeson import Data.Map as Map import Data.Set as Set -import Data.Text as T +import qualified Data.Text as T import Data.Yaml import Distribution.Compiler import Distribution.Nixpkgs.Haskell.Constraint @@ -105,7 +105,7 @@ instance FromJSONKey Identifier where instance FromJSONKey PackageName where fromJSONKey = FromJSONKeyText parseKey -parseKey :: FromJSON k => Text -> k +parseKey :: FromJSON k => T.Text -> k parseKey s = either error id (parseEither parseJSON (String s)) readConfiguration :: FilePath -> IO Configuration