mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge branch 'master' into core-updates
Conflicts: gnu/local.mk gnu/packages/bioinformatics.scm gnu/packages/django.scm gnu/packages/gtk.scm gnu/packages/llvm.scm gnu/packages/python-web.scm gnu/packages/python.scm gnu/packages/tex.scm guix/build-system/asdf.scm guix/build/emacs-build-system.scm guix/profiles.scm
This commit is contained in:
Marius Bakke
commit
f034264204
305 changed files with 727921 additions and 145425 deletions
|
|
@ -17,7 +17,7 @@
|
|||
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
|
||||
;;; Copyright © 2016 Andy Patterson <ajpatter@uwaterloo.ca>
|
||||
;;; Copyright © 2016 Danny Milosavljevic <dannym+a@scratchpost.org>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020 Marius Bakke <mbakke@fastmail.com>
|
||||
;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke <marius@gnu.org>
|
||||
;;; Copyright © 2017, 2018 Julien Lepiller <julien@lepiller.eu>
|
||||
;;; Copyright © 2017, 2020 Thomas Danckaert <post@thomasdanckaert.be>
|
||||
;;; Copyright © 2017 Jelle Licht <jlicht@fsfe.org>
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
;;; Copyright © 2017, 2018 Ben Woodcroft <donttrustben@gmail.com>
|
||||
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
|
||||
;;; Copyright © 2017, 2018 Pierre Langlois <pierre.langlois@gmx.com>
|
||||
;;; Copyright © 2015, 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2015, 2017, 2018, 2019, 2021 Ricardo Wurmus <rekado@elephly.net>
|
||||
;;; Copyright © 2017 Kristofer Buffington <kristoferbuffington@gmail.com>
|
||||
;;; Copyright © 2018 Amirouche Boubekki <amirouche@hypermove.net>
|
||||
;;; Copyright © 2018 Joshua Sierles, Nextjournal <joshua@nextjournal.com>
|
||||
|
|
@ -49,6 +49,7 @@
|
|||
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
|
||||
;;; Copyright © 2021 David Larsson <david.larsson@selfhosted.xyz>
|
||||
;;; Copyright © 2021 Pjotr Prins <pjotr.guix@thebird.nl>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
|
@ -2079,6 +2080,36 @@ Driver.")
|
|||
;; COPYING contains copy of lgpl2.1 - but copyright notices just say "LGPL"
|
||||
(home-page "http://www.unixodbc.org")))
|
||||
|
||||
(define-public nanodbc
|
||||
(package
|
||||
(name "nanodbc")
|
||||
(version "2.13.0")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri
|
||||
(git-reference
|
||||
(url "https://github.com/nanodbc/nanodbc")
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"1q80p7yv9mcl4hyvnvcjdr70y8nc940ypf368lp97vpqn5yckkgm"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
;; The tests require ODBC backends to be installed.
|
||||
(list "-DNANODBC_DISABLE_TESTS=ON"
|
||||
"-DBUILD_SHARED_LIBS=ON")
|
||||
#:tests? #false))
|
||||
(inputs
|
||||
`(("unixodbc" ,unixodbc)))
|
||||
(home-page "https://nanodbc.io/")
|
||||
(synopsis "C++ wrapper for the native C ODBC API")
|
||||
(description "The goal for nanodbc is to make developers happy by providing
|
||||
a simpler and less verbose API for working with ODBC. Common tasks should be
|
||||
easy, requiring concise and simple code.")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public unqlite
|
||||
(package
|
||||
(name "unqlite")
|
||||
|
|
@ -2157,6 +2188,27 @@ sets, bitmaps and hyperloglogs.")
|
|||
(home-page "https://redis.io/")
|
||||
(license license:bsd-3)))
|
||||
|
||||
(define-public ruby-redis
|
||||
(package
|
||||
(name "ruby-redis")
|
||||
(version "4.2.5")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (rubygems-uri "redis" version))
|
||||
(sha256
|
||||
(base32
|
||||
"15x2sr6h094rjbvg8pkq6m3lcd5abpyx93aifvfdz3wv6x55xa48"))))
|
||||
(build-system ruby-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f)) ; Tests require a running redis server.
|
||||
(synopsis "Ruby client for Redis' API")
|
||||
(description
|
||||
"This package provides a Ruby client that tries to match Redis' API
|
||||
one-to-one, while still providing an idiomatic interface.")
|
||||
(home-page "https://github.com/redis/redis-rb")
|
||||
(license license:expat)))
|
||||
|
||||
(define-public kyotocabinet
|
||||
(package
|
||||
(name "kyotocabinet")
|
||||
|
|
@ -3458,19 +3510,34 @@ is designed to have a low barrier to entry.")
|
|||
(define-public python-sqlparse
|
||||
(package
|
||||
(name "python-sqlparse")
|
||||
(version "0.3.1")
|
||||
(version "0.4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (pypi-uri "sqlparse" version))
|
||||
(sha256
|
||||
(base32
|
||||
"0j652a6z7bdf6c77aczfn8m8b2nsr1bcqq48wzghf8vi6wvj0qp1"))))
|
||||
"1s2l0jgi1v7rk7smzb99iamasaz22apfkczsphn3ci4wh8pgv48g"))))
|
||||
(build-system python-build-system)
|
||||
(arguments
|
||||
`(#:phases
|
||||
(modify-phases %standard-phases
|
||||
(replace 'check
|
||||
(lambda _ (invoke "py.test"))))))
|
||||
(lambda _
|
||||
(invoke "py.test")))
|
||||
;; XXX: The regular wrap phase ends up storing pytest as a runtime
|
||||
;; dependency. See <https://bugs.gnu.org/25235>.
|
||||
(replace 'wrap
|
||||
(lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
|
||||
(let* ((out (assoc-ref outputs "out"))
|
||||
(python (assoc-ref (or native-inputs inputs) "python"))
|
||||
(sitedir (string-append "/lib/python"
|
||||
(python-version python)
|
||||
"/site-packages")))
|
||||
(wrap-program (string-append out "/bin/sqlformat")
|
||||
`("PYTHONPATH" ":" prefix
|
||||
,(map (lambda (output)
|
||||
(string-append output sitedir))
|
||||
(list python out))))))))))
|
||||
(native-inputs
|
||||
`(("python-pytest" ,python-pytest)))
|
||||
(home-page "https://github.com/andialbrecht/sqlparse")
|
||||
|
|
@ -3803,16 +3870,16 @@ The drivers officially supported by @code{libdbi} are:
|
|||
(define-public soci
|
||||
(package
|
||||
(name "soci")
|
||||
(version "4.0.1")
|
||||
(version "4.0.2")
|
||||
(source (origin
|
||||
(method git-fetch)
|
||||
(uri (git-reference
|
||||
(url "https://github.com/SOCI/soci/")
|
||||
(commit version)))
|
||||
(commit (string-append "v" version))))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"14x2gjblkgpflv75wl144cyjp1sis5rbxnr9r2gj3yw16v2av0bp"))))
|
||||
"0qc6d71lyrfh5zb7pmfihd1hjyazlkgq6p0g06ans77wnnjh0k9l"))))
|
||||
(build-system cmake-build-system)
|
||||
(propagated-inputs
|
||||
;; Headers of soci has include-references to headers of these inputs.
|
||||
|
|
@ -3838,14 +3905,14 @@ PostreSQL, SQLite, ODBC and MySQL.")
|
|||
(define-public freetds
|
||||
(package
|
||||
(name "freetds")
|
||||
(version "1.2.19")
|
||||
(version "1.2.20")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://www.freetds.org/files/stable/"
|
||||
"freetds-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "11xf2w8gh2p9cq4i38jfvdiwgig8wqbg098xjc08kx4iii8lxy3m"))))
|
||||
(base32 "11fzwcahc1bc8npxbif0448v9cwyf7k04167i7fcspmfw7a0hj0d"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
;; NOTE: (Sharlatan-20210110213908+0000) some tests require DB connection,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue