112effb · typeable/cabal2nix

git.iko.soy/typeable/cabal2nix

on master help sign in

Merge pull request #198 from gridaphobe/master

112effbPeter Simons11 years ago

distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/Configuration/GHC7102.hs−3

compare with master

unifiedsplit

@@ -2288,8 +2288,6 @@ ghc7102 = Configuration

2288 , ("lio-eci11", allPlatforms)

2289 , ("lio-fs", darwin)

2290 , ("lio-simple", allPlatforms)

2291− , ("liquid-fixpoint", allPlatforms)

2292− , ("liquidhaskell", allPlatforms)

2293 , ("listlike-instances", allPlatforms)

2291 , ("listlike-instances", allPlatforms)

2294 , ("list-t-html-parser", allPlatforms)

2292 , ("list-t-html-parser", allPlatforms)

2295 , ("literals", allPlatforms)

2293 , ("literals", allPlatforms)

@@ -3420,7 +3418,6 @@ ghc7102 = Configuration

3420 , ("tamarin-prover-theory", allPlatforms)

3418 , ("tamarin-prover-theory", allPlatforms)

3421 , ("tamarin-prover-utils", allPlatforms)

3419 , ("tamarin-prover-utils", allPlatforms)

3422 , ("tamper", allPlatforms)

3420 , ("tamper", allPlatforms)

3423− , ("target", allPlatforms)

3424 , ("task", allPlatforms)

3421 , ("task", allPlatforms)

3425 , ("tasty-integrate", allPlatforms)

3422 , ("tasty-integrate", allPlatforms)

3426 , ("TBC", allPlatforms)

3423 , ("TBC", allPlatforms)

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

@@ -16,6 +16,7 @@ maintainedPackages =

16 , "streamproc", "git-annex"

17 ]

18 , "gebner" |-> [ "hledger-diff" ]

19+ , "gridaphobe" |-> [ "ghc-srcspan-plugin", "liquid-fixpoint", "liquidhaskell", "located-base", "target" ]

19 , "jb55" |-> [ "pipes-csv", "pipes-mongodb", "cased" ]

20 , "jb55" |-> [ "pipes-csv", "pipes-mongodb", "cased" ]

20 , "psibi" |-> [ "shakespeare", "path-pieces", "persistent", "persistent-mysql"

21 , "psibi" |-> [ "shakespeare", "path-pieces", "persistent", "persistent-mysql"

21 , "persistent-postgresql", "persistent-sqlite", "persistent-redis"

22 , "persistent-postgresql", "persistent-sqlite", "persistent-redis"

distribution-nixpkgs/src/Distribution/Nixpkgs/Haskell/FromCabal/PostProcess.hs+5

@@ -50,9 +50,14 @@ hooks =

50 , ("gtk3", gtk3Hook)

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

52 , ("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)

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

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

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

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

55 , ("rocksdb-haskell", set (metaSection . platforms) (Set.singleton (Platform X86_64 Linux)))

59 , ("rocksdb-haskell", set (metaSection . platforms) (Set.singleton (Platform X86_64 Linux)))

60+ , ("target", set (testDepends . system . contains (pkg "z3")) True)

56 , ("terminfo", set (libraryDepends . system . contains (pkg "ncurses")) True)

61 , ("terminfo", set (libraryDepends . system . contains (pkg "ncurses")) True)

57 , ("thyme", set (libraryDepends . tool . contains (bind "self.cpphs")) True) -- required on Darwin

62 , ("thyme", set (libraryDepends . tool . contains (bind "self.cpphs")) True) -- required on Darwin

58 , ("xmonad", set phaseOverrides xmonadPostInstall)

63 , ("xmonad", set phaseOverrides xmonadPostInstall)