From 80f10fd1c34c75cf6cecf5a7e257653177667887 Mon Sep 17 00:00:00 2001 From: sohalt Date: Thu, 10 Sep 2020 14:50:57 +0200 Subject: [PATCH 1/2] maintainers: add sohalt --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ce853b8b587..e772f3c366d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7853,6 +7853,12 @@ githubId = 3371635; name = "Salar Rahmanian"; }; + sohalt = { + email = "nixos@sohalt.net"; + github = "sohalt"; + githubId = 2157287; + name = "sohalt"; + }; solson = { email = "scott@solson.me"; github = "solson"; From 1c8a1b220e1c5c529c2488511a3dd046085ffc3a Mon Sep 17 00:00:00 2001 From: sohalt Date: Wed, 9 Sep 2020 15:29:05 +0200 Subject: [PATCH 2/2] mpdscribble: 0.22 -> 0.23 --- pkgs/tools/misc/mpdscribble/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/mpdscribble/default.nix b/pkgs/tools/misc/mpdscribble/default.nix index 49f9c6bc031..b3665bb6dcf 100644 --- a/pkgs/tools/misc/mpdscribble/default.nix +++ b/pkgs/tools/misc/mpdscribble/default.nix @@ -1,23 +1,23 @@ -{ stdenv, fetchurl, mpd_clientlib, curl, glib, pkgconfig }: +{ stdenv, fetchurl, meson, ninja, pkgconfig, boost, libgcrypt, systemd, mpd_clientlib, curl }: stdenv.mkDerivation rec { pname = "mpdscribble"; - version = "0.22"; + version = "0.23"; src = fetchurl { url = - "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.bz2"; - sha256 = "0hgb7xh3w455m00lpldwkyrc5spjn3q1pl2ry3kf7w3hiigjpphw"; + "https://www.musicpd.org/download/mpdscribble/${version}/mpdscribble-${version}.tar.xz"; + sha256 = "0s66zqscb44p88cl3kcv5jkjcqsskcnrv7xgrjhzrchf2kcpwf53"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mpd_clientlib curl glib ]; + nativeBuildInputs = [ meson ninja pkgconfig ]; + buildInputs = [ mpd_clientlib curl boost libgcrypt systemd ]; meta = with stdenv.lib; { - description = "A Music Player Daemon (MPD) client which submits information about tracks beeing played to a scrobbler (e.g. last.fm)"; + description = "A Music Player Daemon (MPD) client which submits information about tracks being played to a scrobbler (e.g. last.fm)"; homepage = "https://www.musicpd.org/clients/mpdscribble/"; license = licenses.gpl2; - maintainers = [ maintainers.matthiasbeyer ]; + maintainers = [ maintainers.sohalt ]; platforms = platforms.linux; }; }