~ruther/guix-local

f2166cfacea03dcc399d1858d27ff473ebfc0679 — Andreas Enge 3 years ago 1b28cde
gnu: openldap: Update to 2.6.4 and unify the two variables.

* gnu/packages/openldap.scm (openldap): Update to 2.6.4.
(openldap-for-linphone): Remove variable.
* gnu/packages/linphone.scm (liblinphone)[inputs]: Replace
openldap-for-linphone by openldap.
2 files changed, 4 insertions(+), 18 deletions(-)

M gnu/packages/linphone.scm
M gnu/packages/openldap.scm
M gnu/packages/linphone.scm => gnu/packages/linphone.scm +2 -1
@@ 4,6 4,7 @@
;;; Copyright © 2020, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2023 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2023 Andreas Enge <andreas@enge.fr>
;;;
;;; This file is part of GNU Guix.
;;;


@@ 799,7 800,7 @@ device.")
           libnotify
           libxml2
           mediastreamer2
           openldap-for-linphone
           openldap
           ortp
           soci
           sqlite

M gnu/packages/openldap.scm => gnu/packages/openldap.scm +2 -17
@@ 67,7 67,7 @@
(define-public openldap
  (package
    (name "openldap")
    (version "2.6.3")
    (version "2.6.4")
    (source (origin
              (method url-fetch)
              ;; See <http://www.openldap.org/software/download/> for a list of


@@ 83,7 83,7 @@
                          "openldap-release/openldap-" version ".tgz")))
              (sha256
               (base32
                "0ihddk8c6hg9lkjv0wk0w13g8kb75r8dfsn1n6b77mzk3pbs38nj"))))
                "1489li52sjxm1f97v927jxaxzfk6v9sa32ixrw30qhvq07jh85ym"))))
    (build-system gnu-build-system)
    (inputs (list bdb-5.3 cyrus-sasl gnutls libgcrypt zlib))
    (native-inputs (list libtool groff bdb-5.3))


@@ 113,21 113,6 @@
    (license openldap2.8)
    (home-page "https://www.openldap.org/")))

(define-public openldap-for-linphone
  (package
    (inherit openldap)
    (name "openldap")
    (version "2.6.4")
    (source (origin
              (method git-fetch)
              (uri (git-reference
                    (url "https://gitlab.linphone.org/BC/public/external/openldap/")
                    (commit "8a885896a3fb88098d970ab96316c0b7f18367b8")))
              (file-name (git-file-name name version))
              (sha256
               (base32
                "1yd3cnngr5z3nymnml8fynspxgdzap7y7glp601nbkdj67wyg0k8"))))))

(define-public nss-pam-ldapd
  (package
    (name "nss-pam-ldapd")