public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #75635 from emilazy/whipper-0.9.0

Browse Source 
whipper: update to 0.9.0
This commit is contained in:
Maximilian Bosch 2019-12-14 04:42:08 +01:00 committed by GitHub
commit 7e77cea721
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/applications/audio/whipper/default.nix
View File

@ -1,24 +1,26 @@
{ stdenv, fetchFromGitHub, python2, cdparanoia, cdrdao, flac { stdenv, fetchFromGitHub, python3, cdparanoia, cdrdao, flac
, sox, accuraterip-checksum, utillinux, substituteAll }: , sox, accuraterip-checksum, libsndfile, utillinux, substituteAll }:
python2.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
name = "whipper-${version}"; pname = "whipper";
version = "0.7.3"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "whipper-team"; owner = "whipper-team";
repo = "whipper"; repo = "whipper";
rev = "v${version}"; rev = "v${version}";
sha256 = "0ypbgc458i7yvbyvg6wg6agz5yzlwm1v6zw7fmyq9h59xsv27mpr"; sha256 = "0x1qsp021i0l5sdcm2kcv9zfwp696k4izhw898v6marf8phll7xc";
}; };
pythonPath = with python2.pkgs; [ pythonPath = with python3.pkgs; [
pygobject3 musicbrainzngs urllib3 chardet pygobject3 musicbrainzngs urllib3 chardet
pycdio setuptools mutagen CDDB pycdio setuptools setuptools_scm mutagen
requests requests
]; ];
checkInputs = with python2.pkgs; [ buildInputs = [ libsndfile ];
checkInputs = with python3.pkgs; [
twisted twisted
]; ];
@ -33,6 +35,10 @@ python2.pkgs.buildPythonApplication rec {
"--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ]) "--prefix" "PATH" ":" (stdenv.lib.makeBinPath [ accuraterip-checksum cdrdao utillinux flac sox ])
]; ];
preBuild = ''
export SETUPTOOLS_SCM_PRETEND_VERSION="v${version}"
'';
# some tests require internet access # some tests require internet access
# https://github.com/JoeLametta/whipper/issues/291 # https://github.com/JoeLametta/whipper/issues/291
doCheck = false; doCheck = false;
@ -44,7 +50,7 @@ python2.pkgs.buildPythonApplication rec {
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://github.com/whipper-team/whipper; homepage = https://github.com/whipper-team/whipper;
description = "A CD ripper aiming for accuracy over speed"; description = "A CD ripper aiming for accuracy over speed";
maintainers = with maintainers; [ rycee ]; maintainers = with maintainers; [ rycee emily ];
license = licenses.gpl3Plus; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
}; };

9
pkgs/development/python-modules/pycdio/default.nix
View File

@ -4,20 +4,23 @@
, setuptools , setuptools
, nose , nose
, pkgs , pkgs
, isPy27
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pycdio"; pname = "pycdio";
version = "2.1.0"; version = "2.1.0";
disabled = !isPy27;
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "01b7vqqfry071p60sabydym7r3m3rxszyqpdbs1qi5rk2sfyblnn"; sha256 = "01b7vqqfry071p60sabydym7r3m3rxszyqpdbs1qi5rk2sfyblnn";
}; };
prePatch = "sed -i -e '/DRIVER_BSDI/d' pycdio.py"; prePatch = ''
substituteInPlace setup.py \
--replace 'library_dirs=library_dirs' 'library_dirs=[dir.decode("utf-8") for dir in library_dirs]' \
--replace 'include_dirs=include_dirs' 'include_dirs=[dir.decode("utf-8") for dir in include_dirs]' \
--replace 'runtime_library_dirs=runtime_lib_dirs' 'runtime_library_dirs=[dir.decode("utf-8") for dir in runtime_lib_dirs]'
'';
preConfigure = '' preConfigure = ''
patchShebangs . patchShebangs .