From 5e1bd2b5083bd2356cb8c68fc8e4ee8a46afb670 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 8 Nov 2014 12:04:23 +0100
Subject: [PATCH] haskell-editline: drop obsolete version 0.2.1.0
---
.../libraries/haskell/editline/0.2.1.0.nix | 17 -----------------
.../editline/{0.2.1.1.nix => default.nix} | 0
pkgs/top-level/haskell-packages.nix | 4 +---
3 files changed, 1 insertion(+), 20 deletions(-)
delete mode 100644 pkgs/development/libraries/haskell/editline/0.2.1.0.nix
rename pkgs/development/libraries/haskell/editline/{0.2.1.1.nix => default.nix} (100%)
diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix b/pkgs/development/libraries/haskell/editline/0.2.1.0.nix
deleted file mode 100644
index d36a2ee11f2..00000000000
--- a/pkgs/development/libraries/haskell/editline/0.2.1.0.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, libedit }:
-
-cabal.mkDerivation (self: {
- pname = "editline";
- version = "0.2.1.0";
- sha256 = "1qa65iqr5k3ajq1glf5y84lld132i2i3l0zmsw8xqkq7hrgqwqc3";
- extraLibraries = [ libedit ];
- meta = {
- homepage = "http://code.haskell.org/editline";
- description = "Bindings to the editline library (libedit)";
- license = self.stdenv.lib.licenses.bsd3;
- platforms = self.ghc.meta.platforms;
- hydraPlatforms = self.stdenv.lib.platforms.none;
- };
-})
diff --git a/pkgs/development/libraries/haskell/editline/0.2.1.1.nix b/pkgs/development/libraries/haskell/editline/default.nix
similarity index 100%
rename from pkgs/development/libraries/haskell/editline/0.2.1.1.nix
rename to pkgs/development/libraries/haskell/editline/default.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index eeb7ca6b8a2..51bcc33a0fc 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -725,9 +725,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
editDistance = callPackage ../development/libraries/haskell/edit-distance {};
- editline_0_2_1_0 = callPackage ../development/libraries/haskell/editline/0.2.1.0.nix {};
- editline_0_2_1_1 = callPackage ../development/libraries/haskell/editline/0.2.1.1.nix {};
- editline = self.editline_0_2_1_1;
+ editline = callPackage ../development/libraries/haskell/editline {};
ekg = callPackage ../development/libraries/haskell/ekg {};
ekgCarbon = callPackage ../development/libraries/haskell/ekg-carbon {};