[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Merge branch 'master' into staging
|
From: |
guix-commits |
|
Subject: |
01/01: Merge branch 'master' into staging |
|
Date: |
Tue, 10 Nov 2020 18:06:13 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit a9a0d348743af1a25fd27b2b073f0fe2b46978b6
Merge: 3dee229 569cd53
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Wed Nov 11 00:02:32 2020 +0100
Merge branch 'master' into staging
gnu/build/chromium-extension.scm | 192 +
gnu/installer/parted.scm | 30 +-
gnu/local.mk | 3 +
gnu/packages/ada.scm | 119 +-
gnu/packages/algebra.scm | 11 +-
gnu/packages/aspell.scm | 17 +-
gnu/packages/assembly.scm | 4 +-
gnu/packages/audio.scm | 16 +-
gnu/packages/backup.scm | 4 +-
gnu/packages/bioinformatics.scm | 32 +-
gnu/packages/bootloaders.scm | 13 +-
gnu/packages/browser-extensions.scm | 123 +
gnu/packages/c.scm | 4 +-
gnu/packages/cdrom.scm | 6 +-
gnu/packages/check.scm | 4 +-
gnu/packages/chromium.scm | 4 +-
gnu/packages/cmake.scm | 2 +-
gnu/packages/compression.scm | 2 +-
gnu/packages/databases.scm | 65 +-
gnu/packages/dbm.scm | 8 +-
gnu/packages/disk.scm | 4 +-
gnu/packages/docbook.scm | 12 +-
gnu/packages/education.scm | 4 +-
gnu/packages/emacs-xyz.scm | 85 +-
gnu/packages/embedded.scm | 20 +-
gnu/packages/enchant.scm | 4 +-
gnu/packages/engineering.scm | 8 +-
gnu/packages/finance.scm | 4 +-
gnu/packages/fontutils.scm | 5 +-
gnu/packages/games.scm | 8 +-
gnu/packages/gnome.scm | 70 +-
gnu/packages/gnucash.scm | 21 +-
gnu/packages/gnupg.scm | 1 +
gnu/packages/gnuzilla.scm | 21 +
gnu/packages/guile-xyz.scm | 15 +-
gnu/packages/haskell-apps.scm | 4 +-
gnu/packages/linux.scm | 11 +
gnu/packages/lisp-xyz.scm | 348 +-
gnu/packages/mail.scm | 5 +-
gnu/packages/music.scm | 23 +-
gnu/packages/ocaml.scm | 112 +-
.../patches/sdcc-disable-non-free-code.patch | 3643 ++++
gnu/packages/piet.scm | 121 +-
gnu/packages/python-check.scm | 34 +
gnu/packages/python-crypto.scm | 4 +-
gnu/packages/python-web.scm | 2 +
gnu/packages/python-xyz.scm | 16 +-
gnu/packages/radio.scm | 10 +-
gnu/packages/ruby.scm | 12 +-
gnu/packages/scheme.scm | 6 +-
gnu/packages/sdcc.scm | 10 +-
gnu/packages/shells.scm | 4 +-
gnu/packages/storage.scm | 4 +-
gnu/packages/tls.scm | 50 +-
gnu/packages/version-control.scm | 17 +-
gnu/packages/video.scm | 38 +-
gnu/packages/vpn.scm | 8 +-
gnu/packages/web.scm | 29 +-
gnu/packages/xdisorg.scm | 4 +-
gnu/packages/xfce.scm | 8 +-
gnu/packages/xml.scm | 4 +-
gnu/services/guix.scm | 11 +-
gnu/services/web.scm | 6 +
gnu/system/image.scm | 1 +
guix/build-system/ocaml.scm | 27 +
guix/scripts/publish.scm | 12 +-
po/doc/guix-manual.fr.po | 21510 ++++++++++---------
po/guix/fr.po | 1195 +-
po/packages/fr.po | 4682 ++--
tests/publish.scm | 5 +
70 files changed, 19553 insertions(+), 13364 deletions(-)
diff --cc gnu/packages/databases.scm
index 130726b,8cb2a87..a6c8179
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@@ -3885,16 -3906,14 +3889,13 @@@ The drivers officially supported by @co
("sqlite" ,sqlite)
("odbc" ,unixodbc)
("boost" ,boost)
- ("mariadb:dev" ,mariadb "dev")
- ("mariadb:lib" ,mariadb "lib")))
+ ("mariadb:dev" ,mariadb "dev")))
(arguments
- `(#:tests? #f ; Tests may require running database management systems.
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'fix-lib-path
- (lambda _
- (substitute* "CMakeLists.txt"
- (("set\\(SOCI_LIBDIR \"lib64\"\\)") ""))
- #t)))))
+ `(#:configure-flags
+ ;; C++11 (-DSOCI_CXX11) is OFF by default. hyperledger-iroha needs it.
+ (list "-DCMAKE_CXX_STANDARD=17"
+ "-DSOCI_LIBDIR=lib")
+ #:tests? #f)) ; may require running database management systems
(synopsis "C++ Database Access Library")
(description
"SOCI is an abstraction layer for several database backends, including
diff --cc gnu/packages/lisp-xyz.scm
index ba0bad2,bec4aee..063c882
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@@ -1598,23 -1810,27 +1598,23 @@@ writing code that contains string liter
(define-public ecl-pythonic-string-reader
(sbcl-package->ecl-package sbcl-pythonic-string-reader))
-;; SLIME does not have a ASDF system definition to build all of Swank. As a
-;; result, the asdf-build-system/sbcl will produce an almost empty package.
-;; Some work was done to fix this at
-;; https://github.com/sionescu/slime/tree/swank-asdf but it was never merged
-;; and is now lagging behind. Building SBCL fasls might not be worth the
-;; hassle, so let's just ship the source then.
-(define-public cl-slime-swank
+(define-public sbcl-slime-swank
(package
- (name "cl-slime-swank")
+ (name "sbcl-slime-swank")
- (version "2.24")
+ (version "2.26")
(source
(origin
- (file-name (string-append name "-" version ".tar.gz"))
+ (file-name (git-file-name "slime-swank" version))
(method git-fetch)
(uri (git-reference
(url "https://github.com/slime/slime/";)
(commit (string-append "v" version))))
(sha256
(base32
- "0js24x42m7b5iymb4rxz501dff19vav5pywnzv50b673rbkaaqvh"))))
+ "0mxb1wnw19v0s72w2wkz5afdlzvpy5nn7pr4vav403qybac0sw5c"))))
- (build-system asdf-build-system/source)
+ (build-system asdf-build-system/sbcl)
+ (arguments
+ '(#:asd-systems '("swank")))
(home-page "https://github.com/slime/slime";)
(synopsis "Common Lisp Swank server")
(description
@@@ -11032,3 -14265,273 +11096,271 @@@ object-oriented framework for prototypi
(define-public ecl-geco
(sbcl-package->ecl-package sbcl-geco))
+
+ (define-public sbcl-html-entities
+ (let ((commit "4af018048e891f41d77e7d680ed3aeb639e1eedb"))
+ (package
+ (name "sbcl-html-entities")
+ (version (git-version "0.02" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/BnMcGn/html-entities/";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1b2yl6lf6vis17y4n5s505p7ica96bdafcl6vydy1hg50fy33nfr"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("ppcre" ,sbcl-cl-ppcre)))
+ (native-inputs
+ `(("fiveam" ,sbcl-fiveam)))
+ (home-page "https://github.com/BnMcGn/html-entities/";)
+ (synopsis "Encode and decode entities in HTML with Common Lisp")
+ (description "Html-entities is a Common Lisp library that lets you
+ encode and decode entities in HTML.")
+ (license license:expat))))
+
+ (define-public cl-html-entities
+ (sbcl-package->cl-source-package sbcl-html-entities))
+
+ (define-public ecl-html-entities
+ (sbcl-package->ecl-package sbcl-html-entities))
+
+ (define-public sbcl-quicksearch
+ (let ((commit "fb02ecf7c876ec580ab18c7d2c8c7814c06af599"))
+ (package
+ (name "sbcl-quicksearch")
+ (version (git-version "0.01.04" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/tkych/quicksearch/";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "16k19zjkhh7r64vjq371k5jwjs7cdfjz83flh561n4h4v1z89fps"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("bordeaux-threads" ,sbcl-bordeaux-threads)
+ ("iterate" ,sbcl-iterate)
+ ("alexandria" ,sbcl-alexandria)
+ ("anaphora" ,sbcl-anaphora)
+ ("ppcre" ,sbcl-cl-ppcre)
+ ("drakma" ,sbcl-drakma)
+ ("html-entities" ,sbcl-html-entities)
+ ("yason" ,sbcl-yason)
+ ("flexi-streams" ,sbcl-flexi-streams)
+ ("do-urlencode" ,sbcl-do-urlencode)))
+ (home-page "https://github.com/tkych/quicksearch/";)
+ (synopsis "Search Engine Interface for Common Lisp packages")
+ (description "Quicksearch is a search-engine-interface for Common Lisp.
+ The goal of Quicksearch is to find the Common Lisp library quickly. For
+ example, if you will find the library about json, just type @code{(qs:?
+ 'json)} at REPL.
+
+ The function @code{quicksearch} searches for Common Lisp projects in
+ Quicklisp, Cliki, GitHub and BitBucket, then outputs results in REPL. The
+ function @code{?} is abbreviation wrapper for @code{quicksearch}.")
+ (license license:expat))))
+
+ (define-public cl-quicksearch
+ (sbcl-package->cl-source-package sbcl-quicksearch))
+
+ (define-public ecl-quicksearch
+ (sbcl-package->ecl-package sbcl-quicksearch))
+
+ (define-public sbcl-agutil
+ (let ((commit "df188d754d472da9faa1601a48f1f37bb7b34d68"))
+ (package
+ (name "sbcl-agutil")
+ (version (git-version "0.0.1" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/alex-gutev/agutil/";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1xpnyzksk2xld64b6lw6rw0gn5zxlb77jwna59sd4yl7kxhxlfpf"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("trivia" ,sbcl-trivia)))
+ (home-page "https://github.com/alex-gutev/agutil/";)
+ (synopsis "Collection of Common Lisp utilities")
+ (description "A collection of Common Lisp utility functions and macros
+ mostly not found in other utility packages.")
+ (license license:expat))))
+
+ (define-public cl-agutil
+ (sbcl-package->cl-source-package sbcl-agutil))
+
+ (define-public ecl-agutil
+ (sbcl-package->ecl-package sbcl-agutil))
+
+ (define-public sbcl-custom-hash-table
+ (let ((commit "f26983133940f5edf826ebbc8077acc04816ddfa"))
+ (package
+ (name "sbcl-custom-hash-table")
+ (version (git-version "0.3" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/metawilm/cl-custom-hash-table";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1k4mvrpbqqds2fwjxp1bxmrfmr8ch4dkwhnkbw559knbqshvrlj5"))))
+ (build-system asdf-build-system/sbcl)
+ (arguments
- '(#:asd-file "cl-custom-hash-table.asd"
- #:asd-system-name "cl-custom-hash-table"))
++ '(#:asd-files '("cl-custom-hash-table.asd")
++ #:asd-systems '("cl-custom-hash-table")))
+ (home-page "https://github.com/metawilm/cl-custom-hash-table";)
+ (synopsis "Custom hash tables for Common Lisp")
+ (description "This library allows creation of hash tables with arbitrary
+ @code{test}/@code{hash} functions, in addition to the @code{test} functions
+ allowed by the standard (@code{EQ}, @code{EQL}, @code{EQUAL} and
+ @code{EQUALP}), even in implementations that don't support this functionality
+ directly.")
+ (license license:expat))))
+
+ (define-public cl-custom-hash-table
+ (sbcl-package->cl-source-package sbcl-custom-hash-table))
+
+ (define-public ecl-custom-hash-table
+ (sbcl-package->ecl-package sbcl-custom-hash-table))
+
+ (define-public sbcl-collectors
+ (let ((commit "13acef25d8422d1d82e067b1861e513587c166ee"))
+ (package
+ (name "sbcl-collectors")
+ (version (git-version "0.1" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/AccelerationNet/collectors";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1si68n1j6rpns8jw6ksqjpb937pdl30v7xza8rld7j5vh0jhy2yi"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("alexandria" ,sbcl-alexandria)
+ ("closer-mop" ,sbcl-closer-mop)
+ ("symbol-munger" ,sbcl-symbol-munger)))
+ (native-inputs
+ `(("lisp-unit2" ,sbcl-lisp-unit2)))
+ (home-page "https://github.com/AccelerationNet/collectors/";)
+ (synopsis "Common lisp library providing collector macros")
+ (description "A small collection of common lisp macros to make
+ collecting values easier.")
+ (license license:bsd-3))))
+
+ (define-public cl-collectors
+ (sbcl-package->cl-source-package sbcl-collectors))
+
+ (define-public ecl-collectors
+ (sbcl-package->ecl-package sbcl-collectors))
+
+ (define-public cl-environments
+ ;; TODO: asdf-build-system/sbcl fails here, why? See if it works with the
+ ;; build system revamp once staging is merged after 2020-11-09.
+ (let ((commit "bbcd958a9ff23ce3e6ea5f8ee2edad9634819a3a")) ; No version in
2 years.
+ (package
+ (name "cl-environments")
+ (version (git-version "0.2.3" "1" commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/alex-gutev/cl-environments";)
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1pfxl3vcdrb4mjy4q4c3c7q95kzv6rfjif3hzd5q91i9z621d64r"))))
+ (build-system asdf-build-system/source)
+ (propagated-inputs
+ `(("alexandria" ,cl-alexandria)
+ ("anaphora" ,cl-anaphora)
+ ("collectors" ,cl-collectors)
+ ("optima" ,cl-optima)))
+ (native-inputs
- `(("prove" ,sbcl-prove)
- ("prove-asdf" ,sbcl-prove-asdf)))
++ `(("prove" ,sbcl-prove)))
+ (home-page "https://github.com/alex-gutev/cl-environments";)
+ (synopsis "Implements the Common Lisp standard environment access API")
+ (description "This library provides a uniform API, as specified in
Common
+ Lisp the Language 2, for accessing information about variable and function
+ bindings from implementation-defined lexical environment objects. All major
+ Common Lisp implementations are supported, even those which don't support the
+ CLTL2 environment access API.")
+ (license license:expat))))
+
+ (define-public sbcl-static-dispatch
+ (package
+ (name "sbcl-static-dispatch")
+ (version "0.3")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/alex-gutev/static-dispatch";)
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "1wp5yz8liqqic3yifqf33qhccd755pd7ycvsq1j4i7k3f1wm18i0"))))
+ (build-system asdf-build-system/sbcl)
+ (inputs
+ `(("agutil" ,sbcl-agutil)
+ ("alexandria" ,sbcl-alexandria)
+ ("anaphora" ,sbcl-anaphora)
+ ("arrows" ,sbcl-arrows)
+ ("closer-mop" ,sbcl-closer-mop)
+ ("iterate" ,sbcl-iterate)
+ ("trivia" ,sbcl-trivia)))
+ (propagated-inputs
+ `(("cl-environments" ,cl-environments)))
+ (native-inputs
- `(("prove-asdf" ,sbcl-prove-asdf)
- ("prove" ,sbcl-prove)))
++ `(("prove" ,sbcl-prove)))
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ ;; Use `arrows' instead of cl-arrows which is abandoned and
unlicensed.
+ ;; https://github.com/nightfly19/cl-arrows/issues/5
+ (add-after 'unpack 'use-arrows-instead-of-cl-arrows
+ (lambda _
+ (for-each
+ (lambda (file)
+ (substitute* file
+ ((":cl-arrows") ":arrows")))
+ '("static-dispatch.asd"
+ "src/package.lisp"
+ "test/methods.lisp"
+ "test/test.lisp")))))))
+ (home-page "https://github.com/alex-gutev/static-dispatch";)
+ (synopsis "Static generic function dispatch for Common Lisp")
+ (description "Static dispatch is a Common Lisp library, inspired by
+ @code{inlined-generic-function}, which allows standard Common Lisp generic
+ function dispatch to be performed statically (at compile time) rather than
+ dynamically (runtime). This is similar to what is known as \"overloading\" in
+ languages such as C++ and Java.
+
+ The purpose of static dispatch is to provide an optimization in cases where
+ the usual dynamic dispatch is too slow, and the dynamic features of generic
+ functions, such as adding/removing methods at runtime are not required. An
+ example of such a case is a generic equality comparison function. Currently
+ generic functions are considered far too slow to implement generic arithmetic
+ and comparison operations when used heavily in numeric code.")
+ (license license:expat)))
+
+ (define-public cl-static-dispatch
+ (sbcl-package->cl-source-package sbcl-static-dispatch))
+
+ (define-public ecl-static-dispatch
+ (sbcl-package->ecl-package sbcl-static-dispatch))