diff --git a/pkgs/development/libraries/haskell/leksah/leksah-server.nix b/pkgs/development/libraries/haskell/leksah/leksah-server.nix index c61b89cbcc56..b34ff506ad92 100644 --- a/pkgs/development/libraries/haskell/leksah/leksah-server.nix +++ b/pkgs/development/libraries/haskell/leksah/leksah-server.nix @@ -1,15 +1,22 @@ -{cabal, haddock, binary, binaryShared, deepseq, hslogger, ltk, mtl, - network, parsec, processLeksah}: +{cabal, binary, binaryShared, deepseq, ghc, haddock, hslogger, ltk, + mtl, network, parsec, processLeksah} : cabal.mkDerivation (self : { pname = "leksah-server"; - version = "0.8.0.8"; - sha256 = "10srf3wzrnyjhw7q8lzzfqammjr9k1fgwqlkkcfkljbmsz9j0nfm"; - propagatedBuildInputs = - [binary binaryShared deepseq hslogger ltk mtl network parsec processLeksah haddock]; + version = "0.10.0.4"; + sha256 = "0g523dkiaclk5ym16vzqiabh7mwksjqp0kbx17a899k5gzfwfjp6"; + propagatedBuildInputs = [ + binary binaryShared deepseq ghc haddock hslogger ltk mtl network + parsec processLeksah + ]; meta = { - description = "The interface to GHC-API for leksah"; + homepage = "http://leksah.org"; + description = "Metadata collection for leksah"; license = "GPL"; - maintainers = [self.stdenv.lib.maintainers.andres]; + platforms = self.stdenv.lib.platforms.haskellPlatforms; + maintainers = [ + self.stdenv.lib.maintainers.simons + self.stdenv.lib.maintainers.andres + ]; }; }) diff --git a/pkgs/development/libraries/haskell/leksah/process-leksah.nix b/pkgs/development/libraries/haskell/leksah/process-leksah.nix index a5223233fd4b..7ecc532da125 100644 --- a/pkgs/development/libraries/haskell/leksah/process-leksah.nix +++ b/pkgs/development/libraries/haskell/leksah/process-leksah.nix @@ -1,12 +1,16 @@ -{cabal}: +{cabal} : cabal.mkDerivation (self : { pname = "process-leksah"; - version = "1.0.1.3"; - sha256 = "1pssbpcslrl39z495gf0v2xjgy2i6qpvxbrf4p0hkvrwycr7pnd8"; + version = "1.0.1.4"; + sha256 = "1899ybhnsj22sir2l933lhkk9fpcgjbb4qd6gscnby28qcs5bwbv"; meta = { - description = "This package contains libraries for dealing with system processes"; - license = "BSD"; - maintainers = [self.stdenv.lib.maintainers.andres]; + description = "Process libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.stdenv.lib.platforms.haskellPlatforms; + maintainers = [ + self.stdenv.lib.maintainers.simons + self.stdenv.lib.maintainers.andres + ]; }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index f682e9e70e2d..26f0c9b8e676 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -744,9 +744,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {}; - leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix { - network = self.network_2_2_1_7; - }; + leksahServer = callPackage ../development/libraries/haskell/leksah/leksah-server.nix {}; ListLike = callPackage ../development/libraries/haskell/ListLike {}; @@ -1315,8 +1313,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); }; leksah = callPackage ../applications/editors/leksah { - network = self.network_2_2_1_7; - regexBase = self.regexBase_0_93_2; inherit (pkgs) makeWrapper; };