[PATCH 1/7] gnu: mutter: Update to HEAD.

[PATCH 1/7] gnu: mutter: Update to HEAD.

[David Craven]

* gnu/packages/gnome.scm (mutter): Update to HEAD.
  [native-inputs]: Add autoconf, automake and libtool.
  [arguments]: Add autoreconf phase.
---
 gnu/packages/gnome.scm | 30 +++++++++++++++++++++---------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index f6f7aae69..5fbd0c111 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4203,17 +4203,20 @@ to display dialog boxes from the commandline and shell scripts.")
     (license license:lgpl2.0+)))
 
 (define-public mutter
+  ;; Bugfixes!
+  (let ((commit "23c315ea7121e9bd108e2837d0b4beeba53c5e18"))
   (package
     (name "mutter")
-    (version "3.22.2")
+    (version (git-version "3.22.2" "1" commit))
     (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "git://git.gnome.org/mutter")
+                    (commit commit)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "18lj80klfnkwh0cb3ab0i1vfvzbp0zjl73x9d7pna4dsdhsmi6ym"))))
+                "1v1f9xyzjr1ihmfwpq9kzlv2lyr9qn63ck8zny699mbp5hsi11mb"))))
      ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked
      ;; versions of cogl and clutter.  As a result, many of the inputs,
      ;; propagated-inputs, and configure flags used in cogl and clutter are
@@ -4236,12 +4239,21 @@ to display dialog boxes from the commandline and shell scripts.")
              "--enable-cogl-gst"
              (string-append "--with-gl-libname="
                             (assoc-ref %build-inputs "mesa")
-                            "/lib/libGL.so"))))
+                            "/lib/libGL.so"))
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'autoreconf
+                    (lambda _
+                      (zero? (system* "autoreconf" "-vfi")))))))
     (native-inputs
      `(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
        ("gobject-introspection" ,gobject-introspection)
        ("intltool" ,intltool)
-       ("pkg-config" ,pkg-config)))
+       ("pkg-config" ,pkg-config)
+       ;; For git build
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)))
     (propagated-inputs
      `(;; libmutter.pc refers to these:
        ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
@@ -4287,7 +4299,7 @@ to display dialog boxes from the commandline and shell scripts.")
 desktop via OpenGL.  Mutter combines a sophisticated display engine using the
 Clutter toolkit with solid window-management logic inherited from the Metacity
 window manager.")
-    (license license:gpl2+)))
+    (license license:gpl2+))))
 
 (define-public gnome-online-accounts
   (package
-- 
2.11.0

[PATCH 2/7] gnu: Add git-crypt.

[David Craven]

* gnu/packages/version-control.scm (git-crypt): New variable.
---
 gnu/packages/version-control.scm | 41 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 03ae398bd..84eafdd93 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -367,6 +367,47 @@ write native speed custom Git applications in any language with bindings.")
     ;; GPLv2 with linking exception
     (license license:gpl2)))
 
+(define-public git-crypt
+  (package
+    (name "git-crypt")
+    (version "0.5.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://github.com/AGWA/git-crypt"
+                                  "/archive/" version ".tar.gz"))
+              (file-name (string-append name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "0454fdmgm5f3razkn8n03lfqm5zyzvr4r2528zmlxiwba9518l2i"))))
+    (build-system gnu-build-system)
+    (inputs
+     `(("git" ,git)
+       ("openssl" ,openssl)))
+    (arguments
+     `(#:tests? #f ; No tests.
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (replace 'build
+           (lambda _
+             (zero? (system* "make"))))
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let ((out (assoc-ref outputs "out")))
+               (zero? (system* "make" "install"
+                               (string-append "PREFIX=" out)))))))))
+    (home-page "https://www.agwa.name/projects/git-crypt")
+    (synopsis "Transparent encryption of files in a git repository")
+    (description "git-crypt enables transparent encryption and decryption of
+files in a git repository. Files which you choose to protect are encrypted when
+committed, and decrypted when checked out. git-crypt lets you freely share a
+repository containing a mix of public and private content. git-crypt gracefully
+degrades, so developers without the secret key can still clone and commit to a
+repository with encrypted files. This lets you store your secret material (such
+as keys or passwords) in the same repository as your code, without requiring you
+to lock down your entire repository.")
+    (license license:gpl3+)))
+
 (define-public cgit
   (package
     (name "cgit")
-- 
2.11.0

[PATCH 3/7] gnu: Add replace-input procedure.

[David Craven]

* gnu/packages.scm (replace-input): New procedure.
---
 gnu/packages.scm | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/gnu/packages.scm b/gnu/packages.scm
index 0aa289d56..2535e10b1 100644
--- a/gnu/packages.scm
+++ b/gnu/packages.scm
@@ -53,7 +53,9 @@
             find-newest-available-packages
 
             specification->package
-            specification->package+output))
+            specification->package+output
+
+            replace-input))
 
 ;;; Commentary:
 ;;;
