[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into core-updates
|
From: |
Mark H. Weaver |
|
Subject: |
01/01: Merge branch 'master' into core-updates |
|
Date: |
Fri, 16 Feb 2018 13:14:56 -0500 (EST) |
mhw pushed a commit to branch core-updates
in repository guix.
commit 150062f19060687dbf8e2cbe6a22c2f8600e7c4e
Merge: 54a9335 6a3cf4e
Author: Mark H Weaver <address@hidden>
Date: Fri Feb 16 13:14:26 2018 -0500
Merge branch 'master' into core-updates
build-aux/build-self.scm | 7 +-
doc/guix.texi | 53 ++++-
gnu/local.mk | 1 -
gnu/packages/acl.scm | 2 +-
gnu/packages/admin.scm | 2 +-
gnu/packages/attr.scm | 2 +-
gnu/packages/audio.scm | 2 +-
gnu/packages/avahi.scm | 45 ++--
gnu/packages/avr.scm | 2 +-
gnu/packages/backup.scm | 4 +-
gnu/packages/benchmark.scm | 4 +-
gnu/packages/bioinformatics.scm | 4 +-
gnu/packages/ci.scm | 10 +-
gnu/packages/compression.scm | 46 ++--
gnu/packages/crypto.scm | 6 +-
gnu/packages/databases.scm | 6 +-
gnu/packages/dns.scm | 6 +-
gnu/packages/emacs.scm | 96 +++++++-
gnu/packages/erlang.scm | 50 ++--
gnu/packages/flashing-tools.scm | 106 ++++++++-
gnu/packages/fontutils.scm | 2 +-
gnu/packages/game-development.scm | 6 +-
gnu/packages/games.scm | 2 +-
gnu/packages/gkrellm.scm | 14 +-
gnu/packages/gnustep.scm | 39 ++--
gnu/packages/gsasl.scm | 2 +-
gnu/packages/gtk.scm | 2 +-
gnu/packages/guile.scm | 16 +-
gnu/packages/irc.scm | 4 +-
gnu/packages/java.scm | 24 +-
gnu/packages/kde.scm | 35 +++
gnu/packages/ldc.scm | 6 +
gnu/packages/libunwind.scm | 2 +-
gnu/packages/linux.scm | 8 +-
gnu/packages/lout.scm | 2 +-
gnu/packages/mpd.scm | 2 +-
gnu/packages/networking.scm | 6 +-
.../crypto++-fix-dos-in-asn.1-decoders.patch | 65 ------
gnu/packages/python-web.scm | 4 +-
gnu/packages/python.scm | 96 +++++++-
gnu/packages/ratpoison.scm | 2 +-
gnu/packages/skribilo.scm | 2 +-
gnu/packages/telephony.scm | 2 +-
gnu/packages/terminals.scm | 110 +++++++++
gnu/packages/texinfo.scm | 2 +-
gnu/packages/video.scm | 4 +-
gnu/packages/web.scm | 44 ++++
gnu/packages/xdisorg.scm | 2 +-
gnu/packages/xfce.scm | 4 +-
gnu/packages/xiph.scm | 4 +-
gnu/services/avahi.scm | 4 +-
gnu/services/base.scm | 256 ++++++++++++---------
gnu/services/web.scm | 27 ++-
gnu/system/install.scm | 15 +-
guix/build/union.scm | 2 +-
guix/import/utils.scm | 12 +-
guix/scripts/pack.scm | 21 +-
tests/import-utils.scm | 19 ++
58 files changed, 940 insertions(+), 383 deletions(-)
diff --cc gnu/packages/compression.scm
index 3bf2ec1,9835735..f25c4bb
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@@ -482,9 -473,9 +482,9 @@@ some compression ratio)."
version ".tar.gz"))
(sha256
(base32
- "1p8lvc22sv3damld9ng8y6i8z2dvvpsbi9v7yhr5bc2a20m8iya7"))))
+ "1abbch762gv8rjr579q3qyyk6c80plklbv2mw4x0vg71dgsw9bgz"))))
(build-system gnu-build-system)
- (home-page "http://www.nongnu.org/lzip/lzip.html";)
+ (home-page "https://www.nongnu.org/lzip/lzip.html";)
(synopsis "Lossless data compressor based on the LZMA algorithm")
(description
"Lzip is a lossless data compressor with a user interface similar to the
diff --cc gnu/packages/fontutils.scm
index d34b4b4,387c468..664cbdb
--- a/gnu/packages/fontutils.scm
+++ b/gnu/packages/fontutils.scm
@@@ -437,11 -442,9 +437,11 @@@ resolution."
(sha256
(base32
"0239zvfan56w7vrppriwy77fzb10ag9llaz15nsraps2a2x6di3v"))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("pkg-config" ,pkg-config)))
(propagated-inputs
`(("freetype" ,freetype)))
- (home-page "http://www.nongnu.org/m17n/";)
+ (home-page "https://www.nongnu.org/m17n/";)
(synopsis "Library for handling OpenType Font")
(description "This library can read Open Type Layout Tables from an OTF
file. Currently these tables are supported; head, name, cmap, GDEF, GSUB, and
diff --cc gnu/packages/python.scm
index c3459cc,91e1a8b..6e5e804
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@@ -12664,71 -12557,91 +12665,160 @@@ Week instances stringify to this form."
(define-public python2-isoweek
(package-with-python2 python-isoweek))
+(define-public python-tokenize-rt
+ (package
+ (name "python-tokenize-rt")
+ (version "2.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "tokenize-rt" version))
+ (sha256
+ (base32
+ "1yjvbz7rvrz31zjyax1cgy3xhf4wb3j18jwnj4bnl77ca4gliyiw"))))
+ (build-system python-build-system)
+ (home-page "https://github.com/asottile/tokenize-rt";)
+ (synopsis "Wrapper around the stdlib tokenize which roundtrips.")
+ (description
+ "This Python library is a wrapper around @code{tokenize} from the Python
+standard library. It provides two additional tokens @code{ESCAPED_NL} and
address@hidden, and a @code{Token} data type. Use @code{src_to_tokens}
+and @code{tokens_to_src} to roundtrip.")
+ (license license:expat)))
+
+(define-public python-future-fstrings
+ (package
+ (name "python-future-fstrings")
+ (version "0.4.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "future_fstrings" version))
+ (sha256
+ (base32
+ "0ydxqz2dvns44g55p8ix2x18qkfk3aaz0m0dc70f3g6n8js35h47"))))
+ (build-system python-build-system)
+ (propagated-inputs
+ `(("python-tokenize-rt" ,python-tokenize-rt)))
+ (home-page "https://github.com/asottile/future-fstrings";)
+ (synopsis "Backport of fstrings to Python < 3.6")
+ (description
+ "This package provides a UTF-8 compatible encoding
address@hidden, which performs source manipulation. It decodes the
+source bytes using the UTF-8 encoding and then rewrites Python 3.6 style
address@hidden strings.")
+ (license license:expat)))
+
+(define-public python-typing
+ (package
+ (name "python-typing")
+ (version "3.6.4")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "typing" version))
+ (sha256
+ (base32
+ "1wmk9nkh30n37cbrqwkbggmj2390lhrlagjkd0ikm02l88saj06l"))))
+ (build-system python-build-system)
+ (home-page "https://docs.python.org/3/library/typing.html";)
+ (synopsis "Type hints for Python")
+ (description "This is a backport of the standard library @code{typing}
+module to Python versions older than 3.5. Typing defines a standard notation
+for Python function and variable type annotations. The notation can be used
+for documenting code in a concise, standard format, and it has been designed
+to also be used by static and runtime type checkers, static analyzers, IDEs
+and other tools.")
+ (license license:psfl)))
+
+(define-public python2-typing
+ (package-with-python2 python-typing))
++
+ (define-public bpython
+ (package
+ (name "bpython")
+ (version "0.17")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (pypi-uri "bpython" version))
+ (sha256
+ (base32
+ "1mbah208jhd7bsfaa17fwpi55f7fvif0ghjwgrjmpmx8w1vqab9l"))))
+ (build-system python-build-system)
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'remove-failing-test
+ (lambda _
+ ;; Remove failing test. FIXME: make it pass
+ (delete-file "bpython/test/test_args.py")
+ #t))
+ (add-after 'wrap 'add-aliases
+ ;; for symmetry to bpython2, add symlinks bypthon3, bpdb3, etc.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (for-each
+ (lambda (old new)
+ (symlink old (string-append out "/bin/" new)))
+ '("bpython" "bpython-curses" "bpython-urwid" "bpdb")
+ '("bpython3" "bpython3-curses" "bpython3-urwid" "bpdb3")))
+ #t)))))
+ (propagated-inputs
+ `(("python-pygments" ,python-pygments)
+ ("python-requests", python-requests)
+ ("python-babel" ,python-babel) ; optional, for internationalization
+ ("python-curtsies" ,python-curtsies) ; >= 0.1.18
+ ("python-greenlet" ,python-greenlet)
+ ("python-urwid" ,python-urwid) ; for bpython-urwid only
+ ("python-six" ,python-six)))
+ (native-inputs
+ `(("python-sphinx" ,python-sphinx)
+ ("python-mock" ,python-mock)))
+ (home-page "https://bpython-interpreter.org/";)
+ (synopsis "Fancy interface to the Python interpreter")
+ (description "Bpython is a fancy interface to the Python
+ interpreter. bpython's main features are
+
+ @enumerate
+ @item in-line syntax highlighting,
+ @item readline-like autocomplete with suggestions displayed as you type,
+ @item expected parameter list for any Python function,
+ @item \"rewind\" function to pop the last line of code from memory and
+ re-evaluate,
+ @item send the code you've entered off to a pastebin,
+ @item save the code you've entered to a file, and
+ @item auto-indentation.
+ @end enumerate")
+ (license license:expat)))
+
+ (define-public bpython2
+ (let ((base (package-with-python2
+ (strip-python2-variant bpython))))
+ (package (inherit base)
+ (name "bpython2")
+ (arguments
+ `(#:python ,python-2
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'remove-failing-test
+ (lambda _
+ ;; Remove failing test. FIXME: make it pass
+ (delete-file "bpython/test/test_args.py")
+ ;; Disable failing test-cases (renaming inhibits they are
+ ;; discovered)
+ (substitute* "bpython/test/test_curtsies_repl.py"
+ (("^(\\s*def )(test_get_last_word_with_prev_line\\W)" _ a b)
+ (string-append a "xxx_off_" b))
+ (("^(\\s*def )(test_complex\\W)" _ a b)
+ (string-append a "xxx_off_" b)))
+ #t))
+ (add-before 'build 'rename-scripts
+ ;; rename the scripts to bypthon2, bpdb2, etc.
+ (lambda _
+ (substitute* "setup.py"
+ (("^(\\s+'bpdb)(\\s+=.*',?)\\s*?$" _ name rest)
+ (string-append name "2" rest "\n"))
+ (("^(\\s+'bpython)(-\\S+)?(\\s+=.*',?)\\s*?$" _ name sub
rest)
+ (string-append name "2" (or sub "") rest "\n")))
+ #t))))))))