From 0dfe09b6c9e115f831493634dcf8d8304808ad2f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 5 Jun 2013 11:26:37 +0200 Subject: [PATCH] haskell-bmp: update to version 1.2.5.1 GHC versions prior to 7.6.x cannot compile this version, so override the 'bmp' attribute for those compilers to version 1.2.2.1 in haskell-defaults.nix. --- .../development/libraries/haskell/bmp/1.2.5.1.nix | 15 +++++++++++++++ pkgs/top-level/haskell-defaults.nix | 9 +++++++++ pkgs/top-level/haskell-packages.nix | 3 ++- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/bmp/1.2.5.1.nix diff --git a/pkgs/development/libraries/haskell/bmp/1.2.5.1.nix b/pkgs/development/libraries/haskell/bmp/1.2.5.1.nix new file mode 100644 index 000000000000..21ddb3c18e56 --- /dev/null +++ b/pkgs/development/libraries/haskell/bmp/1.2.5.1.nix @@ -0,0 +1,15 @@ +{ cabal, binary }: + +cabal.mkDerivation (self: { + pname = "bmp"; + version = "1.2.5.1"; + sha256 = "1q1g5p7kan9hqb4s50fz989c4p8vmfrs7qvwiqx9bcic8k7jqld4"; + buildDepends = [ binary ]; + meta = { + homepage = "http://code.ouroborus.net/bmp"; + description = "Read and write uncompressed BMP image files"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.andres ]; + }; +}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 371ee72bd1f4..23573478e394 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -31,12 +31,14 @@ self : self.haskellPlatformArgs_2012_4_0_0 self // { haskellPlatform = self.haskellPlatform_2012_4_0_0; cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; + bmp = self.bmp_1_2_2_1; }; ghc741Prefs = self : self.haskellPlatformArgs_2012_2_0_0 self // { haskellPlatform = self.haskellPlatform_2012_2_0_0; cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; + bmp = self.bmp_1_2_2_1; }; ghc722Prefs = @@ -44,6 +46,7 @@ haskellPlatform = self.haskellPlatform_2012_2_0_0; deepseq = self.deepseq_1_3_0_1; cabalInstall_1_16_0_2 = self.cabalInstall_1_16_0_2.override { Cabal = self.Cabal_1_16_0_3; }; + bmp = self.bmp_1_2_2_1; }; ghc721Prefs = ghc722Prefs; @@ -56,6 +59,7 @@ monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; prettyShow = self.prettyShow_1_2; + bmp = self.bmp_1_2_2_1; }; ghc703Prefs = @@ -66,6 +70,7 @@ monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; prettyShow = self.prettyShow_1_2; + bmp = self.bmp_1_2_2_1; }; ghc702Prefs = ghc701Prefs; @@ -78,6 +83,7 @@ monadPar = self.monadPar_0_1_0_3; jailbreakCabal = self.jailbreakCabal.override { Cabal = self.disableTest self.Cabal_1_14_0; }; prettyShow = self.prettyShow_1_2; + bmp = self.bmp_1_2_2_1; }; ghc6123Prefs = ghc6122Prefs; @@ -91,6 +97,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; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; + bmp = self.bmp_1_2_2_1; }; ghc6121Prefs = @@ -103,6 +110,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; }; cabal2nix = self.cabal2nix.override { Cabal = self.Cabal_1_16_0_3; hackageDb = self.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; }; + bmp = self.bmp_1_2_2_1; }; ghc6104Prefs = @@ -116,6 +124,7 @@ monadPar = self.monadPar_0_1_0_3; # 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; }; # Abstraction for Haskell packages collections diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 92e092078291..fff7983d7c47 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -619,7 +619,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); bmp_1_2_2_1 = callPackage ../development/libraries/haskell/bmp/1.2.2.1.nix {}; bmp_1_2_4_1 = callPackage ../development/libraries/haskell/bmp/1.2.4.1.nix {}; - bmp = self.bmp_1_2_2_1; # later versions work only with ghc 7.6 and beyond + bmp_1_2_5_1 = callPackage ../development/libraries/haskell/bmp/1.2.5.1.nix {}; + bmp = self.bmp_1_2_5_1; Boolean = callPackage ../development/libraries/haskell/Boolean {};