git.iko.soy/typeable/cabal2nix
on master help sign in
liquid-fixpoint: move flag configuration from post-processing to Flags.hs
5c17d2dPeter Simons
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+1
compare with master
unifiedsplit
@@ -20,6 +20,7 @@ configureCabalFlags (PackageIdentifier (PackageName name) _)
20 | name == "hxt" = [enable "network-uri"]
20 | name == "hxt" = [enable "network-uri"]
21 | name == "idris" = [enable "gmp", enable "ffi"]
21 | name == "idris" = [enable "gmp", enable "ffi"]
22 | name == "io-streams" = [enable "NoInteractiveTests"]
22 | name == "io-streams" = [enable "NoInteractiveTests"]
23+ | name == "liquid-fixpoint" = [enable "build-external"]
23 | name == "pandoc" = [enable "https"]
24 | name == "pandoc" = [enable "https"]
24 | name == "reactive-banana-wx" = [disable "buildExamples"]
25 | name == "reactive-banana-wx" = [disable "buildExamples"]
25 | name == "snap-server" = [enable "openssl"]
26 | name == "snap-server" = [enable "openssl"]
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−3
@@ -51,9 +51,7 @@ hooks =
51 , ("libconfig", over (libraryDepends . system) (Set.insert (pkg "libconfig") . Set.delete (binding # ("config", path # ["null"]))))
51 , ("libconfig", over (libraryDepends . system) (Set.insert (pkg "libconfig") . Set.delete (binding # ("config", path # ["null"]))))
52 , ("imagemagick", set (libraryDepends . pkgconfig . contains (pkg "imagemagick")) True) -- https://github.com/NixOS/cabal2nix/issues/136
52 , ("imagemagick", set (libraryDepends . pkgconfig . contains (pkg "imagemagick")) True) -- https://github.com/NixOS/cabal2nix/issues/136
53 , ("jsaddle", set (dependencies . haskell . contains (bind "self.ghcjs-base")) False)
53 , ("jsaddle", set (dependencies . haskell . contains (bind "self.ghcjs-base")) False)
54− , ("liquid-fixpoint", over configureFlags (Set.union (Set.fromList ["-fbuild-external"]))
55− . set (executableDepends . system . contains (pkg "ocaml")) True
54+ , ("liquid-fixpoint", set (executableDepends . system . contains (pkg "ocaml")) True . set (testDepends . system . contains (pkg "z3")) True)
56− . set (testDepends . system . contains (pkg "z3")) True)
57 , ("liquidhaskell", set (testDepends . system . contains (pkg "z3")) True)
55 , ("liquidhaskell", set (testDepends . system . contains (pkg "z3")) True)
58 , ("mysql", set (libraryDepends . system . contains (pkg "mysql")) True)
56 , ("mysql", set (libraryDepends . system . contains (pkg "mysql")) True)
59 , ("readline", over (libraryDepends . system) (Set.union (pkgs ["readline", "ncurses"])))
57 , ("readline", over (libraryDepends . system) (Set.union (pkgs ["readline", "ncurses"])))