git.iko.soy/typeable/cabal2nix
on master help sign in
Remove the obsolete CorePackages module.
commit231064fec6944b560358f15b957e89e2a1f52caa authorPeter Simons <simons@cryp.to> dateFri 28 Aug 2015, 12:25 (11 years ago) parentdadc3b0
3 files changed+2−17
compare with master
unifiedsplit
src/Distribution/Nixpkgs/Haskell/FromCabal/CorePackages.hs−15 src/Distribution/Nixpkgs/Haskell/FromCabal/Name.hs+2 src/Distribution/Nixpkgs/Haskell/FromCabal/Normalize.hs−2
src/Distribution/Nixpkgs/Haskell/FromCabal/CorePackages.hsdeleted−15
@@ -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)
166166buildToolNixName :: String -> [Identifier]
167167buildToolNixName "" = return (error "buildToolNixName: invalid empty dependency name")
168168buildToolNixName "cabal" = return "cabal-install"
169+buildToolNixName "ghc" = []
169170buildToolNixName "gtk2hsC2hs" = return "gtk2hs-buildtools"
170171buildToolNixName "gtk2hsHookGenerator" = return "gtk2hs-buildtools"
171172buildToolNixName "gtk2hsTypeGen" = return "gtk2hs-buildtools"
173+buildToolNixName "hsc2hs" = []
172174buildToolNixName x = return (fromString x)
src/Distribution/Nixpkgs/Haskell/FromCabal/Normalize.hs−2
@@ -6,7 +6,6 @@ import Data.Set ( Set )
66import qualified Data.Set as Set
77import Data.String
88import Distribution.Nixpkgs.Haskell
9−import Distribution.Nixpkgs.Haskell.FromCabal.CorePackages
109import Distribution.Nixpkgs.Meta
1110import Distribution.Package
1211import Distribution.PackageDescription ( FlagAssignment, FlagName(..) )
@@ -27,7 +26,6 @@ normalizeBuildInfo :: PackageName -> BuildInfo -> BuildInfo
2726normalizeBuildInfo (PackageName pname) bi = bi
2827 & haskell %~ Set.filter (\b -> view localName b /= fromString pname)
2928 & tool %~ Set.filter (\b -> view localName b /= fromString pname)
30− & tool %~ Set.filter (\n -> n^.localName.ident `notElem` coreBuildTools)
3129
3230 {-
3331 {