From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fdjEv-0007CK-QK for guix-patches@gnu.org; Thu, 12 Jul 2018 17:35:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fdjEs-0004yf-MJ for guix-patches@gnu.org; Thu, 12 Jul 2018 17:35:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:49549) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fdjEs-0004y4-I9 for guix-patches@gnu.org; Thu, 12 Jul 2018 17:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fdjEs-0006pv-1a for guix-patches@gnu.org; Thu, 12 Jul 2018 17:35:02 -0400 Subject: [bug#31999] [PATCH 7/7] gnu: Update udisk to 2.7.6. Resent-Message-ID: From: Marius Bakke In-Reply-To: <20180628213527.23318-6-ambrevar@gmail.com> References: <20180628213527.23318-1-ambrevar@gmail.com> <20180628213527.23318-6-ambrevar@gmail.com> Date: Thu, 12 Jul 2018 23:34:40 +0200 Message-ID: <87a7qw6sun.fsf@fastmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Pierre Neidhardt , 31999@debbugs.gnu.org --=-=-= Content-Type: text/plain Pierre Neidhardt writes: > * gnu/package/freedesktop.scm (udisks): Update to 2.7.6. [...] > (define-public udisks > (package > (name "udisks") > - (version "2.1.8") > + (version "2.7.6") > (source (origin > - (method url-fetch) > - (uri (string-append "https://udisks.freedesktop.org/releases/" > - name "-" version ".tar.bz2")) > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/storaged-project/udisks") > + (commit (string-append name "-" version)))) > + (file-name (string-append name "-" version "-checkout")) > (sha256 > (base32 > - "1nkxhnqh39c9pzvm4zfj50rgv6apqawdx09bv3sfaxrah4a6jhfs")))) > + "16kf104vv2xbk8cdgaqygszcl69d7lz9gf3vmi7ggywn7nfbp2ks")))) > (build-system gnu-build-system) > (native-inputs > `(("docbook-xml" ,docbook-xml-4.3) ; to build the manpages > ("docbook-xsl" ,docbook-xsl) > ("glib:bin" ,glib "bin") ; for glib-mkenums > ("gobject-introspection" ,gobject-introspection) > + ("gnome-common" ,gnome-common) Do you know what gnome-common is used for? > + ("which" ,which) ; for autogen.sh > + ("automake" ,automake) > + ("autocont" ,autoconf) > + ("libtool" ,libtool) > + ("glib" ,glib "bin") ; for glib-gettextize > + ("gtk-doc" ,gtk-doc) > ("intltool" ,intltool) > ("pkg-config" ,pkg-config) > ("xsltproc" ,libxslt))) > @@ -647,13 +660,15 @@ Analysis and Reporting Technology) functionality.") > ("libgudev" ,libgudev) > ("polkit" ,polkit) > ("util-linux" ,util-linux) > - ("cryptsetup" ,cryptsetup) > - ("parted" ,parted))) > + ("cryptsetup" ,cryptsetup) ; TODO: Not needed on https://www.archlinux.org/packages/extra/x86_64/udisks2/. How does it fail without it? Perhaps it should be propagated from somewhere else? > + ("parted" ,parted) ; TODO: Use as native-input? Arch Linux does it. If the software does not use parted at runtime (check with `guix gc --references`) it should be a native-input. > + )) `guix lint` won't be happy about these ;-) > (outputs '("out" > "doc")) ;5 MiB of gtk-doc HTML > (arguments > `(#:tests? #f ; requiring system message dbus > #:disallowed-references ("doc") ;enforce separation of "doc" > + ;; TODO: No need for configure? Why is that? I see it can run configure as part of autogen, but IMO it's better to keep it this way to keep a consistent interface. > #:configure-flags > (list "--enable-man" > "--localstatedir=/var" > @@ -679,6 +694,13 @@ Analysis and Reporting Technology) functionality.") > docbook-xml-catalog-file))) > #:phases > (modify-phases %standard-phases > + (add-after 'unpack 'autogen > + (lambda _ > + ;; The autogen.sh script in gnome-common will run ./configure > + ;; by default, which is problematic because source shebangs > + ;; have not yet been patched. > + (setenv "NOCONFIGURE" "t") > + (invoke "sh" "autogen.sh"))) LGTM. Thanks a lot for taking this on, hopefully we can get this in master soon! --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCgAdFiEEu7At3yzq9qgNHeZDoqBt8qM6VPoFAltHyXAACgkQoqBt8qM6 VPrsTAf9EVe74RqH55cPt7nJWRZCriucPpB7127AXwsj51l9U+K5Db1VaPRxEib9 slf0i56dcwoiBkK3QviGeQ84xheymOVeT1NTAnhuuRElQAffVGuvwRNCGes4K/eb zeV02xDb5F8tvgLIaZiKI5yyPdnpa0eWS5Qlmnxw1Y3x3OVvQvUyBR7ZhF0SDB+K wOsjZjxKVJ3GxNaKyzqS7jNjayMpZzmAJFesKSvn98M5JJT3WUQ4NAGtbVtlfWcj 5f0ucOKNnkxfC0CnSK+AW23lcas4ZIXn8u2vsec3WrjXyNmFXm3NYfTfpQBhLPdV Qz8FzBIVI1qCbmyjk5Jsa+SMgXRX9w== =s5FW -----END PGP SIGNATURE----- --=-=-=--