@@ -3,23 +3,23 @@
33
44module Main ( main ) where
55
6−import Distribution.Nixpkgs.Haskell.FromCabal ( fromGenericPackageDescription )
7−import Distribution.Nixpkgs.Haskell.FromCabal.Normalize ( normalize )
8−import Internal.HaskellPackage
96import Control.Exception ( bracket )
10−import Control.Lens
117import Data.Maybe ( fromMaybe )
128import qualified Data.Set as Set
9+import Distribution.Compiler
1310import Distribution.Nixpkgs.Fetch
1411import Distribution.Nixpkgs.Haskell
12+import Distribution.Nixpkgs.Haskell.FromCabal
1513import Distribution.Nixpkgs.Meta
1614import Distribution.PackageDescription ( FlagName(..), FlagAssignment )
17−import Distribution.Compiler
18−import Distribution.Version
19−import Distribution.System
2015import Distribution.Simple.Utils ( lowercase )
16+import Distribution.System
17+import Distribution.Version
18+import Internal.HaskellPackage
19+import Internal.Lens
2120import Internal.PrettyPrinting hiding ( (<>) )
2221import Internal.Version
22+import Language.Nix
2323import Options.Applicative
2424import System.IO ( hFlush, stdout, stderr )
2525import qualified Text.PrettyPrint.ANSI.Leijen as P2 hiding ( (<$>), (<>) )
@@ -92,7 +92,7 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
9292
9393 deriv :: Derivation
9494 deriv = fromGenericPackageDescription (const True)
95− undefined
95+ (\i -> Just (create binding (i, create path [i])))
9696 (Platform X86_64 Linux)
9797 (unknownCompilerInfo (CompilerId GHC (Version [7,10,2] [])) NoAbiTag)
9898 flags
@@ -108,7 +108,7 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
108108 & extraFunctionArgs . contains "stdenv" .~ True
109109
110110 deriv' :: Doc
111− deriv' = pPrint (normalize deriv)
111+ deriv' = pPrint deriv
112112
113113 shell :: Doc
114114 shell = vcat