From 706a6ff1544f2fc4baa1d4d2e1cd093a41411906 Mon Sep 17 00:00:00 2001
From: Stefan Stefanović <stefanx2ovic@gmail.com>
Date: Sat, 21 Jul 2018 18:52:33 +0200
Subject: gnu: sddm: Update to 0.18.0.

* gnu/packages/display-managers.scm (sddm): Update to 0.18.0.
* gnu/packages/patches/sddm-fix-build-with-qt-5.11-1024.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Remove it.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
---
 gnu/packages/display-managers.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'gnu/packages/display-managers.scm')

diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index b0ad3df788..a4ed601ec8 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -135,7 +135,7 @@ Qt-style API for Wayland clients.")
 (define-public sddm
   (package
     (name "sddm")
-    (version "0.17.0")
+    (version "0.18.0")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -144,8 +144,7 @@ Qt-style API for Wayland clients.")
                     "sddm-" version ".tar.xz"))
               (sha256
                (base32
-                "0ch6rdppgy2vbzw0c2x9a4c6ry46vx7p6b76d8xbh2nvxh23xv0k"))
-              (patches (search-patches "sddm-fix-build-with-qt-5.11-1024.patch"))))
+                "0icyi9nqgbp2v6dwh3n3jzff9jv2xy8d4rbsz89hd65x7c3hrv87"))))
     (build-system cmake-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-- 
cgit 1.4.1


From a14a2da5fecdb7c022a44ca1fbc7e60981236eb5 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Tue, 24 Jul 2018 13:44:17 +0200
Subject: gnu: lightdm: Take 'nologin' from the 'shadow' package.

Reported by brendarn on #guix.

* gnu/packages/display-managers.scm (lightdm)[inputs]: Use SHADOW
instead of UTIL-LINUX.
---
 gnu/packages/display-managers.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/display-managers.scm')

diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index a4ed601ec8..0a68099d67 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013 Joshua Grant <tadni@riseup.net>
-;;; Copyright © 2014 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2014, 2018 Ludovic Courtès <ludo@gnu.org>
 ;;; Copyright © 2014 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2017 Sou Bunnbu <iyzsong@gmail.com>
@@ -257,7 +257,7 @@ create smooth, animated user interfaces.")
     (inputs
      `(("audit" ,audit)
        ("linux-pam" ,linux-pam)
-       ("util-linux" ,util-linux) ; for sbin/nologin
+       ("shadow" ,shadow)                         ;for sbin/nologin
        ("libgcrypt" ,libgcrypt)
        ("libxcb" ,libxcb)))
     (native-inputs
-- 
cgit 1.4.1