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: 34240dbb2835
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ba7e7aed0874
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Jun 23, 2019

  1. python.pkgs.soundfile: 0.9.0.post1 -> 0.10.2 

    Package was renamed as well.
    @FRidh
    FRidh committed Jun 23, 2019
    Copy the full SHA
    ba7e7ae View commit details
Showing with 11 additions and 8 deletions.
  1. +8 −7 pkgs/development/python-modules/{pysoundfile → soundfile}/default.nix
  2. +3 −1 pkgs/top-level/python-packages.nix
15 changes: 8 additions & 7 deletions ...nt/python-modules/pysoundfile/default.nix → ...ment/python-modules/soundfile/default.nix
View file
Original file line number Diff line number Diff line change
@@ -10,13 +10,13 @@
}:

buildPythonPackage rec {
pname = "PySoundFile";
version = "0.9.0.post1";
name = pname + "-" + version;
pname = "soundfile";
version = "0.10.2";

src = fetchPypi {
inherit pname version;
sha256 = "43dd46a2afc0484c26930a7e59eef9365cee81bce7a4aadc5699f788f60d32c3";
pname = "SoundFile";
inherit version;
sha256 = "0w8mjadairg6av88090kwsridd0k115672b91zlcmf37r0c64zv3";
};

checkInputs = [ pytest ];
@@ -29,10 +29,11 @@ buildPythonPackage rec {
maintainers = with lib.maintainers; [ fridh ];
};

prePatch = ''
substituteInPlace soundfile.py --replace "'sndfile'" "'${libsndfile.out}/lib/libsndfile.so'"
postPatch = ''
substituteInPlace soundfile.py --replace "_find_library('sndfile')" "'${libsndfile.out}/lib/libsndfile${stdenv.hostPlatform.extensions.sharedLibrary}'"
'';

# https://github.com/bastibe/PySoundFile/issues/157
disabled = isPyPy || stdenv.isi686;

}
4 changes: 3 additions & 1 deletion pkgs/top-level/python-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -3826,7 +3826,9 @@ in {

pysftp = callPackage ../development/python-modules/pysftp { };

pysoundfile = callPackage ../development/python-modules/pysoundfile { };
soundfile = callPackage ../development/python-modules/soundfile { };

pysoundfile = self.soundfile; # Alias added 23-06-2019

python3pika = callPackage ../development/python-modules/python3pika { };