centroid: upgrade to 24.05

This commit is contained in:
Tim Van Baak 2024-06-01 19:27:17 +00:00
parent 6078624d88
commit 15573cbfc4
4 changed files with 24 additions and 65 deletions

19
flake.lock generated
View File

@ -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"
}
}
},

View File

@ -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
];
};

View File

@ -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]

View File

@ -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; [ ];
};
}