Commit 138a5726 authored by Doron Behar's avatar Doron Behar
Browse files

beets: 2.0.0 -> 2.2.0

parent 70a877ad

pkgs/tools/audio/beets/builtin-plugins.nix

+17 −5
Original line number Diff line number Diff line
@@ -17,13 +17,17 @@ 
  advancedrewrite = {

    testPaths = [ ];

  };

  acousticbrainz = {

    deprecated = true;

    propagatedBuildInputs = [ python3Packages.requests ];

  };

  albumtypes = { };

  aura = {

    propagatedBuildInputs = with python3Packages; [

      flask

      flask-cors

      pillow

    ];

    testPaths = [ ];

  };

  autobpm = {

    propagatedBuildInputs = with python3Packages; [
@@ -31,7 +35,6 @@ 
      # An optional dependency of librosa, needed for beets' autobpm

      resampy

    ];

    testPaths = [ ];

  };

  badfiles = {

    testPaths = [ ];
@@ -70,8 +73,10 @@ 
  export = { };

  fetchart = {

    propagatedBuildInputs = with python3Packages; [

      requests

      beautifulsoup4

      langdetect

      pillow

      requests

    ];

    wrapperBins = [ imagemagick ];

  };
@@ -107,7 +112,11 @@ 
    propagatedBuildInputs = [ python3Packages.requests ];

    testPaths = [ ];

  };

  lyrics.propagatedBuildInputs = [ python3Packages.beautifulsoup4 ];

  lyrics.propagatedBuildInputs = with python3Packages; [

    beautifulsoup4

    langdetect

    requests

  ];

  mbcollection.testPaths = [ ];

  mbsubmit = { };

  mbsync = { };
@@ -155,6 +164,9 @@ 
  };

  types.testPaths = [ "test/plugins/test_types_plugin.py" ];

  unimported.testPaths = [ ];

  web.propagatedBuildInputs = [ python3Packages.flask ];

  web.propagatedBuildInputs = with python3Packages; [

    flask

    flask-cors

  ];

  zero = { };

}

pkgs/tools/audio/beets/common.nix

+17 −6
Original line number Diff line number Diff line
@@ -76,10 +76,15 @@ in 
python3Packages.buildPythonApplication {

  pname = "beets";

  inherit src version;

  pyproject = true;



  patches = extraPatches;



  propagatedBuildInputs =

  build-system = [

    python3Packages.poetry-core

  ];



  dependencies =

    with python3Packages;

    [

      confuse
@@ -88,10 +93,8 @@ python3Packages.buildPythonApplication { 
      mediafile

      munkres

      musicbrainzngs

      mutagen

      pygobject3

      platformdirs

      pyyaml

      reflink

      unidecode

      typing-extensions

    ]
@@ -146,8 +149,16 @@ python3Packages.buildPythonApplication { 


  __darwinAllowLocalNetworking = true;



  inherit disabledTestPaths;

  inherit disabledTests;

  disabledTestPaths = disabledTestPaths ++ [

    # touches network

    "test/plugins/test_aura.py"

  ];

  disabledTests = disabledTests ++ [

    # beets.ui.UserError: unknown command 'autobpm'

    "test/plugins/test_autobpm.py::TestAutoBPMPlugin::test_import"

    # AssertionError: assert 0 == 117

    "test/plugins/test_autobpm.py::TestAutoBPMPlugin::test_command"

  ];



  # Perform extra "sanity checks", before running pytest tests.

  preCheck = ''

pkgs/tools/audio/beets/default.nix

+2 −4
Original line number Diff line number Diff line
@@ -22,14 +22,12 @@ lib.makeExtensible (self: { 


  beets-stable = callPackage ./common.nix rec {

    inherit python3Packages;

    # NOTE: ./builtin-plugins.nix and ./common.nix can have some conditionals

    # be removed when stable version updates

    version = "2.0.0";

    version = "2.2.0";

    src = fetchFromGitHub {

      owner = "beetbox";

      repo = "beets";

      rev = "v${version}";

      hash = "sha256-6pmImyopy0zFBDYoqDyWcBv61FK1kGsZwW2+7fzAnq8=";

      hash = "sha256-jhwXRgUUQJgQ/PLwvY1UfHCJ9UC8DcdBpE/janao0RM=";

    };

    extraPatches = [

      # Bash completion fix for Nix