diff options
| author | Peter Simons <simons@cryp.to> | 2014-08-24 12:57:51 +0200 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2014-08-24 20:28:12 +0200 |
| commit | cbc67e17043adc8c019d30d961986233571b7aba (patch) | |
| tree | 9e6d3bc8db68c28df2e3bed7da5fb97ae70d3ea3 | |
| parent | 5ec6492ea078a1710f027e49bdd7c0e7ab45babf (diff) | |
| download | nixpkgs-cbc67e17043adc8c019d30d961986233571b7aba.tar nixpkgs-cbc67e17043adc8c019d30d961986233571b7aba.tar.gz nixpkgs-cbc67e17043adc8c019d30d961986233571b7aba.tar.bz2 nixpkgs-cbc67e17043adc8c019d30d961986233571b7aba.tar.lz nixpkgs-cbc67e17043adc8c019d30d961986233571b7aba.tar.xz nixpkgs-cbc67e17043adc8c019d30d961986233571b7aba.tar.zst nixpkgs-cbc67e17043adc8c019d30d961986233571b7aba.zip | |
hsyslog: build with a recent version of Cabal on GHC 6.10.4 (and don't run Haddock)
| -rw-r--r-- | pkgs/development/libraries/haskell/hsyslog/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/top-level/haskell-defaults.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix index 1a5cbd5b8e6..89bd035eaf1 100644 --- a/pkgs/development/libraries/haskell/hsyslog/default.nix +++ b/pkgs/development/libraries/haskell/hsyslog/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "2.0"; sha256 = "02v698grn43bvikqhqiz9ys8x2amngdmhvl3i0ar9203p2x8q3pq"; testDepends = [ doctest ]; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; meta = { homepage = "http://github.com/peti/hsyslog"; description = "FFI interface to syslog(3) from POSIX.1-2001"; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 3c5311b83bb..10d453c1d6c 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -119,6 +119,7 @@ happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + hsyslog = super.hsyslog.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; network = super.network_2_2_1_7.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; |