@@ -356,3 +358,26 @@ version; if SPEC does not specify an output, return OUTPUT."
            (leave (_ "package `~a' lacks output `~a'~%")
                   (package-full-name package)
                   sub-drv))))))
+
+\f
+;;;
+;;; Package utilities.
+;;;
+
+(define (replace-input pkg name replacement)
+  "Returns a package with all inputs of NAME replaced with REPLACEMENT.  Is
+usefull for resolving circular dependencies."
+  (define replace
+    (match-lambda
+     ((tag input)
+      (if (string=? tag name)
+          (list name replacement)
+          (list tag (replace-input input name replacement))))))
+  (package
+    (inherit pkg)
+    (inputs
+     (map replace (package-inputs pkg)))
+    (native-inputs
+     (map replace (package-native-inputs pkg)))
+    (propagated-inputs
+     (map replace (package-propagated-inputs pkg)))))
-- 
2.11.0

[PATCH 4/7] gnu: Add appstream-glib.

[David Craven]

* gnu/packages/glib.scm (appstream-glib): New variable.
---
 gnu/packages/glib.scm | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 44 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 7c61ab3d2..83afa38ae 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -30,6 +30,7 @@
   #:use-module (guix build-system python)
   #:use-module (gnu packages)
   #:use-module (gnu packages base)
+  #:use-module (gnu packages backup)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages enlightenment)
@@ -39,6 +40,7 @@
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages nettle)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -665,7 +667,6 @@ many applications simultaneously.
 This package provides the library for GLib applications.")
     (license license:lgpl2.1+)))
 
-
 (define-public dbus-c++
   (package
     (name "dbus-c++")
@@ -705,3 +706,45 @@ programming langauage.  It also contains the utility
 @command{dbuscxx-xml2cpp}.")
     (home-page "https://sourceforge.net/projects/dbus-cplusplus/")
     (license license:lgpl2.1+)))
