summary refs log tree commit diff
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2021-05-09 15:09:48 +0200
committerMarius Bakke <marius@gnu.org>2021-05-09 23:12:48 +0200
commitfa3043fc8c3f7b004f6fb77493bd0268cc77e5ff (patch)
tree7913b84cae0fe23bc091457717ecfdddd7972cc2
parentb7a9258941bd61be9c04234ddd0041b3fd384b47 (diff)
downloadguix-fa3043fc8c3f7b004f6fb77493bd0268cc77e5ff.tar.gz
gnu: MariaDB: Incorporate grafted changes.
* gnu/packages/databases.scm (mariadb)[replacement]: Remove.
[source](patches): New field.
(mariadb/fixed): Remove variable.
-rw-r--r--gnu/packages/databases.scm9
1 files changed, 1 insertions, 8 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 161c3b42df..276f239f2c 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")