about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-11-25 13:44:52 +0000
committerPeter Simons <simons@cryp.to>2011-11-25 13:44:52 +0000
commit83027a49c926e7c2859fd6ff0cf01d21c2edbe8f (patch)
tree0b6f8855567ef5ef3932820a6922181f7689a925
parent53510bff9a73c40189b8c5b1ae172205b1b49912 (diff)
haskell-src-exts: dropped obsolete version 1.9.6
svn path=/nixpkgs/trunk/; revision=30564
-rw-r--r--pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix19
-rw-r--r--pkgs/development/libraries/haskell/haskell-src-exts/default.nix (renamed from pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix)0
-rw-r--r--pkgs/top-level/haskell-packages.nix10
3 files changed, 2 insertions, 27 deletions
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix b/pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix
deleted file mode 100644
index 42b69258397e0..0000000000000
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.9.6.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ cabal, cpphs, happy }:
-
-cabal.mkDerivation (self: {
-  pname = "haskell-src-exts";
-  version = "1.9.6";
-  sha256 = "1bdbjwhzms962ncwiszp82a8m6jkgz6d9cns5585kipy9n224d3h";
-  buildDepends = [ cpphs ];
-  buildTools = [ 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.ghc.meta.platforms;
-    maintainers = [
-      self.stdenv.lib.maintainers.andres
-      self.stdenv.lib.maintainers.simons
-    ];
-  };
-})
diff --git a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
index 649bf29f58f7f..649bf29f58f7f 100644
--- a/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
+++ b/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 366bf2e904e6a..a2674b10f4171 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -360,10 +360,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   # Haskell libraries.
 
-  Agda = callPackage ../development/libraries/haskell/Agda {
-    syb = self.syb02;
-    haskellSrcExts = self.haskellSrcExts_1_9_6;
-  };
+  Agda = callPackage ../development/libraries/haskell/Agda {};
 
   ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
 
@@ -690,10 +687,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   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 {};
-  haskellSrcExts_1_9_6 = callPackage ../development/libraries/haskell/haskell-src-exts/1.9.6.nix {};
-  haskellSrcExts = self.haskellSrcExts_1_11_1;
+  haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts/default.nix {};
 
   haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};