231064f · typeable/cabal2nix

src/Distribution/Nixpkgs/Haskell/FromCabal/CorePackages.hsdeleted−15

compare with master

unifiedsplit

@@ -1,15 +0,0 @@

1−module Distribution.Nixpkgs.Haskell.FromCabal.CorePackages ( corePackages, coreBuildTools ) where

2−

3−-- | List of packages shipped with ghc and therefore at the moment not in

4−-- nixpkgs. This should probably be configurable at first. Later, it might

5−-- be good to actually include them as dependencies, but set them to null

6−-- if GHC provides them (as different GHC versions vary).

7−

8−corePackages :: [String]

9−corePackages = []

10−

11−coreBuildTools :: [String]

12−coreBuildTools =

13− [ "ghc"

14− , "hsc2hs"

15− ]

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

@@ -166,7 +166,9 @@ libNixName x = return (fromString x)

166buildToolNixName :: String -> [Identifier]

167buildToolNixName "" = return (error "buildToolNixName: invalid empty dependency name")

168buildToolNixName "cabal" = return "cabal-install"

169+buildToolNixName "ghc" = []

169buildToolNixName "gtk2hsC2hs" = return "gtk2hs-buildtools"

170buildToolNixName "gtk2hsC2hs" = return "gtk2hs-buildtools"

170buildToolNixName "gtk2hsHookGenerator" = return "gtk2hs-buildtools"

171buildToolNixName "gtk2hsHookGenerator" = return "gtk2hs-buildtools"

171buildToolNixName "gtk2hsTypeGen" = return "gtk2hs-buildtools"

172buildToolNixName "gtk2hsTypeGen" = return "gtk2hs-buildtools"

173+buildToolNixName "hsc2hs" = []

172buildToolNixName x = return (fromString x)

174buildToolNixName x = return (fromString x)

src/Distribution/Nixpkgs/Haskell/FromCabal/Normalize.hs−2

@@ -6,7 +6,6 @@ import Data.Set ( Set )

6import qualified Data.Set as Set

7import Data.String

8import Distribution.Nixpkgs.Haskell

9−import Distribution.Nixpkgs.Haskell.FromCabal.CorePackages

10import Distribution.Nixpkgs.Meta

9import Distribution.Nixpkgs.Meta

11import Distribution.Package

10import Distribution.Package

12import Distribution.PackageDescription ( FlagAssignment, FlagName(..) )

11import Distribution.PackageDescription ( FlagAssignment, FlagName(..) )

@@ -27,7 +26,6 @@ normalizeBuildInfo :: PackageName -> BuildInfo -> BuildInfo

27normalizeBuildInfo (PackageName pname) bi = bi

26normalizeBuildInfo (PackageName pname) bi = bi

28 & haskell %~ Set.filter (\b -> view localName b /= fromString pname)

27 & haskell %~ Set.filter (\b -> view localName b /= fromString pname)

29 & tool %~ Set.filter (\b -> view localName b /= fromString pname)

28 & tool %~ Set.filter (\b -> view localName b /= fromString pname)

30− & tool %~ Set.filter (\n -> n^.localName.ident `notElem` coreBuildTools)

31

29

32 {-

30 {-

33 {

31 {