From d54e6ae86f00769ca1a3a93cc50a4a1620beced6 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Sun, 12 Sep 2021 21:46:19 +0300 Subject: [PATCH] Update mopidy-ytmusic --- flake.lock | 17 +++++++++++++++++ flake.nix | 5 +++++ profiles/overlay.nix | 23 +++++++++++------------ 3 files changed, 33 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index f415fb0..65cb5d4 100644 --- a/flake.lock +++ b/flake.lock @@ -318,6 +318,22 @@ "type": "github" } }, + "mopidy-ytmusic": { + "flake": false, + "locked": { + "lastModified": 1630842402, + "narHash": "sha256-Gxlbfjenra3el5eym22POpGLyVx3mKx0PguH0jE/M40=", + "owner": "OzymandiasTheGreat", + "repo": "mopidy-ytmusic", + "rev": "e9b4741b80116b14d700b5f17607254a5059cc9b", + "type": "github" + }, + "original": { + "owner": "OzymandiasTheGreat", + "repo": "mopidy-ytmusic", + "type": "github" + } + }, "mtxclient": { "flake": false, "locked": { @@ -622,6 +638,7 @@ "impermanence": "impermanence", "lambda-launcher": "lambda-launcher", "materia-theme": "materia-theme", + "mopidy-ytmusic": "mopidy-ytmusic", "mtxclient": "mtxclient", "nheko": "nheko", "nix": "nix", diff --git a/flake.nix b/flake.nix index a13257d..9e1b588 100644 --- a/flake.nix +++ b/flake.nix @@ -72,6 +72,11 @@ url = "github:nheko-reborn/mtxclient"; flake = false; }; + + mopidy-ytmusic = { + url = "github:OzymandiasTheGreat/mopidy-ytmusic"; + flake = false; + }; }; outputs = { nixpkgs, self, nix, deploy-rs, ... }@inputs: diff --git a/profiles/overlay.nix b/profiles/overlay.nix index 09987fd..1c1a2f2 100644 --- a/profiles/overlay.nix +++ b/profiles/overlay.nix @@ -85,22 +85,21 @@ in { pname = "mopidy-ytmusic"; version = "3.2"; - src = fetchFromGitHub { - owner = "ozymandiasthegreat"; - repo = "mopidy-ytmusic"; - rev = "2a7d8ec7f7161e5ca81e999786ea7c1f4da9205f"; - sha256 = "hDOP0AR9P0sQHeW7JmG+yZf/w5mZrIu4Nl4xCMjQaIQ="; - fetchSubmodules = true; - }; - - prePatch = '' - sed s/0.18.0/0.18.1/ -i setup.py - ''; + src = inputs.mopidy-ytmusic; propagatedBuildInputs = [ mopidy python3Packages.pytube - python3Packages.ytmusicapi + (python3Packages.ytmusicapi.overrideAttrs (oa: { + version = "0.19.1"; + src = fetchFromGitHub { + owner = "sigma67"; + repo = "ytmusicapi"; + rev = "fd9f57750de103202106f02be1696bd440f2c05b"; + sha256 = "/NMy2cGe0K/14OZd+/dXKA6Ez1ivrtrZ6Lwl0P8dioA="; + fetchSubmodules = true; + }; + })) ]; doCheck = false;