[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/03: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/03: Merge branch 'master' into core-updates |
|
Date: |
Sat, 21 Apr 2018 05:11:55 -0400 (EDT) |
mhw pushed a commit to branch core-updates
in repository guix.
commit c52872bfc418c6b2273f973dff8003ca9e062792
Merge: 65bb227 3fe49e5
Author: Mark H Weaver <address@hidden>
Date: Sat Apr 21 04:57:29 2018 -0400
Merge branch 'master' into core-updates
.gitignore | 17 +
Makefile.am | 10 +-
configure.ac | 4 +
doc/contributing.fr.texi | 505 +
doc/guix.fr.texi | 21884 +++++++++
doc/local.mk | 53 +-
gnu/local.mk | 8 +-
gnu/packages/admin.scm | 112 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/bootloaders.scm | 3 -
gnu/packages/build-tools.scm | 43 +
gnu/packages/cdrom.scm | 6 +-
gnu/packages/compression.scm | 5 +-
gnu/packages/cran.scm | 20 +-
gnu/packages/curl.scm | 50 +
gnu/packages/datamash.scm | 6 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/electronics.scm | 20 +-
gnu/packages/emacs.scm | 919 +-
gnu/packages/emulators.scm | 41 +-
gnu/packages/engineering.scm | 17 +-
gnu/packages/flashing-tools.scm | 32 +
gnu/packages/game-development.scm | 2 +-
gnu/packages/games.scm | 67 +-
gnu/packages/gnome.scm | 46 +-
gnu/packages/golang.scm | 607 +
gnu/packages/graphics.scm | 4 +-
gnu/packages/guile.scm | 48 +-
gnu/packages/image.scm | 50 +-
gnu/packages/java.scm | 46 +-
gnu/packages/linux.scm | 80 +-
gnu/packages/mail.scm | 8 +-
gnu/packages/man.scm | 4 +-
gnu/packages/messaging.scm | 136 +-
gnu/packages/mp3.scm | 4 +-
gnu/packages/mpd.scm | 4 +-
gnu/packages/multiprecision.scm | 29 +-
gnu/packages/music.scm | 10 +-
gnu/packages/networking.scm | 4 +-
gnu/packages/package-management.scm | 4 +-
gnu/packages/password-utils.scm | 31 -
.../cool-retro-term-remove-non-free-fonts.patch | 205 -
gnu/packages/patches/datamash-arm-tests.patch | 71 +
gnu/packages/patches/freeimage-unbundle.patch | 550 +
gnu/packages/patches/htop-fix-process-tree.patch | 99 -
.../patches/libmygpo-qt-fix-jsoncreatortest.patch | 41 -
.../mupen64plus-video-z64-glew-correct-path.patch | 36 +
gnu/packages/patches/qemu-CVE-2018-7550.patch | 66 +
.../patches/sharutils-CVE-2018-1000097.patch | 21 +
gnu/packages/perl-check.scm | 29 +
gnu/packages/perl.scm | 92 +-
gnu/packages/photo.scm | 8 +-
gnu/packages/pure.scm | 5 +-
gnu/packages/python-crypto.scm | 70 +-
gnu/packages/python-web.scm | 22 +
gnu/packages/python.scm | 24 +-
gnu/packages/qt.scm | 14 +-
gnu/packages/ruby.scm | 8 +-
gnu/packages/rust.scm | 310 +-
gnu/packages/samba.scm | 4 +-
gnu/packages/serialization.scm | 8 +-
gnu/packages/shells.scm | 8 +-
gnu/packages/statistics.scm | 32 +-
gnu/packages/syncthing.scm | 569 +-
gnu/packages/terminals.scm | 175 +-
gnu/packages/texinfo.scm | 5 +-
gnu/packages/text-editors.scm | 154 +-
gnu/packages/tls.scm | 31 +-
gnu/packages/tmux.scm | 4 +-
gnu/packages/upnp.scm | 6 +-
gnu/packages/version-control.scm | 14 +-
gnu/packages/video.scm | 8 +-
gnu/packages/virtualization.scm | 3 +-
gnu/packages/web-browsers.scm | 4 +-
gnu/packages/web.scm | 4 +-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wine.scm | 6 +-
gnu/packages/wm.scm | 28 +-
gnu/packages/xdisorg.scm | 4 +-
gnu/packages/xfig.scm | 6 +-
gnu/packages/xml.scm | 6 +-
gnu/packages/xorg.scm | 4 +-
gnu/tests/base.scm | 9 +-
guix/build-system/emacs.scm | 6 +-
guix/build/emacs-build-system.scm | 93 +-
guix/build/emacs-utils.scm | 1 +
nix/nix-daemon/nix-daemon.cc | 10 +-
po/doc/contributing.fr.po | 1220 +
po/doc/contributing.pot | 962 +
po/doc/guix.fr.po | 42145 +++++++++++++++++
po/doc/guix.pot | 46344 +++++++++++++++++++
po/doc/local.mk | 77 +
po/guix/fr.po | 37 +-
po/packages/es.po | 1430 +-
tests/guix-daemon.sh | 14 +
95 files changed, 117724 insertions(+), 2329 deletions(-)
diff --cc gnu/local.mk
index 5a1c357,056a46c..114dfca
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -1057,7 -1061,7 +1057,8 @@@ dist_patch_DATA =
%D%/packages/patches/python-unittest2-python3-compat.patch \
%D%/packages/patches/python-unittest2-remove-argparse.patch \
%D%/packages/patches/python-waitress-fix-tests.patch \
+ %D%/packages/patches/qemu-CVE-2018-7550.patch \
+ %D%/packages/patches/qemu-glibc-2.27.patch \
%D%/packages/patches/qt4-ldflags.patch \
%D%/packages/patches/qtbase-use-TZDIR.patch \
%D%/packages/patches/qtscript-disable-tests.patch \
diff --cc gnu/packages/cdrom.scm
index 53e65f3,3d35ff5..e26a1bb
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@@ -480,16 -476,14 +480,16 @@@ from an audio CD."
version ".tar.gz"))
(sha256
(base32
- "0f9bjs0phk23vry7gvh0cll9vl6kmc1y4fwwh762scfdvpbp3774"))
+ "1msm5snyckynbspz54p9krarn7v9izsi7qyyi2z5y4cinw36xv3h"))
(modules '((guix build utils)))
(snippet
- '(substitute* "Makefile"
- (("/usr/bin/install")
- "install")
- (("^etcdir = .*$")
- (string-append "etcdir = $(prefix)/etc\n"))))))
+ '(begin
+ (substitute* "Makefile"
+ (("/usr/bin/install")
+ "install")
+ (("^etcdir = .*$")
+ (string-append "etcdir = $(prefix)/etc\n")))
+ #t))))
(build-system gnu-build-system)
(arguments
'(#:phases
diff --cc gnu/packages/curl.scm
index 8297f67,ae8b960..78dcc64
--- a/gnu/packages/curl.scm
+++ b/gnu/packages/curl.scm
@@@ -6,7 -6,8 +6,8 @@@
;;; Copyright © 2016, 2017 Leo Famulari <address@hidden>
;;; Copyright © 2017 Marius Bakke <address@hidden>
;;; Copyright © 2017 Efraim Flashner <address@hidden>
-;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2018 Roel Janssen <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/emulators.scm
index b0da0bb,7994705..a502af9
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@@ -1008,13 -1007,8 +1009,9 @@@ towards a working Mupen64Plus for casua
(snippet
'(begin
;; We don't need libretro for the GNU/Linux build.
- (delete-file-recursively "libretro")))))
+ (delete-file-recursively "libretro")
- ;; Use system zlib.
- (delete-file-recursively "source/zlib")
- (substitute* "source/core/NstZlib.cpp"
- (("#include \"../zlib/zlib.h\"") "#include <zlib.h>"))
+ #t))))
- (build-system gnu-build-system)
+ (build-system cmake-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
diff --cc gnu/packages/qt.scm
index 04e6a38,08db0a7..b139d2b
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@@ -5,9 -5,9 +5,9 @@@
;;; Copyright © 2015, 2016, 2017, 2018 Efraim Flashner <address@hidden>
;;; Copyright © 2016, 2017 Nils Gillmann <address@hidden>
;;; Copyright © 2016 Thomas Danckaert <address@hidden>
-;;; Copyright © 2017 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2017, 2018 Ricardo Wurmus <address@hidden>
;;; Copyright © 2017 Quiliro <address@hidden>
- ;;; Copyright © 2017 Tobias Geerinckx-Rice <address@hidden>
+ ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Nicolas Goaziou <address@hidden>
;;;
;;; This file is part of GNU Guix.
diff --cc gnu/packages/terminals.scm
index 48c5f1f,e8b0357..399a633
--- a/gnu/packages/terminals.scm
+++ b/gnu/packages/terminals.scm
@@@ -454,36 -453,111 +454,112 @@@ embedded kernel situations."
(commit commit)
(recursive? #t)))
(sha256
- (base32
"1sgqbirninkvgwchr35zgn5vzqvsmrf3cp7lqady1xgrawb8lsz3"))
+ (base32
"08mrvj8zk9ck15q90ipjzza1acnnsjhprv2rxg8yyck0xl9p40jd"))
(patches
- (search-patches "cool-retro-term-remove-non-free-fonts.patch"
- "cool-retro-term-fix-array-size.patch"
+ (search-patches "cool-retro-term-fix-array-size.patch"
"cool-retro-term-dont-check-uninit-member.patch"
"cool-retro-term-memory-leak-1.patch"))
- (modules '((guix build utils)))
+ (modules '((guix build utils)
+ (srfi srfi-1)
+ (srfi srfi-26)
+ (ice-9 rdelim)
+ (ice-9 regex)))
(snippet
- '(begin
+ '(let* ((fonts '(;"1971-ibm-3278" ; BSD 3-clause
+ ;"1975-knight-tv" ; GPL
+ "1977-apple2" ; Non-Free
+ "1977-commodore-pet" ; Non-Free
+ "1979-atari-400-800" ; Non-Free
+ "1982-commodore64" ; Non-Free
+ "1985-atari-st" ; ?
+ "1985-ibm-pc-vga" ; Unclear
+ ;"modern-fixedsys-excelsior" ;
Redistributable
+ ;"modern-hermit" ; SIL
+ ;"modern-inconsolata"; SIL
+ ;"modern-pro-font-win-tweaked" ; X11
+ ;"modern-proggy-tiny"; X11
+ ;"modern-terminus" ; SIL
+ "modern-monaco")) ; Apple Non-Free
+ (name-rx (make-regexp " *name: *\"([^\"]*)\""))
+ (source-rx (make-regexp " *source:
\"fonts/([^/]*)[^\"]*\""))
+ (fontname-rx (make-regexp
"\"fontName\":\"([^\"]*).*"))
+ (names
+ ;; Gather font names from all Fonts*.qml files.
+ ;; These will be used to remove items from the
+ ;; default profiles.
+ (fold
+ (lambda (font-file names)
+ (call-with-input-file font-file
+ (lambda (port)
+ (let loop ((name #f) (names names))
+ (let ((line (read-line port)))
+ (cond
+ ((eof-object? line) (pk 'names names))
+ ((regexp-exec name-rx line)
+ => (lambda (m)
+ (loop (match:substring m 1)
names)))
+ ((regexp-exec source-rx line)
+ => (lambda (m)
+ (let ((font (match:substring m
1)))
+ (if (member font fonts)
+ (loop #f (lset-adjoin
string=?
+ names
name))
+ (loop #f names)))))
+ (else (loop name names))))))))
+ '() (find-files "app/qml" "Font.*\\.qml"))))
+ ;; Remove the font files themselves
(for-each (lambda (font)
(delete-file-recursively
- (string-append "app/qml/fonts/" font))
- (substitute* '("app/qml/resources.qrc")
- (((string-append "<file>fonts/" font ".*"))
- "")))
- '(;;"1971-ibm-3278" ; BSD 3-clause
- "1977-apple2" ; Non-Free
- "1977-commodore-pet" ; Non-Free
- "1979-atari-400-800" ; Non-Free
- "1982-commodore64" ; Non-Free
- "1985-atari-st" ; ?
- "1985-ibm-pc-vga" ; Unclear
- ;;"modern-fixedsys-excelsior" ;
Redistributable
- ;;"modern-hermit" ; SIL
- ;;"modern-inconsolata" ; SIL
- ;;"modern-pro-font-win-tweaked" ; X11
- ;;"modern-proggy-tiny" ; X11
- ;;"modern-terminus" ; SIL
- "modern-monaco")) ; Apple non-free
+ (string-append "app/qml/fonts/" font)))
+ fonts)
+ ;; Remove mention of those fonts in the source
+ (substitute* "app/qml/resources.qrc"
+ (((string-append " *<file>fonts/("
+ (string-join fonts "|")
+ ").*"))
+ ""))
+ (for-each
+ (lambda (file)
+ (let ((start-rx (make-regexp " *ListElement\\{"))
+ (end-rx (make-regexp " *\\}")))
+ (with-atomic-file-replacement file
+ (lambda (in out)
+ (let loop ((line-buffer '())
+ (hold? #f)
+ (discard? #f))
+ (let ((line (read-line in 'concat)))
+ (cond
+ ((eof-object? line) #t) ;done
+ ((regexp-exec start-rx line)
+ (loop (cons line line-buffer) #t #f))
+ ((or (regexp-exec source-rx line)
+ (regexp-exec fontname-rx line))
+ => (lambda (m)
+ (let ((font-or-name (match:substring m
1)))
+ (if (or (member font-or-name fonts)
+ (member font-or-name names))
+ (loop '() #f #t)
+ (loop (cons line line-buffer)
+ hold? #f)))))
+ ((regexp-exec end-rx line)
+ (unless discard?
+ (for-each (cut display <> out)
+ (reverse line-buffer))
+ (display line out))
+ (loop '() #f #f))
+ (hold? (loop (cons line line-buffer)
+ hold? discard?))
+ (discard? (loop line-buffer #f #t))
+ (else (display line out)
+ (loop '() #f #f)))))))))
+ '("app/qml/FontPixels.qml"
+ "app/qml/FontScanlines.qml"
+ "app/qml/Fonts.qml"
+ "app/qml/ApplicationSettings.qml"))
+ ;; Final substitution for default scanline and pixel fonts
+ (substitute* "app/qml/ApplicationSettings.qml"
- (("COMMODORE_PET") "PROGGY_TINY"))))))
++ (("COMMODORE_PET") "PROGGY_TINY"))
+ #t))))
(build-system gnu-build-system)
(inputs
`(("qtbase" ,qtbase)
diff --cc gnu/packages/virtualization.scm
index 761aab4,55ace5a..0b373b1
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@@ -90,10 -88,10 +90,11 @@@
(method url-fetch)
(uri (string-append "https://download.qemu.org/qemu-";
version ".tar.xz"))
- (patches (search-patches "qemu-CVE-2018-7550.patch"))
(sha256
(base32
- "11l6cs6mib16rgdrnqrhkqs033fjik316gkgfz3asbmxz38lalca"))))
+ "11l6cs6mib16rgdrnqrhkqs033fjik316gkgfz3asbmxz38lalca"))
- (patches (search-patches "qemu-glibc-2.27.patch"))))
++ (patches (search-patches "qemu-glibc-2.27.patch"
++ "qemu-CVE-2018-7550.patch"))))
(build-system gnu-build-system)
(arguments
'(;; Running tests in parallel can occasionally lead to failures, like:
diff --cc gnu/packages/wm.scm
index f8899a4,c015eda..0b5e084
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@@ -352,22 -352,29 +352,23 @@@ prompt."
(file-name (string-append name "-" version ".tar.gz"))
(sha256
(base32
- "119xvdm4r6irqk0mar80hx6s8ydw26y35h7712rd7nbg7pb7i053"))))
+ "0zh7il2y6dmzym3w6r9xii5dma8pjjjlq4dm5iby7m3gvplj4q9p"))))
(build-system gnu-build-system)
(arguments
- `(#:tests? #f ; no tests included
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'bootstrap
- (lambda _
- (invoke "autoreconf" "-vfi")
- #t)))))
+ `(#:tests? #f)) ;no tests included
(inputs
- `(("xcb-util-image" ,xcb-util-image)
- ("xcb-util" ,xcb-util)
+ `(("cairo" ,cairo)
+ ("libev" ,libev)
+ ("libjpeg" ,libjpeg-turbo)
("libxcb" ,libxcb)
- ("linux-pam" ,linux-pam)
("libxkbcommon" ,libxkbcommon)
- ("libev" ,libev)
- ("cairo" ,cairo)))
+ ("linux-pam" ,linux-pam)
+ ("xcb-util" ,xcb-util)
+ ("xcb-util-image" ,xcb-util-image)))
(native-inputs
- `(("pkg-config" ,pkg-config)
- ("autoconf" ,autoconf)
- ("automake" ,automake)))
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("pkg-config" ,pkg-config)))
(home-page "https://github.com/PandorasFox/i3lock-color";)
(synopsis "Screen locker with color configuration support")
(description
diff --cc guix/build/emacs-build-system.scm
index 7c3b635,094b047..47a9eda
--- a/guix/build/emacs-build-system.scm
+++ b/guix/build/emacs-build-system.scm
@@@ -260,9 -268,8 +268,9 @@@ second hyphen. This corresponds to 'na
(define %standard-phases
(modify-phases gnu:%standard-phases
- (add-after 'set-paths 'set-emacs-load-path set-emacs-load-path)
(replace 'unpack unpack)
+ (add-after 'unpack 'set-emacs-load-path set-emacs-load-path)
+ (delete 'bootstrap)
(delete 'configure)
;; Move the build phase after install: the .el files are byte compiled
;; directly in the store.
diff --cc guix/build/emacs-utils.scm
index 30aec5b,2bd4e39..c1b00c7
--- a/guix/build/emacs-utils.scm
+++ b/guix/build/emacs-utils.scm
@@@ -1,6 -1,7 +1,7 @@@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014 Mark H Weaver <address@hidden>
+;;; Copyright © 2014, 2018 Mark H Weaver <address@hidden>
;;; Copyright © 2014 Alex Kost <address@hidden>
+ ;;; Copyright © 2018 Maxim Cournoyer <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;