Author: simons
Date: Fri Nov 25 13:44:52 2011
New Revision: 30564
URL: https://nixos.org/websvn/nix/?rev=30564&sc=1

Log:
haskell-src-exts: dropped obsolete version 1.9.6

Added:
   nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/default.nix
      - copied, changed from r30563, 
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix
Deleted:
   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
Modified:
   nixpkgs/trunk/pkgs/top-level/haskell-packages.nix

Copied and modified: 
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/default.nix 
(from r30563, 
nixpkgs/trunk/pkgs/development/libraries/haskell/haskell-src-exts/1.11.1.nix)
==============================================================================

Modified: nixpkgs/trunk/pkgs/top-level/haskell-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Fri Nov 25 13:44:48 
2011        (r30563)
+++ nixpkgs/trunk/pkgs/top-level/haskell-packages.nix   Fri Nov 25 13:44:52 
2011        (r30564)
@@ -360,10 +360,7 @@
 
   # 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 @@
   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 {};
 
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to