[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
50/416: gnu: MariaDB: Remove input labels.
From: |
guix-commits |
Subject: |
50/416: gnu: MariaDB: Remove input labels. |
Date: |
Fri, 14 Apr 2023 15:25:16 -0400 (EDT) |
apteryx pushed a commit to branch master
in repository guix.
commit aeed9d884ef1615be1285cee60e2496be46426a8
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Oct 28 21:58:05 2022 +0200
gnu: MariaDB: Remove input labels.
* gnu/packages/databases.scm (mariadb)[arguments]: Don't reference OpenSSL
by
label.
[inputs]: Remove labels.
---
gnu/packages/databases.scm | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index 952eaeb206..bc3821480a 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1058,13 +1058,12 @@ Language.")
"--skip-rpl"
"--skip-test-list=unstable-tests"))
(format #t "test suite not run~%"))))
- (add-after
- 'install 'post-install
- (lambda* (#:key inputs outputs #:allow-other-keys)
- (let* ((out (assoc-ref outputs "out"))
+ (add-after 'install 'post-install
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
(dev (assoc-ref outputs "dev"))
(lib (assoc-ref outputs "lib"))
- (openssl (assoc-ref inputs "openssl")))
+ (openssl (dirname (search-input-file inputs
"lib/libssl.so"))))
(substitute* (list (string-append out "/bin/mariadb-install-db")
(string-append out "/bin/mysql_install_db"))
(("basedir=\"\"")
@@ -1102,20 +1101,20 @@ Language.")
(substitute* (list (string-append dev "/bin/mysql_config")
(string-append dev
"/lib/pkgconfig/mariadb.pc"))
(("-lssl -lcrypto" all)
- (string-append "-L" openssl "/lib " all)))))))))
+ (string-append "-L" openssl " " all)))))))))
(native-inputs
(list bison perl))
(inputs
- `(("fmt" ,fmt)
- ("jemalloc" ,jemalloc)
- ("libaio" ,libaio)
- ("libxml2" ,libxml2)
- ("ncurses" ,ncurses)
- ("openssl" ,openssl)
- ("pam" ,linux-pam)
- ("pcre2" ,pcre2)
- ("xz" ,xz)
- ("zlib" ,zlib)))
+ (list fmt
+ jemalloc
+ libaio
+ libxml2
+ ncurses
+ openssl
+ linux-pam
+ pcre2
+ xz
+ zlib))
;; The test suite is very resource intensive and can take more than three
;; hours on a x86_64 system. Give slow and busy machines some leeway.
(properties '((timeout . 64800))) ;18 hours
- 18/416: gnu: xdg-utils: Use G-expression., (continued)
- 18/416: gnu: xdg-utils: Use G-expression., guix-commits, 2023/04/14
- 14/416: gnu: VLC: Fix build with dav1d 1.0., guix-commits, 2023/04/14
- 22/416: gnu: spirv-headers: Replace version with %vulkan-sdk-version., guix-commits, 2023/04/14
- 23/416: gnu: spirv-tools: Replace version with %vulkan-sdk-version., guix-commits, 2023/04/14
- 25/416: gnu: spirv-cross: Update to sdk-1.3.231.1., guix-commits, 2023/04/14
- 29/416: gnu: vulkan-tools: Update to sdk-1.3.231.1., guix-commits, 2023/04/14
- 15/416: gnu: python-pytest-mock: Update to 3.10.0., guix-commits, 2023/04/14
- 24/416: gnu: glslang: Update to sdk-1.3.231.1., guix-commits, 2023/04/14
- 26/416: gnu: shaderc: Update to 2022.3., guix-commits, 2023/04/14
- 31/416: gnu: Add volk., guix-commits, 2023/04/14
- 50/416: gnu: MariaDB: Remove input labels.,
guix-commits <=
- 52/416: gnu: NSS: Update to 3.85., guix-commits, 2023/04/14
- 63/416: gnu: sdl2-net: Update to 2.2.0., guix-commits, 2023/04/14
- 64/416: gnu: sdl2-ttf: Update to 2.20.1., guix-commits, 2023/04/14
- 65/416: gnu: sdl2-ttf: Fix source snippet., guix-commits, 2023/04/14
- 19/416: gnu: libx264: Update to 164-0.b093bbe., guix-commits, 2023/04/14
- 34/416: gnu: libwebp: Update to 1.2.4., guix-commits, 2023/04/14
- 35/416: gnu: bluez: Update to 5.66., guix-commits, 2023/04/14
- 37/416: gnu: glew: Update to 2.2.0., guix-commits, 2023/04/14
- 46/416: gnu: Add vulkan-memory-allocator., guix-commits, 2023/04/14
- 47/416: gnu: vulkan-loader: Update to 1.3.232., guix-commits, 2023/04/14