git.iko.soy/typeable/cabal2nix
on master help sign in
Merge pull request #198 from gridaphobe/master

fix post-processing hooks for liquid-fixpoint, liquidhaskell, and target

commit112effb4ccc35f8d2e79372c51c104e138f3db24 authorPeter Simons <simons@cryp.to> dateWed 2 Sep 2015, 00:29 (11 years ago) parent70af994510df64
3 files changed+6−3
compare with master
unifiedsplit
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration/GHC7102.hs−3 distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration/Maintainers.hs+1 distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+5
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration/GHC7102.hs−3
@@ -2288,8 +2288,6 @@ ghc7102 = Configuration
22882288 , ("lio-eci11", allPlatforms)
22892289 , ("lio-fs", darwin)
22902290 , ("lio-simple", allPlatforms)
2291− , ("liquid-fixpoint", allPlatforms)
2292− , ("liquidhaskell", allPlatforms)
22932291 , ("listlike-instances", allPlatforms)
22942292 , ("list-t-html-parser", allPlatforms)
22952293 , ("literals", allPlatforms)
@@ -3420,7 +3418,6 @@ ghc7102 = Configuration
34203418 , ("tamarin-prover-theory", allPlatforms)
34213419 , ("tamarin-prover-utils", allPlatforms)
34223420 , ("tamper", allPlatforms)
3423− , ("target", allPlatforms)
34243421 , ("task", allPlatforms)
34253422 , ("tasty-integrate", allPlatforms)
34263423 , ("TBC", allPlatforms)
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration/Maintainers.hs+1
@@ -16,6 +16,7 @@ maintainedPackages =
1616 , "streamproc", "git-annex"
1717 ]
1818 , "gebner" |-> [ "hledger-diff" ]
19+ , "gridaphobe" |-> [ "ghc-srcspan-plugin", "liquid-fixpoint", "liquidhaskell", "located-base", "target" ]
1920 , "jb55" |-> [ "pipes-csv", "pipes-mongodb", "cased" ]
2021 , "psibi" |-> [ "shakespeare", "path-pieces", "persistent", "persistent-mysql"
2122 , "persistent-postgresql", "persistent-sqlite", "persistent-redis"
distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+5
@@ -50,9 +50,14 @@ hooks =
5050 , ("gtk3", gtk3Hook)
5151 , ("imagemagick", set (libraryDepends . pkgconfig . contains (pkg "imagemagick")) True) -- https://github.com/NixOS/cabal2nix/issues/136
5252 , ("jsaddle", set (dependencies . haskell . contains (bind "self.ghcjs-base")) False)
53+ , ("liquid-fixpoint", over configureFlags (Set.union (Set.fromList ["-fbuild-external"]))
54+ . set (executableDepends . system . contains (pkg "ocaml")) True
55+ . set (testDepends . system . contains (pkg "z3")) True)
56+ , ("liquidhaskell", set (testDepends . system . contains (pkg "z3")) True)
5357 , ("mysql", set (libraryDepends . system . contains (pkg "mysql")) True)
5458 , ("readline", over (libraryDepends . system) (Set.union (pkgs ["readline", "ncurses"])))
5559 , ("rocksdb-haskell", set (metaSection . platforms) (Set.singleton (Platform X86_64 Linux)))
60+ , ("target", set (testDepends . system . contains (pkg "z3")) True)
5661 , ("terminfo", set (libraryDepends . system . contains (pkg "ncurses")) True)
5762 , ("thyme", set (libraryDepends . tool . contains (bind "self.cpphs")) True) -- required on Darwin
5863 , ("xmonad", set phaseOverrides xmonadPostInstall)