From 82aab38251753a4cc38b516707f8a16a1686cc2e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Nov 2014 12:38:08 +0100
Subject: [PATCH] haskell-language-java: drop obsolete version 0.2.6

---
 .../libraries/haskell/language-java/0.2.6.nix | 25 -------------------
 .../language-java/{0.2.7.nix => default.nix}  |  0
 pkgs/top-level/haskell-packages.nix           |  4 +--
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 pkgs/development/libraries/haskell/language-java/0.2.6.nix
 rename pkgs/development/libraries/haskell/language-java/{0.2.7.nix => default.nix} (100%)

diff --git a/pkgs/development/libraries/haskell/language-java/0.2.6.nix b/pkgs/development/libraries/haskell/language-java/0.2.6.nix
deleted file mode 100644
index 316a95481a5..00000000000
--- a/pkgs/development/libraries/haskell/language-java/0.2.6.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, alex, cpphs, filepath, HUnit, mtl, parsec, QuickCheck, syb
-, testFramework, testFrameworkHunit, testFrameworkQuickcheck2
-}:
-
-cabal.mkDerivation (self: {
-  pname = "language-java";
-  version = "0.2.6";
-  sha256 = "1rwkc71c77v1lm5vnfkf7wr4lzvkpdylwz8wia40xwyxidq9qv27";
-  buildDepends = [ cpphs parsec syb ];
-  testDepends = [
-    filepath HUnit mtl QuickCheck testFramework testFrameworkHunit
-    testFrameworkQuickcheck2
-  ];
-  buildTools = [ alex ];
-  doCheck = false;
-  meta = {
-    homepage = "http://github.com/vincenthz/language-java";
-    description = "Manipulating Java source: abstract syntax, lexer, parser, and pretty-printer";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-  };
-})
diff --git a/pkgs/development/libraries/haskell/language-java/0.2.7.nix b/pkgs/development/libraries/haskell/language-java/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/language-java/0.2.7.nix
rename to pkgs/development/libraries/haskell/language-java/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 50b92f2f12e..d1366024cec 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -1468,9 +1468,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   languageGlsl = callPackage ../development/libraries/haskell/language-glsl {};
 
-  languageJava_0_2_6 = callPackage ../development/libraries/haskell/language-java/0.2.6.nix {};
-  languageJava_0_2_7 = callPackage ../development/libraries/haskell/language-java/0.2.7.nix {};
-  languageJava = self.languageJava_0_2_7;
+  languageJava = callPackage ../development/libraries/haskell/language-java {};
 
   languageJavascript = callPackage ../development/libraries/haskell/language-javascript {};