about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-11-08 15:45:38 +0100
committerPeter Simons <simons@cryp.to>2014-11-08 15:50:21 +0100
commit0b36cbf8e7f6885951ccf4f6679b21fcec03102a (patch)
treed5776311b46a811aa413aff3475cabe3507e140d
parentb8d631a6040fea5ca044a3910b1a755d477ce2f5 (diff)
cabal-install: drop obsolete versions 0.10.2, 0.14.0, 0.6.2, 0.8.0, and 0.8.2
-rw-r--r--pkgs/tools/package-management/cabal-install/0.10.2.nix20
-rw-r--r--pkgs/tools/package-management/cabal-install/0.14.0.nix26
-rw-r--r--pkgs/tools/package-management/cabal-install/0.6.2.nix20
-rw-r--r--pkgs/tools/package-management/cabal-install/0.8.0.nix20
-rw-r--r--pkgs/tools/package-management/cabal-install/0.8.2.nix20
-rw-r--r--pkgs/top-level/haskell-defaults.nix4
-rw-r--r--pkgs/top-level/haskell-packages.nix5
7 files changed, 0 insertions, 115 deletions
diff --git a/pkgs/tools/package-management/cabal-install/0.10.2.nix b/pkgs/tools/package-management/cabal-install/0.10.2.nix
deleted file mode 100644
index 3d7b2d72d719c..0000000000000
--- a/pkgs/tools/package-management/cabal-install/0.10.2.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "0.10.2";
-  sha256 = "05gmgxdlymp66c87szx1vq6hlraispdh6pm0n85s74yihjwwhmv3";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ Cabal filepath HTTP network random time zlib ];
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/tools/package-management/cabal-install/0.14.0.nix b/pkgs/tools/package-management/cabal-install/0.14.0.nix
deleted file mode 100644
index c5a67e61999ce..0000000000000
--- a/pkgs/tools/package-management/cabal-install/0.14.0.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "0.14.0";
-  sha256 = "1n2vvlmfgfrj3z4ag5bj278vmdh6fw7xb0ixbxxxcngzd41bbwpl";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal filepath HTTP mtl network random time zlib
-  ];
-  postInstall = ''
-    mkdir $out/etc
-    mv bash-completion $out/etc/bash_completion.d
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/tools/package-management/cabal-install/0.6.2.nix b/pkgs/tools/package-management/cabal-install/0.6.2.nix
deleted file mode 100644
index 3c79857f6e788..0000000000000
--- a/pkgs/tools/package-management/cabal-install/0.6.2.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HTTP, network, random, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "0.6.2";
-  sha256 = "d8ea91bd0a2a624ab1cf52ddfe48cef02b532bb5e2fcda3fd72ca51efc04b41a";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ Cabal filepath HTTP network random zlib ];
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/tools/package-management/cabal-install/0.8.0.nix b/pkgs/tools/package-management/cabal-install/0.8.0.nix
deleted file mode 100644
index d27fbbca7d47b..0000000000000
--- a/pkgs/tools/package-management/cabal-install/0.8.0.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "0.8.0";
-  sha256 = "6d16618ff454f8d732cad64a53b767b5b6bb95ba4970b260a40e8f467035493c";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ Cabal filepath HTTP network random time zlib ];
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/tools/package-management/cabal-install/0.8.2.nix b/pkgs/tools/package-management/cabal-install/0.8.2.nix
deleted file mode 100644
index 6f8881b504bd2..0000000000000
--- a/pkgs/tools/package-management/cabal-install/0.8.2.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file was auto-generated by cabal2nix. Please do NOT edit manually!
-
-{ cabal, Cabal, filepath, HTTP, network, random, time, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "0.8.2";
-  sha256 = "8f896ab46ec6c578f620ce4150f7cd04a2088be793113b33cc570b13b6b86e0b";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [ Cabal filepath HTTP network random time zlib ];
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    hydraPlatforms = self.stdenv.lib.platforms.none;
-    maintainers = with self.stdenv.lib.maintainers; [ simons ];
-  };
-})
diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix
index e53e21fc68db8..72a00c1f5cf26 100644
--- a/pkgs/top-level/haskell-defaults.nix
+++ b/pkgs/top-level/haskell-defaults.nix
@@ -63,10 +63,6 @@
 
   ghc742Prefs = self : super : ghc763Prefs self super // {
     aeson = self.aeson_0_7_0_4.override { blazeBuilder = self.blazeBuilder; };
-    cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override {
-      HTTP = self.HTTP.override { network = self.network_2_3_0_13; };
-      network = self.network_2_3_0_13;
-    };
     extensibleExceptions = null;        # core package in ghc <= 7.4.x
     hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; };
     haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; };
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index cc3d25d7bb166..df16bb125bad1 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -3065,11 +3065,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in
 
   cabalg = callPackage ../development/libraries/haskell/cabalg {};
 
-  cabalInstall_0_6_2  = callPackage ../tools/package-management/cabal-install/0.6.2.nix {};
-  cabalInstall_0_8_0  = callPackage ../tools/package-management/cabal-install/0.8.0.nix {};
-  cabalInstall_0_8_2  = callPackage ../tools/package-management/cabal-install/0.8.2.nix {};
-  cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
-  cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
   cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; };
   cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; };
   cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix {