From 45799eeabaadf81f4bd5d7e7b70a38bd22a5c301 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 23 May 2014 19:26:11 +0200 Subject: haskell-scientific: there's no point in using 0.1.0.1, because it doesn't build with GHC 6.12.x either :-( --- .../libraries/haskell/scientific/0.1.0.1.nix | 17 ----------------- pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 1 - 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/scientific/0.1.0.1.nix diff --git a/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix b/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix deleted file mode 100644 index 178476ad3cf7..000000000000 --- a/pkgs/development/libraries/haskell/scientific/0.1.0.1.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ cabal, deepseq, hashable, smallcheck, tasty, tastySmallcheck -, text -}: - -cabal.mkDerivation (self: { - pname = "scientific"; - version = "0.1.0.1"; - sha256 = "0s401gxwap4xwz9rxypc76rs5w344s3an45295ybf3id6yal5140"; - buildDepends = [ deepseq hashable text ]; - testDepends = [ smallcheck tasty tastySmallcheck text ]; - meta = { - homepage = "https://github.com/basvandijk/scientific"; - description = "Arbitrary-precision floating-point numbers represented using scientific notation"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index f079e4ac4038..e85d7a57327b 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -76,6 +76,7 @@ haddock = self.haddock_2_7_2; parallel = self.parallel_3_2_0_3; primitive = self.primitive_0_5_0_1; + scientific = null; # none of our versions compile split = self.split_0_1_4_3; stm = self.stm_2_4_2; syb = null; # core package in ghc < 7 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ed03835de1a3..9819a4cb5ed7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1879,7 +1879,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sbv = callPackage ../development/libraries/haskell/sbv {}; - scientific_0_1_0_1 = callPackage ../development/libraries/haskell/scientific/0.1.0.1.nix {}; scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {}; scientific_0_3_2_1 = callPackage ../development/libraries/haskell/scientific/0.3.2.1.nix {}; scientific = self.scientific_0_2_0_2; # version 0.3.x requires updates to aeson and other stuff -- cgit 1.4.1