Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c0fcb53d9b0c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: e61638d768bc
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 1, 2019

  1. python3Packages.pytaglib: fix build 

    Applied several patches to fix the test suite on python 2.7 and to
properly install the `pyprinttags` executable. Also switched to the
GitHub source for now as the PyPI tarball was wrongly packaged and
didn't contain the `pyprinttags.py` script (see the last two patches for
further reference).

See also https://hydra.nixos.org/build/102493330

ZHF #68361

(cherry picked from commit c7164ea)
    @Ma27
    Ma27 committed Oct 1, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    tonistiigi Tõnis Tiigi
    GPG key ID: AFA9DE5F8AB7AF39
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e61638d View commit details
Showing with 29 additions and 4 deletions.
  1. +29 −4 pkgs/development/python-modules/pytaglib/default.nix
33 changes: 29 additions & 4 deletions pkgs/development/python-modules/pytaglib/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,46 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, taglib
, cython
, pytest
, glibcLocales
, fetchpatch
}:

buildPythonPackage rec {
pname = "pytaglib";
version = "1.4.5";

src = fetchPypi {
inherit pname version;
sha256 = "8aec64bc146a9f72778a0d2d1f3448f58be6ebea68f64b0ff88ea8e0f4dc5d8f";
src = fetchFromGitHub {
owner = "supermihi";
repo = pname;
rev = "v${version}";
sha256 = "1gvvadlgk8ny8bg76gwvvfcwp1nfgrjphi60h5f9ha7h5ff1g2wb";
};

patches = [
# fix tests on python 2.7
(fetchpatch {
url = https://github.com/supermihi/pytaglib/commit/0c4ae750fcd5b18d2553975c7e3e183e9dca5bf1.patch;
sha256 = "1kv3c68vimx5dc8aacvzphiaq916avmprxddi38wji8p2ql6vngj";
})

# properly install pyprinttags
(fetchpatch {
url = https://github.com/supermihi/pytaglib/commit/ba7a1406ddf35ddc41ed57f1c8d1f2bc2ed2c93a.patch;
sha256 = "0pi0dcq7db5fd3jnbwnfsfsgxvlhnm07z5yhpp93shk0s7ci2bwp";
})
(fetchpatch {
url = https://github.com/supermihi/pytaglib/commit/28772f6f94d37f05728071381a0fa04c6a14783a.patch;
sha256 = "0h259vzj1l0gpibdf322yclyd10x5rh1anzhsjj2ghm6rj6q0r0m";
})
];

postPatch = ''
substituteInPlace setup.py --replace "'pytest-runner', " ""
'';

buildInputs = [ taglib cython ];

checkInputs = [ pytest glibcLocales ];