03/18: gnu: OpenLDAP: Absorb grafted replacement.

[guix-commits]

lfam pushed a commit to branch wip-next-release
in repository guix.

commit 6471572c5c2388e9e5168f96cbbebac8388c01a2
Author: Leo Famulari <leo@famulari.name>
AuthorDate: Fri Mar 5 15:08:43 2021 -0500

    gnu: OpenLDAP: Absorb grafted replacement.
    
    * gnu/packages/openldap.scm (openldap): Update to 2.4.57.
    [replacement]: Remove field.
    (openldap-2.4.57): Remove variable.
---
 gnu/packages/openldap.scm | 26 ++------------------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/openldap.scm b/gnu/packages/openldap.scm
index 400f106..062d646 100644
--- a/gnu/packages/openldap.scm
+++ b/gnu/packages/openldap.scm
@@ -61,8 +61,7 @@
 (define-public openldap
   (package
    (name "openldap")
-   (replacement openldap-2.4.57)
-   (version "2.4.50")
+   (version "2.4.57")
    (source (origin
              (method url-fetch)
              ;; See <http://www.openldap.org/software/download/> for a list of
@@ -78,7 +77,7 @@
                          "openldap-release/openldap-" version ".tgz")))
              (sha256
               (base32
-               "1f46nlfwmys110j36sifm7ah8m8f3s10c3vaiikmmigmifapvdaw"))))
+               "0nmlyqhc52v24b4awh914sczmvxbazgq2cnlycvb9dgcwvhlgfn7"))))
    (build-system gnu-build-system)
    (inputs `(("bdb" ,bdb-5.3)
              ("cyrus-sasl" ,cyrus-sasl)
@@ -126,27 +125,6 @@
    (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")