Merge branch 'master' into core-updates

This commit is contained in:
Christopher Baines 2021-03-05 22:56:40 +00:00
commit a8448da0f4
No known key found for this signature in database
GPG key ID: 5E28A33B0B84F577
245 changed files with 62932 additions and 4624 deletions

View file

@ -1,7 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2019, 2020 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2013 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016, 2021 Leo Famulari <leo@famulari.name>
;;; Copyright © 2017, 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
@ -62,6 +62,7 @@
(define-public openldap
(package
(name "openldap")
(replacement openldap-2.4.57)
(version "2.4.50")
(source (origin
(method url-fetch)
@ -126,6 +127,27 @@
(license openldap2.8)
(home-page "https://www.openldap.org/")))
(define-public openldap-2.4.57
(package
(inherit openldap)
(version "2.4.57")
(source (origin
(method url-fetch)
;; See <http://www.openldap.org/software/download/> for a list of
;; mirrors.
(uri (list (string-append
"ftp://mirror.switch.ch/mirror/OpenLDAP/"
"openldap-release/openldap-" version ".tgz")
(string-append
"https://www.openldap.org/software/download/OpenLDAP/"
"openldap-release/openldap-" version ".tgz")
(string-append
"ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/"
"openldap-release/openldap-" version ".tgz")))
(sha256
(base32
"0nmlyqhc52v24b4awh914sczmvxbazgq2cnlycvb9dgcwvhlgfn7"))))))
(define-public nss-pam-ldapd
(package
(name "nss-pam-ldapd")
@ -216,14 +238,14 @@ servers from Python programs.")
(define-public 389-ds-base
(package
(name "389-ds-base")
(version "1.4.0.21")
(version "1.4.0.31")
(source (origin
(method url-fetch)
(uri (string-append "https://releases.pagure.org/389-ds-base/"
"389-ds-base-" version ".tar.bz2"))
(sha256
(base32
"1qd1ap5d5nxyiq0d19czfwc3h7iwl9lmr5sy7d7xmpr2by59aysr"))))
"1rs218iqxyclccsdqb529favdsmz88zw785lsxd9ln43ja3x3l65"))))
(build-system gnu-build-system)
(arguments
`(#:modules ((srfi srfi-1)