07/33: gnu: MariaDB: Incorporate grafted changes.

[guix-commits]

mbakke pushed a commit to branch core-updates
in repository guix.

commit fa3043fc8c3f7b004f6fb77493bd0268cc77e5ff
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun May 9 15:09:48 2021 +0200

    gnu: MariaDB: Incorporate grafted changes.
    
    * gnu/packages/databases.scm (mariadb)[replacement]: Remove.
    [source](patches): New field.
    (mariadb/fixed): Remove variable.
---
 gnu/packages/databases.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 161c3b4..276f239 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -716,6 +716,7 @@ Language.")
               (sha256
                (base32
                 "1s3vfm73911cddjhgpcbkya6nz7ag2zygg56qqzwscn5ybv28j7b"))
+              (patches (search-patches "mariadb-CVE-2021-27928.patch"))
               (modules '((guix build utils)))
               (snippet
                '(begin
@@ -736,7 +737,6 @@ Language.")
                             (append (find-files "extra/wolfssl")
                                     (find-files "zlib")))
                   #t))))
-    (replacement mariadb/fixed)
     (build-system cmake-build-system)
     (outputs '("out" "lib" "dev"))
     (arguments
@@ -972,13 +972,6 @@ Language.")
 as a drop-in replacement of MySQL.")
     (license license:gpl2)))
 
-(define mariadb/fixed
-  (package
-    (inherit mariadb)
-    (source (origin
-              (inherit (package-source mariadb))
-              (patches (search-patches "mariadb-CVE-2021-27928.patch"))))))
-
 (define-public mariadb-connector-c
   (package
     (name "mariadb-connector-c")