[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into core-updates
|
From: |
guix-commits |
|
Subject: |
01/02: Merge branch 'master' into core-updates |
|
Date: |
Wed, 17 Jul 2019 10:00:02 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 64de896a71a9ba3091259834077d54c0146bdab6
Merge: 5247aab 6bfcb72
Author: Ludovic Courtès <address@hidden>
Date: Wed Jul 17 15:51:10 2019 +0200
Merge branch 'master' into core-updates
HACKING | 2 +-
Makefile.am | 14 +-
build-aux/build-self.scm | 2 +-
doc/build.scm | 369 +++--
doc/contributing.texi | 39 +-
doc/guix.texi | 36 +-
gnu/local.mk | 1 +
gnu/packages/admin.scm | 26 +-
gnu/packages/algebra.scm | 13 +-
gnu/packages/astronomy.scm | 13 +-
gnu/packages/audio.scm | 44 +-
.../{5.1-arm-veyron.conf => 5.2-arm-veyron.conf} | 393 +++++-
.../linux-libre/{5.1-arm.conf => 5.2-arm.conf} | 556 ++++++--
.../linux-libre/{5.1-arm64.conf => 5.2-arm64.conf} | 577 +++++++-
.../linux-libre/{5.1-i686.conf => 5.2-i686.conf} | 560 ++++++--
.../{5.1-x86_64.conf => 5.2-x86_64.conf} | 597 ++++++--
gnu/packages/backup.scm | 3 +-
gnu/packages/base.scm | 2 +-
gnu/packages/bioinformatics.scm | 33 +-
gnu/packages/bootloaders.scm | 11 +-
gnu/packages/bootstrap.scm | 7 +-
gnu/packages/build-tools.scm | 4 +-
gnu/packages/chromium.scm | 4 +-
gnu/packages/commencement.scm | 111 +-
gnu/packages/cran.scm | 2 +-
gnu/packages/crates-io.scm | 4 +-
gnu/packages/docker.scm | 36 +-
gnu/packages/education.scm | 4 +-
gnu/packages/emacs-xyz.scm | 111 +-
gnu/packages/enlightenment.scm | 34 +
gnu/packages/finance.scm | 44 +-
gnu/packages/flashing-tools.scm | 10 +-
gnu/packages/fonts.scm | 18 +-
gnu/packages/games.scm | 4 +-
gnu/packages/gnome.scm | 72 +-
gnu/packages/graphics.scm | 36 +-
gnu/packages/guile-xyz.scm | 10 +-
gnu/packages/ham-radio.scm | 44 +-
gnu/packages/haskell-check.scm | 24 -
gnu/packages/haskell.scm | 10 +
gnu/packages/image.scm | 70 +-
gnu/packages/linux.scm | 33 +-
gnu/packages/mail.scm | 9 +-
gnu/packages/maths.scm | 94 +-
gnu/packages/messaging.scm | 4 +-
gnu/packages/music.scm | 1 +
gnu/packages/networking.scm | 4 +-
gnu/packages/patches/nm-plugin-path.patch | 51 +
gnu/packages/python-web.scm | 76 +-
gnu/packages/python-xyz.scm | 110 +-
gnu/packages/ruby.scm | 6 +-
gnu/packages/rush.scm | 4 +-
gnu/packages/rust.scm | 16 +-
gnu/packages/statistics.scm | 121 +-
gnu/packages/tls.scm | 6 +-
gnu/packages/upnp.scm | 51 +-
gnu/packages/version-control.scm | 4 +-
gnu/packages/wm.scm | 4 +-
gnu/packages/xorg.scm | 32 +-
gnu/packages/zwave.scm | 11 +-
gnu/services/networking.scm | 21 +-
guix/build-system/cargo.scm | 2 +-
guix/build-system/node.scm | 135 ++
guix/build/cargo-build-system.scm | 12 +-
guix/build/compile.scm | 32 +-
guix/build/json.scm | 387 ++++++
guix/build/node-build-system.scm | 166 +++
guix/build/syscalls.scm | 19 +-
guix/channels.scm | 94 +-
guix/derivations.scm | 65 +-
guix/download.scm | 3 +-
guix/gexp.scm | 92 +-
guix/{scripts => }/lint.scm | 1014 +++++++-------
guix/remote.scm | 47 +-
guix/scripts/lint.scm | 1178 +---------------
guix/scripts/publish.scm | 2 +-
guix/self.scm | 2 +-
po/guix/POTFILES.in | 2 +
tests/derivations.scm | 89 +-
tests/gexp.scm | 8 +-
tests/lint.scm | 1455 +++++++++-----------
81 files changed, 5859 insertions(+), 3553 deletions(-)
diff --cc gnu/packages/bootstrap.scm
index 428a89e,5030b81..8dbe524
--- a/gnu/packages/bootstrap.scm
+++ b/gnu/packages/bootstrap.scm
@@@ -30,14 -29,11 +30,14 @@@
#:use-module ((guix store)
#:select (run-with-store add-to-store add-text-to-store))
#:use-module ((guix derivations)
- #:select (derivation derivation->output-path))
+ #:select (derivation derivation-input
derivation->output-path))
#:use-module ((guix utils) #:select (gnu-triplet->nix-system))
#:use-module (guix memoization)
+ #:use-module (guix i18n)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
+ #:use-module (srfi srfi-34)
+ #:use-module (srfi srfi-35)
#:use-module (ice-9 match)
#:export (bootstrap-origin
package-with-bootstrap-guile
@@@ -392,16 -305,15 +392,17 @@@ $out/bin/guile -c ~s $out ~
# Sanity check.
$out/bin/guile --version~%"
- mkdir xz tar
+ (derivation->output-path mkdir)
+ (derivation->output-path xz)
+ (derivation->output-path tar)
(format #f "~s" make-guile-wrapper)
- bash)
- (list mkdir xz tar bash))))
+ (derivation->output-path bash)))))
(derivation store name
- bash `(,builder)
+ (derivation->output-path bash) `(,builder)
#:system system
- #:inputs `((,bash) (,mkdir) (,tar) (,xz)
- (,builder) (,guile))
- #:inputs (list (derivation-input guile))
- #:sources (list bash builder)
++ #:inputs (map derivation-input
++ (list bash mkdir tar xz guile))
++ #:sources (list builder)
#:env-vars `(("GUILE_TARBALL"
. ,(derivation->output-path guile))))))
diff --cc gnu/packages/commencement.scm
index 1107bb2,4a41e2a..69d1f87
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@@ -2483,59 -1015,66 +2484,69 @@@ COREUTILS-FINAL vs. COREUTILS, etc.
;;; GCC toolchain.
;;;
- (define (make-gcc-toolchain gcc)
- "Return a complete toolchain for GCC."
- (package
- (name "gcc-toolchain")
- (version (package-version gcc))
- (source #f)
- (build-system trivial-build-system)
- (arguments
- '(#:modules ((guix build union))
- #:builder (begin
- (use-modules (ice-9 match)
- (srfi srfi-26)
- (guix build union))
-
- (let ((out (assoc-ref %outputs "out")))
-
- (match %build-inputs
- (((names . directories) ...)
- (union-build out directories)))
-
- (union-build (assoc-ref %outputs "debug")
- (list (assoc-ref %build-inputs
- "libc-debug")))
- (union-build (assoc-ref %outputs "static")
- (list (assoc-ref %build-inputs
- "libc-static")))
- #t))))
-
- (native-search-paths (package-native-search-paths gcc))
- (search-paths (package-search-paths gcc))
-
- (license (package-license gcc))
- (synopsis "Complete GCC tool chain for C/C++ development")
- (description
- "This package provides a complete GCC tool chain for C/C++ development to
- be installed in user profiles. This includes GCC, as well as libc (headers
- and binaries, plus debugging symbols in the @code{debug} output), and
Binutils.")
- (home-page "https://gcc.gnu.org/";)
- (outputs '("out" "debug" "static"))
-
- ;; The main raison d'être of this "meta-package" is (1) to conveniently
- ;; install everything that we need, and (2) to make sure ld-wrapper comes
- ;; before Binutils' ld in the user's profile.
- (inputs `(("gcc" ,gcc)
- ("ld-wrapper" ,(car (assoc-ref %final-inputs "ld-wrapper")))
- ("binutils" ,binutils-final)
- ("libc" ,glibc-final)
- ("libc-debug" ,glibc-final "debug")
- ("libc-static" ,glibc-final "static")))))
+ ;; Using the following procedure, a gcc toolchain targeting glibc-2.27 can be
+ ;; instantiated like this:
+ ;;
+ ;; (define-public gcc-glibc-2.27-toolchain
+ ;; (make-gcc-toolchain gcc glibc-2.27))
+
+ (define* (make-gcc-toolchain gcc
+ #:optional
+ (libc #f))
+ "Return a complete toolchain for GCC. If LIBC is specified, target that
libc."
+ (let ((gcc (if libc (make-gcc-libc gcc libc) gcc))
+ (libc (if libc libc glibc-final)))
+ (package
+ (name (string-append (package-name gcc) "-toolchain"))
+ (version (package-version gcc))
+ (source #f)
+ (build-system trivial-build-system)
+ (arguments
+ '(#:modules ((guix build union))
+ #:builder (begin
+ (use-modules (ice-9 match)
+ (srfi srfi-26)
+ (guix build union))
+
+ (let ((out (assoc-ref %outputs "out")))
+
+ (match %build-inputs
+ (((names . directories) ...)
+ (union-build out directories)))
+
+ (union-build (assoc-ref %outputs "debug")
+ (list (assoc-ref %build-inputs
+ "libc-debug")))
+ (union-build (assoc-ref %outputs "static")
+ (list (assoc-ref %build-inputs
+ "libc-static")))
+ #t))))
+
+ (native-search-paths (package-native-search-paths gcc))
+ (search-paths (package-search-paths gcc))
+
+ (license (package-license gcc))
+ (synopsis "Complete GCC tool chain for C/C++ development")
+ (description
+ "This package provides a complete GCC tool chain for C/C++ development
to
+ be installed in user profiles. This includes GCC, as well as libc (headers
+ an d binaries, plus debugging symbols in the @code{debug} output), and
Binutils.")
+ (home-page "https://gcc.gnu.org/";)
+ (outputs '("out" "debug" "static"))
+
+ ;; The main raison d'être of this "meta-package" is (1) to conveniently
+ ;; install everything that we need, and (2) to make sure ld-wrapper
comes
+ ;; before Binutils' ld in the user's profile.
+ (inputs `(("gcc" ,gcc)
+ ("ld-wrapper" ,(car (assoc-ref %final-inputs "ld-wrapper")))
+ ("binutils" ,binutils-final)
+ ("libc" ,libc)
+ ("libc-debug" ,libc "debug")
+ ("libc-static" ,libc "static"))))))
+(define-public gcc-toolchain
+ (make-gcc-toolchain gcc-final))
+
(define-public gcc-toolchain-4.8
(make-gcc-toolchain gcc-4.8))
diff --cc gnu/packages/gnome.scm
index dc36d05,9aa4ed5..46dd268
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@@ -5335,15 -5298,23 +5336,16 @@@ users."
(uri (string-append "mirror://gnome/sources/NetworkManager/"
(version-major+minor version) "/"
"NetworkManager-" version ".tar.xz"))
+ (patches (search-patches "nm-plugin-path.patch"))
(sha256
(base32
- "1jn3g0f2x1irc88awqp8m3gnpdx1whqqqbdgkbgr4x55s702jki4"))
+ "064cgj9za0kzarks0lrv0qw2ysdphb5l97iw0c964bfiqzjfv8rm"))
+ (modules '((guix build utils)))
(snippet
- '(begin
- (use-modules (guix build utils))
- (substitute* "configure"
- ;; Replace libsystemd-login with libelogind.
- (("libsystemd-login") "libelogind"))
- (substitute* "src/devices/wwan/nm-modem-manager.c"
- (("systemd") "elogind"))
- (substitute* "src/nm-session-monitor.c"
- (("systemd") "elogind"))
- (substitute* "./src/nm-logging.c"
- (("systemd") "elogind"))
- #t))))
+ '(begin
+ (substitute* "src/devices/wwan/nm-modem-manager.c"
+ (("systemd") "elogind"))
+ #t))))
(build-system gnu-build-system)
(outputs '("out"
"doc")) ; 8 MiB of gtk-doc HTML
diff --cc gnu/packages/linux.scm
index 22f001d,8ffa18a..a7d4872
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -496,12 -500,12 +496,12 @@@ It has been modified to remove all non-
#:configuration-file kernel-config-veyron
#:extra-version "arm-veyron"))
-(define-public linux-libre-headers-4.14.67
- (make-linux-libre-headers "4.14.67"
-
"050zvdxjy6sc64q75pr1gxsmh49chwav2pwxz8xlif39bvahnrpg"))
+(define-public linux-libre-headers-4.19.56
+ (make-linux-libre-headers "4.19.56"
+
"1zqiic55viy065lhnkmhn33sz3bbbr2ykbm5f92yzd8lpc9zl7yx"))
-(define-public linux-libre-headers linux-libre-headers-4.14.67)
+(define-public linux-libre-headers linux-libre-headers-4.19.56)
- (define-public linux-libre linux-libre-5.1)
+ (define-public linux-libre linux-libre-5.2)
(define-public linux-libre-arm-generic
(make-linux-libre %linux-libre-version
diff --cc guix/download.scm
index 00afd2e,b24aaa0..47c8087
--- a/guix/download.scm
+++ b/guix/download.scm
@@@ -435,9 -432,7 +435,8 @@@ download by itself using its own depend
#:system system
#:hash-algo hash-algo
#:hash hash
+ #:recursive? executable?
- #:inputs `((,mirrors)
- (,content-addressed-mirrors))
+ #:sources (list mirrors content-addressed-mirrors)
;; Honor the user's proxy and locale settings.
#:leaked-env-vars '("http_proxy" "https_proxy"
diff --cc po/guix/POTFILES.in
index 4d77e65,8b556ac..3e923af
--- a/po/guix/POTFILES.in
+++ b/po/guix/POTFILES.in
@@@ -82,4 -81,7 +83,5 @@@ guix/channels.sc
guix/profiles.scm
guix/git.scm
guix/deprecation.scm
+ guix/derivations.scm
-gnu/build/bootloader.scm
nix/nix-daemon/guix-daemon.cc
-