From 5a1e9a9cf25d242bd6ffdec682f419f3a73b97cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 15 Jun 2013 13:18:51 +0200 Subject: [PATCH] haskell-binary: re-add version 0.6.0.0 for the benefit of GHC 6.10.4 --- .../libraries/haskell/binary/0.6.0.0.nix | 13 +++++++++++++ .../haskell/binary/{default.nix => 0.7.1.0.nix} | 0 pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 4 +++- 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/binary/0.6.0.0.nix rename pkgs/development/libraries/haskell/binary/{default.nix => 0.7.1.0.nix} (100%) diff --git a/pkgs/development/libraries/haskell/binary/0.6.0.0.nix b/pkgs/development/libraries/haskell/binary/0.6.0.0.nix new file mode 100644 index 00000000000..01e909212e8 --- /dev/null +++ b/pkgs/development/libraries/haskell/binary/0.6.0.0.nix @@ -0,0 +1,13 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "binary"; + version = "0.6.0.0"; + sha256 = "0p72w7f9nn19g2wggsh8x4z7y9s174f3drz9a5ln4x7h554swcxv"; + meta = { + homepage = "https://github.com/kolmodin/binary"; + description = "Binary serialisation for Haskell values using lazy ByteStrings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/binary/default.nix b/pkgs/development/libraries/haskell/binary/0.7.1.0.nix similarity index 100% rename from pkgs/development/libraries/haskell/binary/default.nix rename to pkgs/development/libraries/haskell/binary/0.7.1.0.nix diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 35ff9cf4097..d2cfbf38f98 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -136,6 +136,7 @@ # deviating from Haskell platform here, to make some packages (notably statistics) compile jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; bmp = self.bmp_1_2_2_1; + binary = self.binary_0_6_0_0; cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; zlib = self.zlib_0_5_3_3; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 787c458874f..2cf5b3eeacf 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -585,7 +585,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bimap = callPackage ../development/libraries/haskell/bimap {}; - binary = callPackage ../development/libraries/haskell/binary {}; + binary_0_6_0_0 = callPackage ../development/libraries/haskell/binary/0.6.0.0.nix {}; + binary_0_7_1_0 = callPackage ../development/libraries/haskell/binary/0.7.1.0.nix {}; + binary = self.binary_0_7_1_0; binaryShared = callPackage ../development/libraries/haskell/binary-shared {};