diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-05 15:24:38 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-20 08:32:31 -0400 |
| commit | 4413b09fa39bd5e0de1e41cea851c5b526faec24 (patch) | |
| tree | 2509e609c821f417bf3edbb51cf3cbfc09433d54 | |
| parent | 458b791f353a5787837289467356f474fc290a4c (diff) | |
| download | guix-4413b09fa39bd5e0de1e41cea851c5b526faec24.tar.gz guix-4413b09fa39bd5e0de1e41cea851c5b526faec24.zip | |
gnu: redis: Use gexps and streamline.
* gnu/packages/databases.scm (redis) [arguments]: Merge the use-correct-tclsh
into the patch-paths phase. Use 'which' instead of assoc-ref. Move
the #:make-flags argument before the #:phases one. Use cc-for-target as the
value of the CC make flag.
[native-inputs]: Move field below arguments.
| -rw-r--r-- | gnu/packages/databases.scm | 65 |
1 files changed, 30 insertions, 35 deletions
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm index 400d34ac8d..1ab9bc36a1 100644 --- a/gnu/packages/databases.scm +++ b/gnu/packages/databases.scm @@ -2455,42 +2455,37 @@ similar to BerkeleyDB, LevelDB, etc.") ;; Delete bundled jemalloc, as the package will use the libc one '(begin (delete-file-recursively "deps/jemalloc"))))) (build-system gnu-build-system) - (native-inputs - (list pkg-config procps tcl which)) (arguments - '(#:phases - (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'use-correct-tclsh - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "runtest" - (("^TCLSH=.*") - (string-append "TCLSH=" - (assoc-ref inputs "tcl") - "/bin/tclsh"))))) - (add-after 'unpack 'patch-paths - (lambda _ - (substitute* "tests/support/server.tcl" - (("/usr/bin/env") - (which "env"))))) - (add-after 'unpack 'adjust-tests - (lambda _ - ;; Disable failing tests - (substitute* "tests/test_helper.tcl" - ;; The AOF tests cause the test suite to hang waiting for a - ;; "background AOF rewrite to finish", perhaps because dead - ;; processes persist as zombies in the build environment. - (("unit/aofrw") "") - (("integration/aof(-multi-part)?") "") - (("integration/failover") "") - (("integration/replication-4") "") - (("integration/replication-psync") "") - (("integration/replication[^-]") ""))))) - #:make-flags `("CC=gcc" - "MALLOC=libc" - "LDFLAGS=-ldl" - ,(string-append "PREFIX=" - (assoc-ref %outputs "out"))))) + (list + #:make-flags #~(list #$(string-append "CC=" (cc-for-target)) + "MALLOC=libc" + "LDFLAGS=-ldl" + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "runtest" + (("^TCLSH=.*") + (string-append "TCLSH=" (which "tclsh")))) + (substitute* "tests/support/server.tcl" + (("/usr/bin/env") + (which "env"))))) + (add-after 'unpack 'adjust-tests + (lambda _ + ;; Disable failing tests + (substitute* "tests/test_helper.tcl" + ;; The AOF tests cause the test suite to hang waiting for a + ;; "background AOF rewrite to finish", perhaps because dead + ;; processes persist as zombies in the build environment. + (("unit/aofrw") "") + (("integration/aof(-multi-part)?") "") + (("integration/failover") "") + (("integration/replication-4") "") + (("integration/replication-psync") "") + (("integration/replication[^-]") ""))))))) + (native-inputs (list pkg-config procps tcl which)) (synopsis "Key-value cache and store") (description "Redis is an advanced key-value cache and store. Redis supports many data structures including strings, hashes, lists, sets, sorted |