Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ba307dd1765d
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9d3911f80603
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 18, 2019

  1. beets: fix absubmit deps

    @lovesegfault
    lovesegfault committed Nov 18, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    sikmir Nikolay Korotkiy
    GPG key ID: D1DE6D7F693663A5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    82b0f74 View commit details

Commits on Nov 22, 2019

  1. beets: fix absubmit deps (#73608) 

    beets: fix absubmit deps
    @infinisil
    infinisil authored Nov 22, 2019
    Copy the full SHA
    9d3911f View commit details
Showing with 11 additions and 7 deletions.
  1. +11 −7 pkgs/tools/audio/beets/default.nix
18 changes: 11 additions & 7 deletions pkgs/tools/audio/beets/default.nix
View file
Original file line number Diff line number Diff line change
@@ -6,6 +6,7 @@
# Attributes needed for tests of the external plugins
, callPackage, beets

, enableAbsubmit ? stdenv.lib.elem stdenv.hostPlatform.system essentia-extractor.meta.platforms, essentia-extractor ? null
, enableAcousticbrainz ? true
, enableAcoustid ? true
, enableBadfiles ? true, flac ? null, mp3val ? null
@@ -33,6 +34,7 @@
, bashInteractive, bash-completion
}:

assert enableAbsubmit -> essentia-extractor != null;
assert enableAcoustid -> pythonPackages.pyacoustid != null;
assert enableBadfiles -> flac != null && mp3val != null;
assert enableConvert -> ffmpeg != null;
@@ -51,6 +53,7 @@ with stdenv.lib;

let
optionalPlugins = {
absubmit = enableAbsubmit;
acousticbrainz = enableAcousticbrainz;
badfiles = enableBadfiles;
chroma = enableAcoustid;
@@ -75,12 +78,12 @@ let
};

pluginsWithoutDeps = [
"absubmit" "beatport" "bench" "bpd" "bpm" "bucket" "cue" "duplicates"
"edit" "embedart" "export" "filefilter" "freedesktop" "fromfilename"
"ftintitle" "fuzzy" "hook" "ihate" "importadded" "importfeeds" "info"
"inline" "ipfs" "lyrics" "mbcollection" "mbsubmit" "mbsync" "metasync"
"missing" "permissions" "play" "plexupdate" "random" "rewrite" "scrub"
"smartplaylist" "spotify" "the" "types" "zero"
"beatport" "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart"
"export" "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy"
"hook" "ihate" "importadded" "importfeeds" "info" "inline" "ipfs" "lyrics"
"mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "permissions" "play"
"plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the"
"types" "zero"
];

enabledOptionalPlugins = attrNames (filterAttrs (_: id) optionalPlugins);
@@ -129,7 +132,8 @@ in pythonPackages.buildPythonApplication rec {
pythonPackages.gst-python
pythonPackages.pygobject3
gobject-introspection
] ++ optional enableAcoustid pythonPackages.pyacoustid
] ++ optional enableAbsubmit essentia-extractor
++ optional enableAcoustid pythonPackages.pyacoustid
++ optional (enableFetchart
|| enableEmbyupdate
|| enableKodiupdate