+
+(define-public appstream-glib
+  (package
+    (name "appstream-glib")
+    (version "0.6.7")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://people.freedesktop.org/~hughsient/"
+                                  "appstream-glib/releases/"
+                                  "appstream-glib-" version ".tar.xz"))
+              (sha256
+               (base32
+                "08mrf4k0jhnpdd4fig2grmi2vbxkgdhrwk0d0zq0j1wp5ip7arwp"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("gdk-pixbuf" ,gdk-pixbuf)
+       ("glib" ,glib)
+       ("gtk+" ,gtk+)
+       ("json-glib" ,json-glib)
+       ("libarchive" ,libarchive)
+       ("libsoup" ,libsoup)
+       ("nettle" ,nettle)
+       ("util-linux" ,util-linux)))
+    (arguments
+     `(#:configure-flags
+       '("--disable-firmware" "--disable-dep11")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-tests
+           (lambda _
+             (substitute* "libappstream-glib/as-self-test.c"
+               (("g_test_add_func.*as_test_store_local_appdata_func);") "")
+               (("g_test_add_func.*as_test_store_speed_appdata_func);") "")
+               (("g_test_add_func.*as_test_store_speed_desktop_func);") ""))
+             #t)))))
+    (home-page "https://github.com/hughsie/appstream-glib")
+    (synopsis "Library for reading and writing AppStream metadata")
+    (description "This library provides objects and helper methods to help
+reading and writing AppStream metadata.")
+    (license license:lgpl2.1+)))
-- 
2.11.0

[PATCH 5/7] gnu: Add gnome-disk-utility.

[David Craven]

* gnu/packages/gnome.scm (gnome-disk-utility): New variable.
---
 gnu/packages/gnome.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5fbd0c111..955ac610a 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -321,6 +321,56 @@ Gnome project.  It includes xml2po tool which makes it easier to translate
 and keep up to date translations of documentation.")
     (license license:gpl2+))) ; xslt under lgpl
 
+(define-public gnome-disk-utility
+  (package
+    (name "gnome-disk-utility")
+    (version "3.22.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/" name "/"
+                                  (version-major+minor version) "/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1hqynlcgwm72il2rdml98gcarz0alsgxs5xf6ww2x0czaj3s3953"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("glib:bin" ,glib "bin")
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)
+       ("docbook-xml" ,docbook-xml)
+       ("docbook-xsl" ,docbook-xsl)
+       ("libxslt" ,libxslt)))
+    (inputs
+     `(("glib" ,glib)
+       ("appstream-glib" ,appstream-glib)
+       ("gnome-settings-daemon" ,gnome-settings-daemon)
+       ("gtk+" ,gtk+)
+       ("libcanberra" ,libcanberra)
+       ("libdvdread" ,libdvdread)
+       ("libnotify" ,libnotify)
+       ("libpwquality" ,libpwquality)
+       ("libsecret" ,libsecret)
+       ("udisks" ,udisks)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'fix-docbook
+           (lambda* (#:key inputs #:allow-other-keys)
+             (substitute* "doc/man/Makefile.in"
+               (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
+                (string-append (assoc-ref inputs "docbook-xsl")
+                               "/xml/xsl/docbook-xsl-"
+                               ,(package-version docbook-xsl)
+                               "/manpages/docbook.xsl")))
+             (setenv "XML_CATALOG_FILES"
+                     (string-append (assoc-ref inputs "docbook-xml")
+                                    "/xml/dtd/docbook/catalog.xml")))))))
+    (home-page "https://git.gnome.org/browse/gnome-disk-utility")
+    (synopsis "Disk management utility for GNOME")
+    (description "Disk management utility for GNOME.")
+    (license license:gpl2)))
+
 (define-public gcr
   (package
     (name "gcr")
-- 
2.11.0

[PATCH 6/7] system: install: Add gptfdisk to installation os.

[David Craven]

* gnu/system/install.scm (installation-os)[packages]: Add gptfdisk.
---
 gnu/system/install.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/system/install.scm b/gnu/system/install.scm
index ad234fd9c..944d9f7e7 100644
--- a/gnu/system/install.scm
+++ b/gnu/system/install.scm
@@ -388,7 +388,7 @@ Use Alt-F2 for documentation.
      (base-pam-services #:allow-empty-passwords? #t))
 
     (packages (cons* (canonical-package glibc) ;for 'tzselect' & co.
-                     parted ddrescue
+                     parted gptfdisk ddrescue
                      grub                  ;mostly so xrefs to its manual work
                      cryptsetup
                      mdadm
-- 
2.11.0

[PATCH 7/7] gnu: Enable CONFIG_HOTPLUG_PCI.

[David Craven]

* gnu/packages/linux-libre-4.9-x86_64.conf
* gnu/packages/linux-libre-4.9-i686.conf
---
 gnu/packages/linux-libre-4.9-i686.conf   | 1 +
 gnu/packages/linux-libre-4.9-x86_64.conf | 1 +
 2 files changed, 2 insertions(+)

diff --git a/gnu/packages/linux-libre-4.9-i686.conf b/gnu/packages/linux-libre-4.9-i686.conf
index 4f3a9f927..839eb820d 100644
--- a/gnu/packages/linux-libre-4.9-i686.conf
+++ b/gnu/packages/linux-libre-4.9-i686.conf
@@ -778,6 +778,7 @@ CONFIG_PCI_XEN=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
 CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
diff --git a/gnu/packages/linux-libre-4.9-x86_64.conf b/gnu/packages/linux-libre-4.9-x86_64.conf
index ca0fcded6..e3284a995 100644
--- a/gnu/packages/linux-libre-4.9-x86_64.conf
+++ b/gnu/packages/linux-libre-4.9-x86_64.conf
@@ -775,6 +775,7 @@ CONFIG_PCI_XEN=y
 CONFIG_PCI_DOMAINS=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
 CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI=y
 CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 # CONFIG_PCIE_ECRC is not set
-- 
2.11.0

Re: [PATCH 1/7] gnu: mutter: Update to HEAD.

[David Craven]

This fixes gnome-session segfaulting on intel skylake.

Re: [PATCH 7/7] gnu: Enable CONFIG_HOTPLUG_PCI.

[David Craven]

This is for new USB-C/Thunderbolt devices. Tested it with an USB-C to
HDMI adapter.

Re: [PATCH 7/7] gnu: Enable CONFIG_HOTPLUG_PCI.

[David Craven]

I was surprised that linux-libre works on the dell xps 13. I'm
considering buying an atheros wifi card, since that's the only thing
that does not work. Does anyone know how to find out if there is a
BIOS whitelist/blacklist? So it's just ARM boards that don't work with
linux-libre?

Re: [PATCH 7/7] gnu: Enable CONFIG_HOTPLUG_PCI.

[David Craven]

> I was surprised that linux-libre works on the dell xps 13. I'm
> considering buying an atheros wifi card, since that's the only thing
> that does not work. Does anyone know how to find out if there is a
> BIOS whitelist/blacklist? So it's just ARM boards that don't work with
> linux-libre?

I'm having trouble finding information. The opened atheros firmware is
only for the AR7010 and AR9271 USB dongles if I understand correctly?
The other thing that was opened are the C headers including the
register definitions for a subset of the AR9300 chipset, but it would
still require implementing the firmware to be useful to linux-libre?

Re: [PATCH 7/7] gnu: Enable CONFIG_HOTPLUG_PCI.

[Danny Milosavljevic]

Hi David,

I have an Atheros AR9285 in GuixSD and it works. /sys/class/net/wlp2s0/device/driver says it's using the driver ath9k PCI.

On Thu, 2 Feb 2017 18:07:22 +0100
David Craven <david@craven.ch> wrote:

> I'm having trouble finding information. The opened atheros firmware is
> only for the AR7010 and AR9271 USB dongles if I understand correctly?
> The other thing that was opened are the C headers including the
> register definitions for a subset of the AR9300 chipset, but it would
> still require implementing the firmware to be useful to linux-libre?

I don't think the firmware needs to be uploaded at all to the AR9285 device.

It probably does have a firmware on-chip - I don't know.

Anyway, it worked out of the box without any extra firmware files on my computer.

Re: [PATCH 7/7] gnu: Enable CONFIG_HOTPLUG_PCI.

[David Craven]

> I don't think the firmware needs to be uploaded at all to the AR9285 device.

I don't understand:

1. free firmware - anyone can update the firmware
2. binary blob - the vendor can update the firmware
3. fixed at manufacturing time - no one can update the firmware

Option 1 is obviously superior to the other two. But how is option 3
better than option 2?

Re: [PATCH 7/7] gnu: Enable CONFIG_HOTPLUG_PCI.

[Danny Milosavljevic]

Hi David,

On Thu, 2 Feb 2017 21:18:06 +0100
David Craven <david@craven.ch> wrote:

> > I don't think the firmware needs to be uploaded at all to the AR9285 device.  
> 
> I don't understand:
> 
> 1. free firmware - anyone can update the firmware
> 2. binary blob - the vendor can update the firmware
> 3. fixed at manufacturing time - no one can update the firmware
> 
> Option 1 is obviously superior to the other two. But how is option 3
> better than option 2?

When it's option 3 then you personally can't be targeted without also targeting anyone else that could have bought that chip.

With option 2 the vendor could create malicious firmware just for you - unbeknownst to you, of course. 

If the firmware is actually fixed and constant (option 3), the company has a very large disincentive to do anything bad to it.

For example, let's say Intel had non-updateable microcode on its CPUs and it included a backdoor. If anyone *ever* found it, nobody would trust Intel ever again - and Intel couldn't sweep it under the rug because millions of physical chips that include the backdoor would be in the hands of different people. What could they do?

On the other hand, if firmware is updateable by a (possibly automated) program, that program could easily check whether it's running on *your* computer specifically and then give you a special firmware. Now nobody but you has a chance to find it. Not to mention checking the date etc.

With all the spying going on that's a *real* possibility. Also, many people already found backdoors in BIOS updates for example - so it's not theoretical.

So that were the life-and-death things.

From an engineering (integrator) standpoint a fixed firmware is also better since it doesn't change. So as an engineer you find out once and for all what it does now and it will continue doing that forever. Moreover, the vendor has an incentive to actually test the thing and fix all the showstoppers *before* selling you the device. With option 2, they really don't (and also could change their mind at any time after the sale (!)).

Re: [PATCH 7/7] gnu: Enable CONFIG_HOTPLUG_PCI.

[David Craven]

Hi Danny,

> For example, let's say Intel had non-updateable microcode on its CPUs and it included a backdoor. If anyone *ever* found it, nobody would trust Intel ever again - and Intel couldn't sweep it under the rug because millions of physical chips that include the backdoor would be in the hands of different people. What could they do?
>
> On the other hand, if firmware is updateable by a (possibly automated) program, that program could easily check whether it's running on *your* computer specifically and then give you a special firmware. Now nobody but you has a chance to find it. Not to mention checking the date etc.
>
> With all the spying going on that's a *real* possibility. Also, many people already found backdoors in BIOS updates for example - so it's not theoretical.

But you can check the hash of the firmware. If a device doesn't have
internal flash we at least know that it's running the firmware we are
giving it. If the device has internal storage and if someone wanted to
target you and did have the resources to do so, they could reflash the
chip and you'd never know. Isn't human error just as scary as the NSA?

Re: [PATCH 7/7] gnu: Enable CONFIG_HOTPLUG_PCI.

[David Craven]

Mmh, I think that forcing binary blobs out of the linux kernel is only
useful if vendors move more work into the driver and silicon instead
of firmware that cannot be updated, since each flash device is a
security risk. But it could also backfire. The thunderbolt firmware
for example is only updateable from windows. That leaves me with a
crashy hdmi output and doesn't stop the NSA from flashing it anyway
and getting access to my PCIE bus - definitively not an improvement
over a binary blob...

I'll push these patches if there are no objections then. Can I
regenerate a pgp key? I think my keys where in the gnome keyring or
something, backing up ~/.gnupg/secring.pgp didn't keep my keys :/

Re: [PATCH 7/7] gnu: Enable CONFIG_HOTPLUG_PCI.

[Danny Milosavljevic]

> If the device has internal storage and if someone wanted to
> target you and did have the resources to do so, they could reflash the
> chip and you'd never know.

They can't if it's read-only (and if they are without physical access to the room). On the other hand, if they had physical access they could do anything - they could replace your entire computer with a prop that just waits for you to type your unlock key.

Of course the situation where they can reflash it remotely whenever they want but you can't reflash it at all is the worst of all possible situations - but it's not the same as option 3.
 

Re: [PATCH 5/7] gnu: Add gnome-disk-utility.

[Maxim Cournoyer]

[-- Attachment #1: Type: text/plain, Size: 3395 bytes --]

Hi David,

David Craven <david@craven.ch> writes:

> * gnu/packages/gnome.scm (gnome-disk-utility): New variable.
> ---
>  gnu/packages/gnome.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 50 insertions(+)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 5fbd0c111..955ac610a 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -321,6 +321,56 @@ Gnome project.  It includes xml2po tool which makes it easier to translate
>  and keep up to date translations of documentation.")
>      (license license:gpl2+))) ; xslt under lgpl
>  
> +(define-public gnome-disk-utility
> +  (package
> +    (name "gnome-disk-utility")
> +    (version "3.22.1")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "mirror://gnome/sources/" name "/"
> +                                  (version-major+minor version) "/"
> +                                  name "-" version ".tar.xz"))
> +              (sha256
> +               (base32
> +                "1hqynlcgwm72il2rdml98gcarz0alsgxs5xf6ww2x0czaj3s3953"))))
> +    (build-system gnu-build-system)
> +    (native-inputs
> +     `(("glib:bin" ,glib "bin")
> +       ("intltool" ,intltool)
> +       ("pkg-config" ,pkg-config)
> +       ("docbook-xml" ,docbook-xml)
> +       ("docbook-xsl" ,docbook-xsl)
> +       ("libxslt" ,libxslt)))
> +    (inputs
> +     `(("glib" ,glib)
> +       ("appstream-glib" ,appstream-glib)
> +       ("gnome-settings-daemon" ,gnome-settings-daemon)
> +       ("gtk+" ,gtk+)
> +       ("libcanberra" ,libcanberra)
> +       ("libdvdread" ,libdvdread)
> +       ("libnotify" ,libnotify)
> +       ("libpwquality" ,libpwquality)
> +       ("libsecret" ,libsecret)
> +       ("udisks" ,udisks)))
> +    (arguments
> +     `(#:phases
> +       (modify-phases %standard-phases
> +         (add-before 'configure 'fix-docbook
> +           (lambda* (#:key inputs #:allow-other-keys)
> +             (substitute* "doc/man/Makefile.in"
> +               (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
> +                (string-append (assoc-ref inputs "docbook-xsl")
> +                               "/xml/xsl/docbook-xsl-"
> +                               ,(package-version docbook-xsl)
> +                               "/manpages/docbook.xsl")))
> +             (setenv "XML_CATALOG_FILES"
> +                     (string-append (assoc-ref inputs "docbook-xml")
> +                                    "/xml/dtd/docbook/catalog.xml")))))))

I think it would be more elegant to pass the XML_CATALOG_FILES variable
by using the #;make-flags keyworded argument. XML_CATALOG_FILES can also
contain both the xml & xsl catalogs (the items are to be space
separated), which means no substitute* call are needed. See the commit
aef5055ff9 which does that.

> +    (home-page "https://git.gnome.org/browse/gnome-disk-utility")
> +    (synopsis "Disk management utility for GNOME")
> +    (description "Disk management utility for GNOME.")
> +    (license license:gpl2)))

This should be gpl2+ (see files headers, such as:
https://git.gnome.org/browse/gnome-disk-utility/tree/src/disks/gduapplication.c)

> +
>  (define-public gcr
>    (package
>      (name "gcr")

Thanks for this contribution!

Maxim

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: [PATCH 1/7] gnu: mutter: Update to HEAD.

[Ludovic Courtès]

Hi David,

David Craven <david@craven.ch> skribis:

> * gnu/packages/gnome.scm (mutter): Update to HEAD.
>   [native-inputs]: Add autoconf, automake and libtool.
>   [arguments]: Add autoreconf phase.
> ---
>  gnu/packages/gnome.scm | 30 +++++++++++++++++++++---------
>  1 file changed, 21 insertions(+), 9 deletions(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index f6f7aae69..5fbd0c111 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -4203,17 +4203,20 @@ to display dialog boxes from the commandline and shell scripts.")
>      (license license:lgpl2.0+)))
>  
>  (define-public mutter
> +  ;; Bugfixes!
> +  (let ((commit "23c315ea7121e9bd108e2837d0b4beeba53c5e18"))

Could you be more specific?  :-)

I think relying on unreleased software is fine when that is known to fix
security issues.  In other cases, we should stick to upstream releases
IMO: it’s upstream’s job to decide when a commit can be considered a
release.

Ludo’.

Re: [PATCH 2/7] gnu: Add git-crypt.

[Ludovic Courtès]

David Craven <david@craven.ch> skribis:

> * gnu/packages/version-control.scm (git-crypt): New variable.

LGTM!

Re: [PATCH 3/7] gnu: Add replace-input procedure.

[Ludovic Courtès]

David Craven <david@craven.ch> skribis:

> * gnu/packages.scm (replace-input): New procedure.

I think it’s the same as ‘package-input-rewriting’ from (guix packages),
isn’t it?

‘package-input-rewriting’ also does memoization, which is crucial with
non-trivial graphs.

Thanks,
Ludo’.

Re: [PATCH 4/7] gnu: Add appstream-glib.

[Ludovic Courtès]

David Craven <david@craven.ch> skribis:

> * gnu/packages/glib.scm (appstream-glib): New variable.

[...]

> +    (home-page "https://github.com/hughsie/appstream-glib")
> +    (synopsis "Library for reading and writing AppStream metadata")
> +    (description "This library provides objects and helper methods to help
> +reading and writing AppStream metadata.")

Could you s/AppStream/@uref{http://…, AppStream}?
Maybe also “metadata of the AppStream foobar format”.

Otherwise LGTM, thanks!

Ludo’.

Re: [PATCH 1/7] gnu: mutter: Update to HEAD.

[David Craven]

> I think relying on unreleased software is fine when that is known to fix
> security issues.  In other cases, we should stick to upstream releases
> IMO: it’s upstream’s job to decide when a commit can be considered a
> release.

It's the 3.22.2 branch so it contains only backported bugfixes. Arch
linux does the same...

Re: [PATCH 5/7] gnu: Add gnome-disk-utility.

[Ludovic Courtès]

Hello!

Maxim Cournoyer <maxim.cournoyer@gmail.com> skribis:

> David Craven <david@craven.ch> writes:

[...]

>> +       (modify-phases %standard-phases
>> +         (add-before 'configure 'fix-docbook
>> +           (lambda* (#:key inputs #:allow-other-keys)
>> +             (substitute* "doc/man/Makefile.in"
>> +               (("http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl")
>> +                (string-append (assoc-ref inputs "docbook-xsl")
>> +                               "/xml/xsl/docbook-xsl-"
>> +                               ,(package-version docbook-xsl)
>> +                               "/manpages/docbook.xsl")))
>> +             (setenv "XML_CATALOG_FILES"
>> +                     (string-append (assoc-ref inputs "docbook-xml")
>> +                                    "/xml/dtd/docbook/catalog.xml")))))))
>
> I think it would be more elegant to pass the XML_CATALOG_FILES variable
> by using the #;make-flags keyworded argument. XML_CATALOG_FILES can also
> contain both the xml & xsl catalogs (the items are to be space
> separated), which means no substitute* call are needed. See the commit
> aef5055ff9 which does that.

Alternately, adding libxml2 as an input should just give you
automatically the XML_CATALOG_FILES definition.

>> +    (home-page "https://git.gnome.org/browse/gnome-disk-utility")
>> +    (synopsis "Disk management utility for GNOME")
>> +    (description "Disk management utility for GNOME.")
>> +    (license license:gpl2)))
>
> This should be gpl2+ (see files headers, such as:
> https://git.gnome.org/browse/gnome-disk-utility/tree/src/disks/gduapplication.c)

Indeed.

Thank you,
Ludo’.

Re: [PATCH 6/7] system: install: Add gptfdisk to installation os.

[Ludovic Courtès]

David Craven <david@craven.ch> skribis:

> * gnu/system/install.scm (installation-os)[packages]: Add gptfdisk.

That seems to add relatively little to the closure size, so why not!

Thanks,
Ludo’.

Re: [PATCH 1/7] gnu: mutter: Update to HEAD.

[Ludovic Courtès]

David Craven <david@craven.ch> skribis:

> This fixes gnome-session segfaulting on intel skylake.

Oh sorry, I just see this message after the first one.

Then OK!  But could you add the explanation above as a comment in the
code?

Thanks!  :-)

Ludo’.

Re: [PATCH 7/7] gnu: Enable CONFIG_HOTPLUG_PCI.

[Ludovic Courtès]

David Craven <david@craven.ch> skribis:

> * gnu/packages/linux-libre-4.9-x86_64.conf
> * gnu/packages/linux-libre-4.9-i686.conf

Could you clarify the commit log (like “Add CONFIG_HOTPLUG_PCI=y.”), and
mention “For USB-C/Thunderbolt devices. Tested it with an USB-C to HDMI
adapter.” in the log as well?

Thanks!

Ludo’.

Re: [PATCH 3/7] gnu: Add replace-input procedure.

[David Craven]

Yes it is! :-)

Re: [PATCH 7/7] gnu: Enable CONFIG_HOTPLUG_PCI.

[David Craven]

> Could you clarify the commit log (like “Add CONFIG_HOTPLUG_PCI=y.”), and
> mention “For USB-C/Thunderbolt devices. Tested it with an USB-C to HDMI
> adapter.” in the log as well?

It's actually a duplicate definition. Missed it when searching the
file, it was probably missing from my custom buggy kernel
configuration so I concluded that it wasn't in the original... :-)

Re: [PATCH 1/7] gnu: mutter: Update to HEAD.

[David Craven]

> Then OK!  But could you add the explanation above as a comment in the
> code?

Yes, it was worded a bit confusingly, sorry. Added a better comment and pushed.