5c17d2d · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

liquid-fixpoint: move flag configuration from post-processing to Flags.hs

commit5c17d2d96ffba75060a78b4ba459c814a83fb0c3 authorPeter Simons <simons@cryp.to> dateWed 16 Sep 2015, 10:21 (11 years ago) parentdd107cc

2 files changed+2−3

unifiedsplit

distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Flags.hs+1

@@ -20,6 +20,7 @@ configureCabalFlags (PackageIdentifier (PackageName name) _)

2020 | name == "hxt" = [enable "network-uri"]

2121 | name == "idris" = [enable "gmp", enable "ffi"]

2222 | name == "io-streams" = [enable "NoInteractiveTests"]

23+ | name == "liquid-fixpoint" = [enable "build-external"]

2324 | name == "pandoc" = [enable "https"]

2425 | name == "reactive-banana-wx" = [disable "buildExamples"]

2526 | name == "snap-server" = [enable "openssl"]

distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+1−3

@@ -51,9 +51,7 @@ hooks =

5151 , ("libconfig", over (libraryDepends . system) (Set.insert (pkg "libconfig") . Set.delete (binding # ("config", path # ["null"]))))

5252 , ("imagemagick", set (libraryDepends . pkgconfig . contains (pkg "imagemagick")) True) -- https://github.com/NixOS/cabal2nix/issues/136

5353 , ("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

56− . set (testDepends . system . contains (pkg "z3")) True)

54+ , ("liquid-fixpoint", set (executableDepends . system . contains (pkg "ocaml")) True . set (testDepends . system . contains (pkg "z3")) True)

5755 , ("liquidhaskell", set (testDepends . system . contains (pkg "z3")) True)

5856 , ("mysql", set (libraryDepends . system . contains (pkg "mysql")) True)

5957 , ("readline", over (libraryDepends . system) (Set.union (pkgs ["readline", "ncurses"])))