From e3cbebfc7c656c50e4506bcc5d21d909fad8c22f Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 9 Feb 2020 21:37:12 +0100 Subject: [PATCH] =?UTF-8?q?gnome-desktop-testing:=202018.1=20=E2=86=92=20u?= =?UTF-8?q?nstable-2019-12-11?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update to master since the stable version prints to journal even when running in terminal, which is annoying. Also clean up the expression. --- .../tools/gnome-desktop-testing/default.nix | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/pkgs/development/tools/gnome-desktop-testing/default.nix b/pkgs/development/tools/gnome-desktop-testing/default.nix index 8f9b9ddf0b55..e0dc9ecda80a 100644 --- a/pkgs/development/tools/gnome-desktop-testing/default.nix +++ b/pkgs/development/tools/gnome-desktop-testing/default.nix @@ -1,25 +1,39 @@ -{ stdenv, glib, autoreconfHook, pkgconfig, systemd, fetchgit }: +{ stdenv +, glib +, autoreconfHook +, pkgconfig +, systemd +, fetchFromGitLab +}: stdenv.mkDerivation rec { - version = "2018.1"; pname = "gnome-desktop-testing"; + version = "unstable-2019-12-11"; - src = fetchgit { - url = https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git; - rev = "v${version}"; - sha256 = "1bcd8v101ynsv2p5swh30hnajjf6z8dxzd89h9racp847hgjgyxc"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "GNOME"; + repo = "gnome-desktop-testing"; + rev = "57239dc8ef49ba74d442603a07a3e132b0cfdc6a"; + sha256 = "01c4jhpk23kfcnw3l9kfwjw9v5kgqmfhhqypw4k2d2sdkf4mgfv4"; }; - nativeBuildInputs = [ autoreconfHook pkgconfig ]; + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; - buildInputs = [ glib systemd ]; + buildInputs = [ + glib + systemd + ]; enableParallelBuilding = true; meta = with stdenv.lib; { - description = "GNOME OSTree testing code"; - homepage = https://live.gnome.org/Initiatives/GnomeGoals/InstalledTests; - license = licenses.lgpl21; + description = "GNOME test runner for installed tests"; + homepage = "https://wiki.gnome.org/Initiatives/GnomeGoals/InstalledTests"; + license = licenses.lgpl2Plus; platforms = platforms.linux; maintainers = [ maintainers.jtojnar ]; };