mirror of
https://https.git.savannah.gnu.org/git/guix.git/
synced 2025-07-16 20:10:39 +02:00
Merge branch 'master' into staging
This commit is contained in:
Ludovic Courtès
commit
3e2d4e69c3
243 changed files with 39113 additions and 28623 deletions
|
|
@ -64,6 +64,7 @@
|
|||
#:use-module (gnu packages crypto)
|
||||
#:use-module (gnu packages curl)
|
||||
#:use-module (gnu packages cyrus-sasl)
|
||||
#:use-module (gnu packages dbm)
|
||||
#:use-module (gnu packages emacs)
|
||||
#:use-module (gnu packages gettext)
|
||||
#:use-module (gnu packages glib)
|
||||
|
|
@ -85,10 +86,12 @@
|
|||
#:use-module (gnu packages popt)
|
||||
#:use-module (gnu packages python)
|
||||
#:use-module (gnu packages python-crypto)
|
||||
#:use-module (gnu packages python-xyz)
|
||||
#:use-module (gnu packages rdf)
|
||||
#:use-module (gnu packages readline)
|
||||
#:use-module (gnu packages ruby)
|
||||
#:use-module (gnu packages serialization)
|
||||
#:use-module (gnu packages sqlite)
|
||||
#:use-module (gnu packages tcl)
|
||||
#:use-module (gnu packages terminals)
|
||||
#:use-module (gnu packages textutils)
|
||||
|
|
@ -159,28 +162,6 @@
|
|||
either single machines or networked clusters.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public gdbm
|
||||
(package
|
||||
(name "gdbm")
|
||||
(version "1.18")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "mirror://gnu/gdbm/gdbm-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1kimnv12bzjjhaqk4c8w2j6chdj9c6bg21lchaf7abcyfss2r0mq"))))
|
||||
(arguments `(#:configure-flags '("--enable-libgdbm-compat")))
|
||||
(build-system gnu-build-system)
|
||||
(home-page "http://www.gnu.org.ua/software/gdbm")
|
||||
(synopsis
|
||||
"Hash library of database functions compatible with traditional dbm")
|
||||
(description
|
||||
"GDBM is a library for manipulating hashed databases. It is used to
|
||||
store key/value pairs in a file in a manner similar to the Unix dbm library
|
||||
and provides interfaces to the traditional file format.")
|
||||
(license license:gpl3+)))
|
||||
|
||||
(define-public go-gopkg.in-mgo.v2
|
||||
(package
|
||||
(name "go-gopkg.in-mgo.v2")
|
||||
|
|
@ -227,109 +208,6 @@ standard Go idioms.")
|
|||
(home-page "http://labix.org/mgo")
|
||||
(license license:bsd-2)))
|
||||
|
||||
(define-public bdb
|
||||
(package
|
||||
(name "bdb")
|
||||
(version "6.2.32")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.oracle.com/berkeley-db/db-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1yx8wzhch5wwh016nh0kfxvknjkafv6ybkqh6nh7lxx50jqf5id9"))))
|
||||
(build-system gnu-build-system)
|
||||
(outputs '("out" ; programs, libraries, headers
|
||||
"doc")) ; 94 MiB of HTML docs
|
||||
(arguments
|
||||
'(#:tests? #f ; no check target available
|
||||
#:disallowed-references ("doc")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(doc (assoc-ref outputs "doc")))
|
||||
;; '--docdir' is not honored, so we need to patch.
|
||||
(substitute* "dist/Makefile.in"
|
||||
(("docdir[[:blank:]]*=.*")
|
||||
(string-append "docdir = " doc "/share/doc/bdb")))
|
||||
|
||||
(invoke "./dist/configure"
|
||||
(string-append "--prefix=" out)
|
||||
(string-append "CONFIG_SHELL=" (which "bash"))
|
||||
(string-append "SHELL=" (which "bash"))
|
||||
|
||||
;; Remove 7 MiB of .a files.
|
||||
"--disable-static"
|
||||
|
||||
;; The compatibility mode is needed by some packages,
|
||||
;; notably iproute2.
|
||||
"--enable-compat185"
|
||||
|
||||
;; The following flag is needed so that the inclusion
|
||||
;; of db_cxx.h into C++ files works; it leads to
|
||||
;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
|
||||
"--enable-cxx")))))))
|
||||
(synopsis "Berkeley database")
|
||||
(description
|
||||
"Berkeley DB is an embeddable database allowing developers the choice of
|
||||
SQL, Key/Value, XML/XQuery or Java Object storage for their data model.")
|
||||
;; Starting with version 6, BDB is distributed under AGPL3. Many individual
|
||||
;; files are covered by the 3-clause BSD license.
|
||||
(license (list license:agpl3+ license:bsd-3))
|
||||
(home-page
|
||||
"http://www.oracle.com/us/products/database/berkeley-db/overview/index.html")))
|
||||
|
||||
(define-public bdb-5.3
|
||||
(package (inherit bdb)
|
||||
(name "bdb")
|
||||
(version "5.3.28")
|
||||
(license (license:non-copyleft "file://LICENSE"
|
||||
"See LICENSE in the distribution."))
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.oracle.com/berkeley-db/db-"
|
||||
version ".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"))))
|
||||
(arguments
|
||||
`(#:tests? #f ; no check target available
|
||||
#:disallowed-references ("doc")
|
||||
#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'configure
|
||||
(lambda* (#:key outputs #:allow-other-keys)
|
||||
(let ((out (assoc-ref outputs "out"))
|
||||
(doc (assoc-ref outputs "doc")))
|
||||
;; '--docdir' is not honored, so we need to patch.
|
||||
(substitute* "dist/Makefile.in"
|
||||
(("docdir[[:blank:]]*=.*")
|
||||
(string-append "docdir = " doc "/share/doc/bdb")))
|
||||
|
||||
(invoke "./dist/configure"
|
||||
(string-append "--prefix=" out)
|
||||
(string-append "CONFIG_SHELL=" (which "bash"))
|
||||
(string-append "SHELL=" (which "bash"))
|
||||
|
||||
;; Bdb doesn't recognize aarch64 as an architecture.
|
||||
,@(if (string=? "aarch64-linux" (%current-system))
|
||||
'("--build=aarch64-unknown-linux-gnu")
|
||||
'())
|
||||
|
||||
;; Remove 7 MiB of .a files.
|
||||
"--disable-static"
|
||||
|
||||
;; The compatibility mode is needed by some packages,
|
||||
;; notably iproute2.
|
||||
"--enable-compat185"
|
||||
|
||||
;; The following flag is needed so that the inclusion
|
||||
;; of db_cxx.h into C++ files works; it leads to
|
||||
;; HAVE_CXX_STDHEADERS being defined in db_cxx.h.
|
||||
"--enable-cxx")))))))))
|
||||
|
||||
(define-public es-dump-restore
|
||||
(package
|
||||
(name "es-dump-restore")
|
||||
|
|
@ -1144,87 +1022,6 @@ browse and edit the contents, add and delete entries, all while tracking your
|
|||
changes.")
|
||||
(license license:gpl3+)))) ; no headers, see README.md
|
||||
|
||||
(define-public sqlite
|
||||
(package
|
||||
(name "sqlite")
|
||||
(replacement sqlite-3.26.0)
|
||||
(version "3.24.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((numeric-version
|
||||
(match (string-split version #\.)
|
||||
((first-digit other-digits ...)
|
||||
(string-append first-digit
|
||||
(string-pad-right
|
||||
(string-concatenate
|
||||
(map (cut string-pad <> 2 #\0)
|
||||
other-digits))
|
||||
6 #\0))))))
|
||||
(string-append "https://sqlite.org/2018/sqlite-autoconf-"
|
||||
numeric-version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0jmprv2vpggzhy7ma4ynmv1jzn3pfiwzkld0kkg6hvgvqs44xlfr"))))
|
||||
(build-system gnu-build-system)
|
||||
(inputs `(("readline" ,readline)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
;; Add -DSQLITE_SECURE_DELETE, -DSQLITE_ENABLE_UNLOCK_NOTIFY and
|
||||
;; -DSQLITE_ENABLE_DBSTAT_VTAB to CFLAGS. GNU Icecat will refuse
|
||||
;; to use the system SQLite unless these options are enabled.
|
||||
(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE "
|
||||
"-DSQLITE_ENABLE_UNLOCK_NOTIFY "
|
||||
"-DSQLITE_ENABLE_DBSTAT_VTAB"))))
|
||||
(home-page "https://www.sqlite.org/")
|
||||
(synopsis "The SQLite database management system")
|
||||
(description
|
||||
"SQLite is a software library that implements a self-contained, serverless,
|
||||
zero-configuration, transactional SQL database engine. SQLite is the most
|
||||
widely deployed SQL database engine in the world. The source code for SQLite
|
||||
is in the public domain.")
|
||||
(license license:public-domain)))
|
||||
|
||||
(define-public sqlite-3.26.0
|
||||
(package (inherit sqlite)
|
||||
(version "3.26.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (let ((numeric-version
|
||||
(match (string-split version #\.)
|
||||
((first-digit other-digits ...)
|
||||
(string-append first-digit
|
||||
(string-pad-right
|
||||
(string-concatenate
|
||||
(map (cut string-pad <> 2 #\0)
|
||||
other-digits))
|
||||
6 #\0))))))
|
||||
(string-append "https://sqlite.org/2018/sqlite-autoconf-"
|
||||
numeric-version ".tar.gz")))
|
||||
(sha256
|
||||
(base32
|
||||
"0pdzszb4sp73hl36siiv3p300jvfvbcdxi2rrmkwgs6inwznmajx"))))))
|
||||
|
||||
;; This is used by Tracker.
|
||||
(define-public sqlite-with-fts5
|
||||
(package/inherit sqlite
|
||||
(name "sqlite-with-fts5")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments sqlite)
|
||||
((#:configure-flags flags)
|
||||
`(cons "--enable-fts5" ,flags))))))
|
||||
|
||||
;; This is used by Qt.
|
||||
(define-public sqlite-with-column-metadata
|
||||
(package/inherit sqlite
|
||||
(name "sqlite-with-column-metadata")
|
||||
(arguments
|
||||
(substitute-keyword-arguments (package-arguments sqlite)
|
||||
((#:configure-flags flags)
|
||||
`(list (string-append "CFLAGS=-O2 -DSQLITE_SECURE_DELETE "
|
||||
"-DSQLITE_ENABLE_UNLOCK_NOTIFY "
|
||||
"-DSQLITE_ENABLE_DBSTAT_VTAB "
|
||||
"-DSQLITE_ENABLE_COLUMN_METADATA")))))))
|
||||
|
||||
(define-public tdb
|
||||
(package
|
||||
(name "tdb")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue