git.iko.soy/typeable/cabal2nix
on master help sign in
hackage2nix: pass our hard-coded Cabal flags to fromGenericPackageDescription
16dd087Peter Simons
src/hackage2nix.hs+5−1
compare with master
unifiedsplit
@@ -4,6 +4,7 @@
4module Main ( main ) where
4module Main ( main ) where
5
5
6import Distribution.Nixpkgs.Haskell.FromCabal ( fromGenericPackageDescription )
6import Distribution.Nixpkgs.Haskell.FromCabal ( fromGenericPackageDescription )
7+import Distribution.Nixpkgs.Haskell.FromCabal.Flags
7import Distribution.Nixpkgs.Haskell.FromCabal.HackageGit ( readHackage, Hackage )
8import Distribution.Nixpkgs.Haskell.FromCabal.HackageGit ( readHackage, Hackage )
8import Distribution.Nixpkgs.Haskell.Constraint
9import Distribution.Nixpkgs.Haskell.Constraint
9import Distribution.Nixpkgs.Haskell.FromCabal.Configuration.GHC7102
10import Distribution.Nixpkgs.Haskell.FromCabal.Configuration.GHC7102
@@ -143,8 +144,11 @@ generatePackageSet config hackage nixpkgs = do
143 let -- TODO: Include list of broken dependencies in the generated output.
144 let -- TODO: Include list of broken dependencies in the generated output.
144 descr = hackage Map.! name Map.! pkgversion
145 descr = hackage Map.! name Map.! pkgversion
145
146
147+ flagAssignment :: FlagAssignment
148+ flagAssignment = configureCabalFlags (packageId descr)
149+
146 drv' :: Derivation
150 drv' :: Derivation
147− drv' = fromGenericPackageDescription haskellResolver nixpkgsResolver (platform ghc7102) (compilerInfo ghc7102) [] [] descr
151+ drv' = fromGenericPackageDescription haskellResolver nixpkgsResolver (platform ghc7102) (compilerInfo ghc7102) flagAssignment [] descr
148
152
149 attr :: String
153 attr :: String
150 attr | Just v <- Map.lookup name generatedDefaultPackageSet, v == pkgversion = name
154 attr | Just v <- Map.lookup name generatedDefaultPackageSet, v == pkgversion = name