Unverified Commit 7aa4c722 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #300588 from dotlambda/spotdl 

spotdl: 4.2.4 -> 4.2.5
parents a24d6aca 04c32a26

pkgs/development/python-modules/pykakasi/default.nix

+11 −4
Original line number Diff line number Diff line
@@ -8,30 +8,37 @@ 
, pytest-benchmark

, pytestCheckHook

, pythonOlder

, setuptools

, setuptools-scm

}:



buildPythonPackage rec {

  pname = "pykakasi";

  version = "2.2.1";

  format = "setuptools";

  pyproject = true;



  disabled = pythonOlder "3.6";



  src = fetchFromGitHub {

    owner = "miurahr";

    repo = pname;

    repo = "pykakasi";

    rev = "refs/tags/v${version}";

    hash = "sha256-ivlenHPD00bxc0c9G368tfTEckOC3vqDB5kMQzHXbVM==";

  };



  nativeBuildInputs = [

  postPatch = ''

    substituteInPlace pyproject.toml \

      --replace-fail ', "klepto"' ""

  '';



  build-system = [

    setuptools-scm

  ];



  propagatedBuildInputs = [

  dependencies = [

    jaconv

    deprecated

    setuptools

  ] ++ lib.optionals (pythonOlder "3.8") [

    importlib-metadata

  ];

pkgs/tools/audio/spotdl/default.nix

+4 −6
Original line number Diff line number Diff line
@@ -9,24 +9,24 @@ let 
  python = python3;

in python.pkgs.buildPythonApplication rec {

  pname = "spotdl";

  version = "4.2.4";

  version = "4.2.5";

  pyproject = true;



  src = fetchFromGitHub {

    owner = "spotDL";

    repo = "spotify-downloader";

    rev = "refs/tags/v${version}";

    hash = "sha256-U0UA94t7WdCeU9Y86rcnT8BzXVx8ryhD3MTJxmNBYcc=";

    hash = "sha256-vxMhFs2mLbVQndlC2UpeDP+M4pwU9Y4cZHbZ8y3vWbI=";

  };



  nativeBuildInputs = with python.pkgs; [

  build-system = with python.pkgs; [

    poetry-core

    pythonRelaxDepsHook

  ];



  pythonRelaxDeps = true;



  propagatedBuildInputs = with python.pkgs; [

  dependencies = with python.pkgs; [

    spotipy

    ytmusicapi

    pytube
@@ -43,10 +43,8 @@ in python.pkgs.buildPythonApplication rec { 
    platformdirs

    pykakasi

    syncedlyrics

    typing-extensions

    soundcloud-v2

    bandcamp-api

    setuptools # for pkg_resources

  ] ++ python-slugify.optional-dependencies.unidecode;



  nativeCheckInputs = with python.pkgs; [