mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
Merge branch 'master' into core-updates
This commit is contained in:
commit
a8448da0f4
245 changed files with 62932 additions and 4624 deletions
|
@ -47,6 +47,7 @@
|
|||
;;; Copyright © 2020 Vinicius Monego <monego@posteo.net>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
|
||||
;;; Copyright © 2021 Greg Hogan <code@greghogan.com>
|
||||
;;;
|
||||
;;; This file is part of GNU Guix.
|
||||
;;;
|
||||
|
@ -1169,7 +1170,7 @@ as a drop-in replacement of MySQL.")
|
|||
(define-public mariadb-connector-c
|
||||
(package
|
||||
(name "mariadb-connector-c")
|
||||
(version "3.1.11")
|
||||
(version "3.1.12")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
|
@ -1177,8 +1178,9 @@ as a drop-in replacement of MySQL.")
|
|||
"https://downloads.mariadb.org/f/connector-c-" version
|
||||
"/mariadb-connector-c-" version "-src.tar.gz"
|
||||
"/from/https%3A//mirrors.ukfast.co.uk/sites/mariadb/?serve"))
|
||||
(file-name (string-append name "-" version ".tar.gz"))
|
||||
(sha256
|
||||
(base32 "03svzahdf7czjlm695c11r4bfd04qdqgx8r1vkpr1zlkjhwnqvry"))))
|
||||
(base32 "0qzyahr8x9l1xz0l79wz3iahxz7648n1azc5yr7kx0dl113y2nig"))))
|
||||
(inputs
|
||||
`(("openssl" ,openssl)))
|
||||
(build-system cmake-build-system)
|
||||
|
@ -1194,6 +1196,7 @@ developed in C/C++ to MariaDB and MySQL databases.")
|
|||
(define-public postgresql-13
|
||||
(package
|
||||
(name "postgresql")
|
||||
(replacement postgresql-13.2)
|
||||
(version "13.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
|
@ -1248,42 +1251,56 @@ TIMESTAMP. It also supports storage of binary large objects, including
|
|||
pictures, sounds, or video.")
|
||||
(license (license:x11-style "file://COPYRIGHT"))))
|
||||
|
||||
(define-public postgresql-13.2
|
||||
(package
|
||||
(inherit postgresql-13)
|
||||
(name "postgresql")
|
||||
(version "13.2")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
|
||||
version "/postgresql-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1z5d847jnajcfr3wa6jn52a8xjhamvwzmz18xlm5nvxqip8grmsz"))
|
||||
(patches (search-patches "postgresql-disable-resolve_symlinks.patch"))))))
|
||||
|
||||
(define-public postgresql-11
|
||||
(package
|
||||
(inherit postgresql-13)
|
||||
(name "postgresql")
|
||||
(version "11.6")
|
||||
(version "11.11")
|
||||
(source (origin
|
||||
(inherit (package-source postgresql-13))
|
||||
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
|
||||
version "/postgresql-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0w1iq488kpzfgfnlw4k32lz5by695mpnkq461jrgsr99z5zlz4j9"))))))
|
||||
"0v0qk298nxmpzpgsxcsxma328hdkyzd7fwjs0zsn6zavl5zpnq20"))))))
|
||||
|
||||
(define-public postgresql-10
|
||||
(package
|
||||
(inherit postgresql-11)
|
||||
(version "10.13")
|
||||
(version "10.16")
|
||||
(source (origin
|
||||
(inherit (package-source postgresql-11))
|
||||
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
|
||||
version "/postgresql-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1qal0yp7a90yzya7hl56gsmw5fvacplrdhpn7h9gnbyr1i2iyw2d"))))))
|
||||
"1cvv8qw0gkkczqhiwx6ns7w88dwkvdz4cvb2d4ff14363f5p2p53"))))))
|
||||
|
||||
(define-public postgresql-9.6
|
||||
(package
|
||||
(inherit postgresql-10)
|
||||
(version "9.6.16")
|
||||
(version "9.6.21")
|
||||
(source (origin
|
||||
(inherit (package-source postgresql-10))
|
||||
(uri (string-append "https://ftp.postgresql.org/pub/source/v"
|
||||
version "/postgresql-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"1rr2dgv4ams8r2lp13w85c77rkmzpb88fjlc28mvlw6zq2fblv2w"))))))
|
||||
"0d0ngpadf1i7c0i2psaxcbmiwx8334ibcsn283n9fp4853pyl3wk"))))))
|
||||
|
||||
(define-public postgresql postgresql-13)
|
||||
|
||||
|
@ -2255,14 +2272,14 @@ similar to BerkeleyDB, LevelDB, etc.")
|
|||
(define-public redis
|
||||
(package
|
||||
(name "redis")
|
||||
(version "6.0.10")
|
||||
(version "6.0.11")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://download.redis.io/releases/redis-"
|
||||
version".tar.gz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1gc529nfh8frk4pynyjlnmzvwa0j9r5cmqwyd7537sywz6abifvr"))
|
||||
"0prwqap452m581nyc3cz642d1z3x9nd81896hlqdm3z8238z49y9"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Delete bundled jemalloc, as the package will use the libc one
|
||||
|
@ -3773,7 +3790,7 @@ Monitor read/write activity on a mongo server
|
|||
(define-public apache-arrow
|
||||
(package
|
||||
(name "apache-arrow")
|
||||
(version "0.17.1")
|
||||
(version "3.0.0")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
|
@ -3783,7 +3800,7 @@ Monitor read/write activity on a mongo server
|
|||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32
|
||||
"02r6yx3yhywzikd3b0vfkjgddhfiriyx2vpm3jf5880wq59x798a"))))
|
||||
"03ngddh3r1g6f9aja2jlfksgvgyzmxmfy4bxvzjrcv5fvl5x8ii0"))))
|
||||
(build-system cmake-build-system)
|
||||
(arguments
|
||||
`(#:tests? #f
|
||||
|
@ -3861,23 +3878,24 @@ Monitor read/write activity on a mongo server
|
|||
;;"-DBENCHMARK_ENABLE_TESTING=OFF"
|
||||
"-DARROW_BUILD_STATIC=OFF")))
|
||||
(inputs
|
||||
`(("boost" ,boost)
|
||||
`(("apache-thrift" ,apache-thrift "lib")
|
||||
("boost" ,boost)
|
||||
("brotli" ,google-brotli)
|
||||
("bzip2" ,bzip2)
|
||||
("double-conversion" ,double-conversion)
|
||||
("snappy" ,snappy)
|
||||
("gflags" ,gflags)
|
||||
("glog" ,glog)
|
||||
("apache-thrift" ,apache-thrift "lib")
|
||||
("protobuf" ,protobuf)
|
||||
("rapidjson" ,rapidjson)
|
||||
("zlib" ,zlib)
|
||||
("bzip2" ,bzip2)
|
||||
("lz4" ,lz4)
|
||||
("zstd" ,zstd "lib")
|
||||
("re2" ,re2)
|
||||
("grpc" ,grpc)
|
||||
("lz4" ,lz4)
|
||||
("protobuf" ,protobuf)
|
||||
("python-3" ,python)
|
||||
("python-numpy" ,python-numpy)))
|
||||
("python-numpy" ,python-numpy)
|
||||
("rapidjson" ,rapidjson)
|
||||
("re2" ,re2)
|
||||
("snappy" ,snappy)
|
||||
("utf8proc" ,utf8proc)
|
||||
("zlib" ,zlib)
|
||||
("zstd" ,zstd "lib")))
|
||||
(native-inputs
|
||||
`(("pkg-config" ,pkg-config)))
|
||||
(outputs '("out" "lib" "include"))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue