diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-22 17:23:24 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2016-10-22 17:23:24 +0200 |
| commit | e56832d7301f2be7c18abf12d151db00be88f6fa (patch) | |
| tree | 8023c83da9db86e0a31535ad9b09e9f601c3b250 /pkgs/applications/audio | |
| parent | bd12c109931951a36449edaa9c8ed3fc85dc6984 (diff) | |
| parent | 8c465c5201e819486b3072be563738cc1801e8d7 (diff) | |
| download | nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.gz nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.bz2 nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.lz nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.xz nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.tar.zst nixlib-e56832d7301f2be7c18abf12d151db00be88f6fa.zip | |
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'pkgs/applications/audio')
| -rw-r--r-- | pkgs/applications/audio/mpg123/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/audio/puddletag/default.nix | 22 |
2 files changed, 12 insertions, 14 deletions
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix index 9ff4aef60835..9004a46115ee 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/applications/audio/mpg123/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, alsaLib }: stdenv.mkDerivation rec { - name = "mpg123-1.22.2"; + name = "mpg123-1.23.8"; src = fetchurl { url = "mirror://sourceforge/mpg123/${name}.tar.bz2"; - sha256 = "0i1phi6fdjas37y00h3j8rb0b8ngr9az6hy5ff5bl53ify3j87kd"; + sha256 = "13ngfzk84k4ks7ymanmq8f6707yrybra5h0mk3ir6mdnxk4068yy"; }; buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib; diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index 3bbed303aec4..b8213f4d9f48 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,33 +1,31 @@ -{ stdenv, lib, fetchFromGitHub, pythonPackages, makeWrapper, chromaprint }: +{ stdenv, fetchFromGitHub, python2Packages, makeWrapper, chromaprint }: -with lib; -with pythonPackages; +let + pypkgs = python2Packages; -buildPythonApplication rec { - version = "1.1.1"; +in pypkgs.buildPythonApplication rec { name = "puddletag-${version}"; - namePrefix = ""; + version = "1.1.1"; src = fetchFromGitHub { owner = "keithgg"; repo = "puddletag"; - rev = "1.1.1"; + rev = version; sha256 = "0zmhc01qg64fb825b3kj0mb0r0d9hms30nqvhdks0qnv7ahahqrx"; }; sourceRoot = "${name}-src/source"; - disabled = isPy3k; + disabled = pypkgs.isPy3k; # work to support python 3 has not begun outputs = [ "out" ]; - propagatedBuildInputs = [ - chromaprint + propagatedBuildInputs = [ chromaprint ] ++ (with pypkgs; [ configobj mutagen pyparsing pyqt4 - ]; + ]); doCheck = false; # there are no tests dontStrip = true; # we are not generating any binaries @@ -36,7 +34,7 @@ buildPythonApplication rec { siteDir=$(toPythonPath $out) mkdir -p $siteDir PYTHONPATH=$PYTHONPATH:$siteDir - ${python.interpreter} setup.py install --prefix $out + ${pypkgs.python.interpreter} setup.py install --prefix $out ''; meta = with stdenv.lib; { |