diff options
author | Peter Simons <simons@cryp.to> | 2014-07-16 12:07:14 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2014-07-16 12:07:14 +0200 |
commit | 5ae5d00d1829211370b941e3a0813308a87a26a1 (patch) | |
tree | 5df341f7eb071d2604cb4852b0a519ca2193fa25 /pkgs | |
parent | dde46a144553e8c680bf2b4602bfc2deaded2c15 (diff) | |
parent | 51ef9caae55eb263e5f92960aa294e321b1800b6 (diff) | |
download | nixlib-5ae5d00d1829211370b941e3a0813308a87a26a1.tar nixlib-5ae5d00d1829211370b941e3a0813308a87a26a1.tar.gz nixlib-5ae5d00d1829211370b941e3a0813308a87a26a1.tar.bz2 nixlib-5ae5d00d1829211370b941e3a0813308a87a26a1.tar.lz nixlib-5ae5d00d1829211370b941e3a0813308a87a26a1.tar.xz nixlib-5ae5d00d1829211370b941e3a0813308a87a26a1.tar.zst nixlib-5ae5d00d1829211370b941e3a0813308a87a26a1.zip |
Merge pull request #3294 from nilcons/haskellfixes
Fix various Haskell packages for 7.8
Diffstat (limited to 'pkgs')
4 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/libraries/haskell/deepseq-th/default.nix b/pkgs/development/libraries/haskell/deepseq-th/default.nix index e70a25dff93d..5fa23a8afda2 100644 --- a/pkgs/development/libraries/haskell/deepseq-th/default.nix +++ b/pkgs/development/libraries/haskell/deepseq-th/default.nix @@ -8,6 +8,10 @@ cabal.mkDerivation (self: { sha256 = "12wk8higrp12b22zzz1b4ar1q5h7flk22bp2rvswsqri2zkbi965"; buildDepends = [ deepseq ]; testDepends = [ deepseq ]; + jailbreak = true; + # TH semantics is a little bit different in GHC 7.8 + # tests needs updating, but the package is still working + doCheck = false; meta = { description = "Template Haskell based deriver for optimised NFData instances"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index d356fc1f05c7..5934378c94ea 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -8,6 +8,8 @@ cabal.mkDerivation (self: { sha256 = "0sfralwgd5b9hfqmp20v31sq96s0v7j9g920qdj3n9i5mhslhwd2"; buildDepends = [ deepseq text ]; testDepends = [ chell chellQuickcheck QuickCheck text ]; + # tests fragile on 32-bits + doCheck = false; meta = { homepage = "https://john-millikin.com/software/haskell-filesystem/"; description = "High-level, byte-based file and directory path manipulations"; diff --git a/pkgs/development/libraries/haskell/template-default/default.nix b/pkgs/development/libraries/haskell/template-default/default.nix index 6780c12fcd52..3a7e3f05bdd2 100644 --- a/pkgs/development/libraries/haskell/template-default/default.nix +++ b/pkgs/development/libraries/haskell/template-default/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.1.1"; sha256 = "07b8j11v0247fwaf3mv72m7aaq3crbsyrxmxa352vn9h2g6l1jsd"; buildDepends = [ dataDefault ]; + jailbreak = true; meta = { homepage = "https://github.com/haskell-pkg-janitors/template-default"; description = "declaring Default instances just got even easier"; diff --git a/pkgs/development/libraries/haskell/tz/default.nix b/pkgs/development/libraries/haskell/tz/default.nix index ead6e4f55581..3de1fafd5821 100644 --- a/pkgs/development/libraries/haskell/tz/default.nix +++ b/pkgs/development/libraries/haskell/tz/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "tz"; - version = "0.0.0.5"; - sha256 = "03s5vs08dj3r7rq78ncya6x6dazvr93gfylyynwybpai09l2y89v"; + version = "0.0.0.6"; + sha256 = "0yn2c016fzqwbgdrqp5hjn95gzp4w3gqjgax1w6wkg97bksdlq27"; buildDepends = [ binary deepseq time tzdata vector ]; testDepends = [ bindingsPosix HUnit QuickCheck testFramework testFrameworkHunit |