[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/02: Merge branch 'master' into python-build-system
|
From: |
Leo Famulari |
|
Subject: |
01/02: Merge branch 'master' into python-build-system |
|
Date: |
Fri, 25 Nov 2016 16:32:05 +0000 (UTC) |
lfam pushed a commit to branch python-build-system
in repository guix.
commit de32aa74b4f7762e887e80047804c42d495ab841
Merge: d464917 d66cbd1
Author: Leo Famulari <address@hidden>
Date: Fri Nov 25 11:20:21 2016 -0500
Merge branch 'master' into python-build-system
.gitignore | 3 +
Makefile.am | 9 +-
config-daemon.ac | 2 +
doc/guix.texi | 183 +++-
etc/guix-publish.conf.in | 12 +
etc/guix-publish.service.in | 19 +
gnu/build/install.scm | 5 +
gnu/build/marionette.scm | 102 +-
gnu/local.mk | 11 +-
gnu/packages/algebra.scm | 4 +-
gnu/packages/aspell.scm | 10 +-
gnu/packages/audio.scm | 82 +-
gnu/packages/bioinformatics.scm | 13 +-
gnu/packages/bittorrent.scm | 4 +-
gnu/packages/chez.scm | 15 +-
gnu/packages/compression.scm | 10 +-
gnu/packages/connman.scm | 4 +-
gnu/packages/crypto.scm | 2 +-
gnu/packages/cryptsetup.scm | 65 ++
gnu/packages/cups.scm | 4 +-
gnu/packages/databases.scm | 26 +-
gnu/packages/dico.scm | 10 +-
gnu/packages/emacs.scm | 69 +-
gnu/packages/engineering.scm | 181 ++++
gnu/packages/firmware.scm | 92 ++
gnu/packages/ftp.scm | 2 +-
gnu/packages/games.scm | 4 +-
gnu/packages/gcc.scm | 2 +-
gnu/packages/gnome.scm | 5 +-
gnu/packages/gnupg.scm | 19 +-
gnu/packages/gnuzilla.scm | 34 +-
gnu/packages/grub.scm | 11 +-
gnu/packages/gstreamer.scm | 33 +-
gnu/packages/gtk.scm | 5 +-
gnu/packages/guile.scm | 3 +-
gnu/packages/image.scm | 33 +-
gnu/packages/imagemagick.scm | 4 +-
gnu/packages/linux.scm | 37 +-
gnu/packages/mail.scm | 33 +-
gnu/packages/maths.scm | 6 +-
gnu/packages/mp3.scm | 1 -
gnu/packages/mpd.scm | 6 +-
gnu/packages/music.scm | 205 ++--
gnu/packages/networking.scm | 6 +-
gnu/packages/package-management.scm | 8 +-
.../patches/gd-fix-chunk-size-on-boundaries.patch | 102 ++
.../gd-fix-truecolor-format-correction.patch | 95 ++
gnu/packages/patches/guile-repl-server-test.patch | 48 +
.../patches/handbrake-pkg-config-path.patch | 24 +
gnu/packages/patches/icecat-CVE-2016-9064.patch | 996 ++++++++++++++++++++
gnu/packages/patches/libtiff-CVE-2016-5652.patch | 47 -
gnu/packages/patches/libtiff-CVE-2016-9273.patch | 41 -
gnu/packages/patches/lvm2-static-link.patch | 14 +
gnu/packages/patches/pixman-CVE-2016-5296.patch | 19 +
gnu/packages/pdf.scm | 1 -
gnu/packages/perl.scm | 33 +-
gnu/packages/php.scm | 334 +++++++
gnu/packages/psyc.scm | 2 +-
gnu/packages/python.scm | 14 +-
gnu/packages/qemu.scm | 3 +-
gnu/packages/ruby.scm | 46 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/syndication.scm | 2 +-
gnu/packages/telephony.scm | 5 +-
gnu/packages/upnp.scm | 27 +-
gnu/packages/video.scm | 123 ++-
gnu/packages/vim.scm | 6 +-
gnu/packages/w3m.scm | 22 +-
gnu/packages/web.scm | 43 +-
gnu/packages/wm.scm | 4 +-
gnu/packages/wxwidgets.scm | 81 ++
gnu/packages/xdisorg.scm | 51 +-
gnu/packages/xiph.scm | 4 +-
gnu/services/dbus.scm | 94 +-
gnu/services/desktop.scm | 93 --
gnu/services/dict.scm | 20 +-
gnu/services/networking.scm | 71 +-
gnu/services/version-control.scm | 141 +++
gnu/system.scm | 3 +-
gnu/system/examples/desktop.tmpl | 15 +-
gnu/system/mapped-devices.scm | 8 +-
gnu/system/vm.scm | 2 -
gnu/tests/base.scm | 59 +-
gnu/tests/install.scm | 66 +-
guix/build/syscalls.scm | 220 ++++-
guix/derivations.scm | 4 +
guix/download.scm | 159 +++-
guix/gexp.scm | 3 -
guix/profiles.scm | 4 -
guix/scripts/download.scm | 58 +-
guix/scripts/lint.scm | 43 +-
guix/scripts/perform-download.scm | 113 +++
guix/scripts/system.scm | 3 -
guix/store.scm | 29 +-
guix/tests/http.scm | 120 +++
guix/ui.scm | 6 +-
nix/libstore/build.cc | 36 +-
nix/libstore/builtins.cc | 79 ++
nix/libstore/builtins.hh | 44 +
nix/libstore/worker-protocol.hh | 5 +-
nix/local.mk | 21 +-
nix/nix-daemon/nix-daemon.cc | 9 +
nix/scripts/download.in | 11 +
tests/derivations.scm | 74 ++
tests/gexp.scm | 59 +-
tests/guix-download.sh | 9 +-
tests/lint.scm | 130 +--
tests/syscalls.scm | 45 +
108 files changed, 4561 insertions(+), 880 deletions(-)
diff --cc gnu/packages/python.scm
index 60b94b5,5e8956f..ec672a5
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -460,11 -460,12 +460,11 @@@ pidof, tty, taskset, pmap."
(uri (pypi-uri "passlib" version))
(sha256
(base32
- "1z27wdxs5rj5xhhqfzvzn3yg682irkxw6dcs5jj7mcf97psk8gd8"))))
+ "1vdbqsa1a31s98fxkinl052q8nnpvbxnb83qanxfpi2p6c2zdr0b"))))
(build-system python-build-system)
(native-inputs
- `(("python-nose" ,python-nose)
- ("python-setuptools" ,python-setuptools)))
- (inputs
+ `(("python-nose" ,python-nose)))
+ (propagated-inputs
`(("python-py-bcrypt" ,python-py-bcrypt)))
(arguments
`(#:phases
@@@ -2200,8 -2334,10 +2202,8 @@@ files."
(uri (pypi-uri "PyLD" version))
(sha256
(base32
- "0k881ffazpf8q1z8862g4bb3pzwpnz9whrci2mf311mvn1qbyqad"))))
+ "1m0fs6897vxfkf7awah5i66i7b7smm5fnywf1w50fpzyfbfhr156"))))
(build-system python-build-system)
- (inputs
- `(("python-setuptools" ,python-setuptools)))
(arguments `(#:tests? #f)) ; no tests
(home-page "http://github.com/digitalbazaar/pyld";)
(synopsis "Python implementation of the JSON-LD specification")
diff --cc tests/lint.scm
index b66cd29,0c53456..3a9b89f
--- a/tests/lint.scm
+++ b/tests/lint.scm
@@@ -34,12 -34,7 +35,11 @@@
#:use-module (gnu packages)
#:use-module (gnu packages glib)
#:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python)
+ #:use-module (web server)
+ #:use-module (web server http)
+ #:use-module (web response)
#:use-module (ice-9 match)
- #:use-module (ice-9 threads)
#:use-module (srfi srfi-9 gnu)
#:use-module (srfi srfi-64))