git.iko.soy/typeable/cabal2nix
on master help sign in
cabal2nix: add a dummy resolved to fix the executable
4386dadPeter Simons
src/cabal2nix.hs+9−9
compare with master
unifiedsplit
@@ -3,23 +3,23 @@
3
3
4module Main ( main ) where
4module Main ( main ) where
5
5
6−import Distribution.Nixpkgs.Haskell.FromCabal ( fromGenericPackageDescription )
7−import Distribution.Nixpkgs.Haskell.FromCabal.Normalize ( normalize )
8−import Internal.HaskellPackage
9import Control.Exception ( bracket )
6import Control.Exception ( bracket )
10−import Control.Lens
11import Data.Maybe ( fromMaybe )
7import Data.Maybe ( fromMaybe )
12import qualified Data.Set as Set
8import qualified Data.Set as Set
9+import Distribution.Compiler
13import Distribution.Nixpkgs.Fetch
10import Distribution.Nixpkgs.Fetch
14import Distribution.Nixpkgs.Haskell
11import Distribution.Nixpkgs.Haskell
12+import Distribution.Nixpkgs.Haskell.FromCabal
15import Distribution.Nixpkgs.Meta
13import Distribution.Nixpkgs.Meta
16import Distribution.PackageDescription ( FlagName(..), FlagAssignment )
14import Distribution.PackageDescription ( FlagName(..), FlagAssignment )
17−import Distribution.Compiler
18−import Distribution.Version
19−import Distribution.System
20import Distribution.Simple.Utils ( lowercase )
15import Distribution.Simple.Utils ( lowercase )
16+import Distribution.System
17+import Distribution.Version
18+import Internal.HaskellPackage
19+import Internal.Lens
21import Internal.PrettyPrinting hiding ( (<>) )
20import Internal.PrettyPrinting hiding ( (<>) )
22import Internal.Version
21import Internal.Version
22+import Language.Nix
23import Options.Applicative
23import Options.Applicative
24import System.IO ( hFlush, stdout, stderr )
24import System.IO ( hFlush, stdout, stderr )
25import qualified Text.PrettyPrint.ANSI.Leijen as P2 hiding ( (<$>), (<>) )
25import qualified Text.PrettyPrint.ANSI.Leijen as P2 hiding ( (<$>), (<>) )
@@ -92,7 +92,7 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
92
92
93 deriv :: Derivation
93 deriv :: Derivation
94 deriv = fromGenericPackageDescription (const True)
94 deriv = fromGenericPackageDescription (const True)
95− undefined
95+ (\i -> Just (create binding (i, create path [i])))
96 (Platform X86_64 Linux)
96 (Platform X86_64 Linux)
97 (unknownCompilerInfo (CompilerId GHC (Version [7,10,2] [])) NoAbiTag)
97 (unknownCompilerInfo (CompilerId GHC (Version [7,10,2] [])) NoAbiTag)
98 flags
98 flags
@@ -108,7 +108,7 @@ main = bracket (return ()) (\() -> hFlush stdout >> hFlush stderr) $ \() -> do
108 & extraFunctionArgs . contains "stdenv" .~ True
108 & extraFunctionArgs . contains "stdenv" .~ True
109
109
110 deriv' :: Doc
110 deriv' :: Doc
111− deriv' = pPrint (normalize deriv)
111+ deriv' = pPrint deriv
112
112
113 shell :: Doc
113 shell :: Doc
114 shell = vcat
114 shell = vcat