@@ -6,23 +6,22 @@ module Main ( main ) where
66import Control.Exception ( bracket )
77import Data.Maybe ( fromMaybe )
88import qualified Data.Set as Set
9−import Distribution.Compiler
109import Distribution.Nixpkgs.Fetch
1110import Distribution.Nixpkgs.Haskell
1211import Distribution.Nixpkgs.Haskell.FromCabal
12+import Distribution.Nixpkgs.Haskell.FromCabal.Configuration.GHC7102
1313import Distribution.Nixpkgs.Meta
1414import Distribution.PackageDescription ( FlagName(..), FlagAssignment )
1515import Distribution.Simple.Utils ( lowercase )
16−import Distribution.System
17−import Distribution.Version
1816import Internal.HaskellPackage
1917import Internal.Lens
20−import Internal.PrettyPrinting hiding ( (<>) )
2118import Internal.Version
19+import Internal.PrettyPrinting hiding ( (<>) )
2220import Language.Nix
2321import Options.Applicative
2422import System.IO ( hFlush, stdout, stderr )
2523import qualified Text.PrettyPrint.ANSI.Leijen as P2 hiding ( (<$>), (<>) )
24+-- import Text.Show.Pretty
2625
2726data Options = Options
2827 { optSha256 :: Maybe String
@@ -93,8 +92,8 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
9392 deriv :: Derivation
9493 deriv = fromGenericPackageDescription (const True)
9594 (\i -> Just (create binding (i, create path [i])))
96− (Platform X86_64 Linux)
97− (unknownCompilerInfo (CompilerId GHC (Version [7,10,2] [])) NoAbiTag)
95+ (platform ghc7102)
96+ (compilerInfo ghc7102)
9897 flags
9998 []
10099 (pkgCabal pkg)
@@ -107,9 +106,6 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
107106 & doCheck &&~ optDoCheck
108107 & extraFunctionArgs . contains "stdenv" .~ True
109108
110− deriv' :: Doc
111− deriv' = pPrint deriv
112−
113109 shell :: Doc
114110 shell = vcat
115111 [ text "{ nixpkgs ? import <nixpkgs> {}, compiler ? \"default\" }:"
@@ -118,7 +114,7 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
118114 , text ""
119115 , text " inherit (nixpkgs) pkgs;"
120116 , text ""
121− , hcat [ text " f = ", deriv', semi ]
117+ , hcat [ text " f = ", pPrint deriv, semi ]
122118 , text ""
123119 , text " haskellPackages = if compiler == \"default\""
124120 , text " then pkgs.haskellPackages"
@@ -131,7 +127,8 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
131127 , text " if pkgs.lib.inNixShell then drv.env else drv"
132128 ]
133129
134− print (if optNixShellOutput then shell else deriv')
130+ -- putStrLn $ ppShow deriv
131+ print (if optNixShellOutput then shell else pPrint deriv)
135132
136133readFlagList :: [String] -> FlagAssignment
137134readFlagList = map tagWithValue