about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2014-05-23 19:26:11 +0200
committerPeter Simons <simons@cryp.to>2014-05-23 21:54:27 +0200
commit45799eeabaadf81f4bd5d7e7b70a38bd22a5c301 (patch)
tree97e9722bee578a2ff2a6ebfea0a36aa5bd7da620
parentdb0b1b76d3aa2394504b64c61d79b630cc1b8811 (diff)
downloadnixlib-45799eeabaadf81f4bd5d7e7b70a38bd22a5c301.tar
nixlib-45799eeabaadf81f4bd5d7e7b70a38bd22a5c301.tar.gz
nixlib-45799eeabaadf81f4bd5d7e7b70a38bd22a5c301.tar.bz2
nixlib-45799eeabaadf81f4bd5d7e7b70a38bd22a5c301.tar.lz
nixlib-45799eeabaadf81f4bd5d7e7b70a38bd22a5c301.tar.xz
nixlib-45799eeabaadf81f4bd5d7e7b70a38bd22a5c301.tar.zst
nixlib-45799eeabaadf81f4bd5d7e7b70a38bd22a5c301.zip
haskell-scientific: there's no point in using 0.1.0.1, because it doesn't build with GHC 6.12.x either :-(
-rw-r--r--pkgs/development/libraries/haskell/scientific/0.1.0.1.nix17
-rw-r--r--pkgs/top-level/haskell-defaults.nix1
-rw-r--r--pkgs/top-level/haskell-packages.nix1
3 files changed, 1 insertions, 18 deletions
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