[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: Merge branch 'master' into core-updates
|
From: |
Ludovic Courtès |
|
Subject: |
02/03: Merge branch 'master' into core-updates |
|
Date: |
Fri, 10 Feb 2017 12:08:13 -0500 (EST) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 768f0ac9dd9993827430d62d0f72a5020f476892
Merge: 955ba55 49dbae5
Author: Ludovic Courtès <address@hidden>
Date: Fri Feb 10 17:40:25 2017 +0100
Merge branch 'master' into core-updates
.gitignore | 1 +
Makefile.am | 4 +
config-daemon.ac | 1 +
configure.ac | 9 +
doc/guix.texi | 87 +++++-
etc/completion/bash/guix | 24 +-
etc/git/pre-push | 22 +-
gnu/build/activation.scm | 49 ++-
gnu/build/linux-container.scm | 40 ++-
gnu/build/shepherd.scm | 177 +++++++++++
gnu/local.mk | 14 +-
gnu/packages/admin.scm | 20 +-
gnu/packages/bash.scm | 42 +++
gnu/packages/bioinformatics.scm | 29 +-
gnu/packages/bootloaders.scm | 332 +++++++++++++++++++++
gnu/packages/cdrom.scm | 6 +-
gnu/packages/compression.scm | 76 ++++-
gnu/packages/databases.scm | 106 ++++---
gnu/packages/disk.scm | 18 +-
gnu/packages/dns.scm | 4 +-
gnu/packages/emacs.scm | 13 +-
gnu/packages/firmware.scm | 136 ++++++++-
gnu/packages/fonts.scm | 122 +++++++-
gnu/packages/games.scm | 70 +++--
gnu/packages/glib.scm | 46 ++-
gnu/packages/gnome.scm | 118 +++++++-
gnu/packages/gnunet.scm | 36 ++-
gnu/packages/grub.scm | 161 ----------
gnu/packages/gstreamer.scm | 4 +-
gnu/packages/guile.scm | 15 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/irc.scm | 16 +-
gnu/packages/ldc.scm | 89 +++---
gnu/packages/libidn.scm | 7 +-
gnu/packages/linux.scm | 151 +++++++++-
gnu/packages/lua.scm | 4 +-
gnu/packages/mail.scm | 53 ++++
gnu/packages/maths.scm | 17 +-
gnu/packages/music.scm | 49 +++
gnu/packages/package-management.scm | 41 +--
.../gst-plugins-base-fix-test-on-32bit.patch | 32 ++
gnu/packages/patches/libvpx-CVE-2016-2818.patch | 21 +-
gnu/packages/patches/ntfs-3g-CVE-2017-0358.patch | 42 +++
gnu/packages/patches/p7zip-CVE-2016-9296.patch | 24 ++
gnu/packages/patches/qemu-CVE-2017-2615.patch | 52 ++++
gnu/packages/patches/qemu-CVE-2017-5578.patch | 39 +++
gnu/packages/patches/qemu-CVE-2017-5579.patch | 44 +++
gnu/packages/patches/qemu-CVE-2017-5856.patch | 68 +++++
.../patches/vsearch-unbundle-cityhash.patch | 73 +++++
gnu/packages/python.scm | 137 ++++++++-
gnu/packages/qemu.scm | 6 +-
gnu/packages/rdesktop.scm | 73 ++++-
gnu/packages/re2c.scm | 47 +++
gnu/packages/rust.scm | 3 +
gnu/packages/shells.scm | 20 +-
gnu/packages/statistics.scm | 58 +++-
gnu/packages/tls.scm | 11 +-
gnu/packages/u-boot.scm | 137 ---------
gnu/packages/version-control.scm | 63 +++-
gnu/packages/video.scm | 79 ++++-
gnu/packages/vim.scm | 4 +-
gnu/packages/web.scm | 50 +++-
gnu/packages/webkit.scm | 4 +-
gnu/packages/wget.scm | 8 +-
gnu/packages/xdisorg.scm | 3 +-
gnu/packages/xorg.scm | 10 +-
gnu/services.scm | 25 +-
gnu/services/base.scm | 7 +-
gnu/services/networking.scm | 31 +-
gnu/services/shepherd.scm | 2 +
gnu/system/file-systems.scm | 56 +++-
gnu/system/grub.scm | 4 +-
gnu/system/install.scm | 4 +-
gnu/system/linux-container.scm | 21 +-
gnu/system/vm.scm | 2 +-
gnu/tests/base.scm | 53 +++-
guix/build-system/dub.scm | 147 +++++++++
guix/build/dub-build-system.scm | 125 ++++++++
guix/git-download.scm | 43 ++-
guix/import/hackage.scm | 24 +-
guix/import/json.scm | 3 +-
guix/import/pypi.scm | 13 +-
guix/import/stackage.scm | 135 +++++++++
guix/profiles.scm | 26 +-
guix/scripts/environment.scm | 26 +-
guix/scripts/import.scm | 3 +-
guix/scripts/import/stackage.scm | 115 +++++++
guix/scripts/refresh.scm | 1 +
nix/libstore/builtins.cc | 6 +
tests/containers.scm | 27 ++
tests/file-systems.scm | 8 +
tests/pypi.scm | 10 +
92 files changed, 3481 insertions(+), 757 deletions(-)
diff --cc gnu/build/activation.scm
index d36eeaf,c4ed40e..beee56d
--- a/gnu/build/activation.scm
+++ b/gnu/build/activation.scm
@@@ -79,9 -79,21 +79,16 @@@
(define (dot-or-dot-dot? file)
(member file '("." "..")))
-(define (make-file-writable file)
- "Make FILE writable for its owner.."
- (let ((stat (lstat file))) ;XXX: symlinks
- (chmod file (logior #o600 (stat:perms stat)))))
-
(define* (copy-account-skeletons home
- #:optional (directory %skeleton-directory))
- "Copy the account skeletons from DIRECTORY to HOME."
+ #:key
+ (directory %skeleton-directory)
+ uid gid)
+ "Copy the account skeletons from DIRECTORY to HOME. When UID is an integer,
+ make it the owner of all the files created; likewise for GID."
+ (define (set-owner file)
+ (when (or uid gid)
+ (chown file (or uid -1) (or gid -1))))
+
(let ((files (scandir directory (negate dot-or-dot-dot?)
string<?)))
(mkdir-p home)
diff --cc gnu/packages/databases.scm
index 050ed0e,b74551c..477f806
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -697,8 -714,28 +699,8 @@@ for example from a shell script."
zero-configuration, transactional SQL database engine. SQLite is the most
widely deployed SQL database engine in the world. The source code for SQLite
is in the public domain.")
- (license public-domain)))
+ (license license:public-domain)))
-(define-public sqlite-3.15.1
- (package (inherit sqlite)
- (version "3.15.1")
- (source (origin
- (method url-fetch)
- (uri (let ((numeric-version
- (match (string-split version #\.)
- ((first-digit other-digits ...)
- (string-append first-digit
- (string-pad-right
- (string-concatenate
- (map (cut string-pad <>
2 #\0)
- other-digits))
- 6 #\0))))))
- (string-append
"https://sqlite.org/2016/sqlite-autoconf-";
- numeric-version ".tar.gz")))
- (sha256
- (base32
-
"1ig2d9jzzixiifmgqsl6kjcvy17jwxby3s24gfnc5qvyd6vqkyjx"))))))
-
(define-public tdb
(package
(name "tdb")
diff --cc gnu/packages/version-control.scm
index 49f95ef,976584f..1a95686
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@@ -300,8 -291,11 +291,11 @@@ as well as the classic centralized work
(list (search-path-specification
(variable "GIT_SSL_CAINFO")
(file-type 'regular)
+ (separator #f) ;single entry
- (files '("etc/ssl/certs/ca-certificates.crt")))))
+ (files '("etc/ssl/certs/ca-certificates.crt")))
+ (search-path-specification
+ (variable "GIT_EXEC_PATH")
+ (files '("libexec/git-core")))))
(synopsis "Distributed version control system")
(description