From 15573cbfc4d82a42169d1b44da7650b1b61d5503 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Sat, 1 Jun 2024 19:27:17 +0000
Subject: [PATCH] centroid: upgrade to 24.05

---
 flake.lock                          | 19 +++++++++-
 flake.nix                           |  5 ++-
 machine/centroid/default.nix        |  7 ++--
 machine/centroid/mopidy-youtube.nix | 58 -----------------------------
 4 files changed, 24 insertions(+), 65 deletions(-)
 delete mode 100644 machine/centroid/mopidy-youtube.nix

diff --git a/flake.lock b/flake.lock
index f3d60e5..684a2c6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -152,6 +152,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-2405": {
+      "locked": {
+        "lastModified": 1717179513,
+        "narHash": "sha256-vboIEwIQojofItm2xGCdZCzW96U85l9nDW3ifMuAIdM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "63dacb46bf939521bdc93981b4cbb7ecb58427a0",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -159,7 +175,8 @@
         "intake-sources": "intake-sources",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs-2305": "nixpkgs-2305",
-        "nixpkgs-2311": "nixpkgs-2311"
+        "nixpkgs-2311": "nixpkgs-2311",
+        "nixpkgs-2405": "nixpkgs-2405"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 7e4de9f..920e915 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,7 @@
   inputs = {
     nixpkgs-2305.url = "github:NixOS/nixpkgs/23.05";
     nixpkgs-2311.url = "github:NixOS/nixpkgs/23.11";
+    nixpkgs-2405.url = "github:NixOS/nixpkgs/24.05";
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;
@@ -26,6 +27,7 @@
     self,
     nixpkgs-2305,
     nixpkgs-2311,
+    nixpkgs-2405,
     flake-compat,
     nixos-wsl,
     intake,
@@ -54,11 +56,10 @@
           ./machine/catacomb
         ];
       };
-      centroid = nixpkgs-2311.lib.nixosSystem {
+      centroid = nixpkgs-2405.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           self.nixosModules.beatific
-          (pinNixpkgs nixpkgs-2311)
           ./machine/centroid
         ];
       };
diff --git a/machine/centroid/default.nix b/machine/centroid/default.nix
index 364c438..7d919bc 100644
--- a/machine/centroid/default.nix
+++ b/machine/centroid/default.nix
@@ -43,15 +43,14 @@
     "pipewire"  # necessary to allow the system service to play sound
   ];
   services.mopidy = let
-    mopidy-ytdlp = pkgs.callPackage ./mopidy-youtube.nix { };
+    mopidyPackages' = pkgs.mopidyPackages.overrideScope (prev: final: { extraPkgs = pkgs: [ pkgs.yt-dlp ]; });
   in {
     enable = true;
-    extensionPackages = with pkgs; [
+    extensionPackages = with mopidyPackages'; [
       mopidy-bandcamp
       mopidy-jellyfin
       mopidy-musicbox-webclient
-      # Replace the default mopidy-youtube, which doesn't have yt-dlp or a way to inject it
-      mopidy-ytdlp
+      mopidy-youtube
     ];
     configuration = ''
       [file]
diff --git a/machine/centroid/mopidy-youtube.nix b/machine/centroid/mopidy-youtube.nix
deleted file mode 100644
index 3cdb774..0000000
--- a/machine/centroid/mopidy-youtube.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ lib
-, fetchFromGitHub
-, python3
-, mopidy
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "mopidy-youtube";
-  version = "3.6";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "natumbri";
-    repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-Mp8eCVNGokJRwmYiZYCYRwV1QVDV02Uqfh6fGcPgJss=";
-  };
-
-  propagatedBuildInputs = with python3.pkgs; [
-    beautifulsoup4
-    cachetools
-    pykka
-    requests
-    youtube-dl  # this no longer works
-    yt-dlp      # <- added
-    ytmusicapi
-  ] ++ [
-    mopidy
-  ];
-
-  nativeCheckInputs = with python3.pkgs; [
-    vcrpy
-    pytestCheckHook
-  ];
-
-  disabledTests = [
-    # Test requires a YouTube API key
-    "test_get_default_config"
-  ];
-
-  disabledTestPaths = [
-    # Disable tests which interact with Youtube
-    "tests/test_api.py"
-    "tests/test_backend.py"
-    "tests/test_youtube.py"
-  ];
-
-  pythonImportsCheck = [
-    "mopidy_youtube"
-  ];
-
-  meta = with lib; {
-    description = "Mopidy extension for playing music from YouTube";
-    homepage = "https://github.com/natumbri/mopidy-youtube";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ];
-  };
-}