diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index 6cb6e626f279f46..935217c6992ecfd 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -22,13 +22,30 @@ buildPythonPackage rec { --replace "'git-annex'" "'${git-annex}/bin/git-annex'" ''; - # TODO: Remove for next version patches = [ + # fixes the "not-a-git-repo" testcase where recent git versions expect a slightly different error. ./not-a-git-repo-testcase.patch + + # fixes the testcase which parses the output of `git-annex info` where several + # new lines are displayed that broke the test. + (fetchpatch { + url = "https://github.com/Ma27/git-annex-adapter/commit/39cb6da69c1aec3d57ea9f68c2dea5113ae1b764.patch"; + sha256 = "0wyy2icqan3jpiw7dm50arfq3mgq4b5s3g91k82srap763r9hg5m"; + }) + + # fixes the testcase which runs "git status" and complies with the + # slightly altered output. (fetchpatch { url = "https://github.com/alpernebbi/git-annex-adapter/commit/9f64c4b99cae7b681820c6c7382e1e40489f4d1e.patch"; sha256 = "0yh66gial6bx7kbl7s7lkzljnkpgvgr8yahqqcq9z76d0w752dir"; }) + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + # `rev` is part of utillinux on NixOS which is not available on `nixpks` for darwin: + # https://logs.nix.ci/?key=nixos/nixpkgs.45061&attempt_id=271763ba-2ae7-4098-b469-b82b1d8edb9b + (fetchpatch { + url = "https://github.com/alpernebbi/git-annex-adapter/commit/0b60b4577528b309f6ac9d47b55a00dbda9850ea.patch"; + sha256 = "0z608hpmyzv1mm01dxr7d6bi1hc77h4yafghkynmv99ijgnm1qk7"; + }) ]; checkInputs = [