[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Sun, 27 Oct 2019 05:22:59 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit a557810ac72effd6841b76772195b10c03dee345
Merge: 4c1918d 2a19c0d
Author: Marius Bakke <address@hidden>
Date: Sun Oct 27 10:17:14 2019 +0100
Merge branch 'master' into staging
doc/guix-cookbook.texi | 469 ++++++++-
doc/guix.texi | 3 +
gnu/local.mk | 3 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/cdrom.scm | 4 +-
gnu/packages/ci.scm | 2 +
gnu/packages/cran.scm | 111 +-
gnu/packages/disk.scm | 4 +-
gnu/packages/emacs-xyz.scm | 4 +-
gnu/packages/emulators.scm | 4 +-
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/games.scm | 4 +-
gnu/packages/gettext.scm | 6 +-
gnu/packages/gnome.scm | 87 +-
gnu/packages/gnuzilla.scm | 303 ++++--
gnu/packages/guile-xyz.scm | 37 +-
gnu/packages/haskell-apps.scm | 5 +-
gnu/packages/image.scm | 6 +-
gnu/packages/linux.scm | 62 +-
gnu/packages/lisp.scm | 4 +-
gnu/packages/mail.scm | 198 ++--
gnu/packages/man.scm | 4 +-
gnu/packages/messaging.scm | 65 +-
gnu/packages/password-utils.scm | 18 +-
.../patches/dav1d-aarch64-symbol-alignment.patch | 25 -
.../patches/icecat-default-search-ddg.patch | 1108 ++++++++++++++++++++
gnu/packages/patches/icecat-disable-sync.patch | 9 +
gnu/packages/patches/icecat-makeicecat.patch | 33 +-
gnu/packages/perl-check.scm | 4 +-
gnu/packages/perl.scm | 4 +-
gnu/packages/php.scm | 4 +-
gnu/packages/python-xyz.scm | 9 +-
gnu/packages/ruby.scm | 27 +
gnu/packages/security-token.scm | 46 +-
gnu/packages/ssh.scm | 4 +-
gnu/packages/statistics.scm | 16 +-
gnu/packages/tls.scm | 2 +-
gnu/packages/video.scm | 9 +-
gnu/packages/vpn.scm | 4 +-
gnu/packages/web-browsers.scm | 2 +
gnu/packages/web.scm | 15 +-
gnu/services/cuirass.scm | 5 +-
gnu/services/xorg.scm | 5 +-
guix/scripts/build.scm | 15 +-
45 files changed, 2297 insertions(+), 464 deletions(-)
diff --cc gnu/packages/gnuzilla.scm
index 95ba676,db7106c..01647fe
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@@ -840,10 -973,18 +973,10 @@@ from forcing GEXP-PROMISE.
(lambda _
(use-modules (guix build cargo-utils))
(let ((null-hash
"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"))
- (substitute* '("Cargo.lock" "servo/Cargo.lock")
+ (substitute* '("Cargo.lock" "gfx/wr/Cargo.lock")
(("(\"checksum .* = )\".*\"" all name)
(string-append name "\"" null-hash "\"")))
- (for-each
- (lambda (filename)
- (delete-file filename)
- (let ((dir (dirname filename)))
- (display (string-append
- "patch-cargo-checksums: generate-checksums for "
- dir "\n"))
- (generate-checksums dir)))
- (find-files "third_party/rust" ".cargo-checksum.json")))
+ (generate-all-checksums "third_party/rust"))
#t))
(add-before 'configure 'augment-CPLUS_INCLUDE_PATH
(lambda* (#:key build inputs #:allow-other-keys)