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: 526ab5723aa0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b9066431b0b4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 18, 2018

  1. python.pkgs.eyeD3: 0.7.8 -> 0.8.7

    @Mic92
    Mic92 committed Nov 18, 2018
    Copy the full SHA
    cd46a85 View commit details

  2. Merge pull request #50534 from Mic92/eyed3 

    python.pkgs.eyeD3: 0.7.8 -> 0.8.7
    @Mic92
    Mic92 authored Nov 18, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    b906643 View commit details
Showing with 23 additions and 5 deletions.
  1. +23 −5 pkgs/development/python-modules/eyed3/default.nix
28 changes: 23 additions & 5 deletions pkgs/development/python-modules/eyed3/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,41 @@
{ stdenv
, buildPythonPackage
, fetchurl
, fetchPypi
, pythonAtLeast
, pythonOlder
, paver
, python
, isPyPy
, six
, pathlib
, python_magic
, isPy3k
, lib
}:

buildPythonPackage rec {
version = "0.7.8";
version = "0.8.7";
pname = "eyeD3";
disabled = isPyPy;

src = fetchurl {
url = "http://eyed3.nicfit.net/releases/${pname}-${version}.tar.gz";
sha256 = "1nv7nhfn1d0qm7rgkzksbccgqisng8klf97np0nwaqwd5dbmdf86";
src = fetchPypi {
inherit pname version;
sha256 = "1fzqy6hkg73xvpapdjrdzr3r0fsamnplvjfl7dz7rzgzx2r4x4pg";
};

# https://github.com/nicfit/eyeD3/pull/284
postPatch = lib.optionalString (pythonAtLeast "3.4") ''
sed -ie '/pathlib/d' requirements/requirements.yml
'';

buildInputs = [ paver ];

# requires special test data:
# https://github.com/nicfit/eyeD3/blob/103198e265e3279384f35304e8218be6717c2976/Makefile#L97
doCheck = false;

propagatedBuildInputs = [ six python_magic ] ++ lib.optional (pythonOlder "3.4") pathlib;

postInstall = ''
for prog in "$out/bin/"*; do
wrapProgram "$prog" --prefix PYTHONPATH : "$PYTHONPATH" \