git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #110129 from dotlambda/git-annex-adapter-patch
983fdcbSandro
pkgs/development/python-modules/git-annex-adapter/default.nix+6−1
@@ -1,4 +1,4 @@
1−{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, substituteAll
1+{ lib, stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll
2, python, util-linux, pygit2, gitMinimal, git-annex, cacert
2, python, util-linux, pygit2, gitMinimal, git-annex, cacert
3}:
3}:
4
4
@@ -17,6 +17,11 @@ buildPythonPackage rec {
17 };
17 };
18
18
19 patches = [
19 patches = [
20+ # fix tests with recent versions of git-annex
21+ (fetchpatch {
22+ url = "https://github.com/alpernebbi/git-annex-adapter/commit/6c210d828e8a57b12c716339ad1bf15c31cd4a55.patch";
23+ sha256 = "17kp7pnm9svq9av4q7hfic95xa1w3z02dnr8nmg14sjck2rlmqsi";
24+ })
20 (substituteAll {
25 (substituteAll {
21 src = ./git-annex-path.patch;
26 src = ./git-annex-path.patch;
22 gitAnnex = "${git-annex}/bin/git-annex";
27 gitAnnex = "${git-annex}/bin/git-annex";