6e4a853 · typeable/cabal2nix

src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration.hs+2

compare with master

unifiedsplit

@@ -51,3 +51,5 @@ data Configuration = Configuration

51 , packageMaintainers :: Map PackageName (Set Identifier)

52 }

53 deriving (Show)

54+

55+{-# ANN module "HLint: ignore Use import/export shortcut" #-}

src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs−1

@@ -4,7 +4,6 @@ module Distribution.Nixpkgs.Haskell.FromCabal.PostProcess ( postProcess ) where

4

5import Internal.Lens

6import Data.Set.Lens

7−import Data.Maybe

8import Data.Set ( Set )

7import Data.Set ( Set )

9import qualified Data.Set as Set

8import qualified Data.Set as Set

10import Distribution.Nixpkgs.Haskell

9import Distribution.Nixpkgs.Haskell

src/Language/Nix.hs+2

@@ -7,3 +7,5 @@ module Language.Nix

7import Language.Nix.Identifier

8import Language.Nix.Path

9import Language.Nix.Binding

10+

11+{-# ANN module "HLint: ignore Use import/export shortcut" #-}

src/hackage2nix.hs+5−8

@@ -44,13 +44,12 @@ type PackageSet = Map String Version

44type PackageMultiSet = Map String (Set Version)

45

46resolveConstraint :: Constraint -> Hackage -> Version

47+resolveConstraint c = fromMaybe (error msg) . resolveConstraint' c

47−resolveConstraint c = fromMaybe (error ("constraint " ++ display c ++ " cannot be resolved in Hackage")) .

48+ where msg = "constraint " ++ display c ++ " cannot be resolved in Hackage"

48− resolveConstraint' c

49

50resolveConstraint' :: Constraint -> Hackage -> Maybe Version

51−resolveConstraint' (Dependency (PackageName name) vrange) hackage | Set.null vs = Nothing

51+resolveConstraint' (Dependency (PackageName name) vrange) hackage =

52− | otherwise = Just (Set.findMax vs)

53− where vs = Set.filter (`withinRange` vrange) (Map.keysSet (hackage Map.! name))

52+ Set.findMax . Set.filter (`withinRange` vrange) . Map.keysSet <$> Map.lookup name hackage

54

53

55data Options = Options

54data Options = Options

56 { hackageRepository :: FilePath

55 { hackageRepository :: FilePath

@@ -191,6 +190,4 @@ readPreferredVersions p = mapMaybe parsePreferredVersionsLine . lines <$> readFi

191parsePreferredVersionsLine :: String -> Maybe Constraint

190parsePreferredVersionsLine :: String -> Maybe Constraint

192parsePreferredVersionsLine [] = Nothing

191parsePreferredVersionsLine [] = Nothing

193parsePreferredVersionsLine ('-':'-':_) = Nothing

192parsePreferredVersionsLine ('-':'-':_) = Nothing

194−parsePreferredVersionsLine l = case simpleParse l of

193+parsePreferredVersionsLine l = simpleParse l `mplus` error ("invalid preferred-versions line: " ++ show l)

195− Just c -> Just c

196− Nothing -> error ("invalid preferred-versions line: " ++ show l)