diff --git a/pkgs/development/libraries/haskell/smallcheck/default.nix b/pkgs/development/libraries/haskell/smallcheck/default.nix index 39ee91b09f37..84d5be8edbdf 100644 --- a/pkgs/development/libraries/haskell/smallcheck/default.nix +++ b/pkgs/development/libraries/haskell/smallcheck/default.nix @@ -1,13 +1,13 @@ -{cabal}: +{ cabal }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "smallcheck"; version = "0.4"; sha256 = "0nq13jm3akrmgk6n2clisip16v0jf1xkm0hm678v63s87hxqb1ma"; meta = { - description = "Another lightweight testing library in Haskell"; - license = "BSD"; - maintainers = [self.stdenv.lib.maintainers.andres]; + description = "Another lightweight testing library in Haskell."; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.stdenv.lib.platforms.haskellPlatforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) - diff --git a/pkgs/development/libraries/haskell/uulib/default.nix b/pkgs/development/libraries/haskell/uulib/default.nix index 98399dd11ccb..9e034eab283e 100644 --- a/pkgs/development/libraries/haskell/uulib/default.nix +++ b/pkgs/development/libraries/haskell/uulib/default.nix @@ -1,10 +1,14 @@ -{cabal}: +{ cabal }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "uulib"; version = "0.9.13"; sha256 = "115fxvx5lqyjdwws6gkcixk1gi2p5gkyqinww7gbp54p4n0yy7n0"; meta = { - description = "Haskell Utecht Tools Library"; + homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; + description = "Haskell Utrecht Tools Library"; + license = "LGPL"; + platforms = self.stdenv.lib.platforms.haskellPlatforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/development/tools/haskell/uuagc/default.nix b/pkgs/development/tools/haskell/uuagc/default.nix index a7ede2ef3798..ffaa82a8325f 100644 --- a/pkgs/development/tools/haskell/uuagc/default.nix +++ b/pkgs/development/tools/haskell/uuagc/default.nix @@ -1,12 +1,17 @@ -{cabal, uulib}: +{ cabal, haskellSrcExts, mtl, uulib }: -cabal.mkDerivation (self : { +cabal.mkDerivation (self: { pname = "uuagc"; - version = "0.9.36"; - name = self.fname; - sha256 = "02sl19apxwhgj7zq37pl6xkl35pafma2683d7hyzyyn6y5kqma1j"; - extraBuildInputs = [uulib]; + version = "0.9.38.6"; + sha256 = "1dr8vxis16rcdvklp0rv2d50bi33jag7n4wynbfqw9bzgyfbagnw"; + isLibrary = true; + isExecutable = true; + buildDepends = [ haskellSrcExts mtl uulib ]; meta = { + homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; description = "Attribute Grammar System of Universiteit Utrecht"; + license = "GPL"; + platforms = self.stdenv.lib.platforms.haskellPlatforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 70683925078a..aaeee79fbd0d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1028,6 +1028,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); parsec = self.parsec2; }; + # known not to work with anything above ghc-6.10.* scion = callPackage ../development/libraries/haskell/scion {}; sendfile = callPackage ../development/libraries/haskell/sendfile {};