diff options
author | Peter Simons <simons@cryp.to> | 2016-09-08 14:54:36 +0200 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2016-09-09 13:55:39 +0200 |
commit | f649d4eefa265dda33b33674b6c8ae1777077f68 (patch) | |
tree | c0c30c435f35a93bf32e28d4bf3ccc6ed5611474 /pkgs/development/haskell-modules/configuration-common.nix | |
parent | 0777d26038ac8c9c2031690b6169edd88102adcd (diff) | |
download | nixlib-f649d4eefa265dda33b33674b6c8ae1777077f68.tar nixlib-f649d4eefa265dda33b33674b6c8ae1777077f68.tar.gz nixlib-f649d4eefa265dda33b33674b6c8ae1777077f68.tar.bz2 nixlib-f649d4eefa265dda33b33674b6c8ae1777077f68.tar.lz nixlib-f649d4eefa265dda33b33674b6c8ae1777077f68.tar.xz nixlib-f649d4eefa265dda33b33674b6c8ae1777077f68.tar.zst nixlib-f649d4eefa265dda33b33674b6c8ae1777077f68.zip |
git-annex: fix GHC 8.x build
Diffstat (limited to 'pkgs/development/haskell-modules/configuration-common.nix')
-rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 9b04315e4a8c..c743b383516c 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -39,14 +39,20 @@ self: super: { # Link the proper version. zeromq4-haskell = super.zeromq4-haskell.override { zeromq = pkgs.zeromq4; }; - # This package needs a little help compiling properly on Darwin. - git-annex = (overrideCabal super.git-annex (drv: { + # The Hackage tarball is purposefully broken. Mr. Hess wants people to build + # his package from the Git repo because that is, like, better! + git-annex = ((overrideCabal super.git-annex (drv: { src = pkgs.fetchFromGitHub { owner = "joeyh"; repo = "git-annex"; sha256 = "1frdld9kgnfd4ll8yx086lwmbqxa5k56y567qw2zy9kz1iiz2fpi"; rev = drv.version; }; + })).overrideScope (self: super: { + # https://github.com/prowdsponsor/esqueleto/issues/137 + persistent = self.persistent_2_2_4_1; + persistent-template = self.persistent-template_2_1_8_1; + persistent-sqlite = self.persistent-sqlite_2_2_1; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; fdo-notify = if pkgs.stdenv.isLinux then self.fdo-notify else null; |