mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 13:58:15 -05:00
gnu: rpm: Update to 4.18.0.
* gnu/packages/package-management.scm (rpm): Update to 4.18.0. [arguments]: Improve robustness of fix-lua-check phase. Delete obsolete set-nss-library-path phase. [inputs]: Remove bdb, cpio, nspr, and nss. Move python to... [native-inputs]: ... here.
This commit is contained in:
parent
f912d5c740
commit
f9c151b936
1 changed files with 9 additions and 20 deletions
|
@ -18,7 +18,7 @@
|
|||
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
|
||||
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
|
||||
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru>
|
||||
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
|
||||
;;; Copyright © 2021 John Kehayias <john.kehayias@protonmail.com>
|
||||
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
|
||||
;;;
|
||||
|
@ -854,7 +854,7 @@ (define-public xstow
|
|||
(define-public rpm
|
||||
(package
|
||||
(name "rpm")
|
||||
(version "4.17.1.1")
|
||||
(version "4.18.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "http://ftp.rpm.org/releases/rpm-"
|
||||
|
@ -862,36 +862,25 @@ (define-public rpm
|
|||
version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32
|
||||
"0lpkdp55assxf04dvfvwnmfmm6z4q5phkgfli1cwqn4nfxy0all7"))))
|
||||
"0m250plyananjn0790xmwy6kixmxcdj5iyy2ybnk1aw7f4nia5ra"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
'(#:configure-flags '("--with-external-db" ;use the system's bdb
|
||||
"--enable-python")
|
||||
'(#:configure-flags '("--enable-python")
|
||||
#:phases (modify-phases %standard-phases
|
||||
(add-after 'unpack 'fix-lua-check
|
||||
(lambda _
|
||||
(substitute* "configure"
|
||||
(("lua >= 5.3")
|
||||
"lua-5.3 >= 5.3"))))
|
||||
(add-before 'configure 'set-nss-library-path
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((nss (assoc-ref inputs "nss")))
|
||||
(setenv "LIBRARY_PATH"
|
||||
(string-append (getenv "LIBRARY_PATH") ":"
|
||||
nss "/lib/nss"))))))))
|
||||
(("lua >= ?.?")
|
||||
"lua-5.3 >= 5.3")))))))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(list pkg-config
|
||||
python))
|
||||
(inputs
|
||||
(list bdb
|
||||
bzip2
|
||||
cpio
|
||||
(list bzip2
|
||||
file
|
||||
libarchive
|
||||
libgcrypt
|
||||
lua
|
||||
nspr
|
||||
nss
|
||||
python
|
||||
sqlite
|
||||
xz
|
||||
zlib))
|
||||
|
|
Loading…
Reference in a new issue