From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Wingo Subject: [PATCH v2 2/7] gnu: elogind: Update to version 219.5. Date: Tue, 18 Aug 2015 10:05:24 +0200 Message-ID: <80aff6510ebd15768ecebd76d452f474318b190a.1440062095.git.wingo@pobox.com> References: <95cd06d0b1639449fffa2ded823e54d0f26afbb6.1440062095.git.wingo@pobox.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:50076) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSM1l-0008W2-OK for guix-devel@gnu.org; Thu, 20 Aug 2015 05:20:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZSM1i-0002Nn-UU for guix-devel@gnu.org; Thu, 20 Aug 2015 05:20:53 -0400 Received: from pb-sasl0.int.icgroup.com ([208.72.237.25]:64797 helo=sasl.smtp.pobox.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZSM1i-0002Ni-Qm for guix-devel@gnu.org; Thu, 20 Aug 2015 05:20:50 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-sasl0.pobox.com (Postfix) with ESMTP id AB6C9124ED for ; Thu, 20 Aug 2015 05:20:50 -0400 (EDT) Received: from pb-sasl0. (unknown [127.0.0.1]) by pb-sasl0.pobox.com (Postfix) with ESMTP id A49E2124EC for ; Thu, 20 Aug 2015 05:20:50 -0400 (EDT) Received: from rusty (unknown [88.160.190.192]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by pb-sasl0.pobox.com (Postfix) with ESMTPSA id E7DB4124EA for ; Thu, 20 Aug 2015 05:20:49 -0400 (EDT) In-Reply-To: <95cd06d0b1639449fffa2ded823e54d0f26afbb6.1440062095.git.wingo@pobox.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * gnu/packages/freedesktop.scm (elogind): Update to 219.5. --- gnu/packages/freedesktop.scm | 110 +++++++++++++++++++++---------------------- 1 file changed, 54 insertions(+), 56 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index cbf26dc..7413456 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -130,65 +130,63 @@ the freedesktop.org XDG Base Directory specification.") (license license:expat))) (define-public elogind - (let ((commit "14405a9")) - (package - (name "elogind") - (version (string-append "219." commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "http://git.elephly.net/software/elogind.git") - (commit commit))) - (sha256 - (base32 - "1wz5lxj95qg64x2q5hf4zcb35hpxlw3wfswx6sb2srvsg50y3y72")) - (file-name (string-append name "-checkout-" commit)) - (modules '((guix build utils))) - (snippet - '(begin - (use-modules (guix build utils)) - (substitute* "Makefile.am" - ;; Avoid validation against DTD because the DTDs for - ;; both doctype 4.2 and 4.5 are needed. - (("XSLTPROC_FLAGS = ") "XSLTPROC_FLAGS = --novalid")))))) - (build-system gnu-build-system) - (arguments - `(#:configure-flags - (list - ;; pam_elogind fails because of bus-error.c hackery - "--disable-pam" - (string-append "--with-rootprefix=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ - (and (zero? (system* "intltoolize" "--force" "--automake")) - (zero? (system* "autoreconf" "-vif")))))))) - (native-inputs - `(("intltool" ,intltool) - ("gettext" ,gnu-gettext) - ("docbook-xsl" ,docbook-xsl) - ("docbook-xml" ,docbook-xml) - ("xsltproc" ,libxslt) - ("libxml2" ,libxml2) ;for XML_CATALOG_FILES - ("pkg-config", pkg-config) - ("autoconf" ,autoconf) - ("automake" ,automake) - ("libtool" ,libtool) - ("gperf" ,gperf))) - (inputs - `(("linux-pam" ,linux-pam) - ("linux-libre-headers" ,linux-libre-headers) - ("libcap" ,libcap) - ("dbus" ,dbus) - ("eudev" ,eudev))) - (home-page "https://github.com/andywingo/elogind") - (synopsis "User, seat, and session management service") - (description "Elogind is the systemd project's \"logind\" service, + (package + (name "elogind") + (version "219.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/andywingo/elogind") + (tag (string-append "v" version)))) + (sha256 + (base32 + "09ipra2q6gsdll3356jcb1yx2za9p4qab5qfk9g2z40msvb93hs5")) + (file-name (string-append name "-checkout-" version)) + (modules '((guix build utils))) + (snippet + '(begin + (use-modules (guix build utils)) + (substitute* "Makefile.am" + ;; Avoid validation against DTD because the DTDs for + ;; both doctype 4.2 and 4.5 are needed. + (("XSLTPROC_FLAGS = ") "XSLTPROC_FLAGS = --novalid")))))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "--with-udevrulesdir=" + (assoc-ref %outputs "out") + "/lib/udev/rules.d")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'autogen + (lambda _ + (and (zero? (system* "intltoolize" "--force" "--automake")) + (zero? (system* "autoreconf" "-vif")))))))) + (native-inputs + `(("intltool" ,intltool) + ("gettext" ,gnu-gettext) + ("docbook-xsl" ,docbook-xsl) + ("docbook-xml" ,docbook-xml) + ("xsltproc" ,libxslt) + ("libxml2" ,libxml2) ;for XML_CATALOG_FILES + ("pkg-config", pkg-config) + ("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("gperf" ,gperf))) + (inputs + `(("linux-pam" ,linux-pam) + ("linux-libre-headers" ,linux-libre-headers) + ("libcap" ,libcap) + ("dbus" ,dbus) + ("eudev" ,eudev))) + (home-page "https://github.com/andywingo/elogind") + (synopsis "User, seat, and session management service") + (description "Elogind is the systemd project's \"logind\" service, extracted out as a separate project. Elogind integrates with PAM to provide the org.freedesktop.login1 interface over the system bus, allowing other parts of a the system to know what users are logged in, and where.") - (license license:lgpl2.1+)))) + (license license:lgpl2.1+))) (define-public python-pyxdg (package -- 2.4.3