[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, 26 Dec 2014 23:20:54 +0000 |
civodul pushed a commit to branch core-updates
in repository guix.
commit 763a401ed185d39119289c670c1eb250ace13ed9
Merge: 9426440 bf7688f
Author: Ludovic Courtès <address@hidden>
Date: Fri Dec 26 23:31:04 2014 +0100
Merge branch 'master' into core-updates
.gitmodules | 3 -
bootstrap | 12 +-
doc/guix.texi | 85 +-
gnu-system.am | 11 +
gnu/packages.scm | 41 +-
gnu/packages/bioinformatics.scm | 116 +-
gnu/packages/compression.scm | 20 +
gnu/packages/game-development.scm | 48 +
gnu/packages/ghostscript.scm | 11 +-
gnu/packages/gnome.scm | 89 +-
gnu/packages/gnuzilla.scm | 15 +-
gnu/packages/groff.scm | 12 +-
gnu/packages/linux.scm | 4 +-
gnu/packages/ntp.scm | 34 +-
.../patches/icecat-CVE-2014-1587-bug-1042567.patch | 30 +
.../patches/icecat-CVE-2014-1587-bug-1072847.patch | 19 +
.../patches/icecat-CVE-2014-1587-bug-1079729.patch | 191 ++
.../patches/icecat-CVE-2014-1587-bug-1080312.patch | 308 ++
.../patches/icecat-CVE-2014-1587-bug-1089207.patch | 119 +
gnu/packages/patches/icecat-CVE-2014-1590.patch | 33 +
gnu/packages/patches/icecat-CVE-2014-1592.patch | 400 +++
gnu/packages/patches/icecat-CVE-2014-1593.patch | 154 +
gnu/packages/patches/icecat-CVE-2014-1594.patch | 34 +
gnu/packages/patches/xfce4-panel-plugins.patch | 115 +
gnu/packages/perl.scm | 109 +
gnu/packages/python.scm | 266 ++-
gnu/packages/qemu.scm | 4 +-
gnu/packages/tmux.scm | 4 +-
gnu/packages/video.scm | 4 +-
gnu/packages/xdisorg.scm | 42 +
gnu/packages/xfce.scm | 68 +-
gnu/services/base.scm | 121 +-
gnu/services/networking.scm | 72 +-
gnu/services/xorg.scm | 71 +-
gnu/system/install.scm | 13 +-
guix/build-system/python.scm | 42 +-
guix/build/python-build-system.scm | 35 +-
guix/build/syscalls.scm | 200 ++-
guix/packages.scm | 61 +-
guix/profiles.scm | 8 +-
nix-upstream | 1 -
nix/AUTHORS | 2 +
nix/COPYING | 504 +++
nix/boost/assert.hpp | 38 +
nix/boost/format.hpp | 64 +
nix/boost/format/exceptions.hpp | 96 +
nix/boost/format/feed_args.hpp | 247 ++
nix/boost/format/format_class.hpp | 135 +
nix/boost/format/format_fwd.hpp | 49 +
nix/boost/format/format_implementation.cc | 256 ++
nix/boost/format/free_funcs.cc | 71 +
nix/boost/format/group.hpp | 680 ++++
nix/boost/format/internals.hpp | 167 +
nix/boost/format/internals_fwd.hpp | 65 +
nix/boost/format/macros_default.hpp | 48 +
nix/boost/format/parsing.cc | 454 +++
nix/boost/throw_exception.hpp | 47 +
nix/libstore/build.cc | 3351 ++++++++++++++++++++
nix/libstore/derivations.cc | 278 ++
nix/libstore/derivations.hh | 93 +
nix/libstore/gc.cc | 748 +++++
nix/libstore/globals.cc | 240 ++
nix/libstore/globals.hh | 218 ++
nix/libstore/local-store.cc | 2010 ++++++++++++
nix/libstore/local-store.hh | 333 ++
nix/libstore/misc.cc | 220 ++
nix/libstore/misc.hh | 38 +
nix/libstore/optimise-store.cc | 180 ++
nix/libstore/pathlocks.cc | 199 ++
nix/libstore/pathlocks.hh | 45 +
nix/libstore/references.cc | 122 +
nix/libstore/references.hh | 11 +
nix/libstore/remote-store.cc | 602 ++++
nix/libstore/remote-store.hh | 104 +
nix/libstore/schema.sql | 44 +
nix/libstore/store-api.cc | 331 ++
nix/libstore/store-api.hh | 366 +++
nix/libstore/worker-protocol.hh | 60 +
nix/libutil/affinity.cc | 55 +
nix/libutil/affinity.hh | 9 +
nix/libutil/archive.cc | 335 ++
nix/libutil/archive.hh | 75 +
nix/libutil/hash.cc | 382 +++
nix/libutil/hash.hh | 113 +
nix/libutil/serialise.cc | 259 ++
nix/libutil/serialise.hh | 133 +
nix/libutil/types.hh | 86 +
nix/libutil/util.cc | 1105 +++++++
nix/libutil/util.hh | 349 ++
nix/libutil/xml-writer.cc | 94 +
nix/libutil/xml-writer.hh | 69 +
nix/nix-daemon/nix-daemon.cc | 939 ++++++
nix/sync-with-upstream | 89 -
po/guix/LINGUAS | 1 +
po/guix/fr.po | 1368 ++++++++
po/packages/LINGUAS | 1 +
po/packages/fr.po | 1567 +++++++++
tests/profiles.scm | 30 +-
tests/syscalls.scm | 34 +-
99 files changed, 22291 insertions(+), 343 deletions(-)