mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
nixos/tests/mpd: update and format
mpc-cli is now mpc
This commit is contained in:
parent
178ea7bbd5
commit
77ec23d6af
@ -1,12 +1,13 @@
|
||||
import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
import ./make-test-python.nix (
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
track = pkgs.fetchurl {
|
||||
# Sourced from http://freemusicarchive.org/music/Blue_Wave_Theory/Surf_Music_Month_Challenge/Skyhawk_Beach_fade_in
|
||||
# License: http://creativecommons.org/licenses/by-sa/4.0/
|
||||
|
||||
name = "Blue_Wave_Theory-Skyhawk_Beach.mp3";
|
||||
url = "https://freemusicarchive.org/file/music/ccCommunity/Blue_Wave_Theory/Surf_Music_Month_Challenge/Blue_Wave_Theory_-_04_-_Skyhawk_Beach.mp3";
|
||||
sha256 = "0xw417bxkx4gqqy139bb21yldi37xx8xjfxrwaqa0gyw19dl6mgp";
|
||||
hash = "sha256-91VDWwrcP6Cw4rk72VHvZ8RGfRBrpRE8xo/02dcJhHc=";
|
||||
meta.license = lib.licenses.cc-by-sa-40;
|
||||
};
|
||||
|
||||
defaultCfg = rec {
|
||||
@ -16,12 +17,23 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
musicDirectory = "${dataDir}/music";
|
||||
};
|
||||
|
||||
defaultMpdCfg = with defaultCfg; {
|
||||
inherit dataDir musicDirectory user group;
|
||||
defaultMpdCfg = {
|
||||
inherit (defaultCfg)
|
||||
dataDir
|
||||
musicDirectory
|
||||
user
|
||||
group
|
||||
;
|
||||
enable = true;
|
||||
};
|
||||
|
||||
musicService = { user, group, musicDirectory }: {
|
||||
musicService =
|
||||
{
|
||||
user,
|
||||
group,
|
||||
musicDirectory,
|
||||
}:
|
||||
{
|
||||
description = "Sets up the music file(s) for MPD to use.";
|
||||
requires = [ "mpd.service" ];
|
||||
after = [ "mpd.service" ];
|
||||
@ -35,23 +47,26 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
};
|
||||
};
|
||||
|
||||
mkServer = { mpd, musicService, }:
|
||||
{ boot.kernelModules = [ "snd-dummy" ];
|
||||
mkServer =
|
||||
{ mpd, musicService }:
|
||||
{
|
||||
boot.kernelModules = [ "snd-dummy" ];
|
||||
services.mpd = mpd;
|
||||
systemd.services.musicService = musicService;
|
||||
};
|
||||
in {
|
||||
in
|
||||
{
|
||||
name = "mpd";
|
||||
meta = with pkgs.lib.maintainers; {
|
||||
maintainers = [ emmanuelrosa ];
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ emmanuelrosa ];
|
||||
};
|
||||
|
||||
nodes =
|
||||
{ client =
|
||||
{ ... }: { };
|
||||
nodes = {
|
||||
client = { ... }: { };
|
||||
|
||||
serverALSA =
|
||||
{ ... }: lib.mkMerge [
|
||||
{ ... }:
|
||||
lib.mkMerge [
|
||||
(mkServer {
|
||||
mpd = defaultMpdCfg // {
|
||||
network.listenAddress = "any";
|
||||
@ -63,13 +78,14 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
}
|
||||
'';
|
||||
};
|
||||
musicService = with defaultMpdCfg; musicService { inherit user group musicDirectory; };
|
||||
musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; };
|
||||
})
|
||||
{ networking.firewall.allowedTCPPorts = [ 6600 ]; }
|
||||
];
|
||||
|
||||
serverPulseAudio =
|
||||
{ ... }: lib.mkMerge [
|
||||
{ ... }:
|
||||
lib.mkMerge [
|
||||
(mkServer {
|
||||
mpd = defaultMpdCfg // {
|
||||
extraConfig = ''
|
||||
@ -80,7 +96,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
'';
|
||||
};
|
||||
|
||||
musicService = with defaultCfg; musicService { inherit user group musicDirectory; };
|
||||
musicService = musicService { inherit (defaultMpdCfg) user group musicDirectory; };
|
||||
})
|
||||
{
|
||||
hardware.pulseaudio = {
|
||||
@ -95,7 +111,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
};
|
||||
|
||||
testScript = ''
|
||||
mpc = "${pkgs.mpc-cli}/bin/mpc --wait"
|
||||
mpc = "${lib.getExe pkgs.mpc} --wait"
|
||||
|
||||
# Connects to the given server and attempts to play a tune.
|
||||
def play_some_music(server):
|
||||
@ -130,4 +146,5 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
|
||||
# to perform the following test:
|
||||
client.fail(f"{mpc} -h serverPulseAudio status")
|
||||
'';
|
||||
})
|
||||
}
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user