Author: simons
Date: Sun Aug 7 18:21:52 2011
New Revision: 28226
URL: https://svn.nixos.org/websvn/nix/?rev=28226&sc=1
Log:
haskell-src-exts: updated to version 1.11.1.nix
The older version, 1.9.6.nix, is still around because Agda won't accept
the latest one.
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix
- copied, changed from r28225,
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
Deleted:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
Modified:
nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
Added:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
Sun Aug 7 18:21:52 2011 (r28226)
@@ -0,0 +1,15 @@
+{cabal, cpphs, happy} :
+
+cabal.mkDerivation (self : {
+ pname = "haskell-src-exts";
+ version = "1.11.1";
+ sha256 = "1jqf8l81zw7x5ryf8h2n0b2636yhxkfp3j4ndbqw6hc7i5q581m6";
+ propagatedBuildInputs = [ cpphs happy ];
+ meta = {
+ homepage = "http://code.haskell.org/haskell-src-exts";;
+ description = "Manipulating Haskell source: abstract syntax, lexer,
parser, and pretty-printer";
+ license = self.stdenv.lib.licenses.bsd3;
+ platforms = self.stdenv.lib.platforms.haskellPlatforms;
+ maintainers = [ self.stdenv.lib.maintainers.simons ];
+ };
+})
Copied and modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix
(from r28225,
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/default.nix)
==============================================================================
Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Aug 7 18:21:44
2011 (r28225)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix Sun Aug 7 18:21:52
2011 (r28226)
@@ -352,11 +352,8 @@
# Haskell libraries.
Agda = callPackage ../development/libraries/haskell/Agda {
- # I've been trying to get the latest Agda to build with ghc-6.12, too,
- # but failed so far.
- # mtl = self.mtl2;
- # QuickCheck = self.QuickCheck2;
- syb = self.syb02;
+ syb = self.syb02;
+ haskellSrcExts = self.haskellSrcExts_1_9_6;
};
ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
@@ -615,7 +612,10 @@
haskellSrc_1_0_1_4 = callPackage
../development/libraries/haskell/haskell-src/1.0.1.4.nix {};
haskellSrc = self.haskellSrc_1_0_1_3;
- haskellSrcExts = callPackage
../development/libraries/haskell/haskell-src-exts {};
+ # The old version is required for Agda.
+ haskellSrcExts_1_11_1 = callPackage
../development/libraries/haskell/haskell-src-exts/1.11.1.nix {};
+ haskellSrcExts_1_9_6 = callPackage
../development/libraries/haskell/haskell-src-exts/1.9.6.nix {};
+ haskellSrcExts = self.haskellSrcExts_1_11_1;
haskellSrcMeta = callPackage
../development/libraries/haskell/haskell-src-meta {};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
