diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-19 08:57:41 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-12-19 08:57:41 +0100 |
commit | 911d1853ca990a7af6725105e7cda8c24cac025f (patch) | |
tree | 61aac8cb7c86d87fa2cdffe4b01e721e5e6fff64 /pkgs/development/python-modules/git-annex-adapter/default.nix | |
parent | 826ab7026e0f18c85fb861ae5f97bad1e9f37006 (diff) | |
parent | b9307eddd67e0e3f087dec608ccc84fec72deda5 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/python-modules/git-annex-adapter/default.nix')
-rw-r--r-- | pkgs/development/python-modules/git-annex-adapter/default.nix | 38 |
1 files changed, 3 insertions, 35 deletions
diff --git a/pkgs/development/python-modules/git-annex-adapter/default.nix b/pkgs/development/python-modules/git-annex-adapter/default.nix index f4d690eedc303..d8fc12b1c4223 100644 --- a/pkgs/development/python-modules/git-annex-adapter/default.nix +++ b/pkgs/development/python-modules/git-annex-adapter/default.nix @@ -4,16 +4,16 @@ buildPythonPackage rec { pname = "git-annex-adapter"; - version = "0.2.0"; + version = "0.2.1"; disabled = !isPy3k; - # There is only a wheel on PyPI - build from source instead + # No tests in PyPI tarball src = fetchFromGitHub { owner = "alpernebbi"; repo = pname; rev = "v${version}"; - sha256 = "1sbgp4ivgw4m8nngrlb1f78xdnssh639c1khv4z98753w3sdsxdz"; + sha256 = "146q1jhcfc7f96ajkhjffskkljk2xzivs5ih5clb8qx0sh7mj097"; }; prePatch = '' @@ -22,38 +22,6 @@ buildPythonPackage rec { --replace "'git-annex'" "'${git-annex}/bin/git-annex'" ''; - 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"; - }) - - # fix test broken due to renaming of repository version 6 to 7 - (fetchpatch { - url = https://github.com/alpernebbi/git-annex-adapter/commit/a72efea02ec9b2ed9c7aad0b222056d72eb0c143.patch; - sha256 = "0nv9ms01jnwp3qzwsla4w8pcpakq5lh7c77xdbhiidbrx0n1p4q7"; - }) - ] ++ 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 = [ utillinux # `rev` is needed in tests/test_process.py ]; |