JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-annex: fix GHC 8.x build

Browse Source
This commit is contained in:
Peter Simons 2016-09-08 14:54:36 +02:00
parent 0777d26038
commit f649d4eefa
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -40,7 +40,7 @@ rec {
svnSupport = true;
}));
git-annex = pkgs.haskell.packages.lts.git-annex;
git-annex = pkgs.haskellPackages.git-annex;
gitAnnex = git-annex;
git-annex-remote-b2 = callPackage ./git-annex-remote-b2 { };

10
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -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;