TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into core-updates

Browse source
This commit is contained in:
Mark H Weaver 2018-01-26 00:15:26 -05:00
parent 7bf0170e9f a81f7eb858
commit b89d8a4271
No known key found for this signature in database
GPG key ID: 7CEF29847562C516
30 changed files with 676 additions and 185 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gnu/local.mk
View file

@ -613,6 +613,7 @@ dist_patch_DATA = \
%D%/packages/patches/docbook-xsl-nonrecursive-string-subst.patch \
%D%/packages/patches/doc++-include-directives.patch \
%D%/packages/patches/doc++-segfault-fix.patch \
%D%/packages/patches/dovecot-CVE-2017-15132.patch \
%D%/packages/patches/doxygen-test.patch \
%D%/packages/patches/dvd+rw-tools-add-include.patch \
%D%/packages/patches/eigen-arm-neon-fixes.patch \
@ -1039,6 +1040,7 @@ dist_patch_DATA = \
%D%/packages/patches/readline-link-ncurses.patch \
%D%/packages/patches/readline-6.2-CVE-2014-2524.patch \
%D%/packages/patches/readline-7.0-mingw.patch \
%D%/packages/patches/reposurgeon-add-missing-docbook-files.patch \
%D%/packages/patches/reptyr-fix-gcc-7.patch \
%D%/packages/patches/ripperx-missing-file.patch \
%D%/packages/patches/rpcbind-CVE-2017-8779.patch \

52
gnu/packages/audio.scm
View file

