diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-09-27 00:01:13 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-09-27 00:07:45 +0200 |
| commit | 900a04e6c9953fbdc59d4a51bef8283594357d28 (patch) | |
| tree | 36993211261e9e5c2b741e571311c63d09ae416d /pkgs/tools/audio | |
| parent | d4c66e2f46b248d55313105f09d25e5a1d304337 (diff) | |
beets: Use pythonPackages.buildPythonApplication
The top-level attribute has been removed in commit 771ed59b48bc1257439b4529426cc9047aebc27b. This has been partially resolved in commit 18bdd44729a4e3d58220ed4789a91aabd20470dd. The latter change however only addressed the main derivations but missed out on the plugins. This is now done by just passing pythonPackages down the chain. Tested by only evaluating the expression, not building. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @domenkozar, @pjones, @profpatsch
Diffstat (limited to 'pkgs/tools/audio')
| -rw-r--r-- | pkgs/tools/audio/beets/alternatives-plugin.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/audio/beets/copyartifacts-plugin.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/audio/beets/default.nix | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix index 75f74e71be529..273b5d94c9fce 100644 --- a/pkgs/tools/audio/beets/alternatives-plugin.nix +++ b/pkgs/tools/audio/beets/alternatives-plugin.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "beets-alternatives-${version}"; version = "0.8.2"; diff --git a/pkgs/tools/audio/beets/copyartifacts-plugin.nix b/pkgs/tools/audio/beets/copyartifacts-plugin.nix index d3b36d15e03e3..fa00d64f673ff 100644 --- a/pkgs/tools/audio/beets/copyartifacts-plugin.nix +++ b/pkgs/tools/audio/beets/copyartifacts-plugin.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, pythonPackages }: -buildPythonApplication rec { +pythonPackages.buildPythonApplication rec { name = "beets-copyartifacts"; src = fetchFromGitHub { diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 73ad23a6e6642..283a6d48ca263 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -107,10 +107,10 @@ in pythonPackages.buildPythonApplication rec { ++ optional enableThumbnails pythonPackages.pyxdg ++ optional enableWeb pythonPackages.flask ++ optional enableAlternatives (import ./alternatives-plugin.nix { - inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub; + inherit stdenv pythonPackages fetchFromGitHub; }) ++ optional enableCopyArtifacts (import ./copyartifacts-plugin.nix { - inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub; + inherit stdenv pythonPackages fetchFromGitHub; }); buildInputs = with pythonPackages; [ |