@@ -106,7 +106,8 @@ plan2nix args (Plan { packages, extras, compilerVersion, compilerPackages }) = d
106
106
return $ fromString pkg $= mkPath False nix
107
107
_ -> return []
108
108
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
110
111
111
112
return $ mkNonRecSet [
112
113
" pkgs" $= (" hackage" ==> mkNonRecSet (
@@ -119,7 +120,7 @@ plan2nix args (Plan { packages, extras, compilerVersion, compilerPackages }) = d
119
120
]))
120
121
, " extras" $= (" hackage" ==> mkNonRecSet [ " packages" $= extrasNix ])
121
122
, " modules" $= mkList [
122
- mkNonRecSet [ " packages" $= mkNonRecSet flags ]
123
+ mkParamset [( " lib " , Nothing )] True ==> mkNonRecSet [ " packages" $= mkNonRecSet flags ]
123
124
]
124
125
]
125
126
where
@@ -166,7 +167,7 @@ plan2nix args (Plan { packages, extras, compilerVersion, compilerPackages }) = d
166
167
flags2nix :: Text -> HashMap Text Bool -> [Binding NExpr ]
167
168
flags2nix pkgName pkgFlags =
168
169
[ quoted pkgName $= mkNonRecSet
169
- [ " flags" $= mkNonRecSet [ quoted flag $= mkBool val
170
+ [ " flags" $= mkNonRecSet [ quoted flag $= ( " lib " @. " mkOverride " @@ mkInt 900 @@ mkBool val)
170
171
| (flag, val) <- Map. toList pkgFlags
171
172
]
172
173
]
0 commit comments