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

haskellPackages.git-annex: Fix build

Browse Source
This commit is contained in:
Malte Brandy 2020-11-19 15:22:56 +01:00 committed by Peter Simons
parent bea4d0dc49
commit fb82f19d71
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,7 +69,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src"; name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/"; url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version; rev = "refs/tags/" + super.git-annex.version;
sha256 = "1g5ba1lv0v4zjk5ghdp78wxgszspfda1lrl734fi7hyavqrfjxkz"; sha256 = "13s6czv4p6n6s16kr5r255vldrn9038qjd5yl5xrh91xk6z410cd";
}; };
}).override { }).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null; dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -252,7 +252,13 @@ self: super: {
angel = dontCheck super.angel; angel = dontCheck super.angel;
apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw
app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw
aws = dontCheck super.aws; # needs aws credentials aws = appendPatch (dontCheck super.aws) # needs aws credentials
(pkgs.fetchpatch {
# https://github.com/aristidb/aws/pull/271
# bump a version bound
url = https://github.com/aristidb/aws/commit/3639262ccd6761dea76f052692ac3aefbd254723.patch;
sha256 = "0nxaspldgayqjnidda8w7wps5gdpr2wz6vynl7vkaw8kzxks9bci";
});
aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing aws-kinesis = dontCheck super.aws-kinesis; # needs aws credentials for testing
binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw
binary-search = dontCheck super.binary-search; binary-search = dontCheck super.binary-search;
@ -1432,6 +1438,10 @@ self: super: {
# 2020-11-17: persistent-test is ahead of the persistent version in stack # 2020-11-17: persistent-test is ahead of the persistent version in stack
persistent-sqlite = dontCheck super.persistent-sqlite; persistent-sqlite = dontCheck super.persistent-sqlite;
# 2020-11-19: hasn‘t bumped aeson bound
# https://git-annex.branchable.com/bugs/aeson_bound_can_be_bumped_to___60___1.6
git-lfs = doJailbreak super.git-lfs;
# The tests for semver-range need to be updated for the MonadFail change in # The tests for semver-range need to be updated for the MonadFail change in
# ghc-8.8: # ghc-8.8:
# https://github.com/adnelson/semver-range/issues/15 # https://github.com/adnelson/semver-range/issues/15