From 3d5f6b7d1cd8c7c89f8bbb1d30b66df119d8435a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 26 Nov 2012 15:31:33 +0100 Subject: [PATCH] Drop obsolete haskell-time versions 1.1.3, 1.2.0.3, 1.2.0.5, and 1.4.0.1. --- .../development/libraries/haskell/time/1.1.3.nix | 14 -------------- .../libraries/haskell/time/1.2.0.3.nix | 14 -------------- .../libraries/haskell/time/1.2.0.5.nix | 14 -------------- .../libraries/haskell/time/1.4.0.1.nix | 15 --------------- pkgs/top-level/haskell-packages.nix | 16 +++------------- 5 files changed, 3 insertions(+), 70 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/time/1.1.3.nix delete mode 100644 pkgs/development/libraries/haskell/time/1.2.0.3.nix delete mode 100644 pkgs/development/libraries/haskell/time/1.2.0.5.nix delete mode 100644 pkgs/development/libraries/haskell/time/1.4.0.1.nix diff --git a/pkgs/development/libraries/haskell/time/1.1.3.nix b/pkgs/development/libraries/haskell/time/1.1.3.nix deleted file mode 100644 index 55c52e8a73c0..000000000000 --- a/pkgs/development/libraries/haskell/time/1.1.3.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "time"; - version = "1.1.3"; - sha256 = "46d32400bc0099ccef1fb670684c00a31055725403ea15c7a39278ff7dccc65b"; - meta = { - homepage = "http://semantic.org/TimeLib/"; - description = "A time library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/time/1.2.0.3.nix b/pkgs/development/libraries/haskell/time/1.2.0.3.nix deleted file mode 100644 index 23c07f9dd235..000000000000 --- a/pkgs/development/libraries/haskell/time/1.2.0.3.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "time"; - version = "1.2.0.3"; - sha256 = "acb1e3cf2b98a73632d35b0665808b05df6c03fcefd62796fe291f5b2ef4348e"; - meta = { - homepage = "http://semantic.org/TimeLib/"; - description = "A time library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/time/1.2.0.5.nix b/pkgs/development/libraries/haskell/time/1.2.0.5.nix deleted file mode 100644 index 9d059245d7b5..000000000000 --- a/pkgs/development/libraries/haskell/time/1.2.0.5.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ cabal }: - -cabal.mkDerivation (self: { - pname = "time"; - version = "1.2.0.5"; - sha256 = "0y4plv9qvpmzzzb5855zngm6lmd38m0vr2mzwm94xhz2xsqhdh2z"; - meta = { - homepage = "http://semantic.org/TimeLib/"; - description = "A time library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/development/libraries/haskell/time/1.4.0.1.nix b/pkgs/development/libraries/haskell/time/1.4.0.1.nix deleted file mode 100644 index 107c7cee0372..000000000000 --- a/pkgs/development/libraries/haskell/time/1.4.0.1.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ cabal, deepseq }: - -cabal.mkDerivation (self: { - pname = "time"; - version = "1.4.0.1"; - sha256 = "046jyz2xnbg2s94d9xhpphgq93mqlky7bc50vss40wdk6l7w8aws"; - buildDepends = [ deepseq ]; - meta = { - homepage = "http://semantic.org/TimeLib/"; - description = "A time library"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 23af53dbd0f4..2dc7c6d118a6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -487,9 +487,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); basicPrelude = callPackage ../development/libraries/haskell/basic-prelude {}; - benchpress = callPackage ../development/libraries/haskell/benchpress { - time = self.time_1_1_3; - }; + benchpress = callPackage ../development/libraries/haskell/benchpress {}; bimap = callPackage ../development/libraries/haskell/bimap {}; @@ -606,9 +604,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); configurator = callPackage ../development/libraries/haskell/configurator {}; - convertible = callPackage ../development/libraries/haskell/convertible { - time = self.time_1_1_3; - }; + convertible = callPackage ../development/libraries/haskell/convertible {}; continuedFractions = callPackage ../development/libraries/haskell/continued-fractions {}; @@ -1632,10 +1628,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); threads = callPackage ../development/libraries/haskell/threads {}; time_1_1_2_4 = callPackage ../development/libraries/haskell/time/1.1.2.4.nix {}; - time_1_1_3 = callPackage ../development/libraries/haskell/time/1.1.3.nix {}; - time_1_2_0_3 = callPackage ../development/libraries/haskell/time/1.2.0.3.nix {}; - time_1_2_0_5 = callPackage ../development/libraries/haskell/time/1.2.0.5.nix {}; - time_1_4_0_1 = callPackage ../development/libraries/haskell/time/1.4.0.1.nix {}; time_1_4_0_2 = callPackage ../development/libraries/haskell/time/1.4.0.2.nix {}; # time is in the core package set. It should only be necessary to # pass it explicitly in rare circumstances. @@ -1755,9 +1747,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); wxGTK = pkgs.wxGTK29; }; - wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix { - time = self.time_1_2_0_5; - }; + wxdirect = callPackage ../development/libraries/haskell/wxHaskell/wxdirect.nix {}; X11_1_5_0_1 = callPackage ../development/libraries/haskell/X11/1.5.0.1.nix {}; X11_1_6_0_2 = callPackage ../development/libraries/haskell/X11/1.6.0.2.nix {};