From e1af9e865d434c6f267300ea4d7d281e1242f95d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:23:48 +0100 Subject: haddock: drop obsolete versions 2.4.2, 2.7.2, 2.9.2, 2.9.4, 2.11.0, 2.12.0, 2.13.2, 2.13.2.1, 2.14.2, and 2.14.3 --- pkgs/top-level/haskell-defaults.nix | 6 ------ 1 file changed, 6 deletions(-) (limited to 'pkgs/top-level/haskell-defaults.nix') diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 6ee3e4d9e0ab..e6773ea1fda4 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -49,7 +49,6 @@ }; entropy = super.entropy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; gloss = null; # requires base >= 4.7 - haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_2; }; rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_2; }; @@ -70,7 +69,6 @@ }; extensibleExceptions = null; # core package in ghc <= 7.4.x hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; - haddock = self.haddock_2_11_0; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; primitive = self.primitive_0_5_3_0; # later versions don't compile random = self.random_1_0_1_1; # requires base >= 4.6.x @@ -81,14 +79,12 @@ caseInsensitive = self.caseInsensitive_1_0_0_1; deepseq = self.deepseq_1_3_0_2; DrIFT = null; # doesn't compile with old GHC versions - haddock = self.haddock_2_9_4; syb = self.syb_0_4_0; }; ghc704Prefs = self : super : ghc722Prefs self super // { binary = self.binary_0_7_2_2; # core package in ghc >= 7.2.2 caseInsensitive = super.caseInsensitive; # undo the override from ghc 7.2.2 - haddock = self.haddock_2_9_2.override { alex = self.alex_2_3_5; }; HsSyck = self.HsSyck_0_51; jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; random = null; # core package in ghc <= 7.0.x @@ -103,7 +99,6 @@ deepseq = self.deepseq_1_2_0_1; dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; exceptions = null; # none of our versions compile - haddock = self.haddock_2_7_2; logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; monadPar = self.monadPar_0_1_0_3; nats = null; # none of our versions compile @@ -129,7 +124,6 @@ cabalInstall_1_16_0_2 = super.cabalInstall_1_16_0_2; caseInsensitive = super.caseInsensitive.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; GLUT = self.GLUT_2_2_2_1; - haddock = self.haddock_2_4_2; happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; -- cgit 1.4.1 From b1aa6efc1a00499004c80b8c63afcd8476cd438d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 12:43:05 +0100 Subject: haskell-MonadRandom: drop obsolete version 0.1.13 --- .../development/libraries/haskell/MonadRandom/0.1.13.nix | 16 ---------------- pkgs/top-level/haskell-defaults.nix | 2 +- pkgs/top-level/haskell-packages.nix | 1 - 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix (limited to 'pkgs/top-level/haskell-defaults.nix') diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix b/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix deleted file mode 100644 index 0cbd926b1f18..000000000000 --- a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, random, transformers }: - -cabal.mkDerivation (self: { - pname = "MonadRandom"; - version = "0.1.13"; - sha256 = "1pi12ymsbl2l0ly3ggihg8r0ac87ax267m419cga60wp5ry5zbnk"; - buildDepends = [ mtl random transformers ]; - meta = { - description = "Random-number generation monad"; - license = "unknown"; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index e6773ea1fda4..e53e21fc68db 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -23,7 +23,7 @@ ghc783Prefs = self : super : ghcHEADPrefs self super // { cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; - MonadRandom = self.MonadRandom_0_1_13; # requires transformers >= 0.4.x + MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x mtl = self.mtl_2_1_3_1; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 406c1220a114..633742f463ea 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1667,7 +1667,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {}; - MonadRandom_0_1_13 = callPackage ../development/libraries/haskell/MonadRandom/0.1.13.nix {}; MonadRandom_0_2_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.2.0.1.nix {}; MonadRandom_0_3 = callPackage ../development/libraries/haskell/MonadRandom/0.3.nix {}; MonadRandom = self.MonadRandom_0_3; -- cgit 1.4.1 From 0b36cbf8e7f6885951ccf4f6679b21fcec03102a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 8 Nov 2014 15:45:38 +0100 Subject: cabal-install: drop obsolete versions 0.10.2, 0.14.0, 0.6.2, 0.8.0, and 0.8.2 --- .../package-management/cabal-install/0.10.2.nix | 20 ----------------- .../package-management/cabal-install/0.14.0.nix | 26 ---------------------- .../package-management/cabal-install/0.6.2.nix | 20 ----------------- .../package-management/cabal-install/0.8.0.nix | 20 ----------------- .../package-management/cabal-install/0.8.2.nix | 20 ----------------- pkgs/top-level/haskell-defaults.nix | 4 ---- pkgs/top-level/haskell-packages.nix | 5 ----- 7 files changed, 115 deletions(-) delete mode 100644 pkgs/tools/package-management/cabal-install/0.10.2.nix delete mode 100644 pkgs/tools/package-management/cabal-install/0.14.0.nix delete mode 100644 pkgs/tools/package-management/cabal-install/0.6.2.nix delete mode 100644 pkgs/tools/package-management/cabal-install/0.8.0.nix delete mode 100644 pkgs/tools/package-management/cabal-install/0.8.2.nix (limited to 'pkgs/top-level/haskell-defaults.nix') 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 3d7b2d72d719..000000000000 --- 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 c5a67e61999c..000000000000 --- 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 3c79857f6e78..000000000000 --- 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 d27fbbca7d47..000000000000 --- 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 6f8881b504bd..000000000000 --- 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 e53e21fc68db..72a00c1f5cf2 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 cc3d25d7bb16..df16bb125bad 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 { -- cgit 1.4.1 From 68f3d5688036cfeb774d64e9191efc587a8239b6 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 11 Nov 2014 12:50:22 -0600 Subject: Drop reference to old shelly from haskell-defaults.nix --- pkgs/top-level/haskell-defaults.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'pkgs/top-level/haskell-defaults.nix') diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 72a00c1f5cf2..50f1177e07ae 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -68,7 +68,6 @@ haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; primitive = self.primitive_0_5_3_0; # later versions don't compile random = self.random_1_0_1_1; # requires base >= 4.6.x - shelly = self.shelly_0_15_4_1; }; ghc722Prefs = self : super : ghc742Prefs self super // { -- cgit 1.4.1