Skip to content

Commit 493446b

Browse files
committed
Use mkOverride 900 for project flags.
See input-output-hk/haskell.nix#254
1 parent 5d4649a commit 493446b

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

plan2nix/Plan2Nix.hs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ plan2nix args (Plan { packages, extras, compilerVersion, compilerPackages }) = d
106106
return $ fromString pkg $= mkPath False nix
107107
_ -> return []
108108
let flags = concatMap (\case
109-
(name, Just (Package v r flags _)) -> flags2nix name flags) $ Map.toList extras
109+
(name, Just (Package _v _r f _)) -> flags2nix name f
110+
_ -> []) $ Map.toList extras
110111

111112
return $ mkNonRecSet [
112113
"pkgs" $= ("hackage" ==> mkNonRecSet (
@@ -119,7 +120,7 @@ plan2nix args (Plan { packages, extras, compilerVersion, compilerPackages }) = d
119120
]))
120121
, "extras" $= ("hackage" ==> mkNonRecSet [ "packages" $= extrasNix ])
121122
, "modules" $= mkList [
122-
mkNonRecSet [ "packages" $= mkNonRecSet flags ]
123+
mkParamset [("lib", Nothing)] True ==> mkNonRecSet [ "packages" $= mkNonRecSet flags ]
123124
]
124125
]
125126
where
@@ -166,7 +167,7 @@ plan2nix args (Plan { packages, extras, compilerVersion, compilerPackages }) = d
166167
flags2nix :: Text -> HashMap Text Bool -> [Binding NExpr]
167168
flags2nix pkgName pkgFlags =
168169
[ quoted pkgName $= mkNonRecSet
169-
[ "flags" $= mkNonRecSet [ quoted flag $= mkBool val
170+
[ "flags" $= mkNonRecSet [ quoted flag $= ("lib" @. "mkOverride" @@ mkInt 900 @@ mkBool val)
170171
| (flag, val) <- Map.toList pkgFlags
171172
]
172173
]

stack2nix/Stack2nix.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ stack2nix args stack@(Stack resolver compiler _ _) =
7878
++ [ "compiler.nix-name" $= fromString (quoted name)
7979
| (Just c) <- [compiler], let name = filter (`elem` ((['a'..'z']++['0'..'9']) :: [Char])) c]))
8080
, "resolver" $= fromString (quoted resolver)
81-
, "modules" $= mkList [ mkNonRecSet [ "packages" $= mkNonRecSet flags ] ]
81+
, "modules" $= mkList [ mkParamset [("lib", Nothing)] True ==> mkNonRecSet [ "packages" $= mkNonRecSet flags ] ]
8282
] ++ [
8383
"compiler" $= fromString (quoted c) | (Just c) <- [compiler]
8484
]
@@ -109,7 +109,7 @@ extraDeps2nix (Stack _ _ pkgs _) =
109109
flags2nix :: Stack -> [Binding NExpr]
110110
flags2nix (Stack _ _ _ pkgFlags) =
111111
[ quoted pkgName $= mkNonRecSet
112-
[ "flags" $= mkNonRecSet [ quoted flag $= mkBool val
112+
[ "flags" $= mkNonRecSet [ quoted flag $= ("lib" @. "mkOverride" @@ mkInt 900 @@ mkBool val)
113113
| (flag, val) <- HM.toList flags
114114
]
115115
]

0 commit comments

Comments
 (0)