Pushed as e2dd54c09035aadce8a363c3b1faf703f025d62d and 0290f533cc879239f275e45a704334c545f77f3a with your changes, thanks for the review! On Wed, 19 Dec 2018 22:40:48 +0100 Ludovic Courtès wrote: > Hi, > > Rutger Helling skribis: > > > From a55c2fedeca18627e8f0aa23efc0c78e846e40ee Mon Sep 17 00:00:00 > > 2001 From: Rutger Helling > > Date: Wed, 19 Dec 2018 10:27:28 +0100 > > Subject: [PATCH 1/2] gnu: Add scdoc. > > > > * gnu/packages/man.scm (scdoc): New variable. > > [...] > > > + (home-page "https://git.sr.ht/~sircmpwn/scdoc") > > + (synopsis "Simple man page generator") > > + (description "scdoc is a simple man page generator written for > > POSIX systems +written in C99.") > > s/written in C99/in C99/ > > > + ;; MIT license, see /share/doc/scdoc-1.6.0/COPYING. > > + (license (x11-style "file://COPYING")))) > > Should be ‘license:expat’. > > > From 793ae79c8bbd68b981f4c4b94b43784011776ede Mon Sep 17 00:00:00 > > 2001 From: Rutger Helling > > Date: Wed, 19 Dec 2018 10:31:50 +0100 > > Subject: [PATCH 2/2] gnu: Add grim. > > > > * gnu/packages/image.scm (grim): New variable. > > [...] > > > +(define-public grim > > + (package > > + (name "grim") > > + (version "1.0") > > + (source > > + (origin > > + (method url-fetch) > > + (uri (string-append > > "https://github.com/emersion/grim/archive/v" version > > + ".tar.gz")) > > + (file-name (string-append name "-" version ".tar.gz")) > > + (sha256 > > + (base32 > > "0xkk5nqyp1px0sxz4asmchznc0q39wdx1b67ql741k8aj815km0f")))) > > + (build-system meson-build-system) > > + (native-inputs `(("pkg-config" ,pkg-config))) > > + (inputs `(("cairo" ,cairo) > > + ("libjpeg-turbo" ,libjpeg-turbo) > > + ("scdoc" ,scdoc) > > + ("wayland" ,wayland) > > + ("wayland-protocols" ,wayland-protocols))) > > + (home-page "https://github.com/emersion/grim") > > + (synopsis "Grab images from a Wayland compositor") > > + (description "grim can grab images from a Wayland compositor.") > > s/grab images/create screenshots/ ? That would make it easier to find > via ‘guix package -s’. :-) > > > + ;; MIT license. > > + (license (license:x11-style > > +"https://raw.githubusercontent.com/emersion/grim/master/LICENSE")))) > > ‘license:expat’ as well, AFAICS: > > https://directory.fsf.org/wiki/License:Expat > > OK with these changes, thanks! > > Ludo’.