From ba7e7aed08740f5a33e3ef1fa56e4c591af85dc0 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sun, 23 Jun 2019 15:32:05 +0200 Subject: [PATCH] python.pkgs.soundfile: 0.9.0.post1 -> 0.10.2 Package was renamed as well. --- .../{pysoundfile => soundfile}/default.nix | 15 ++++++++------- pkgs/top-level/python-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 8 deletions(-) rename pkgs/development/python-modules/{pysoundfile => soundfile}/default.nix (63%) diff --git a/pkgs/development/python-modules/pysoundfile/default.nix b/pkgs/development/python-modules/soundfile/default.nix similarity index 63% rename from pkgs/development/python-modules/pysoundfile/default.nix rename to pkgs/development/python-modules/soundfile/default.nix index aa7d23c5fcb..4ba18618674 100644 --- a/pkgs/development/python-modules/pysoundfile/default.nix +++ b/pkgs/development/python-modules/soundfile/default.nix @@ -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; + } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a29e76020cb..6f43c49050b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { };