;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015, 2017 Andy Wingo <wingo@pobox.com>
-;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 David Hashe <david.hashe@dhashe.com>
-;;; Copyright © 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2017, 2019 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016 Kei Kebreau <kkebreau@posteo.net>
;;; Copyright © 2017, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2017, 2018, 2019 Marius Bakke <mbakke@fastmail.com>
-;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
-;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
+;;; Copyright © 2017, 2018, 2019 Rutger Helling <rhelling@mykolab.com>
+;;; Copyright © 2017 Brendan Tildesley <mail@brendan.scot>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Pierre Neidhardt <mail@ambrevar.xyz>
;;; Copyright © 2018 Stefan Stefanović <stefanx2ovic@gmail.com>
+;;; Copyright © 2019 Reza Alizadeh Majd <r.majd@pantherx.org>
+;;; Copyright © 2019 Guillaume Le Vaillant <glv@posteo.net>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module (gnu packages docbook)
#:use-module (gnu packages documentation)
#:use-module (gnu packages gettext)
+ #:use-module (gnu packages ghostscript)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib) ;intltool
#:use-module (gnu packages gnome)
- #:use-module (gnu packages gnuzilla)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages image)
#:use-module (gnu packages libffi)
#:use-module (gnu packages libunwind)
#:use-module (gnu packages libusb)
#:use-module (gnu packages linux)
#:use-module (gnu packages m4)
+ #:use-module (gnu packages nss)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages polkit)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages sqlite)
#:use-module (gnu packages valgrind)
+ #:use-module (gnu packages video)
#:use-module (gnu packages w3m)
#:use-module (gnu packages web)
#:use-module (gnu packages xdisorg)
(define-public libinput
(package
(name "libinput")
- (version "1.12.3")
+ (version "1.14.1")
(source (origin
(method url-fetch)
(uri (string-append "https://freedesktop.org/software/libinput/"
"libinput-" version ".tar.xz"))
(sha256
(base32
- "0mg2zqbjcgj0aq7d9nwawvyhx43vakilahrc83hrfyif3a3gyrpj"))))
+ "0w7fas37mp2k06f12i3lnj717lw73asziknj6z51kh1m50ja6cz3"))))
(build-system meson-build-system)
(arguments
- `(#:configure-flags '("-Ddocumentation=false")))
+ `(#:configure-flags '("-Ddocumentation=false")
+
+ ;; XXX: Using 'debug' or 'debugoptimized' pulls in an additional test that
+ ;; hangs, and the comments around it suggests that we should be using this
+ ;; Meson target anyway.
+ #:build-type "release"))
(native-inputs
`(("check" ,check)
- ("pkg-config" ,pkg-config)
- ("valgrind" ,valgrind)))
- (propagated-inputs
- `(;; In Requires.private of libinput.pc.
- ("libevdev" ,libevdev)
- ("libudev" ,eudev)
- ("libwacom" ,libwacom)
- ("mtdev" ,mtdev)))
+ ("pkg-config" ,pkg-config)))
(inputs
`(("cairo" ,cairo)
("glib" ,glib)
- ("gtk+" ,gtk+)))
+ ("gtk+" ,gtk+)
+ ("libevdev" ,libevdev)
+ ("libwacom" ,libwacom)
+ ("mtdev" ,mtdev)))
+ (propagated-inputs
+ `(;; libinput.h requires <libudev.h>, so propagate it.
+ ("udev" ,eudev)))
(home-page "https://www.freedesktop.org/wiki/Software/libinput/")
(synopsis "Input devices handling library")
(description
(define-public libinput-minimal
(package (inherit libinput)
(name "libinput-minimal")
- (inputs '())
- (propagated-inputs
- (alist-delete "libwacom" (package-propagated-inputs libinput)))
+ (inputs
+ (fold alist-delete (package-inputs libinput)
+ '("cairo" "glib" "gtk+" "libwacom")))
(arguments
(substitute-keyword-arguments (package-arguments libinput)
((#:configure-flags flags ''())
(name "libxdg-basedir")
(version "1.2.0")
(source (origin
- (method url-fetch)
- (uri (string-append
- "https://github.com/devnev/libxdg-basedir/archive/"
- name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/devnev/libxdg-basedir")
+ (commit (string-append name "-" version))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0s28c7sfwqimsmb3kn91mx7wi55fs3flhbmynl9k60rrllr00aqw"))))
+ "12yz53ny5bi2dii3zwcr6b9ay0yy1g1xv13jg097k7gjligcq11m"))))
(build-system gnu-build-system)
(arguments
'(#:phases
(define-public elogind
(package
(name "elogind")
- (version "239.4")
+ (version "241.4")
(source (origin
(method git-fetch)
(uri (git-reference
(file-name (git-file-name name version))
(sha256
(base32
- "106hld2fa89iz0d17gkmwvbkxc2yspn1klq73nvkj4878wx3vcr9"))))
+ "13nd0chackqclgvw43910k4pkw2q773dh6wq9s5f3d97ibnik48k"))))
(build-system meson-build-system)
(arguments
`(#:configure-flags
of a the system to know what users are logged in, and where.")
(license license:lgpl2.1+)))
+(define-public localed
+ ;; XXX: This package is extracted from systemd but we retain so little of it
+ ;; that it would make more sense to maintain a fork of the bits we need.
+ (package
+ (name "localed")
+ (version "241")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/systemd/systemd")
+ (commit (string-append "v" version))))
+ (sha256
+ (base32
+ "0sy91flzbhpq58k7v0294pa2gxpr0bk27rcnxlbhk2fi6nc51d28"))
+ (file-name (git-file-name name version))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; Connect to the right location for our D-Bus daemon.
+ (substitute* '("src/basic/def.h"
+ "src/libsystemd/sd-bus/sd-bus.c"
+ "src/stdio-bridge/stdio-bridge.c")
+ (("/run/dbus/system_bus_socket")
+ "/var/run/dbus/system_bus_socket"))
+
+ ;; Don't insist on having systemd as PID 1 (otherwise
+ ;; 'localectl' would exit without doing anything.)
+ (substitute* "src/shared/bus-util.c"
+ (("sd_booted\\(\\)")
+ "(1)"))
+ #t))
+ (patches (search-patches "localed-xorg-keyboard.patch"))))
+ (build-system meson-build-system)
+ (arguments
+ ;; Try to build as little as possible (list of components taken from the
+ ;; top-level 'meson.build' file.)
+ (let ((components '("utmp"
+ "hibernate"
+ "environment-d"
+ "binfmt"
+ "coredump"
+ "resolve"
+ "logind"
+ "hostnamed"
+ "localed"
+ "machined"
+ "portabled"
+ "networkd"
+ "timedated"
+ "timesyncd"
+ "firstboot"
+ "randomseed"
+ "backlight"
+ "vconsole"
+ "quotacheck"
+ "sysusers"
+ "tmpfiles"
+ "hwdb"
+ "rfkill"
+ "ldconfig"
+ "efi"
+ "tpm"
+ "ima"
+ "smack"
+ "gshadow"
+ "idn"
+ "nss-myhostname"
+ "nss-systemd")))
+ `(#:configure-flags ',(map (lambda (component)
+ (string-append "-D" component "=false"))
+ (delete "localed" components))
+
+ ;; It doesn't make sense to test all of systemd.
+ #:tests? #f
+
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'set-xkeyboard-config-file-name
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Set the file name to xkeyboard-config and kbd.
+ ;; This is used by 'localectl list-x11-keymap-layouts'
+ ;; and similar functions.
+ (let ((xkb (assoc-ref inputs "xkeyboard-config"))
+ (kbd (assoc-ref inputs "kbd")))
+ (substitute* "src/locale/localectl.c"
+ (("/usr/share/X11/xkb/rules")
+ (string-append xkb "/share/X11/xkb/rules")))
+ (substitute* "src/basic/def.h"
+ (("/usr/share/keymaps")
+ (string-append kbd "/share/keymaps")))
+ #t)))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Install 'localed', the D-Bus and polkit files, and
+ ;; 'localectl'.
+ (let* ((out (assoc-ref outputs "out"))
+ (libexec (string-append out "/libexec/localed"))
+ (bin (string-append out "/bin"))
+ (lib (string-append out "/lib"))
+ (dbus (string-append out
+ "/share/dbus-1/system-services"))
+ (conf (string-append out
+ "/etc/dbus-1/system.d/"))
+ (polkit (string-append out
+ "/share/polkit-1/actions"))
+ (data (string-append out "/share/systemd")))
+ (define (source-file regexp)
+ (car (find-files ".." regexp)))
+
+ (mkdir-p libexec)
+ (copy-file "systemd-localed"
+ (string-append libexec "/localed"))
+ (install-file "localectl" bin)
+
+ (let ((service-file (source-file
+ "\\.locale1\\.service$")))
+ (substitute* service-file
+ (("^Exec=.*$")
+ (string-append "Exec=" libexec "/localed\n")))
+ (install-file service-file dbus))
+ (install-file (source-file "\\.locale1\\.policy$")
+ polkit)
+ (install-file (source-file "\\.locale1\\.conf$")
+ conf)
+ (for-each (lambda (file)
+ (install-file file lib))
+ (find-files "src/shared"
+ "libsystemd-shared.*\\.so"))
+
+ (for-each (lambda (map)
+ (install-file map data))
+ (find-files ".." "^(kbd-model-map|language-fallback-map)$"))
+ #t)))))))
+ (native-inputs (package-native-inputs elogind))
+ (inputs `(("libmount" ,util-linux)
+ ("xkeyboard-config" ,xkeyboard-config)
+ ("kbd" ,kbd)
+ ,@(package-inputs elogind)))
+ (home-page "https://www.freedesktop.org/wiki/Software/systemd/localed/")
+ (synopsis "Control the system locale and keyboard layout")
+ (description
+ "Localed is a tiny daemon that can be used to control the system locale
+and keyboard mapping from user programs. It is used among other things by the
+GNOME Shell. The @command{localectl} command-line tool allows you to interact
+with localed. This package is extracted from the broader systemd package.")
+ (license license:lgpl2.1+)))
+
(define-public packagekit
(package
(name "packagekit")
- (version "1.1.11")
+ (version "1.1.12")
(source (origin
(method url-fetch)
(uri (string-append
"PackageKit-" version ".tar.xz"))
(sha256
(base32
- "0fi6wn54y03zh5sn92nmmxkh4cd8yn44cyk0l8phw60ivfwmkh1q"))))
+ "00css16dv3asaxrklvyxy9dyjzhw82wmfrqxqpca9w2xryz58i8z"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f
(define-public wayland
(package
(name "wayland")
- (version "1.16.0")
+ (version "1.17.0")
(source (origin
(method url-fetch)
(uri (string-append "https://wayland.freedesktop.org/releases/"
name "-" version ".tar.xz"))
(sha256
(base32
- "1xajhxad43izq9f7sbww1hlg42nayijy8xnp21kgpk09c6sw4wjf"))))
+ "194ibzwpdcn6fvk4xngr4bf5axpciwg2bj82fdvz88kfmjw13akj"))))
(build-system gnu-build-system)
(arguments
`(#:parallel-tests? #f))
(define-public wayland-protocols
(package
(name "wayland-protocols")
- (version "1.17")
+ (version "1.18")
(source (origin
(method url-fetch)
(uri (string-append
"wayland-protocols-" version ".tar.xz"))
(sha256
(base32
- "0bw1sqixqk2a7mqw630cs4dlgcp5yib90vyikzm3lr05jz7ij4yz"))))
+ "1cvl93h83ymbfhb567jv5gzyq08181w7c46rsw4xqqqpcvkvfwrx"))))
(build-system gnu-build-system)
(inputs
`(("wayland" ,wayland)))
(source (origin
(method git-fetch)
(uri (git-reference (url home-page) (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
"16h57hzd688664qcyznzhjp3hxipdkzgv46x82yhkww24av8b55n"))))
(define-public weston
(package
(name "weston")
- (version "5.0.0")
+ (version "6.0.1")
(source (origin
(method url-fetch)
(uri (string-append
"weston-" version ".tar.xz"))
(sha256
(base32
- "1bsc9ry566mpk6fdwkqpvwq2j7m79d9cvh7d3lgf6igsphik98hm"))))
- (build-system gnu-build-system)
+ "1d2m658ll8x7prlsfk71qgw89c7dz6y7d6nndfxwl49fmrd6sbxz"))))
+ (build-system meson-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
("xorg-server" ,xorg-server)))
(inputs
`(("cairo" ,cairo-xcb)
+ ("colord" ,colord)
("dbus" ,dbus)
("elogind" ,elogind)
+ ("lcms" ,lcms)
+ ("libevdev" ,libevdev)
("libinput" ,libinput-minimal)
+ ("libjpeg" ,libjpeg)
("libunwind" ,libunwind)
+ ("libva" ,libva)
+ ("libwebp" ,libwebp)
("libxcursor" ,libxcursor)
("libxkbcommon" ,libxkbcommon)
+ ("libxml2" ,libxml2)
("mesa" ,mesa)
("mtdev" ,mtdev)
("linux-pam" ,linux-pam)
+ ("pango" ,pango)
("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols)
("xorg-server-xwayland" ,xorg-server-xwayland)))
(arguments
`(#:configure-flags
- (list "--disable-setuid-install"
- "--enable-systemd-login"
- (string-append "--with-xserver-path="
+ (list "-Dbackend-rdp=false" ; TODO: Enable.
+ "-Dremoting=false" ; TODO: Enable.
+ "-Dsimple-dmabuf-drm=auto"
+ "-Dsystemd=false"
+ (string-append "-Dxwayland-path="
(assoc-ref %build-inputs "xorg-server-xwayland")
"/bin/Xwayland"))
#:parallel-tests? #f ; Parallel tests cause failures.
(add-before 'configure 'use-elogind
(lambda _
;; Use elogind instead of systemd
- (substitute* "configure"
- (("libsystemd-login >= 198") "libelogind"))
+ (substitute* "libweston/meson.build"
+ (("libsystemd-login") "libelogind"))
(substitute* '("libweston/launcher-logind.c"
"libweston/weston-launch.c")
(("#include <systemd/sd-login.h>")
#t))
(add-after 'configure 'patch-confdefs.h
(lambda _
- (system "echo \"#define HAVE_SYSTEMD_LOGIN_209 1\" >> confdefs.h")))
+ (system "echo \"#define HAVE_SYSTEMD_LOGIN_209 1\" >> confdefs.h")
+ #t))
(add-before 'check 'setup
(lambda _
(setenv "HOME" (getcwd))
(define-public exempi
(package
(name "exempi")
- (version "2.5.0")
+ (version "2.5.1")
(source (origin
(method url-fetch)
(uri (string-append
name "-" version ".tar.bz2"))
(sha256
(base32
- "06vi7dc2gappwqm3xpfyy5ihxq14bmvj3bd47yk482jlq0jgr0nw"))))
+ "1j4vx054l1c2cggw4aka4iw48jkcf68qk5y064pbqw1k3ddks2qh"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags (list (string-append "--with-boost="
(inputs
`(("expat" ,expat)
("zlib" ,zlib)))
- (home-page "https://wiki.freedesktop.org/libopenraw/Exempi")
+ (home-page "https://libopenraw.freedesktop.org/exempi/")
(synopsis "XMP metadata handling library")
(description "Exempi is an implementation of the Extensible Metadata
Platform (@dfn{XMP}), which enables embedding metadata in PDF and image
(package
(name "accountsservice")
(version "0.6.50")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://www.freedesktop.org/software/"
- name "/" name "-" version ".tar.xz"))
- (sha256
- (base32
- "0jn7vg1z4vxnna0hl33hbcb4bb3zpilxc2vyclh24vx4vvsjhn83"))))
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://www.freedesktop.org/software/"
+ "accountsservice/accountsservice-" version ".tar.xz"))
+ (sha256
+ (base32 "0jn7vg1z4vxnna0hl33hbcb4bb3zpilxc2vyclh24vx4vvsjhn83"))))
(build-system gnu-build-system)
(arguments
'(#:tests? #f ; XXX: tests require DocBook 4.1.2
(define-public libmbim
(package
(name "libmbim")
- (version "1.18.0")
+ (version "1.20.2")
(source (origin
(method url-fetch)
(uri (string-append
- "https://www.freedesktop.org/software/" name "/"
- name "-" version ".tar.xz"))
+ "https://www.freedesktop.org/software/libmbim/"
+ "libmbim-" version ".tar.xz"))
(sha256
(base32
- "10mjjy860aakfd3h1yaj9l1jw816amrpwmyqlx37j21xv0l03x3c"))))
+ "16q550sy84izi5ic3sbbhjnnka2fwhj8vvdrirpn9xspbsgbc3sm"))))
(build-system gnu-build-system)
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums
(define-public libqmi
(package
(name "libqmi")
- (version "1.22.2")
+ (version "1.22.4")
(source (origin
(method url-fetch)
(uri (string-append
"libqmi-" version ".tar.xz"))
(sha256
(base32
- "09w20dsgr16bgbqw5ds7r6j2s6ihwyalh9zpbjhcn7cvm0afbwgi"))))
+ "1wgrrb9vb3myl8xgck8ik86876ycbg8crylybs3ssi21vrxqwnsc"))))
(build-system gnu-build-system)
(inputs
`(("libgudev" ,libgudev)))
(define-public modem-manager
(package
(name "modem-manager")
- (version "1.4.14")
+ (version "1.10.8")
(source (origin
(method url-fetch)
(uri (string-append
"ModemManager-" version ".tar.xz"))
(sha256
(base32
- "18hvffwcncwz14kdzk42jbkh362n0kjv3kgx7axbqx572pawvrmb"))))
+ "16hnl0sdriqgv4v30mfs64mdl9rw7lsh802zlm3ggwxxil3p9qfb"))))
(build-system gnu-build-system)
(arguments
'(#:configure-flags
(define-public telepathy-mission-control
(package
(name "telepathy-mission-control")
- (version "5.16.4")
- (source (origin
- (method url-fetch)
- (uri (string-append "https://telepathy.freedesktop.org/releases/"
- name "/" name "-" version ".tar.gz"))
- (sha256
- (base32
- "1jz6wwgsfxixha6ys2hbzbk5faqnj9kh2m5qdlgx5anqgandsscp"))))
+ (version "5.16.5")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://telepathy.freedesktop.org/releases/"
+ "telepathy-mission-control/"
+ "telepathy-mission-control-" version ".tar.gz"))
+ (sha256
+ (base32 "00xxv38cfdirnfvgyd56m60j0nkmsv5fz6p2ydyzsychicxl6ssc"))))
(build-system gnu-build-system)
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-compile-schemas, etc.
their MIME type.
@end itemize")
(license license:perl-license)))
+
+(define-public uchardet
+ (package
+ (name "uchardet")
+ (version "0.0.6")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://www.freedesktop.org/software/"
+ name "/releases/" name "-" version ".tar.xz"))
+ (sha256
+ (base32 "0q9c02b6nmw41yfsiqsnphgc3f0yg3fj31wkccp47cmwvy634lc3"))))
+ (build-system cmake-build-system)
+ (home-page "https://www.freedesktop.org/wiki/Software/uchardet/")
+ (synopsis "Encoding detector library")
+ (description "uchardet is an encoding detector library, which takes a
+sequence of bytes in an unknown character encoding without any additional
+information, and attempts to determine the encoding of the text. Returned
+encoding names are iconv-compatible.")
+
+ ;; This combines code under MPL 1.1, LGPL 2.1+, and GPL 2.0+, so the
+ ;; combination is GPL 2.0+.
+ (license license:gpl2+)))
+
+(define-public udiskie
+ (package
+ (name "udiskie")
+ (version "1.7.7")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "udiskie" version))
+ (sha256
+ (base32
+ "121g9dkr7drv9igpdbcbkj59x15mm72rzp3198bp50zj0lr4wbvi"))
+ ;; Remove support for the libappindicator library of the
+ ;; Unity desktop environment which is not in Guix.
+ (patches (search-patches "udiskie-no-appindicator.patch"))))
+ (build-system python-build-system)
+ (native-inputs
+ `(("asciidoc" ,asciidoc)
+ ("gettext" ,gettext-minimal)
+ ("gobject-introspection" ,gobject-introspection)))
+ (inputs
+ `(("gobject-introspection" ,gobject-introspection)
+ ("gtk+" ,gtk+)
+ ("libnotify" ,libnotify)
+ ("udisks" ,udisks)))
+ (propagated-inputs
+ `(("python-docopt" ,python-docopt)
+ ("python-pygobject" ,python-pygobject)
+ ("python-keyutils" ,python-keyutils)
+ ("python-pyxdg" ,python-pyxdg)
+ ("python-pyyaml" ,python-pyyaml)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'install 'wrap-gi-typelib
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (gi-typelib-path (getenv "GI_TYPELIB_PATH")))
+ (wrap-program (string-append out "/bin/udiskie")
+ `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
+ #t)))))
+ (home-page "https://github.com/coldfix/udiskie")
+ (synopsis "Automounter for removable media")
+ (description
+ "The @command{udiskie} program is a udisks2 front-end that allows to
+manage removable media such as CDs or flash drives from userspace.
+
+Its features include:
+
+@itemize
+@item automount removable media,
+@item notifications,
+@item tray icon,
+@item command line tools for manual (un)mounting,
+@item LUKS encrypted devices,
+@item unlocking with keyfiles,
+@item loop devices (mounting ISO archives),
+@item password caching.
+@end itemize
+")
+ (license license:expat)))