me/guix
Archived
1
0
Fork 0
Code Activity

gnu: rpm: Update to 4.18.0.

Browse source 
* 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:
Maxim Cournoyer 2023-01-24 16:23:40 -05:00
parent f912d5c740
commit f9c151b936
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gnu/packages/package-management.scm
View file

@ -18,7 +18,7 @@
;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net> ;;; Copyright © 2020 Martin Becze <mjbecze@riseup.net>
;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com> ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
;;; Copyright © 2021 Ivan Gankevich <i.gankevich@spbu.ru> ;;; 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 © 2021 John Kehayias <john.kehayias@protonmail.com>
;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com> ;;; Copyright © 2022 Zhu Zihao <all_but_last@163.com>
;;; ;;;
@ -854,7 +854,7 @@ features of Stow with some extensions.")
(define-public rpm (define-public rpm
(package (package
(name "rpm") (name "rpm")
(version "4.17.1.1") (version "4.18.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "http://ftp.rpm.org/releases/rpm-" (uri (string-append "http://ftp.rpm.org/releases/rpm-"
@ -862,36 +862,25 @@ features of Stow with some extensions.")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"0lpkdp55assxf04dvfvwnmfmm6z4q5phkgfli1cwqn4nfxy0all7")))) "0m250plyananjn0790xmwy6kixmxcdj5iyy2ybnk1aw7f4nia5ra"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--with-external-db" ;use the system's bdb '(#:configure-flags '("--enable-python")
"--enable-python")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'unpack 'fix-lua-check (add-after 'unpack 'fix-lua-check
(lambda _ (lambda _
(substitute* "configure" (substitute* "configure"
(("lua >= 5.3") (("lua >= ?.?")
"lua-5.3 >= 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"))))))))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config
python))
(inputs (inputs
(list bdb (list bzip2
bzip2
cpio
file file
libarchive libarchive
libgcrypt libgcrypt
lua lua
nspr
nss
python
sqlite sqlite
xz xz
zlib)) zlib))