@ -9,6 +9,7 @@
;;; Copyright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2016, 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Oleg Pykhalov <go.wigust@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -3264,3 +3265,54 @@ (define-public cli-visualizer
transforms (FFTs) of the sound being played, as well as other graphical
representations.")
(license license:expat)))
(define-public cava
(package
(name "cava")
(version "0.6.0")
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/karlstav/cava/archive/"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"1p24lz3h4d0h82ffylqr7mq8a8x1c66flm2r2bsv1liw51n1rma2"))))
(build-system gnu-build-system)
(native-inputs
`(("autoconf" ,autoconf)
("automake" ,automake)
("libtool" ,libtool)))
(inputs
`(("fftw" ,fftw)
("ncurses" ,ncurses)
("pulseaudio" ,pulseaudio)))
(arguments
`(#:configure-flags
(list (string-append "PREFIX=" %output)
(string-append "FONT_DIR=" %output "/usr/share/consolefonts"))
#:make-flags
(let ((lib (string-append %output "/lib")))
(list (string-append "cava_LDFLAGS = -L" lib " -Wl,-rpath " lib)))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'bootstrap
(lambda* (#:key outputs #:allow-other-keys)
(setenv "HOME" (getcwd))
(invoke "sh" "autogen.sh")))
(add-before 'build 'make-cava-ldflags
(lambda* (#:key outputs #:allow-other-keys)
(mkdir-p (string-append (assoc-ref outputs "out") "/lib"))))
(add-after 'install 'data
(lambda* (#:key outputs #:allow-other-keys)
(for-each (lambda (file)
(install-file file
(string-append (assoc-ref outputs "out")
"/share/doc/examples")))
(find-files "example_files")))))))
(home-page "https://karlstav.github.io/cava/")
(synopsis "Console audio visualizer for ALSA, MPD, and PulseAudio")
(description "C.A.V.A. is a bar audio spectrum visualizer for the terminal
using ALSA, MPD, PulseAudio, or a FIFO buffer as its input.")
(license license:expat)))

36
gnu/packages/avahi.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -76,39 +77,26 @@ (define-public avahi
(define-public nss-mdns
(package
(name "nss-mdns")
(version "0.10")
(version "0.11")
(source (origin
(method url-fetch)
(uri (list
(string-append
"mirror://debian/pool/main/n/nss-mdns/nss-mdns_"
version ".orig.tar.gz")
"http://pkgs.fedoraproject.org/repo/pkgs/nss-mdns/nss-mdns-0.10.tar.gz/03938f17646efbb50aa70ba5f99f51d7/nss-mdns-0.10.tar.gz"
;; This used to be the canonical URL but it vanished.
;; See <http://bugs.gnu.org/18704>.
;; (string-append
;; "http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-"
;; version ".tar.gz")
))
(uri (string-append "https://github.com/lathiat/nss-mdns"
"/releases/download/v" version "/"
name "-" version ".tar.gz"))
(sha256
(base32
"0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y"))
(file-name (string-append name "-" version ".tar.gz"))))
"14jwy6mklzgjz3mfmw67mxhszrw9d3d3yjjhg87j4crci6m19i39"))))
(build-system gnu-build-system)
(arguments
;; The Avahi daemon socket is expected by src/Makefile.am to be at
;; "$(localstatedir)/run/avahi-daemon/socket", so set $(localstatedir)
;; appropriately.
'(#:configure-flags '("--localstatedir=/var")))
;; XXX: Stale URL, missing replacement. See <http://bugs.gnu.org/18704>.
(home-page "http://0pointer.de/lennart/projects/nss-mdns/")
(synopsis "The mDNS Name Service Switch (NSS) plug-in")
(home-page "https://github.com/lathiat/nss-mdns")
(synopsis "Multicast DNS Name Service Switch (@dfn{NSS}) plug-in")
(description
"Nss-mdns is a plug-in for the Name Service Switch (NSS) functionality
of the GNU C Library, providing host name resolution via Multicast DNS (mDNS).
It allows for name resolution by programs in the ad-hoc mDNS domain
'.local'.")
"Nss-mdns is a plug-in for the GNU C Library's Name Service Switch
(@dfn{NSS}) that resolves host names via multicast DNS (@dfn{mDNS}). It is
most often used in home and other small networks without a local name server,
to resolve host names in the @samp{.local} top-level domain.")
(license lgpl2.1+)))

8
gnu/packages/bioinformatics.scm
View file

@ -2039,7 +2039,7 @@ (define-public deeptools
(version "2.5.1")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/fidelram/deepTools/"
(uri (string-append "https://github.com/deeptools/deepTools/"
"archive/" version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
@ -2058,7 +2058,7 @@ (define-public deeptools
`(("python-mock" ,python-mock) ;for tests
("python-nose" ,python-nose) ;for tests
("python-pytz" ,python-pytz))) ;for tests
(home-page "https://github.com/fidelram/deepTools")
(home-page "https://github.com/deeptools/deepTools")
(synopsis "Tools for normalizing and visualizing deep-sequencing data")
(description
"DeepTools addresses the challenge of handling the large amounts of data
@ -2074,7 +2074,7 @@ (define-public deeptools
(define-public diamond
(package
(name "diamond")
(version "0.9.14")
(version "0.9.15")
(source (origin
(method url-fetch)
(uri (string-append
@ -2083,7 +2083,7 @@ (define-public diamond
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
"07li3chjdna0wjyh680j3bhwiqh1fbfq9dy9jxxs82mc0rw0m1yy"))))
"0c9v0lddz8df5pnra464832cgn1igzpawgsknly7s1mq0qk9aiqj"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; no "check" target

24
gnu/packages/cobol.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;;
;;; This file is part of GNU Guix.
;;;
@ -24,7 +24,8 @@ (define-module (gnu packages cobol)
#:use-module (guix download)
#:use-module (gnu packages databases)
#:use-module (gnu packages multiprecision)
#:use-module (gnu packages ncurses))
#:use-module (gnu packages ncurses)
#:use-module (gnu packages perl))
(define-public gnucobol
(package
@ -42,11 +43,26 @@ (define-public gnucobol
(arguments
'(#:configure-flags (list (string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out")
"/lib"))))
"/lib"))
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'place-cobol85-test-suite
(lambda* (#:key inputs #:allow-other-keys)
(let ((newcob (assoc-ref inputs "newcob")))
(copy-file newcob "tests/cobol85/newcob.val.Z")))))
#:test-target "checkall"))
(native-inputs
`(("perl" ,perl)))
(inputs
`(("bdb" ,bdb)
("gmp" ,gmp)
("ncurses" ,ncurses)))
("ncurses" ,ncurses)
("newcob" ,(origin
(method url-fetch)
(uri "http://www.itl.nist.gov/div897/ctg/suites/newcob.val.Z")
(sha256
(base32
"1yb1plmv4firfnbb119r2vh1hay221w1ya34nyz0qwsxppfr56hy"))))))
(build-system gnu-build-system)
(home-page "https://savannah.gnu.org/projects/gnucobol/")
(synopsis "A modern COBOL compiler")

19
gnu/packages/conky.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Siniša Biđin <sinisa@bidin.eu>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -24,15 +25,16 @@ (define-module (gnu packages conky)
#:use-module (guix build-system cmake)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages image)
#:use-module (gnu packages lua)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages xorg))
(define-public conky
(package
(name "conky")
(version "1.10.6")
(version "1.10.7")
(source
(origin
(method url-fetch)
@ -40,15 +42,12 @@ (define-public conky
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32 "1jk0my7z45vz9vd8958d27nkk4kvr53k7wyf6cz2x9xjc0lri02c"))))
(base32 "1b06rigfjxnaidkabkyf8mdh9k3jm11nj547lb5liwi2ql4rdfr3"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ; there are no tests
#:configure-flags
'("-DRELEASE=true"
;; XXX: it checks ncurses with pkg-config.
;; TODO: add 'ncurses.pc' to the ncurses package.
"-DBUILD_NCURSES=false")
(list "-DRELEASE=true")
#:phases
(modify-phases %standard-phases
(add-after 'unpack 'add-freetype-to-search-path
@ -67,12 +66,14 @@ (define-public conky
#t)))))
(inputs
`(("freetype" ,freetype)
("ncurses" ,ncurses)
("imlib2" ,imlib2)
("libx11" ,libx11)
("libxdamage" ,libxdamage)
("libxext" ,libxext)
("libxft" ,libxft)
("libxinerama" ,libxinerama)
("lua" ,lua)))
("lua" ,lua)
("ncurses" ,ncurses)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "https://github.com/brndnmtthws/conky")

4
gnu/packages/databases.scm
View file

@ -112,7 +112,7 @@ (define-public 4store
(version "1.1.6")
(source (origin
(method url-fetch)
(uri (string-append "https://github.com/garlik/4store/archive/v"
(uri (string-append "https://github.com/4store/4store/archive/v"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
@ -145,7 +145,7 @@ (define-public 4store
(lambda _
(zero? (system* "sh" "autogen.sh")))))))
;; http://www.4store.org has been down for a while now.
(home-page "https://github.com/garlik/4store")
(home-page "https://github.com/4store/4store")
(synopsis "Clustered RDF storage and query engine")
(description "4store is a RDF/SPARQL store written in C, supporting
either single machines or networked clusters.")

4
gnu/packages/datastructures.scm
View file

@ -97,14 +97,14 @@ (define-public ssdeep
(define-public liburcu
(package
(name "liburcu")
(version "0.10.0")
(version "0.10.1")
(source (origin
(method url-fetch)
(uri (string-append "https://www.lttng.org/files/urcu/"
"userspace-rcu-" version ".tar.bz2"))
(sha256
(base32
"141imnd1s4bcd4wz0wk7sp3fj649kp8whp82gw49h48mlmxqmdbw"))))
"01pbg67qy5hcssy2yi0ckqapzfclgdq93li2rmzw4pa3wh5j42cw"))))
(build-system gnu-build-system)
(native-inputs
`(("perl" ,perl))) ; for tests

7
gnu/packages/dc.scm
View file

@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014 Sree Harsha Totakura <sreeharsha@totakura.in>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -32,14 +33,14 @@ (define-module (gnu packages dc)
(define-public ncdc
(package
(name "ncdc")
(version "1.19")
(version "1.20")
(source
(origin
(method url-fetch)
(uri (string-append "http://dev.yorhel.nl/download/ncdc-" version
".tar.gz"))
(sha256 (base32
"1wgvqwfxq9kc729h2r528n55821w87sfbm4h21mr6pvkpfw30hf2"))))
"0ccn7dqbqpqsbglqyalz32c20rjvf1pw0zr88jyvd2b2vxbqi6ca"))))
(build-system gnu-build-system)
(inputs
`(("bzip2" ,bzip2)
@ -50,7 +51,7 @@ (define-public ncdc
("zlib" ,zlib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
(home-page "http://dev.yorhel.nl/ncdc")
(home-page "https://dev.yorhel.nl/ncdc")
(synopsis
"Lightweight direct connect client with a friendly ncurses interface")
(description

4
gnu/packages/dns.scm
View file

@ -99,7 +99,7 @@ (define-public dnsmasq
(define-public isc-bind
(package
(name "bind")
(version "9.11.2-P1")
(version "9.12.0")
(source (origin
(method url-fetch)
(uri (string-append
@ -107,7 +107,7 @@ (define-public isc-bind
version ".tar.gz"))
(sha256
(base32
"04hjvwvs7ssgj69lqparx0wj0w3xkc0x8y2iv62kzjighd41bhyf"))))
"10iwkghl5g50b7wc17bsb9wa0dh2gd57bjlk6ynixhywz6dhx1r9"))))
(build-system gnu-build-system)
(outputs `("out" "utils"))
(inputs

9
gnu/packages/elf.scm
View file

@ -4,6 +4,7 @@
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -32,14 +33,14 @@ (define-module (gnu packages elf)
(define-public elfutils
(package
(name "elfutils")
(version "0.169")
(version "0.170")
(source (origin
(method url-fetch)
(uri (string-append "https://sourceware.org/elfutils/ftp/"
version "/elfutils-" version ".tar.bz2"))
(sha256
(base32
"1hiv1yqig3292dwqhrwsxwk3qjalxp5fpl8yphwbfwh8ng3zl4ll"))
"0rp0r54z44is49c594qy7hr211nhb00aa5y7z74vsybbaxslg10z"))
(patches (search-patches "elfutils-tests-ptrace.patch"))))
(build-system gnu-build-system)
@ -61,8 +62,8 @@ (define-public elfutils
(synopsis "Linker and ELF manipulation tools")
(description
"This package provides command-line tools to manipulate binaries in the
Executable and Linkable Format (ELF). This includes ld, ar, objdump,
addr2line, and more.")
Executable and Linkable Format (@dfn{ELF}). This includes @command{ld},
@command{ar}, @command{objdump}, @command{addr2line}, and more.")
;; Libraries are dual-licensed LGPLv3.0+ | GPLv2, and programs are GPLv3+.
(license lgpl3+)))

137
gnu/packages/emacs.scm
View file

@ -6466,6 +6466,143 @@ (define-public emacs-tiny
an elisp expression.")
(license license:gpl3+)))
(define-public emacs-emojify
(package
(name "emacs-emojify")
(version "0.4")
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/iqbalansari/emacs-emojify/"
"releases/download/v" version "/emojify-"
version ".tar"))
(sha256
(base32
"0k84v2d2bkiwcky9fi1yyprgkj46g7wh6pyl9gzmcd7sqv051d5n"))))
(build-system emacs-build-system)
(arguments
`(#:phases
(modify-phases %standard-phases
(add-after 'install 'install-data
(lambda* (#:key outputs #:allow-other-keys)
(copy-recursively "data"
(string-append (assoc-ref outputs "out")
"/share/emacs/site-lisp/guix.d/"
"emojify-" ,version "/data"))
#t)))))
(propagated-inputs
`(("emacs-ht" ,emacs-ht)))
(home-page "https://github.com/iqbalansari/emacs-emojify")
(synopsis "Display emojis in Emacs")
(description "This package displays emojis in Emacs similar to how Github,
Slack, and other websites do. It can display plain ASCII like @code{:)} as
well as Github-style emojis like @code{:smile:}. It provides a minor mode
@code{emojify-mode} to enable the display of emojis in a buffer.")
(license license:gpl3+)))
(define-public emacs-websocket
(package
(name "emacs-websocket")
(version "1.8")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/websocket-"
version ".tar"))
(sha256
(base32
"0dcxmnnm8z7cvsc7nkb822a1g6w03klp7cijjnfq0pz84p3w9cd9"))))
(build-system emacs-build-system)
(home-page "http://elpa.gnu.org/packages/websocket.html")
(synopsis "Emacs WebSocket client and server")
(description "This is an Elisp library for WebSocket clients to talk to
WebSocket servers, and for WebSocket servers to accept connections from
WebSocket clients. This library is designed to be used by other library
writers, to write applications that use WebSockets, and is not useful by
itself.")
(license license:gpl3+)))
(define-public emacs-oauth2
(package
(name "emacs-oauth2")
(version "0.11")
(source
(origin
(method url-fetch)
(uri (string-append "https://elpa.gnu.org/packages/oauth2-"
version ".el"))
(sha256
(base32
"0ydkc9jazsnbbvfhd47mql52y7k06n3z7r0naqxkwb99j9blqsmp"))))
(build-system emacs-build-system)
(home-page "http://elpa.gnu.org/packages/oauth2.html")
(synopsis "OAuth 2.0 authorization protocol implementation")
(description
"This package provides an Elisp implementation of the OAuth 2.0 draft.
The main entry point is @code{oauth2-auth-and-store} which will return a token
structure. This token structure can be then used with
@code{oauth2-url-retrieve-synchronously} or @code{oauth2-url-retrieve} to
retrieve any data that need OAuth authentication to be accessed. If the token
needs to be refreshed, the code handles it automatically and stores the new
value of the access token.")
(license license:gpl3+)))
(define-public emacs-circe
(package
(name "emacs-circe")
(version "2.6")
(source
(origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/jorgenschaefer/circe.git")
(commit (string-append "v" version))))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"19h3983zy3f15cgs86irvbdzz55qyjm48qd7gjlzcxplr7vnnh0j"))))
(build-system emacs-build-system)
;; In order to securely connect to an IRC server using TLS, Circe requires
;; the GnuTLS binary.
(propagated-inputs
`(("gnutls" ,gnutls)))
(home-page "https://github.com/jorgenschaefer/circe")
(synopsis "Client for IRC in Emacs")
(description "Circe is a Client for IRC in Emacs. It integrates well with
the rest of the editor, using standard Emacs key bindings and indicating
activity in channels in the status bar so it stays out of your way unless you
want to use it.")
(license license:gpl3+)))
(define-public emacs-slack
(let ((commit "58b1309255563819ee8f83f625af49ac0353bed1")
(revision "1"))
(package
(name "emacs-slack")
(version (string-append "0-" revision "." (string-take commit 7)))
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://github.com/yuya373/emacs-slack.git")
(commit commit)))
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
"1bj43ircd9djk4i58qwxvmcbhzybxb954k52l80pk441ffk8v4vx"))))
(build-system emacs-build-system)
(propagated-inputs
`(("emacs-alert" ,emacs-alert)
("emacs-emojify" ,emacs-emojify)
("emacs-request" ,emacs-request)
("emacs-websocket" ,emacs-websocket)
("emacs-oauth2" ,emacs-oauth2)
("emacs-circe" ,emacs-circe)))
(home-page "https://github.com/yuya373/emacs-slack")
(synopsis "Slack client for Emacs")
(description "This package provides an Emacs client for the Slack
messaging service.")
(license license:gpl3+))))
(define-public emacs-bash-completion
(package
(name "emacs-bash-completion")

6
gnu/packages/gcc.scm
View file

@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2014, 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
@ -480,14 +480,14 @@ (define-public gcc-6
(define-public gcc-7
(package
(inherit gcc-6)
(version "7.2.0")
(version "7.3.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gcc/gcc-"
version "/gcc-" version ".tar.xz"))
(sha256
(base32
"16j7i0888j2f1yp9l0nhji6cq65dy6y4nwy8868a8njbzzwavxqw"))
"0p71bij6bfhzyrs8676a8jmpjsfz392s2rg862sdnsk30jpacb43"))
(patches (search-patches "gcc-strmov-store-file-names.patch"
"gcc-5.0-libvtv-runpath.patch"))))
(description

30
gnu/packages/glib.scm
View file

@ -7,6 +7,7 @@
;;; Copyright © 2016 Lukas Gradl <lgradl@openmailbox.org>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Petter <petter@mykolab.ch>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -35,19 +36,23 @@ (define-module (gnu packages glib)
#:use-module (gnu packages flex)
#:use-module (gnu packages gettext)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gperf)
#:use-module (gnu packages gtk)
#:use-module (gnu packages libffi)
#:use-module (gnu packages linux)
#:use-module (gnu packages m4)
#:use-module (gnu packages nettle)
#:use-module (gnu packages pcre)
#:use-module (gnu packages package-management)
#:use-module (gnu packages perl)
#:use-module (gnu packages perl-check)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system perl)
#:use-module (guix build-system python)
#:use-module (guix download)
@ -710,7 +715,7 @@ (define-public dbus-c++
(define-public appstream-glib
(package
(name "appstream-glib")
(version "0.6.7")
(version "0.7.5")
(source (origin
(method url-fetch)
(uri (string-append "https://people.freedesktop.org/~hughsient/"
@ -718,30 +723,35 @@ (define-public appstream-glib
"appstream-glib-" version ".tar.xz"))
(sha256
(base32
"08mrf4k0jhnpdd4fig2grmi2vbxkgdhrwk0d0zq0j1wp5ip7arwp"))))
(build-system gnu-build-system)
"0ps80cbqnf3q86rvz3ajqjssdgkjc9kmynqf0wxqfir7ayc9y9ag"))))
(build-system meson-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
`(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for glib-compile-resources
("pkg-config" ,pkg-config)))
(inputs
`(("gdk-pixbuf" ,gdk-pixbuf)
("gcab" ,gcab)
("glib" ,glib)
("gperf" ,gperf)
("gtk+" ,gtk+)
("json-glib" ,json-glib)
("libarchive" ,libarchive)
("libsoup" ,libsoup)
("nettle" ,nettle)
("util-linux" ,util-linux)))
("libyaml" ,libyaml)
("util-linux" ,util-linux))) ; for libuuid
(arguments
`(#:configure-flags
'("--disable-firmware" "--disable-dep11")
(list "-Ddep11=false"
"-Dintrospection=false" ; avoid g-ir-scanner dependency
"-Drpm=false"
"-Dstemmer=false")
#: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);") ""))
(("g_test_add_func.*as_test_store_local_appdata_func);") ""))
#t)))))
(home-page "https://github.com/hughsie/appstream-glib")
(synopsis "Library for reading and writing AppStream metadata")

43
gnu/packages/iso-codes.scm
View file

@ -23,6 +23,7 @@ (define-module (gnu packages iso-codes)
#:use-module (guix packages)
#:use-module (guix download)
#:use-module (guix build-system gnu)
#:use-module (guix build-system python)
#:use-module (gnu packages gettext)
#:use-module (gnu packages perl)
#:use-module (gnu packages python))
@ -64,3 +65,45 @@ (define-public iso-codes
changes in the ISO standard and will not work with outdated
information.")
(license license:gpl2+))) ; some bits use the lgpl2
(define-public python-iso639
(package
(name "python-iso639")
(version "0.4.5")
(source
(origin
(method url-fetch)
(uri (pypi-uri "iso-639" version))
(sha256
(base32
"0jffmh4m20q8j27xb2fqbnlghjj0cx8pgsbzqisdg65qh2wd976w"))))
(build-system python-build-system)
(home-page "https://github.com/noumar/iso639")
(synopsis "Python library for ISO 639 standard")
(description "This package provides a Python library for ISO 639 standard
that is concerned with representation of names for languages and language
groups.")
(license license:agpl3+)))
(define-public python2-iso639
(package-with-python2 python-iso639))
(define-public python-iso3166
(package
(name "python-iso3166")
(version "0.8")
(source
(origin
(method url-fetch)
(uri (pypi-uri "iso3166" version))
(sha256
(base32
"0cs9w507dj93jj9z9di93lx2fplf8pma4jkrsvvb258dv6z1gszv"))))
(build-system python-build-system)
(home-page "https://github.com/deactivated/python-iso3166")
(synopsis "Self-contained ISO 3166-1 country definitions")
(description "This package provides the ISO 3166-1 country definitions.")
(license license:expat)))
(define-public python2-iso3166
(package-with-python2 python-iso3166))

20
gnu/packages/linux.scm
View file

@ -283,6 +283,14 @@ (define* (make-linux-libre version hash supported-systems
("bc" ,bc)
("openssl" ,openssl)
("kmod" ,kmod)
;; On x86, build with GCC-7 for full retpoline support.
;; FIXME: Remove this when our default compiler has retpoline support.
,@(match (system->linux-architecture
(or (%current-target-system) (%current-system)))
((or "x86_64" "i386")
`(("gcc" ,gcc-7)))
(_
'()))
,@(match (and configuration-file
(configuration-file
(system->linux-architecture
@ -396,8 +404,8 @@ (define-public linux-libre-4.4
#:configuration-file kernel-config))
(define-public linux-libre-4.1
(make-linux-libre "4.1.48"
"13ii6ixcm46hzk1ns6n4hrrv4dyc0n3wvj2qhmxi178akdcgbn8a"
(make-linux-libre "4.1.49"
"0dklmqj6ayjlkz97b811zdvpgb3yppahinji9l9jmkz4ssi7a1gs"
%intel-compatible-systems
#:configuration-file kernel-config))
@ -4062,7 +4070,7 @@ (define-public libmnl
(define-public libnftnl
(package
(name "libnftnl")
(version "1.0.8")
(version "1.0.9")
(source
(origin
(method url-fetch)
@ -4070,7 +4078,7 @@ (define-public libnftnl
"libnftnl-" version ".tar.bz2"))
(sha256
(base32
"0f10cfiyl4c0f8k3brxfrw28x7a6qvrakaslg4jgqncwxycxggg6"))))
"0d9nkdbdck8sg6msysqyv3m9kjr9sjif5amf26dfa0g3mqjdihgy"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
@ -4087,7 +4095,7 @@ (define-public libnftnl
(define-public nftables
(package
(name "nftables")
(version "0.8")
(version "0.8.1")
(source
(origin
(method url-fetch)
@ -4095,7 +4103,7 @@ (define-public nftables
"/files/nftables-" version ".tar.bz2"))
(sha256
(base32
"16iq9x0qxikdhp1nan500rk33ycqddl1k57876m4dfv3n7kqhnrz"))))
"1i1gfy8l7qyhc5vlrpp63s0n5kybmc9pi4dywiq8rmkhrrnddsla"))))
(build-system gnu-build-system)
(inputs `(("bison", bison)
("flex", flex)

1
gnu/packages/mail.scm
View file

@ -1144,6 +1144,7 @@ (define-public dovecot
(uri (string-append "https://www.dovecot.org/releases/"
(version-major+minor version) "/"
name "-" version ".tar.gz"))
(patches (search-patches "dovecot-CVE-2017-15132.patch"))
(sha256 (base32
"10c5myzgys866c3x6jdr1s9x9pqnjd5vpyz8z384sph21m3wnq6y"))))
(build-system gnu-build-system)

2
gnu/packages/music.scm
View file

@ -3875,7 +3875,7 @@ (define-public libmusicbrainz
version "/libmusicbrainz-" version ".tar.gz"))
(sha256
(base32
"0ikb9igyyk28jm34raxfzkw2qyn4nzzwsymdyprp7cmvi6g2ajb7")) ))
"0ikb9igyyk28jm34raxfzkw2qyn4nzzwsymdyprp7cmvi6g2ajb7"))))
(build-system cmake-build-system)
(arguments `(#:phases
(modify-phases %standard-phases

67
gnu/packages/package-management.scm
View file

@ -35,10 +35,13 @@ (define-module (gnu packages package-management)
#:use-module (gnu packages databases)
#:use-module (gnu packages file)
#:use-module (gnu packages gettext)
#:use-module (gnu packages glib)
#:use-module (gnu packages gnome)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages gnuzilla)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages guile)
#:use-module (gnu packages linux)
#:use-module (gnu packages lisp)
#:use-module (gnu packages man)
#:use-module (gnu packages nettle)
@ -56,8 +59,10 @@ (define-module (gnu packages package-management)
#:use-module (gnu packages tls)
#:use-module (gnu packages vim)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
#:use-module (guix build-system emacs)
#:use-module (guix build-system gnu)
#:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (guix download)
#:use-module (guix gexp)
@ -784,3 +789,65 @@ (define-public gwl
;; the web interface modules in gwl/ are licensed AGPL3+,
;; and the fonts included in this package are licensed OFL1.1.
(license (list license:gpl3+ license:agpl3+ license:silofl1.1))))
(define-public gcab
(package
(name "gcab")
(version "1.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32
"1ji8j8pnxqaycbp9ydi2zq7gcr02c2vw4qnc198i6jwy9zkh2x19"))))
(build-system meson-build-system)
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums
("intltool" ,intltool)
("pkg-config" ,pkg-config)
("vala" ,vala)))
(inputs
`(("glib" ,glib)
("zlib" ,zlib)))
(arguments
`(#:configure-flags
;; XXX This ‘documentation’ is for developers, and fails informatively:
;; Error in gtkdoc helper script: 'gtkdoc-mkhtml' failed with status 5
(list "-Ddocs=false"
"-Dintrospection=false")))
(home-page "https://wiki.gnome.org/msitools") ; no dedicated home page
(synopsis "Microsoft Cabinet file manipulation library")
(description
"The libgcab library provides GObject functions to read, write, and modify
Microsoft cabinet (.@dfn{CAB}) files.")
(license (list license:gpl2+ ; tests/testsuite.at
license:lgpl2.1+)))) ; the rest
(define-public msitools
(package
(name "msitools")
(version "0.97")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
version "/" name "-" version ".tar.xz"))
(sha256
(base32
"0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs"))))
(build-system gnu-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("gcab" ,gcab)
("glib" ,glib)
("libgsf" ,libgsf)
("libxml2" ,libxml2)
("uuid" ,util-linux)))
(home-page "https://wiki.gnome.org/msitools")
(synopsis "Windows Installer file manipulation tool")
(description
"msitools is a collection of command-line tools to inspect, extract, build,
and sign Windows@tie{}Installer (.@dfn{MSI}) files. It aims to be a solution
for packaging and deployment of cross-compiled Windows applications.")
(license license:lgpl2.1+)))

36
gnu/packages/patches/dovecot-CVE-2017-15132.patch Normal file
View file

@ -0,0 +1,36 @@
Fix CVE-2017-15132:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2017-15132
Patch copied from upstream source repository:
https://github.com/dovecot/core/commit/1a29ed2f96da1be22fa5a4d96c7583aa81b8b060
From 1a29ed2f96da1be22fa5a4d96c7583aa81b8b060 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Mon, 18 Dec 2017 16:50:51 +0200
Subject: [PATCH] lib-auth: Fix memory leak in auth_client_request_abort()
This caused memory leaks when authentication was aborted. For example
with IMAP:
a AUTHENTICATE PLAIN
*
Broken by 9137c55411aa39d41c1e705ddc34d5bd26c65021
---
src/lib-auth/auth-client-request.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib-auth/auth-client-request.c b/src/lib-auth/auth-client-request.c
index 480fb42b30..046f7c307d 100644
--- a/src/lib-auth/auth-client-request.c
+++ b/src/lib-auth/auth-client-request.c
@@ -186,6 +186,7 @@ void auth_client_request_abort(struct auth_client_request **_request)
auth_client_send_cancel(request->conn->client, request->id);
call_callback(request, AUTH_REQUEST_STATUS_ABORT, NULL, NULL);
+ pool_unref(&request->pool);
}
unsigned int auth_client_request_get_id(struct auth_client_request *request)

22
gnu/packages/patches/reposurgeon-add-missing-docbook-files.patch Normal file
View file

@ -0,0 +1,22 @@
Author: Tobias Geerinckx-Rice <me@tobias.gr>
Upstream issue: <https://gitlab.com/esr/reposurgeon/merge_requests/101>
Two files required to build the documentation (including man pages) are
not included in the latest reposurgeon release, breaking ‘make all’.
Luckily, they are tiny:
--- a/docbook-extra.xml 1970-01-01 01:00:00.000000000 +0100
+++ b/docbook-extra.xml 2018-01-25 00:17:18.236727017 +0100
@@ -0,0 +1,5 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:param name="variablelist.term.separator"></xsl:param>
+<xsl:param name="variablelist.term.break.after">1</xsl:param>
+</xsl:stylesheet>
diff -Naur reposurgeon-3.43/nofooter.conf reposurgeon-3.43-b/nofooter.conf
--- a/nofooter.conf 1970-01-01 01:00:00.000000000 +0100
+++ b/nofooter.conf 2018-01-25 00:23:15.384498847 +0100
@@ -0,0 +1,2 @@
+[footer-text]
+

4
gnu/packages/perl.scm
View file

@ -4610,7 +4610,7 @@ (define-public perl-mime-tools
(define-public perl-mime-types
(package
(name "perl-mime-types")
(version "2.14")
(version "2.16")
(source
(origin
(method url-fetch)
@ -4618,7 +4618,7 @@ (define-public perl-mime-types
"MIME-Types-" version ".tar.gz"))
(sha256
(base32
"0w00fdci07cc6k1v4zaib4icggqjmg8hggpx4lzqj1ajq07wyja0"))))
"0nkv99yd8bxa6h8c52nd07142f0mdzjnhcdw66s3wljmzsi9z8hk"))))
(build-system perl-build-system)
(home-page "http://search.cpan.org/dist/MIME-Types/")
(synopsis "Definition of MIME types")

43
gnu/packages/python-crypto.scm
View file

@ -715,3 +715,46 @@ (define-public python-josepy
(define-public python2-josepy
(package-with-python2 python-josepy))
(define-public python-pycryptodome
(package
(name "python-pycryptodome")
(version "3.4.7")
(source
(origin
(method url-fetch)
(uri (pypi-uri "pycryptodome" version))
(sha256
(base32
"1xrsd6ql4w0ypkxnsg3fivs3r3z6dd93x44lhvam7jzh3gixzn0q"))))
(build-system python-build-system)
(home-page "https://www.pycryptodome.org")
(synopsis "Cryptographic library for Python")
(description "This package provides a cryptographic library for Python.
It brings the following enhancements with respect to the last official version
of PyCrypto:
@itemize
@item Authenticated encryption modes (GCM, CCM, EAX, SIV, OCB)
@item Accelerated AES on Intel platforms via AES-NI
@item First class support for PyPy
@item Elliptic curves cryptography (NIST P-256 curve only)
@item Better and more compact API (nonce and iv attributes for ciphers,
automatic generation of random nonces and IVs, simplified CTR cipher mode, and
more)
@item SHA-3 (including SHAKE XOFs) and BLAKE2 hash algorithms
@item Salsa20 and ChaCha20 stream ciphers
@item scrypt and HKDF
@item Deterministic (EC)DSA
@item Password-protected PKCS#8 key containers
@item Shamir’s Secret Sharing scheme
@item Random numbers get sourced directly from the OS (and not from a CSPRNG
in userspace)
@item Cleaner RSA and DSA key generation (largely based on FIPS 186-4)
@item Major clean ups and simplification of the code base
@end itemize\n")
(license license:bsd-2)))
(define-public python2-pycryptodome
(package-with-python2 python-pycryptodome))

141
gnu/packages/qt.scm
View file

@ -2,7 +2,7 @@
;;; Copyright © 2013, 2014, 2015 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 ng0 <ng0@infotropique.org>
;;; Copyright © 2016 Thomas Danckaert <post@thomasdanckaert.be>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
@ -103,7 +103,7 @@ (define-public grantlee
(define-public qt
(package
(name "qt")
(version "5.9.3")
(version "5.9.4")
(outputs '("out" "examples"))
(source (origin
(method url-fetch)
@ -115,8 +115,8 @@ (define-public qt
"/single/qt-everywhere-opensource-src-"
version ".tar.xz"))
(sha256
(base32
"0ik0ikwa0qb7dqcr9knxpnwv50b7m6m2iglzq9yjs3437zqdib2p"))
(base32
"1mblh8k04l13nk9fhhrr43h5bcph1gbz94j5y7csx8zvxb5xkb73"))
(modules '((guix build utils)))
(snippet
'(begin
@ -369,7 +369,7 @@ (define-public qt-4
(define-public qtbase
(package
(name "qtbase")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -378,7 +378,7 @@ (define-public qtbase
version ".tar.xz"))
(sha256
(base32
"10lrkarvs7dpx9rlj7sjcc0pzi42098x8nqnhmydr4bnbq048z4y"))
"1kq422vb2zaic099pgzwk7c0qzgc3xap6qahw5vklrq0mgivvrk9"))
(modules '((guix build utils)))
(snippet
;; corelib uses bundled harfbuzz, md4, md5, sha3
@ -566,7 +566,7 @@ (define-public qtbase
(define-public qtsvg
(package (inherit qtbase)
(name "qtsvg")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -575,7 +575,7 @@ (define-public qtsvg
version ".tar.xz"))
(sha256
(base32
"1wjx9ymk2h19l9kk76jh87bnhhj955f9a93akvwwzfwg1jk2hrnz"))))
"0yh3an9rc7fh013cw3bm318ap6428icsmnj38hhg1w6lpwr2gwm2"))))
(propagated-inputs `())
(native-inputs `(("perl" ,perl)))
(inputs
@ -641,7 +641,7 @@ (define-public qtsvg
(define-public qtimageformats
(package (inherit qtsvg)
(name "qtimageformats")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -650,7 +650,7 @@ (define-public qtimageformats
version ".tar.xz"))
(sha256
(base32
"1p95wzm46j49c5br45g0pmlz3n3fl93j1ipzmnpmq9y2pbfhkcyl"))
"1nfxvf96wh1smdmcsk4m9f7zg69fgp844f8772qpv6v4m20p1qb9"))
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "src/3rdparty"))))
@ -670,7 +670,7 @@ (define-public qtimageformats
(define-public qtx11extras
(package (inherit qtsvg)
(name "qtx11extras")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -679,7 +679,7 @@ (define-public qtx11extras
version ".tar.xz"))
(sha256
(base32
"1gpjgca4xvyy0r743kh2ys128r14fh6j8bdphnmmi5v2pf6bzq74"))))
"1a125fi7lbxfps207i12jammm4cjbiawmp4sqa3bxqah8p21i6w7"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -694,7 +694,7 @@ (define-public qtx11extras
(define-public qtxmlpatterns
(package (inherit qtsvg)
(name "qtxmlpatterns")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -703,7 +703,7 @@ (define-public qtxmlpatterns
version ".tar.xz"))
(sha256
(base32
"1fphhqr3v3vzjp2vbv16bc1vs879wn7aqlabgcpkhqx92ak6d76g"))))
"0ybz0i3wblvrm958s9ykp3a79bakjbb7k74q71mqaaswkv9imxgs"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases)
@ -723,7 +723,7 @@ (define-public qtxmlpatterns
(define-public qtdeclarative
(package (inherit qtsvg)
(name "qtdeclarative")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -732,7 +732,7 @@ (define-public qtdeclarative
version ".tar.xz"))
(sha256
(base32
"01wlk17zf47yzx7cc3cp617gj70yadllj2rsfk78879c0v96cpsh"))))
"0r9dhfc6qmxlzn2v9r6z6n2mcq6pv1nmyh91g9hcdlkx40xqlqyw"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -755,7 +755,7 @@ (define-public qtdeclarative
(define-public qtconnectivity
(package (inherit qtsvg)
(name "qtconnectivity")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -764,7 +764,7 @@ (define-public qtconnectivity
version ".tar.xz"))
(sha256
(base32
"0j86rspn4xgwq1ddc1mpq1kq0ib2c0ag6rsn9ly2xs4iimp1x2g2"))))
"12qckqz6ldvn1czkkigadmgl07yk4gs74hy4ifh4hmpm7cv519yv"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases)
@ -790,7 +790,7 @@ (define-public qtconnectivity
(define-public qtwebsockets
(package (inherit qtsvg)
(name "qtwebsockets")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -799,7 +799,7 @@ (define-public qtwebsockets
version ".tar.xz"))
(sha256
(base32
"1phic630ah85ajxp6iqrw9bpg0y8s88y45ygkc1wcasmbgzrs1nf"))))
"00786d9m8skj68n5x9d8151zmmskx7ckhgcdd08hs9nly04h55vj"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -817,7 +817,7 @@ (define-public qtwebsockets
(define-public qtsensors
(package (inherit qtsvg)
(name "qtsensors")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -826,7 +826,7 @@ (define-public qtsensors
version ".tar.xz"))
(sha256
(base32
"1hfsih5iy4fi6mnpw2shf1lzx9hxcdc1arspad1mark17l5s4pmr"))))
"0n6lkkn7c9x8vcplmfvkx7jq6najh2mrwnfb3blrmkmpash3lgvr"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:parallel-tests? _ #f) #f) ; can lead to race condition
@ -849,7 +849,7 @@ (define-public qtsensors
(define-public qtmultimedia
(package (inherit qtsvg)
(name "qtmultimedia")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -858,7 +858,7 @@ (define-public qtmultimedia
version ".tar.xz"))
(sha256
(base32
"19iqh8xpspzlmpzh05bx5rchlslbfy2pp00xv52496yf9b95i5g7"))
"0x2f3vpax7rq0lxnncbp5b248bxdicrwn8hv4hsas2g2283s0lj9"))
(modules '((guix build utils)))
(snippet
'(begin
@ -899,7 +899,7 @@ (define-public qtmultimedia
(define-public qtwayland
(package (inherit qtsvg)
(name "qtwayland")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -908,7 +908,7 @@ (define-public qtwayland
version ".tar.xz"))
(sha256
(base32
"0vazcmpqdka3llmyg7m99lw0ngrydmw74p9nd04544xdn128r3ih"))
"0x4q17k23akf14i3pyllr96s8lvprk1x006wp0mi5rhk4199cx1z"))
(modules '((guix build utils)))
(snippet
;; The examples try to build and cause the build to fail
@ -949,7 +949,7 @@ (define-public qtwayland
(define-public qtserialport
(package (inherit qtsvg)
(name "qtserialport")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -958,7 +958,7 @@ (define-public qtserialport
version ".tar.xz"))
(sha256
(base32
"1pxb679cx77vk39ik7j0k91a57wqa63d4g4riw3r2gpcay8kxpac"))))
"172i5cpqnk0c3m0hg08hgj15qvsyd1xvw9yf2dqicg3l10lqwg8c"))))
(native-inputs `(("perl" ,perl)))
(inputs
`(("qtbase" ,qtbase)
@ -970,7 +970,7 @@ (define-public qtserialport
(define-public qtserialbus
(package (inherit qtsvg)
(name "qtserialbus")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -979,7 +979,7 @@ (define-public qtserialbus
version ".tar.xz"))
(sha256
(base32
"0f39qh05mp54frpn5sy9k5vfw5zb2gg72qaqz81mwlck2xg78qpg"))))
"1i6b7w9z30mzzi0dcmrxx1scpzpnnw2fag1igvrnzvw1jwp414ff"))))
(inputs
`(("qtbase" ,qtbase)
("qtserialport" ,qtserialport)))
@ -991,7 +991,7 @@ (define-public qtserialbus
(define-public qtwebchannel
(package (inherit qtsvg)
(name "qtwebchannel")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1000,7 +1000,7 @@ (define-public qtwebchannel
version ".tar.xz"))
(sha256
(base32
"0n438mk01sh2bbqakc1m3s65qqmi75m4n4hymad8wcgijfr9a9v3"))))
"1acs0fa5rxm3cir0lydc9a8685qagf1786vkssv51wk3v9r3lc4h"))))
(native-inputs
`(("perl" ,perl)
("qtdeclarative" ,qtdeclarative)
@ -1015,7 +1015,7 @@ (define-public qtwebchannel
(define-public qtlocation
(package (inherit qtsvg)
(name "qtlocation")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1024,7 +1024,7 @@ (define-public qtlocation
version ".tar.xz"))
(sha256
(base32
"1qacqz6l7zljqszblhgzg5y1v4mgki59k45ag7yc2iw7vrf45zc0"))))
"186jzv19v674n8jmm13v5xwv211lygih5657rlvbhc1s4jq6iv9p"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1045,7 +1045,7 @@ (define-public qtlocation
(define-public qttools
(package (inherit qtsvg)
(name "qttools")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1054,7 +1054,7 @@ (define-public qttools
version ".tar.xz"))
(sha256
(base32
"1zw4j8ymwcpn7dx1dlbxpmx5lfp26rag7pysap1xry9m7vg3hb24"))))
"11vfk6c8snsqwqj1xk53c0h2mkqr4gfa9kinp8py56x7sn15galm"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1072,7 +1072,7 @@ (define-public qttools
(define-public qtscript
(package (inherit qtsvg)
(name "qtscript")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1081,7 +1081,7 @@ (define-public qtscript
version ".tar.xz"))
(sha256
(base32
"0rjm6nph1nssfpknp4i682bvk7363y4a2f74060vcm7ib2pzl2xq"))
"0lz0iv1baah7cxrpyiqzqp4fxxf75i21qd06ha7r5d80hq3xlia0"))
(patches (search-patches "qtscript-disable-tests.patch"))))
(native-inputs
`(("perl" ,perl)
@ -1096,7 +1096,7 @@ (define-public qtscript
(define-public qtquickcontrols
(package (inherit qtsvg)
(name "qtquickcontrols")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1105,7 +1105,7 @@ (define-public qtquickcontrols
version ".tar.xz"))
(sha256
(base32
"09p2q3max4xrlw5svbhn11y9cgrvcjsj88xw4c0kq91cgnyyw3ih"))))
"12yrmv6afjbd1fw3r8zjdrbq5l7cy7k5bxcyiv1m97gykfh0b8hn"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1120,7 +1120,7 @@ (define-public qtquickcontrols
(define-public qtquickcontrols2
(package (inherit qtsvg)
(name "qtquickcontrols2")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1129,7 +1129,7 @@ (define-public qtquickcontrols2
version ".tar.xz"))
(sha256
(base32
"0hq888qq8q7dglpyzif64pplqjxfrqjpkvbcx0ycq35darls5ai1"))))
"0334ayansm743kf113rs3k9hi9qb6giscfx9xig3y1z7asisfa0m"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1145,7 +1145,7 @@ (define-public qtquickcontrols2
(define-public qtgraphicaleffects
(package (inherit qtsvg)
(name "qtgraphicaleffects")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1154,7 +1154,7 @@ (define-public qtgraphicaleffects
version ".tar.xz"))
(sha256
(base32
"1nghl39sqsjamjn6pfmxmgga6z9vwzv2zbgc92amrfxxr2dh42vr"))))
"1vxq4j7cb5cya1g234rxhfb361n45gp8c70gj8pc03njswkm7xwp"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1198,7 +1198,7 @@ (define-public qtdeclarative-render2d
(define-public qtgamepad
(package (inherit qtsvg)
(name "qtgamepad")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1207,7 +1207,7 @@ (define-public qtgamepad
version ".tar.xz"))
(sha256
(base32
"14vari5cq10a0z02559l2m1v78g7ygnyqf1ilkmy2f0kr36wm7y6"))))
"1ci6aapq0i8qbzkn9xxvxn1n81z3y28yrlyzw0anqzj9qp97cl6f"))))
(native-inputs
`(("perl" ,perl)
("pkg-config" ,pkg-config)))
@ -1228,7 +1228,7 @@ (define-public qtgamepad
(define-public qtscxml
(package (inherit qtsvg)
(name "qtscxml")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1237,7 +1237,7 @@ (define-public qtscxml
version ".tar.xz"))
(sha256
(base32
"06x8hs3p7bfgnl6b2fjld4s41acw1rbnxbcgkprgw2fxxnl1zxfq"))
"0x8bjp9jzib4kfn7rbricw4qr259qqsdbrz0dw39453s2m7cbv0x"))
(modules '((guix build utils)))
(snippet
'(begin
@ -1258,7 +1258,7 @@ (define-public qtscxml
(define-public qtpurchasing
(package (inherit qtsvg)
(name "qtpurchasing")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1267,7 +1267,7 @@ (define-public qtpurchasing
version ".tar.xz"))
(sha256
(base32
"00yfdd00frgf7fs9s0vyn1c6c4abxgld5rfgkzms3y6n6lcphs0j"))))
"08sk8vw16pa1qv36rfr9dsbzlwlv6kznfpsq8wfabhkgbfl6awqs"))))
(inputs
`(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)))
@ -1278,7 +1278,7 @@ (define-public qtpurchasing
(define-public qtcanvas3d
(package (inherit qtsvg)
(name "qtcanvas3d")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1287,7 +1287,7 @@ (define-public qtcanvas3d
version ".tar.xz"))
(sha256
(base32
"1g0a606fgal4x17ly0qrj05pb0k8riwh7nj4g3jip05g8iwb2f2y"))
"0agdxgk7knf6zkjdi6316y2k9zq72wcg5zn3cbhw4hzjw81qadgg"))
(modules '((guix build utils)))
(snippet
'(delete-file-recursively "examples/canvas3d/3rdparty"))))
@ -1315,7 +1315,7 @@ (define-public qtcanvas3d
(define-public qtcharts
(package (inherit qtsvg)
(name "qtcharts")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1324,7 +1324,7 @@ (define-public qtcharts
version ".tar.xz"))
(sha256
(base32
"1sb99ncmh84bz0xzq55chgic7jk61awnfvi7ld4gq5ap3nl865zc"))))
"1rykb72gr95rxd0rvbl846ys8xvyyhrms1jz7l4hlwp6zn1jkxvm"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1342,7 +1342,7 @@ (define-public qtcharts
(define-public qtdatavis3d
(package (inherit qtsvg)
(name "qtdatavis3d")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1351,7 +1351,7 @@ (define-public qtdatavis3d
version ".tar.xz"))
(sha256
(base32
"0s636ix44akrjx47gv9qj2ac02q8clnwj3acfr28p6pagm46k7vh"))))
"1ggwfnqf17mp5dkfr82q1qrimkb6wv3304vl8mjv1nq0zisckhjv"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:tests? _ #f) #f))) ; TODO: Enable the tests
@ -1369,7 +1369,7 @@ (define-public qtdatavis3d
(define-public qtnetworkauth
(package (inherit qtsvg)
(name "qtnetworkauth")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1378,7 +1378,7 @@ (define-public qtnetworkauth
version ".tar.xz"))
(sha256
(base32
"0fdz5q47xbiij3mi5lzhvxpq4jp9fm929v9kyvcyadz86mp3f8nz"))))
"0mqcqkp9h5bgzb3wfy239wh1c9s9zxd7mww11c0jyp56wk5balcx"))))
(arguments
(substitute-keyword-arguments (package-arguments qtsvg)
((#:phases phases)
@ -1398,7 +1398,7 @@ (define-public qtnetworkauth
(define-public qtremoteobjects
(package (inherit qtsvg)
(name "qtremoteobjects")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1407,7 +1407,7 @@ (define-public qtremoteobjects
version ".tar.xz"))
(sha256
(base32
"0z6qd381r6a7gdrsknlkkbhq9mmdqi040kfrvgm6mfa69336f4dk"))))
"1wb50dapv0l45c0rfmpiaddvwv9na50lmd5zmm052q9d1xb15f6b"))))
(inputs
`(("qtbase" ,qtbase)
("qtdeclarative" ,qtdeclarative)))
@ -1420,7 +1420,7 @@ (define-public qtremoteobjects
(define-public qtspeech
(package (inherit qtsvg)
(name "qtspeech")
(version "5.9.3")
(version "5.9.4")
(source (origin
(method url-fetch)
(uri (string-append "https://download.qt.io/official_releases/qt/"
@ -1429,7 +1429,7 @@ (define-public qtspeech
version ".tar.xz"))
(sha256
(base32
"1c4rpf3by620fx8lrvmc38r60cikqczqh2rfcm7ixz3x8cj60lh1"))))
"17h8hrixxcsn7pd5iipbj2hxpp5m2dhfq3w04wkamambb49qs80x"))))
(inputs
`(("qtbase" ,qtbase)))
(native-inputs
@ -1715,15 +1715,14 @@ (define-public python-qscintilla
(replace 'configure
(lambda* (#:key outputs configure-flags #:allow-other-keys)
(chdir "Python")
(and (apply invoke "python3" "configure.py"
configure-flags)
;; Install to the right directory
(begin
(substitute* '("Makefile"
"Qsci/Makefile")
(("\\$\\(INSTALL_ROOT\\)/gnu/store/[^/]+")
(assoc-ref outputs "out")))
#t)))))))
(apply invoke "python3" "configure.py"
configure-flags)
;; Install to the right directory
(substitute* '("Makefile"
"Qsci/Makefile")
(("\\$\\(INSTALL_ROOT\\)/gnu/store/[^/]+")
(assoc-ref outputs "out")))
#t)))))
(inputs
`(("qscintilla" ,qscintilla)
("python" ,python)

50
gnu/packages/version-control.scm
View file

@ -11,7 +11,7 @@
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2017 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2017, 2018 ng0 <ng0@n0.is>
;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017 Vasile Dumitrascu <va511e@yahoo.com>
;;; Copyright © 2017 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2017 André <eu@euandre.org>
@ -1318,22 +1318,33 @@ (define-public aegis
(define-public reposurgeon
(package
(name "reposurgeon")
(version "3.37")
(version "3.43")
(source (origin
(method url-fetch)
(uri (string-append "http://www.catb.org/~esr/" name "/"
name "-" version ".tar.xz"))
(sha256
(base32
"14asjg4xy3mhh5z0r3k7c1wv9y803j2zfq32g5q5m95sf7yzygan"))))
"1af0z14wcm4bk5a9ysinbwq2fp3lf5f7i8mvwh7286hr3fnagcaz"))
(patches (search-patches
"reposurgeon-add-missing-docbook-files.patch"))))
(build-system gnu-build-system)
(arguments
`(#:tests? #f ;no test suite distributed
#:make-flags
(list (string-append "target=" (assoc-ref %outputs "out")))
`(#:make-flags
(list "ECHO=echo"
(string-append "target=" (assoc-ref %outputs "out")))
#:phases
(modify-phases %standard-phases
(delete 'configure)
(add-after 'unpack 'patch-inputs
(lambda* (#:key inputs #:allow-other-keys)
(let ((tzdata (assoc-ref inputs "tzdata")))
(substitute* "reposurgeon"
(("/usr/share/zoneinfo")
(string-append tzdata "/share/zoneinfo")))
(substitute* "test/svn-to-svn"
(("/bin/echo") "echo"))
#t)))
(delete 'configure) ; no configure script
(add-before 'build 'fix-docbook
(lambda* (#:key inputs #:allow-other-keys)
(substitute* (find-files "." "\\.xml$")
@ -1341,19 +1352,32 @@ (define-public reposurgeon
(string-append (assoc-ref inputs "docbook-xml")
"/xml/dtd/docbook/docbookx.dtd")))
#t))
(add-before 'check 'set-up-test-environment
(lambda* (#:key inputs #:allow-other-keys)
(let ((tzdata (assoc-ref inputs "tzdata")))
(setenv "TZDIR" (string-append tzdata "/share/zoneinfo"))
#t)))
(add-after 'install 'install-emacs-data
(lambda* (#:key outputs #:allow-other-keys)
(install-file "reposurgeon-mode.el"
(string-append (assoc-ref outputs "out")
"/share/emacs/site-lisp")))))))
(inputs
`(("python" ,python-wrapper)))
`(("python" ,python-wrapper)
("tzdata" ,tzdata)))
(native-inputs
`(("asciidoc" ,asciidoc)
("docbook-xml" ,docbook-xml-4.1.2)
`( ;; For building documentation.
("asciidoc" ,asciidoc)
("docbook-xml" ,docbook-xml)
("docbook-xsl" ,docbook-xsl)
("libxml2" ,libxml2)
("xmlto" ,xmlto)))
("xmlto" ,xmlto)
;; For tests.
("cvs" ,cvs)
("git" ,git)
("mercurial" ,mercurial)
("subversion" ,subversion)))
(home-page "http://www.catb.org/~esr/reposurgeon/")
(synopsis "Edit version-control repository history")
(description "Reposurgeon enables risky operations that version-control
@ -1753,8 +1777,8 @@ (define-public gource
(source (origin
(method url-fetch)
(uri (string-append
"https://github.com/acaudwell/Gource/archive/"
"gource-" version ".tar.gz"))
"https://github.com/acaudwell/Gource/releases/download"
"/gource-" version "/gource-" version ".tar.gz"))
(sha256
(base32
"1llqwdnfa1pff8bxk27qsqff1fcg0a9kfdib0rn7p28vl21n1cgj"))))

31
gnu/packages/video.scm
View file

@ -89,6 +89,7 @@ (define-module (gnu packages video)
#:use-module (gnu packages gtk)
#:use-module (gnu packages image)
#:use-module (gnu packages imagemagick)
#:use-module (gnu packages iso-codes)
#:use-module (gnu packages libreoffice)
#:use-module (gnu packages linux)
#:use-module (gnu packages lua)
@ -102,6 +103,7 @@ (define-module (gnu packages video)
#:use-module (gnu packages popt)
#:use-module (gnu packages pulseaudio)
#:use-module (gnu packages python)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web)
#:use-module (gnu packages qt)
#:use-module (gnu packages ruby)
@ -1725,6 +1727,35 @@ (define-public livestreamer
(home-page "http://livestreamer.io/")
(license license:bsd-2)))
(define-public streamlink
(package
(name "streamlink")
(version "0.10.0")
(source
(origin
(method url-fetch)
(uri (pypi-uri "streamlink" version))
(sha256
(base32
"17299xnd9jzi7m1d2rr4xdlj47q64bzj2957nlsrhw0hskds1s6h"))))
(build-system python-build-system)
(home-page "https://github.com/streamlink/streamlink")
(native-inputs
`(("python-pytest" ,python-pytest)
("python-mock" ,python-mock)
("python-requests-mock" ,python-requests-mock)))
(propagated-inputs
`(("python-pysocks" ,python-pysocks)
("python-websocket-client" ,python-websocket-client)
("python-iso3166" ,python-iso3166)
("python-iso639" ,python-iso639)
("python-pycryptodome" ,python-pycryptodome)
("python-requests" ,python-requests)))
(synopsis "Extract streams from various services")
(description "Streamlink is command-line utility that extracts streams
from sites like Twitch.tv and pipes them into a video player of choice.")
(license license:bsd-2)))
(define-public mlt
(package
(name "mlt")

4
gnu/packages/webkit.scm
View file

@ -54,14 +54,14 @@ (define-module (gnu packages webkit)
(define-public webkitgtk
(package
(name "webkitgtk")
(version "2.18.5")
(version "2.18.6")
(source (origin
(method url-fetch)
(uri (string-append "https://www.webkitgtk.org/releases/"
name "-" version ".tar.xz"))
(sha256
(base32
"1f1rsp14gkb2r1mrrxn2cnbs45vg38da27q4cf02zlxmgv680v8c"))))
"0g5cpdijjv5hlrbi4i4dh97yrh5apnyvm90wpr9f84hgyk12r4ck"))))
(build-system cmake-build-system)
(arguments
'(#:tests? #f ; no tests

6
gnu/packages/wm.scm
View file

@ -809,8 +809,8 @@ (define-public keybinder
(source
(origin
(method url-fetch)
(uri (string-append "https://github.com/engla/keybinder/releases/"
"download/v" version "/keybinder-"
(uri (string-append "https://github.com/kupferlauncher/keybinder"
"/releases/download/v" version "/keybinder-"
version ".tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
@ -828,7 +828,7 @@ (define-public keybinder
(description
"Keybinder is a library for registering global keyboard shortcuts.
Keybinder works with GTK-based applications using the X Window System.")
(home-page "https://github.com/engla/keybinder")
(home-page "https://github.com/kupferlauncher/keybinder")
(license license:gpl2+)))
(define-public spectrwm

40
gnu/services/databases.scm
View file

@ -3,6 +3,7 @@
;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017 Christopher Baines <mail@cbaines.net>
;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
;;;
;;; This file is part of GNU Guix.
;;;
@ -147,26 +148,33 @@ (define postgresql-activation
(define postgresql-shepherd-service
(match-lambda
(($ <postgresql-configuration> postgresql port locale config-file data-directory)
(let ((start-script
;; Wrapper script that switches to the 'postgres' user before
;; launching daemon.
(program-file "start-postgres"
#~(let ((user (getpwnam "postgres"))
(postgres (string-append #$postgresql
"/bin/postgres")))
(setgid (passwd:gid user))
(setuid (passwd:uid user))
(system* postgres
(string-append "--config-file="
#$config-file)
"-p" (number->string #$port)
"-D" #$data-directory)))))
(let* ((pg_ctl-wrapper
;; Wrapper script that switches to the 'postgres' user before
;; launching daemon.
(program-file
"pg_ctl-wrapper"
#~(begin
(use-modules (ice-9 match)
(ice-9 format))
(match (command-line)
((_ mode)
(let ((user (getpwnam "postgres"))
(pg_ctl #$(file-append postgresql "/bin/pg_ctl"))
(options (format #f "--config-file=~a -p ~d"
#$config-file #$port)))
(setgid (passwd:gid user))
(setuid (passwd:uid user))
(execl pg_ctl pg_ctl "-D" #$data-directory "-o" options
mode)))))))
(action (lambda args
#~(lambda _
(invoke #$pg_ctl-wrapper #$@args)))))
(list (shepherd-service
(provision '(postgres))
(documentation "Run the PostgreSQL daemon.")
(requirement '(user-processes loopback syslogd))
(start #~(make-forkexec-constructor #$start-script))
(stop #~(make-kill-destructor))))))))
(start (action "start"))
(stop (action "stop"))))))))
(define postgresql-service-type
(service-type (name 'postgresql)

9
guix/build/dub-build-system.scm
View file

@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016 David Craven <david@craven.ch>
;;; Copyright © 2017 Danny Milosavljevic <dannym@scratchpost.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
@ -69,14 +70,14 @@ (define* (configure #:key inputs #:allow-other-keys)
(zero? (system* "dub" "add-path" vendor-dir))))
(define (grep string file-name)
"Find the first occurence of STRING in the file named FILE-NAME.
Return the position of this occurence, or #f if none was found."
"Find the first occurrence of STRING in the file named FILE-NAME.
Return the position of this occurrence, or #f if none was found."
(string-contains (call-with-input-file file-name get-string-all)
string))
(define (grep* string file-name)
"Find the first occurence of STRING in the file named FILE-NAME.
Return the position of this occurence, or #f if none was found.
"Find the first occurrence of STRING in the file named FILE-NAME.
Return the position of this occurrence, or #f if none was found.
If the file named FILE-NAME doesn't exist, return #f."
(catch 'system-error
(lambda ()