[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/06: Merge branch 'master' into core-updates
|
From: |
Leo Famulari |
|
Subject: |
01/06: Merge branch 'master' into core-updates |
|
Date: |
Fri, 6 Jan 2017 22:21:38 +0000 (UTC) |
lfam pushed a commit to branch core-updates
in repository guix.
commit 74288230ea8b2310495dc2739f39ceadcc143fd0
Merge: 92e7795 aa21c76
Author: Leo Famulari <address@hidden>
Date: Fri Jan 6 17:14:41 2017 -0500
Merge branch 'master' into core-updates
.mailmap | 23 +-
HACKING | 5 +
Makefile.am | 30 +-
NEWS | 478 +
build-aux/build-self.scm | 7 +
build-aux/check-final-inputs-self-contained.scm | 7 +-
build-aux/hydra/demo-os.scm | 84 -
build-aux/hydra/gnu-system.scm | 33 +-
configure.ac | 17 +-
d3.v3.js | 9584 ++++++++++++++++++++
doc/contributing.texi | 5 +-
doc/emacs.texi | 881 --
doc/guix.texi | 647 +-
doc/htmlxref.cnf | 2 +
doc/images/bootstrap-packages.dot | 210 +-
doc/images/coreutils-bag-graph.dot | 424 +-
doc/images/coreutils-graph.dot | 44 +-
doc/images/shepherd-graph.dot | 86 +-
emacs/guix-about.el | 37 -
emacs/guix-backend.el | 393 -
emacs/guix-base.el | 377 -
emacs/guix-buffer.el | 624 --
emacs/guix-build-log.el | 381 -
emacs/guix-command.el | 830 --
emacs/guix-config.el.in | 44 -
emacs/guix-devel.el | 382 -
emacs/guix-entry.el | 59 -
emacs/guix-external.el | 88 -
emacs/guix-geiser.el | 126 -
emacs/guix-guile.el | 98 -
emacs/guix-help-vars.el | 108 -
emacs/guix-helper.scm.in | 65 -
emacs/guix-history.el | 92 -
emacs/guix-hydra-build.el | 362 -
emacs/guix-hydra-jobset.el | 162 -
emacs/guix-hydra.el | 367 -
emacs/guix-info.el | 482 -
emacs/guix-init.el | 3 -
emacs/guix-license.el | 65 -
emacs/guix-list.el | 585 --
emacs/guix-location.el | 79 -
emacs/guix-main.scm | 1163 ---
emacs/guix-messages.el | 247 -
emacs/guix-pcomplete.el | 370 -
emacs/guix-popup.el | 48 -
emacs/guix-prettify.el | 210 -
emacs/guix-profiles.el | 77 -
emacs/guix-read.el | 147 -
emacs/guix-ui-generation.el | 456 -
emacs/guix-ui-license.el | 150 -
emacs/guix-ui-location.el | 83 -
emacs/guix-ui-package.el | 1191 ---
emacs/guix-ui-system-generation.el | 105 -
emacs/guix-ui.el | 323 -
emacs/guix-utils.el | 609 --
emacs/local.mk | 77 -
etc/git/pre-push | 57 +
gnu/build/cross-toolchain.scm | 178 +
gnu/build/file-systems.scm | 153 +-
gnu/build/vm.scm | 16 +-
gnu/local.mk | 78 +-
gnu/packages/admin.scm | 36 +-
gnu/packages/algebra.scm | 22 +-
gnu/packages/aspell.scm | 53 +-
gnu/packages/assembly.scm | 23 +-
gnu/packages/audio.scm | 62 +-
gnu/packages/backup.scm | 102 +-
gnu/packages/base.scm | 32 +-
gnu/packages/bioinformatics.scm | 604 +-
gnu/packages/bittorrent.scm | 83 +-
gnu/packages/boost.scm | 2 +-
gnu/packages/bootstrap.scm | 4 +-
gnu/packages/busybox.scm | 12 +-
gnu/packages/calendar.scm | 8 +-
gnu/packages/cdrom.scm | 101 +
gnu/packages/check.scm | 4 +-
gnu/packages/ci.scm | 61 +
gnu/packages/code.scm | 4 +-
gnu/packages/commencement.scm | 5 +-
gnu/packages/connman.scm | 83 +-
gnu/packages/cross-base.scm | 292 +-
gnu/packages/crypto.scm | 4 +-
gnu/packages/cups.scm | 2 +-
gnu/packages/curl.scm | 10 +-
gnu/packages/databases.scm | 36 +-
gnu/packages/dav.scm | 19 +-
gnu/packages/debug.scm | 22 +
gnu/packages/disk.scm | 36 +
gnu/packages/display-managers.scm | 2 +-
gnu/packages/django.scm | 27 +-
gnu/packages/dns.scm | 114 +-
gnu/packages/docbook.scm | 20 +-
gnu/packages/docker.scm | 2 -
gnu/packages/ebook.scm | 14 +-
gnu/packages/emacs.scm | 182 +-
gnu/packages/embedded.scm | 352 +-
gnu/packages/enlightenment.scm | 39 +-
gnu/packages/feh.scm | 67 -
gnu/packages/flashing-tools.scm | 36 +
gnu/packages/fonts.scm | 46 +-
gnu/packages/fpga.scm | 18 +-
gnu/packages/freedesktop.scm | 37 +-
gnu/packages/ftp.scm | 17 +-
gnu/packages/game-development.scm | 6 +-
gnu/packages/games.scm | 18 +-
gnu/packages/gcc.scm | 35 +-
gnu/packages/geeqie.scm | 108 -
gnu/packages/ghostscript.scm | 2 +-
gnu/packages/gimp.scm | 2 +
gnu/packages/gl.scm | 36 +-
gnu/packages/glib.scm | 24 +-
gnu/packages/gnome.scm | 99 +-
gnu/packages/gnunet.scm | 36 +-
gnu/packages/gnupg.scm | 132 +-
gnu/packages/gnustep.scm | 8 +-
gnu/packages/gnuzilla.scm | 124 +-
gnu/packages/golang.scm | 6 +-
gnu/packages/gps.scm | 2 +-
gnu/packages/graphviz.scm | 50 +-
gnu/packages/groff.scm | 41 +
gnu/packages/grub.scm | 61 +-
gnu/packages/gstreamer.scm | 32 +-
gnu/packages/gtk.scm | 28 +-
gnu/packages/guile.scm | 120 +-
gnu/packages/gv.scm | 23 +-
gnu/packages/haskell.scm | 302 +-
gnu/packages/hurd.scm | 19 +-
gnu/packages/idris.scm | 256 +
gnu/packages/image-viewers.scm | 207 +
gnu/packages/image.scm | 184 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/inkscape.scm | 32 +-
gnu/packages/irc.scm | 113 +-
gnu/packages/java.scm | 44 +-
gnu/packages/kde-frameworks.scm | 360 +-
gnu/packages/kde.scm | 219 +-
gnu/packages/key-mon.scm | 2 -
gnu/packages/libevent.scm | 4 +-
gnu/packages/libreoffice.scm | 38 +-
gnu/packages/libunistring.scm | 6 +-
gnu/packages/libupnp.scm | 3 +-
gnu/packages/links.scm | 4 +-
gnu/packages/linux.scm | 201 +-
gnu/packages/lirc.scm | 3 +-
gnu/packages/lisp.scm | 42 +-
gnu/packages/llvm.scm | 6 +-
gnu/packages/lua.scm | 36 +
gnu/packages/lynx.scm | 4 +-
gnu/packages/machine-learning.scm | 22 +
gnu/packages/mail.scm | 239 +-
gnu/packages/make-bootstrap.scm | 63 +-
gnu/packages/man.scm | 4 +-
gnu/packages/maths.scm | 109 +-
gnu/packages/mc.scm | 14 +-
gnu/packages/messaging.scm | 82 +-
gnu/packages/mingw.scm | 84 +
gnu/packages/monitoring.scm | 125 +
gnu/packages/moreutils.scm | 60 +-
gnu/packages/mp3.scm | 9 +-
gnu/packages/mpd.scm | 24 +-
gnu/packages/mtools.scm | 7 +-
gnu/packages/multiprecision.scm | 9 +-
gnu/packages/music.scm | 421 +-
gnu/packages/nano.scm | 4 +-
gnu/packages/ncurses.scm | 256 +-
gnu/packages/networking.scm | 44 +-
gnu/packages/ntp.scm | 55 +-
gnu/packages/nutrition.scm | 6 +-
gnu/packages/ocaml.scm | 751 +-
gnu/packages/onc-rpc.scm | 10 +-
gnu/packages/openstack.scm | 95 +-
gnu/packages/package-management.scm | 66 +-
gnu/packages/parallel.scm | 4 +-
gnu/packages/password-utils.scm | 44 +-
.../patches/awesome-reproducible-png.patch | 4 +-
gnu/packages/patches/cairo-CVE-2016-9082.patch | 122 +
.../chicken-CVE-2016-6830+CVE-2016-6831.patch | 81 +
gnu/packages/patches/cssc-gets-undeclared.patch | 17 -
gnu/packages/patches/cssc-missing-include.patch | 12 -
gnu/packages/patches/fcgi-2.4.0-gcc44-fixes.patch | 14 +
gnu/packages/patches/fcgi-2.4.0-poll.patch | 89 +
.../patches/gcc-4.9.3-mingw-gthr-default.patch | 11 +
gnu/packages/patches/gcj-arm-mode.patch | 36 +
.../gnupg-test-segfault-on-32bit-arch.patch | 40 +
.../patches/gst-plugins-good-fix-crashes.patch | 1047 ---
.../gst-plugins-good-fix-invalid-read.patch | 37 -
.../patches/gst-plugins-good-fix-signedness.patch | 58 -
.../gst-plugins-good-flic-bounds-check.patch | 319 -
gnu/packages/patches/httpd-CVE-2016-8740.patch | 36 +
gnu/packages/patches/icecat-CVE-2016-9064.patch | 996 --
.../patches/inkscape-drop-wait-for-targets.patch | 68 -
.../patches/kdbusaddons-kinit-file-name.patch | 15 +
.../patches/khal-disable-failing-tests.patch | 33 +
gnu/packages/patches/libepoxy-gl-null-checks.patch | 54 +
gnu/packages/patches/libpng-CVE-2016-10087.patch | 37 +
gnu/packages/patches/libupnp-CVE-2016-8863.patch | 72 +
gnu/packages/patches/libxml2-CVE-2016-4658.patch | 257 +
gnu/packages/patches/libxml2-CVE-2016-5131.patch | 218 +
gnu/packages/patches/mcrypt-CVE-2012-4409.patch | 35 +-
gnu/packages/patches/mcrypt-CVE-2012-4527.patch | 198 +-
.../patches/mingw-w64-5.0rc2-gcc-4.9.3.patch | 218 +
.../patches/multiqc-fix-git-subprocess-error.patch | 16 +
gnu/packages/patches/mupdf-CVE-2016-6265.patch | 30 -
gnu/packages/patches/mupdf-CVE-2016-6525.patch | 21 -
gnu/packages/patches/mupdf-CVE-2016-7504.patch | 99 -
gnu/packages/patches/mupdf-CVE-2016-7505.patch | 32 -
gnu/packages/patches/mupdf-CVE-2016-7506.patch | 42 -
gnu/packages/patches/mupdf-CVE-2016-7563.patch | 37 -
gnu/packages/patches/mupdf-CVE-2016-7564.patch | 34 -
gnu/packages/patches/mupdf-CVE-2016-8674.patch | 165 -
gnu/packages/patches/mupdf-CVE-2016-9017.patch | 46 -
gnu/packages/patches/mupdf-CVE-2016-9136.patch | 32 -
.../patches/mupdf-build-with-openjpeg-2.1.patch | 9 -
gnu/packages/patches/nasm-no-ps-pdf.patch | 20 -
gnu/packages/patches/netcdf-config-date.patch | 47 -
gnu/packages/patches/netcdf-date-time.patch | 11 +
gnu/packages/patches/netcdf-tst_h_par.patch | 21 +
.../patches/ocaml-Add-a-.file-directive.patch | 96 +
...ml-bisect-fix-camlp4-in-another-directory.patch | 125 +
.../patches/ocaml-bitstring-fix-configure.patch | 53 +
.../patches/onionshare-fix-install-paths.patch | 39 -
gnu/packages/patches/openjpeg-CVE-2015-6581.patch | 47 -
.../openjpeg-CVE-2016-9850-CVE-2016-9851.patch | 245 +
.../patches/openssh-memory-exhaustion.patch | 39 -
.../patches/python-2.7-site-prefixes.patch | 26 +
.../python-dendropy-exclude-failing-tests.patch | 21 -
.../patches/python-pycrypto-CVE-2013-7459.patch | 97 +
.../patches/python-rarfile-fix-tests.patch | 14 -
gnu/packages/patches/qemu-CVE-2016-8576.patch | 62 -
gnu/packages/patches/qemu-CVE-2016-8577.patch | 36 -
gnu/packages/patches/qemu-CVE-2016-8578.patch | 27 -
gnu/packages/patches/readline-7.0-mingw.patch | 28 +
gnu/packages/patches/ruby-symlinkfix.patch | 53 -
gnu/packages/patches/seq24-rename-mutex.patch | 124 +
gnu/packages/patches/slock-CVE-2016-6866.patch | 51 -
.../patches/tcsh-fix-out-of-bounds-read.patch | 31 +
gnu/packages/patches/unrtf-CVE-2016-10091.patch | 189 +
gnu/packages/patches/vtk-mesa-10.patch | 36 -
gnu/packages/pciutils.scm | 4 +-
gnu/packages/pdf.scm | 31 +-
gnu/packages/perl-web.scm | 47 +
gnu/packages/perl.scm | 542 +-
gnu/packages/photo.scm | 15 +-
gnu/packages/php.scm | 4 +-
gnu/packages/pretty-print.scm | 46 +-
gnu/packages/protobuf.scm | 9 +-
gnu/packages/python.scm | 2779 +++---
gnu/packages/qemu.scm | 21 +-
gnu/packages/qt.scm | 224 +-
gnu/packages/rdf.scm | 5 +-
gnu/packages/readline.scm | 14 +-
gnu/packages/ruby.scm | 61 +-
gnu/packages/rust.scm | 322 +
gnu/packages/samba.scm | 14 +-
gnu/packages/scanner.scm | 64 +-
gnu/packages/scheme.scm | 31 +-
gnu/packages/sdl.scm | 15 +-
gnu/packages/security-token.scm | 6 +-
gnu/packages/serialization.scm | 6 +-
gnu/packages/shells.scm | 23 +-
gnu/packages/shellutils.scm | 10 +-
gnu/packages/speech.scm | 34 +
gnu/packages/spice.scm | 2 +-
gnu/packages/ssh.scm | 5 +-
gnu/packages/statistics.scm | 748 +-
gnu/packages/suckless.scm | 30 +-
gnu/packages/swig.scm | 4 +-
gnu/packages/sxiv.scm | 62 -
gnu/packages/{owncloud.scm => sync.scm} | 57 +-
gnu/packages/telephony.scm | 27 +-
gnu/packages/terminals.scm | 70 +-
gnu/packages/tex.scm | 152 +
gnu/packages/text-editors.scm | 77 +
gnu/packages/tls.scm | 68 +-
gnu/packages/tor.scm | 58 +-
gnu/packages/unrtf.scm | 2 +
gnu/packages/version-control.scm | 36 +-
gnu/packages/video.scm | 61 +-
gnu/packages/vim.scm | 4 +-
gnu/packages/vpn.scm | 71 +-
gnu/packages/vtk.scm | 50 +-
gnu/packages/web.scm | 217 +-
gnu/packages/wget.scm | 34 +
gnu/packages/wicd.scm | 3 +
gnu/packages/wine.scm | 31 +-
gnu/packages/wm.scm | 52 +-
gnu/packages/wxwidgets.scm | 6 +-
gnu/packages/xdisorg.scm | 29 +-
gnu/packages/xml.scm | 66 +-
gnu/packages/xorg.scm | 110 +-
gnu/packages/zile.scm | 82 +-
gnu/packages/zip.scm | 4 +-
gnu/services.scm | 10 +-
gnu/services/admin.scm | 7 +-
gnu/services/avahi.scm | 2 +-
gnu/services/base.scm | 100 +-
gnu/services/configuration.scm | 2 +
gnu/services/cuirass.scm | 141 +
gnu/services/cups.scm | 2 +-
gnu/services/databases.scm | 35 +-
gnu/services/desktop.scm | 5 +
gnu/services/kerberos.scm | 378 +-
gnu/services/networking.scm | 3 +
gnu/services/sddm.scm | 2 +-
gnu/services/shepherd.scm | 2 +-
gnu/services/web.scm | 100 +-
gnu/system/examples/desktop.tmpl | 3 +-
gnu/system/grub.scm | 17 +-
gnu/system/install.scm | 8 +-
gnu/system/linux-initrd.scm | 9 +
gnu/tests/install.scm | 11 +-
gnu/tests/mail.scm | 159 +
gnu/tests/nfs.scm | 131 +
graph.js | 129 +
guix/build-system/cargo.scm | 149 +
guix/build-system/ocaml.scm | 181 +
guix/build-system/python.scm | 2 +
guix/build/cargo-build-system.scm | 110 +
guix/build/cmake-build-system.scm | 1 +
guix/build/download.scm | 9 +-
guix/build/make-bootstrap.scm | 85 +
guix/build/ocaml-build-system.scm | 119 +
guix/build/pull.scm | 2 +-
guix/build/python-build-system.scm | 150 +-
guix/build/syscalls.scm | 6 +-
guix/derivations.scm | 47 +-
guix/docker.scm | 127 +
guix/gexp.scm | 53 +-
guix/git-download.scm | 30 +-
guix/gnu-maintenance.scm | 107 +-
guix/grafts.scm | 90 +-
guix/graph.scm | 79 +-
guix/import/cpan.scm | 170 +-
guix/import/cran.scm | 215 +-
guix/import/crate.scm | 165 +
guix/import/elpa.scm | 10 +-
guix/import/gem.scm | 10 +-
guix/import/github.scm | 15 +-
guix/import/json.scm | 17 +-
guix/import/pypi.scm | 13 +-
guix/import/utils.scm | 36 +
guix/profiles.scm | 24 +-
guix/scripts/archive.scm | 20 +-
guix/scripts/build.scm | 6 +-
guix/scripts/copy.scm | 207 +
guix/scripts/environment.scm | 37 +-
guix/scripts/graph.scm | 57 +-
guix/scripts/hash.scm | 5 +-
guix/scripts/import.scm | 21 +-
guix/scripts/import/cran.scm | 26 +-
guix/scripts/import/{cran.scm => crate.scm} | 30 +-
guix/scripts/lint.scm | 75 +-
guix/scripts/offload.scm | 411 +-
guix/scripts/package.scm | 3 +-
guix/scripts/publish.scm | 17 +-
guix/scripts/refresh.scm | 134 +-
guix/scripts/system.scm | 2 +-
guix/ssh.scm | 226 +
guix/store.scm | 56 +-
guix/ui.scm | 10 +-
guix/upstream.scm | 87 +-
guix/utils.scm | 5 +
nix/libstore/build.cc | 34 +-
nix/libstore/globals.hh | 6 +
nix/libstore/optimise-store.cc | 4 +-
nix/local.mk | 24 +-
nix/nix-daemon/nix-daemon.cc | 19 +-
po/guix/POTFILES.in | 1 +
po/guix/da.po | 1292 ++-
po/guix/fr.po | 920 +-
po/guix/pt_BR.po | 929 +-
po/packages/POTFILES.in | 3 +-
po/packages/da.po | 7465 ++++++++++-----
tests/cpan.scm | 73 +-
tests/crate.scm | 103 +
tests/gem.scm | 10 +-
tests/gexp.scm | 23 +-
tests/graph.scm | 17 +-
tests/guix-environment.sh | 17 +-
tests/lint.scm | 37 +
tests/packages.scm | 3 +-
tests/profiles.scm | 18 +-
tests/pypi.scm | 159 +-
tests/scripts-build.scm | 13 +
tests/store.scm | 9 +
385 files changed, 35988 insertions(+), 25172 deletions(-)
diff --cc build-aux/hydra/gnu-system.scm
index 10e0f89,e406ed9..f5a37a2
--- a/build-aux/hydra/gnu-system.scm
+++ b/build-aux/hydra/gnu-system.scm
@@@ -124,14 -123,8 +123,9 @@@ SYSTEM.
'("mips64el-linux-gnu"
"mips64el-linux-gnuabi64"
"arm-linux-gnueabihf"
- "i686-w64-mingw32"))
++ "i686-w64-mingw32"
+ "powerpc-linux-gnu"))
- (define (demo-os)
- "Return the \"demo\" 'operating-system' structure."
- (let* ((dir (dirname (assoc-ref (current-source-location) 'filename)))
- (file (string-append dir "/demo-os.scm")))
- (read-operating-system file)))
-
(define %guixsd-supported-systems
'("x86_64-linux" "i686-linux"))
diff --cc gnu/local.mk
index 55d56e1,1889a0e..6dcd174
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@@ -534,8 -542,11 +542,10 @@@ dist_patch_DATA =
%D%/packages/patches/fasthenry-spUtils.patch \
%D%/packages/patches/fasthenry-spSolve.patch \
%D%/packages/patches/fasthenry-spFactor.patch \
+ %D%/packages/patches/fcgi-2.4.0-gcc44-fixes.patch \
+ %D%/packages/patches/fcgi-2.4.0-poll.patch \
%D%/packages/patches/findutils-localstatedir.patch \
%D%/packages/patches/findutils-test-xargs.patch \
- %D%/packages/patches/flex-CVE-2016-6354.patch \
%D%/packages/patches/flint-ldconfig.patch \
%D%/packages/patches/fltk-shared-lib-defines.patch \
%D%/packages/patches/fltk-xfont-on-demand.patch \
@@@ -546,9 -557,9 +556,10 @@@
%D%/packages/patches/gcc-arm-bug-71399.patch \
%D%/packages/patches/gcc-arm-link-spec-fix.patch \
%D%/packages/patches/gcc-cross-environment-variables.patch \
+ %D%/packages/patches/gcc-libiberty-printf-decl.patch \
%D%/packages/patches/gcc-libvtv-runpath.patch \
%D%/packages/patches/gcc-strmov-store-file-names.patch \
+ %D%/packages/patches/gcc-4.9.3-mingw-gthr-default.patch \
%D%/packages/patches/gcc-5.0-libvtv-runpath.patch \
%D%/packages/patches/gcc-6-arm-none-eabi-multilib.patch \
%D%/packages/patches/gcc-6-cross-environment-variables.patch \
@@@ -832,9 -842,9 +838,8 @@@
%D%/packages/patches/ruby-concurrent-ignore-broken-test.patch \
%D%/packages/patches/ruby-puma-ignore-broken-test.patch \
%D%/packages/patches/ruby-rack-ignore-failing-test.patch \
- %D%/packages/patches/ruby-symlinkfix.patch \
%D%/packages/patches/ruby-tzinfo-data-ignore-broken-test.patch\
%D%/packages/patches/ruby-yard-fix-skip-of-markdown-tests.patch \
- %D%/packages/patches/sed-hurd-path-max.patch \
%D%/packages/patches/scheme48-tests.patch \
%D%/packages/patches/scotch-test-threading.patch \
%D%/packages/patches/sdl-libx11-1.6.patch \
diff --cc gnu/packages/libunistring.scm
index 5df7be6,a9779d4..212bec4
--- a/gnu/packages/libunistring.scm
+++ b/gnu/packages/libunistring.scm
@@@ -1,7 -1,7 +1,8 @@@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2012, 2013, 2014 Ludovic Courtès <address@hidden>
;;; Copyright © 2015 Mark H Weaver <address@hidden>
+;;; Copyright © 2016 Efraim Flashner <address@hidden>
+ ;;; Copyright © 2016 Jan Nieuwenhuizen <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@@ -32,11 -33,11 +34,11 @@@
(method url-fetch)
(uri (string-append
"mirror://gnu/libunistring/libunistring-"
- version ".tar.gz"))
+ version ".tar.xz"))
(sha256
(base32
- "0ixxmgpgh2v8ifm6hbwsjxl023myk3dfnj7wnvmqjivza31fw9cn"))))
+ "15z76qrmrvkc3c6hfq2lzzqysgd21s682f2smycfab5g598n8drf"))))
- (propagated-inputs '()) ; FIXME: add libiconv when !glibc
+ (propagated-inputs (libiconv-if-needed))
(build-system gnu-build-system)
(arguments
;; Work around parallel build issue whereby C files may be compiled before
diff --cc gnu/packages/linux.scm
index a0d86bb,0c19162..5e450a7
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@@ -17,7 -17,7 +17,8 @@@
;;; Copyright © 2016 John Darrington <address@hidden>
;;; Copyright © 2016 Marius Bakke <address@hidden>
;;; Copyright © 2016 Rene Saavedra <address@hidden>
+;;; Copyright © 2016 Carlos Sánchez de La Lama <address@hidden>
+ ;;; Copyright © 2016 ng0 <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --cc gnu/packages/ncurses.scm
index 81da864,6949e1e..d725a71
--- a/gnu/packages/ncurses.scm
+++ b/gnu/packages/ncurses.scm
@@@ -28,131 -30,140 +30,157 @@@
#:use-module (guix build-system perl)
#:use-module (gnu packages)
#:use-module (gnu packages perl)
+ #:use-module (gnu packages pkg-config)
- #:use-module (gnu packages swig))
+ #:use-module (gnu packages swig)
+ #:use-module (guix utils))
(define-public ncurses
- (let ((patch-makefile-phase
- '(lambda _
- (for-each patch-makefile-SHELL
- (find-files "." "Makefile.in"))))
- (configure-phase
- ;; The 'configure' script does not understand '--docdir', so we must
- ;; override that and use '--mandir' instead.
- '(lambda* (#:key build target outputs configure-flags
- #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (doc (assoc-ref outputs "doc")))
- (zero? (apply system* "./configure"
- (string-append "SHELL=" (which "sh"))
- (string-append "--build=" build)
- (string-append "--prefix=" out)
- (string-append "--mandir=" doc "/share/man")
- (if target
- (cons (string-append "--host=" target)
- configure-flags)
- configure-flags))))))
- (remove-shebang-phase
- '(lambda _
- ;; To avoid retaining a reference to the bootstrap Bash via the
- ;; shebang of the 'ncursesw6-config' script, simply remove that
- ;; shebang: it'll work just as well without it. Likewise, do not
- ;; retain a reference to the "doc" output.
- (substitute* "misc/ncurses-config.in"
- (("address@hidden@")
- "# No shebang here, use /bin/sh!\n")
- (("@SHELL@ \\$0")
- "$0")
- (("mandir=.*$")
- "mandir=share/man"))
- #t))
- (post-install-phase
- '(lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- ;; When building a wide-character (Unicode) build, create
backward
- ;; compatibility links from the the "normal" libraries to the
- ;; wide-character ones (e.g. libncurses.so to libncursesw.so).
- (with-directory-excursion (string-append out "/lib")
- (for-each (lambda (lib)
- (define libw.a
- (string-append "lib" lib "w.a"))
- (define lib.a
- (string-append "lib" lib ".a"))
- (define libw.so.x
- (string-append "lib" lib "w.so.6"))
- (define lib.so.x
- (string-append "lib" lib ".so.6"))
- (define lib.so
- (string-append "lib" lib ".so"))
- (define packagew.pc
- (string-append lib "w.pc"))
- (define package.pc
- (string-append lib ".pc"))
-
- (when (file-exists? libw.a)
- (format #t "creating symlinks for `lib~a'~%"
lib)
- (symlink libw.a lib.a)
- (symlink libw.so.x lib.so.x)
- (false-if-exception (delete-file lib.so))
- (call-with-output-file lib.so
- (lambda (p)
- (format p "INPUT (-l~aw)~%" lib))))
- (with-directory-excursion "pkgconfig"
- (format #t "creating symlink for `~a'~%"
package.pc)
- (when (file-exists? packagew.pc)
- (symlink packagew.pc package.pc))))
- '("curses" "ncurses" "form" "panel" "menu")))))))
- (package
- (name "ncurses")
- (version "6.0")
- (source (origin
+ (package
+ (name "ncurses")
+ (version "6.0")
+ (source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/ncurses/ncurses-"
version ".tar.gz"))
(sha256
(base32
"0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm"))))
- (build-system gnu-build-system)
- (outputs '("out"
- "doc")) ;1 MiB of man pages
- (arguments
- `(#:configure-flags
- `("--with-shared" "--without-debug" "--enable-widec"
+ (build-system gnu-build-system)
+ (outputs '("out"
+ "doc")) ;1 MiB of man pages
+ (arguments
+ (let ((patch-makefile-phase
+ '(lambda _
+ (for-each patch-makefile-SHELL
+ (find-files "." "Makefile.in"))))
+ (configure-phase
+ ;; The 'configure' script does not understand '--docdir', so we
must
+ ;; override that and use '--mandir' instead.
+ '(lambda* (#:key build target outputs configure-flags
+ #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (doc (assoc-ref outputs "doc")))
+ (zero? (apply system* "./configure"
+ (string-append "SHELL=" (which "sh"))
+ (string-append "--build=" build)
+ (string-append "--prefix=" out)
+ (string-append "--mandir=" doc "/share/man")
+ (if target
+ (cons (string-append "--host=" target)
+ configure-flags)
+ configure-flags))))))
+ (remove-shebang-phase
+ '(lambda _
+ ;; To avoid retaining a reference to the bootstrap Bash via the
+ ;; shebang of the 'ncursesw6-config' script, simply remove that
+ ;; shebang: it'll work just as well without it. Likewise, do
not
+ ;; retain a reference to the "doc" output.
+ (substitute* "misc/ncurses-config.in"
+ (("address@hidden@")
+ "# No shebang here, use /bin/sh!\n")
+ (("@SHELL@ \\$0")
+ "$0")
+ (("mandir=.*$")
+ "mandir=share/man"))
+ #t))
+ (post-install-phase
+ `(lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ ;; When building a wide-character (Unicode) build, create
backward
+ ;; compatibility links from the the "normal" libraries to the
- ;; wide-character libraries (e.g. libncurses.so to
libncursesw.so).
++ ;; wide-character ones (e.g. libncurses.so to
libncursesw.so).
+ ,@(if (target-mingw?)
+ '( ;; TODO: create .la files to link to the .dll?
+ (with-directory-excursion (string-append out "/bin")
+ (for-each
+ (lambda (lib)
+ (define lib.dll
+ (string-append "lib" lib ".dll"))
+ (define libw6.dll
+ (string-append "lib" lib "w6.dll"))
+
+ (when (file-exists? libw6.dll)
+ (format #t "creating symlinks for `lib~a'~%"
lib)
+ (symlink libw6.dll lib.dll)))
+ '("curses" "ncurses" "form" "panel" "menu"))))
+ '())
+ (with-directory-excursion (string-append out "/lib")
+ (for-each (lambda (lib)
+ (define libw.a
+ (string-append "lib" lib "w.a"))
+ (define lib.a
+ (string-append "lib" lib ".a"))
+
+ ,@(if (not (target-mingw?))
+ '((define libw.so.x
+ (string-append "lib" lib "w.so.6"))
+ (define lib.so.x
+ (string-append "lib" lib ".so.6"))
+ (define lib.so
- (string-append "lib" lib ".so")))
++ (string-append "lib" lib ".so"))
++ (define packagew.pc
++ (string-append lib "w.pc"))
++ (define package.pc
++ (string-append lib ".pc")))
+ '())
- "--enable-pc-files"
- ,(string-append "--with-pkg-config-libdir="
- (assoc-ref %outputs "out")
- "/lib/pkgconfig")
+ (when (file-exists? libw.a)
+ (format #t "creating symlinks for `lib~a'~%"
lib)
+ (symlink libw.a lib.a)
+ ,@(if (not (target-mingw?))
+ '((symlink libw.so.x lib.so.x)
+ (false-if-exception (delete-file
lib.so))
+ (call-with-output-file lib.so
+ (lambda (p)
- (format p "INPUT (-l~aw)~%"
lib))))
++ (format p "INPUT (-l~aw)~%"
lib)))
++ (with-directory-excursion "pkgconfig"
++ (format #t "creating symlink for
`~a'~%"
++ package.pc)
++ (when (file-exists? packagew.pc)
++ (symlink packagew.pc
package.pc))))
+ '())))
+ '("curses" "ncurses" "form" "panel" "menu")))))))
+ `(#:configure-flags
+ ,(cons*
+ 'quasiquote
+ `(("--with-shared" "--without-debug" "--enable-widec"
+
++ "--enable-pc-files"
++ ,(list 'unquote '(string-append "--with-pkg-config-libdir="
++ (assoc-ref %outputs "out")
++ "/lib/pkgconfig"))
+
- ;; By default headers land in an `ncursesw' subdir, which is not
- ;; what users expect.
- ,(string-append "--includedir=" (assoc-ref %outputs "out")
- "/include")
- "--enable-overwrite" ;really honor --includedir
+ ;; By default headers land in an `ncursesw' subdir, which is not
+ ;; what users expect.
+ ,(list 'unquote '(string-append "--includedir=" (assoc-ref
%outputs "out")
+ "/include"))
+ "--enable-overwrite" ;really honor --includedir
- ;; Make sure programs like 'tic', 'reset', and 'clear' have a
- ;; correct RUNPATH.
- ,(string-append "LDFLAGS=-Wl,-rpath=" (assoc-ref %outputs "out")
- "/lib"))
- #:tests? #f ; no "check" target
- #:phases (modify-phases %standard-phases
- (replace 'configure ,configure-phase)
- (add-after 'install 'post-install
- ,post-install-phase)
- (add-before 'configure 'patch-makefile-SHELL
- ,patch-makefile-phase)
- (add-after 'unpack 'remove-unneeded-shebang
- ,remove-shebang-phase))))
- (self-native-input? #t) ; for `tic'
+ ;; Make sure programs like 'tic', 'reset', and 'clear' have a
+ ;; correct RUNPATH.
+ ,(list 'unquote '(string-append "LDFLAGS=-Wl,-rpath="
(assoc-ref %outputs "out")
+ "/lib"))
+ ;; MinGW: Use term-driver created for the MinGW port.
+ ,@(if (target-mingw?) '("--enable-term-driver") '()))))
+ #:tests? #f ; no "check" target
+ #:phases (modify-phases %standard-phases
+ (replace 'configure ,configure-phase)
+ (add-after 'install 'post-install
+ ,post-install-phase)
+ (add-before 'configure 'patch-makefile-SHELL
+ ,patch-makefile-phase)
+ (add-after 'unpack 'remove-unneeded-shebang
+ ,remove-shebang-phase)))))
+ (self-native-input? #t) ; for `tic'
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
- (native-search-paths
- (list (search-path-specification
- (variable "TERMINFO_DIRS")
- (files '("share/terminfo")))))
- (synopsis "Terminal emulation (termcap, terminfo) library")
- (description
- "GNU Ncurses is a library which provides capabilities to write text to
+ (native-search-paths
+ (list (search-path-specification
+ (variable "TERMINFO_DIRS")
+ (files '("share/terminfo")))))
+ (synopsis "Terminal emulation (termcap, terminfo) library")
+ (description
+ "GNU Ncurses is a library which provides capabilities to write text to
a terminal in a terminal-independent manner. It supports pads and color as
well as multiple highlights and forms characters. It is typically used to
implement user interfaces for command-line applications. The accompanying
- branch core-updates updated (92e7795 -> 8ee40f6), Leo Famulari, 2017/01/06
- 02/06: gnu: m4: Don't replace 'sh' reference with 'bash'., Leo Famulari, 2017/01/06
- 04/06: gnu: glibc/linux: Don't replace 'sh' reference with 'bash'., Leo Famulari, 2017/01/06
- 03/06: gnu: gnu-make: Don't replace 'sh' reference with 'bash'., Leo Famulari, 2017/01/06
- 05/06: gnu: glibc/linux: Use /bin/sh instead of /bin/bash as the default shell., Leo Famulari, 2017/01/06
- 06/06: Revert "Revert "gnu: gawk: Don't replace 'sh' reference with 'bash'."", Leo Famulari, 2017/01/06
- 01/06: Merge branch 'master' into core-updates,
Leo Famulari <=