git.iko.soy/typeable/stackage2nix
on master help sign in
Add: package config
ba0e443Dmitry Bushev
src/Distribution/Nixpkgs/Haskell/Stack.hs+38−68
compare with master
unifiedsplit
@@ -15,61 +15,8 @@ import Distribution.Nixpkgs.Haskell.Derivation
15import Distribution.Nixpkgs.Haskell.FromCabal as FromCabal
15import Distribution.Nixpkgs.Haskell.FromCabal as FromCabal
16import Distribution.Nixpkgs.Haskell.PackageSourceSpec as PackageSourceSpec
16import Distribution.Nixpkgs.Haskell.PackageSourceSpec as PackageSourceSpec
17import Language.Nix
17import Language.Nix
18−import Language.Nix.PrettyPrinting
19import Stack.Config
18import Stack.Config
20
19
21−data OverrideConfig = OverrideConfig
22− { stackageCompilerConfig :: FilePath
23− -- ^ Nixpkgs compiler config for Stackage packages set
24− , stackagePackagesConfig :: FilePath
25− -- ^ Nixpkgs packages config for Stackage packages set
26− , haskellPackagesOverride :: Identifier
27− -- ^ 'pkgs.haskell.packages.<compiler>' to override
28− }
29−
30−overrideConfigFixture :: OverrideConfig
31−overrideConfigFixture = OverrideConfig
32− { stackageCompilerConfig = "./haskell-modules/configuration-6_30.nix"
33− , stackagePackagesConfig = "./haskell-modules/packages-6_30.nix"
34− , haskellPackagesOverride = "ghc7103" }
35−
36−stackageCompilerConfigFun :: FilePath -> Doc
37−stackageCompilerConfigFun p =
38− funargs [text "superPkgs"] $$ "import" <+> string p
39− <+> lbrace
40− <+> text "inherit (superPkgs) pkgs;"
41− <+> rbrace
42−
43−nixLet :: [Doc] -> Doc
44−nixLet ls = vcat
45− [ text "let"
46− , nest 2 $ vcat ls
47− ]
48−
49−nixpkgsOverride :: OverrideConfig -> Doc
50−nixpkgsOverride OverrideConfig {..} = vcat
51− [ text "{ nixpkgs ? import <nixpkgs> {}, compiler ? \"default\" }: "
52− , text ""
53− , nixLet
54− [ text "inherit (nixpkgs.stdenv.lib) extends;"
55− , attr "stackageCompilerConfig" $ stackageCompilerConfigFun stackageCompilerConfig
56− , attr "stackagePackagesConfig" $ stackageCompilerConfigFun stackagePackagesConfig
57− , text "packageOverrides = super: let self = super.pkgs; in"
58− , text "{"
59− , text " pkgs = super.pkgs // {"
60− , text " haskell = super.pkgs.haskell // {"
61− , text " packages = super.pkgs.haskell.packages // {"
62− , text " \"${compiler}\" = super.pkgs.haskell.packages." <> disp haskellPackagesOverride <> ".override {};"
63− , text " };"
64− , text " };"
65− , text " };"
66− , text "};"
67− , text "in packageOverrides nixpkgs"
68− ]
69− ]
70−
71−-- TODO: maybe move to module Stack.Derivation
72−
73newtype HackageDb = HackageDb { fromHackageDB :: T.Text }
20newtype HackageDb = HackageDb { fromHackageDB :: T.Text }
74 deriving (Eq, Ord, Show)
21 deriving (Eq, Ord, Show)
75
22
@@ -78,6 +25,25 @@ makePrisms ''HackageDb
78unHackageDb :: HackageDb -> String
25unHackageDb :: HackageDb -> String
79unHackageDb = T.unpack . fromHackageDB
26unHackageDb = T.unpack . fromHackageDB
80
27
28+data PackageConfig = PackageConfig
29+ { _pcHaskellResolver :: HaskellResolver
30+ , _pcNixpkgsResolver :: NixpkgsResolver
31+ , _pcTargetPlatform :: Platform
32+ , _pcTargetCompiler :: CompilerInfo
33+ , _pcFlagAssignment :: FlagAssignment
34+ }
35+
36+makeLenses ''PackageConfig
37+
38+mkPackageConfig :: Platform -> CompilerId -> FlagAssignment -> PackageConfig
39+mkPackageConfig platform compilerId flagAssignment = PackageConfig
40+ { _pcHaskellResolver = const True
41+ , _pcNixpkgsResolver = \i -> Just (binding # (i, path # [i]))
42+ , _pcTargetPlatform = platform
43+ , _pcTargetCompiler = unknownCompilerInfo compilerId NoAbiTag
44+ , _pcFlagAssignment = flagAssignment
45+ }
46+
81-- Thin wrapper around private stack2nix 'PackageSourceSpec.fromDB' method.
47-- Thin wrapper around private stack2nix 'PackageSourceSpec.fromDB' method.
82getStackPackageFromDb
48getStackPackageFromDb
83 :: Maybe HackageDb
49 :: Maybe HackageDb
@@ -104,21 +70,25 @@ stackLocationToSource = \case
104 , sourceHash = UnknownHash }
70 , sourceHash = UnknownHash }
105
71
106packageDerivation
72packageDerivation
73+ :: PackageConfig
107− :: Maybe HackageDb
74+ -> Maybe HackageDb
108− -> System.Platform
109− -> Compiler.CompilerId
110− -> PackageDescription.FlagAssignment
111 -> StackPackage
75 -> StackPackage
112 -> IO Derivation
76 -> IO Derivation
113−packageDerivation optHackageDb optPlatform optCompilerId optFlagAssignment sed = do
77+packageDerivation conf optHackageDb stackPackage = do
114− pkg <- getStackPackageFromDb optHackageDb sed
78+ pkg <- getStackPackageFromDb optHackageDb stackPackage
115− pure
79+ pure $ genericPackageDerivation conf pkg
116− $ FromCabal.fromGenericPackageDescription
117− (const True)
118− (\i -> Just (binding # (i, path # [i])))
119− optPlatform
120− (unknownCompilerInfo optCompilerId NoAbiTag)
121− optFlagAssignment
122− []
123− (pkgCabal pkg)
124 & src .~ pkgSource pkg
80 & src .~ pkgSource pkg
81+
82+genericPackageDerivation
83+ :: PackageConfig
84+ -> Package
85+ -> Derivation
86+genericPackageDerivation conf pkg =
87+ FromCabal.fromGenericPackageDescription
88+ (conf ^. pcHaskellResolver)
89+ (conf ^. pcNixpkgsResolver)
90+ (conf ^. pcTargetPlatform)
91+ (conf ^. pcTargetCompiler)
92+ (conf ^. pcFlagAssignment)
93+ []
94+ (pkgCabal pkg)
src/Distribution/Nixpkgs/Haskell/Stack/PrettyPrinting.hs+5−5
@@ -14,9 +14,9 @@ overridePackages :: [Derivation] -> Doc
14overridePackages deps = PP.packageSetConfig . PP.cat $ callPackage <$> deps
14overridePackages deps = PP.packageSetConfig . PP.cat $ callPackage <$> deps
15 where
15 where
16 drvNameString = PP.doubleQuotes . disp . pkgName . view pkgid
16 drvNameString = PP.doubleQuotes . disp . pkgName . view pkgid
17− callPackage drv = vcat
17+ callPackage drv = hang
18− [ drvNameString drv <> " = callPackage",
18+ (drvNameString drv <> " = callPackage") 2
19− nest 2 (PP.parens $ PP.pPrint drv) <+> "{};"]
19+ (PP.parens (PP.pPrint drv) <+> "{};")
20
20
21overrideHaskellPackages :: Doc -> [Derivation] -> Doc
21overrideHaskellPackages :: Doc -> [Derivation] -> Doc
22overrideHaskellPackages ghc packages = vcat
22overrideHaskellPackages ghc packages = vcat
@@ -25,10 +25,10 @@ overrideHaskellPackages ghc packages = vcat
25 , "with nixpkgs;"
25 , "with nixpkgs;"
26 , "let"
26 , "let"
27 , nest 2 $ vcat
27 , nest 2 $ vcat
28− [ "extraDepsPackages ="
28+ [ "packageSetConfig ="
29 , nest 2 $ overridePackages packages <> semi
29 , nest 2 $ overridePackages packages <> semi
30 , ""
30 , ""
31− , "pkgOverrides = self: extraDepsPackages {"
31+ , "pkgOverrides = self: packageSetConfig {"
32 , nest 2 "inherit pkgs stdenv;"
32 , nest 2 "inherit pkgs stdenv;"
33 , nest 2 "inherit (self) callPackage;"
33 , nest 2 "inherit (self) callPackage;"
34 , "};"
34 , "};"
src/Runner.hs+4−1
@@ -23,7 +23,10 @@ run :: IO ()
23run = do
23run = do
24 Options{..} <- execParser pinfo
24 Options{..} <- execParser pinfo
25 stackYaml <- either fail pure =<< readStackConfig optStackYaml
25 stackYaml <- either fail pure =<< readStackConfig optStackYaml
26+ let
27+ flags = readFlagList optFlags
28+ pkgConfig = mkPackageConfig optPlatform optCompilerId flags
26− packages <- traverse (packageDerivation optHackageDb optPlatform optCompilerId (readFlagList optFlags))
29+ packages <- traverse (packageDerivation pkgConfig optHackageDb)
27 $ stackYaml ^. scPackages
30 $ stackYaml ^. scPackages
28 let out = PP.overrideHaskellPackages (PP.text "ghc802") packages
31 let out = PP.overrideHaskellPackages (PP.text "ghc802") packages
29 print out
32 print out