From 3e4045ee9fdbb9f42bb06e751c0a5792516c0aa3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 13 Nov 2011 01:38:09 +0000 Subject: [PATCH] haskell-haskell-src: added version 1.0.1.5 svn path=/nixpkgs/trunk/; revision=30409 --- .../libraries/haskell/haskell-src/1.0.1.5.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 +++-- 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix diff --git a/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix new file mode 100644 index 00000000000..dd62d57a02a --- /dev/null +++ b/pkgs/development/libraries/haskell/haskell-src/1.0.1.5.nix @@ -0,0 +1,18 @@ +{ cabal, happy, syb }: + +cabal.mkDerivation (self: { + pname = "haskell-src"; + version = "1.0.1.5"; + sha256 = "1ay3i2sbrp0pzg6fagg8gqrwq5lcnm5jb5sr11frbk274a82cdwz"; + buildDepends = [ syb ]; + buildTools = [ happy ]; + meta = { + description = "Support for manipulating Haskell source code"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 95b17115b2f..3dc22ab3557 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -127,7 +127,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); cgi = self.cgi_3001_1_7_4; # 7.2 ok, 7.3 ok fgl = self.fgl_5_4_2_4; # 7.2 ok, 7.3 ok GLUT = self.GLUT_2_1_2_1; # 7.2 ok, 7.3 ok - haskellSrc = self.haskellSrc_1_0_1_4; # 7.2 fails, 7.3 fails + haskellSrc = self.haskellSrc_1_0_1_5; # 7.2 fails, 7.3 fails html = self.html_1_0_1_2; # 7.2 ok, 7.3 ok HUnit = self.HUnit_1_2_2_3; # 7.2 ok, 7.3 ok network = self.network_2_3_0_7; # 7.2 ok, 7.3 ok @@ -683,7 +683,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); haskellSrc_1_0_1_3 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.3.nix {}; haskellSrc_1_0_1_4 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.4.nix {}; - haskellSrc = self.haskellSrc_1_0_1_3; + haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {}; + haskellSrc = self.haskellSrc_1_0_1_5; # The old version is required for Agda. haskellSrcExts_1_11_1 = callPackage ../development/libraries/haskell/haskell-src-exts/1.11.1.nix {};