git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #75635 from emilazy/whipper-0.9.0

whipper: update to 0.9.0

commit7e77cea72128ff378867967ded62f5e4cffc8129 authorMaximilian Bosch <maximilian@mbosch.me> dateSat 14 Dec 2019, 04:42 (7 years ago) parent9ff834f85dce63
2 files changed+22−13
pkgs/applications/audio/whipper/default.nix+16−10 pkgs/development/python-modules/pycdio/default.nix+6−3
pkgs/applications/audio/whipper/default.nix+16−10
@@ -1,24 +1,26 @@
1−{ stdenv, fetchFromGitHub, python2, cdparanoia, cdrdao, flac
2−, sox, accuraterip-checksum, utillinux, substituteAll }:
1+{ stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac
2+, sox, accuraterip-checksum, libsndfile, utillinux, substituteAll }:
33
4−python2.pkgs.buildPythonApplication rec {
5− name = "whipper-${version}";
6− version = "0.7.3";
4+python3.pkgs.buildPythonApplication rec {
5+ pname = "whipper";
6+ version = "0.9.0";
77
88 src = fetchFromGitHub {
99 owner = "whipper-team";
1010 repo = "whipper";
1111 rev = "v${version}";
12− sha256 = "0ypbgc458i7yvbyvg6wg6agz5yzlwm1v6zw7fmyq9h59xsv27mpr";
12+ sha256 = "0x1qsp021i0l5sdcm2kcv9zfwp696k4izhw898v6marf8phll7xc";
1313 };
1414
15− pythonPath = with python2.pkgs; [
15+ pythonPath = with python3.pkgs; [
1616 pygobject3 musicbrainzngs urllib3 chardet
17− pycdio setuptools mutagen CDDB
17+ pycdio setuptools setuptools_scm mutagen
1818 requests
1919 ];
2020
21− checkInputs = with python2.pkgs; [
21+ buildInputs = [ libsndfile ];
22+
23+ checkInputs = with python3.pkgs; [
2224 twisted
2325 ];
2426
@@ -33,6 +35,10 @@ python2.pkgs.buildPythonApplication rec {
3335 "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ])
3436 ];
3537
38+ preBuild = ''
39+ export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"
40+ '';
41+
3642 # some tests require internet access
3743 # https://github.com/JoeLametta/whipper/issues/291
3844 doCheck = false;
@@ -44,7 +50,7 @@ python2.pkgs.buildPythonApplication rec {
4450 meta = with stdenv.lib; {
4551 homepage = https://github.com/whipper-team/whipper;
4652 description = "A CD ripper aiming for accuracy over speed";
47− maintainers = with maintainers; [ rycee ];
53+ maintainers = with maintainers; [ rycee emily ];
4854 license = licenses.gpl3Plus;
4955 platforms = platforms.linux;
5056 };
pkgs/development/python-modules/pycdio/default.nix+6−3
@@ -4,20 +4,23 @@
44, setuptools
55, nose
66, pkgs
7−, isPy27
87}:
98
109buildPythonPackage rec {
1110 pname = "pycdio";
1211 version = "2.1.0";
13− disabled = !isPy27;
1412
1513 src = fetchPypi {
1614 inherit pname version;
1715 sha256 = "01b7vqqfry071p60sabydym7r3m3rxszyqpdbs1qi5rk2sfyblnn";
1816 };
1917
20− prePatch = "sed -i -e '/DRIVER_BSDI/d' pycdio.py";
18+ prePatch = ''
19+ substituteInPlace setup.py \
20+ --replace 'library_dirs=library_dirs' 'library_dirs=[dir.decode("utf-8") for dir in library_dirs]' \
21+ --replace 'include_dirs=include_dirs' 'include_dirs=[dir.decode("utf-8") for dir in include_dirs]' \
22+ --replace 'runtime_library_dirs=runtime_lib_dirs' 'runtime_library_dirs=[dir.decode("utf-8") for dir in runtime_lib_dirs]'
23+ '';
2124
2225 preConfigure = ''
2326 patchShebangs .