me/guix
Archived
1
0
Fork 0
Code Activity

gnu: rpm: Update to 4.17.0.

Browse source 
* gnu/packages/package-management.scm (rpm): Update to 4.17.0.
[configure-flags]: Remove '--without-lua', no longer supported.
[phases]: Delete trailing #t.
{fix-lua-check}: New phase.
[inputs]: Use new style, sort inputs and add lua.
This commit is contained in:
Maxim Cournoyer 2022-05-13 01:03:31 -04:00
parent 2e6f4220cf
commit c61746b8aa
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 23 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -80,6 +80,7 @@
#:use-module (gnu packages libedit) #:use-module (gnu packages libedit)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages lisp) #:use-module (gnu packages lisp)
#:use-module (gnu packages lua)
#:use-module (gnu packages man) #:use-module (gnu packages man)
#:use-module (gnu packages markup) #:use-module (gnu packages markup)
#:use-module (gnu packages nettle) #:use-module (gnu packages nettle)
@ -825,7 +826,7 @@ features of Stow with some extensions.")
(define-public rpm (define-public rpm
(package (package
(name "rpm") (name "rpm")
(version "4.16.1.3") (version "4.17.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-"
@ -833,35 +834,40 @@ features of Stow with some extensions.")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"07g2g0adgjm29wqy94iqhpp5dk0hacfw1yf7kzycrrxnfbwwfgai")))) "0sjyqs6hc57k46f45b68dfxnp985s0gar0fi1s0ig6vl4h5j439f"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
'(#:configure-flags '("--with-external-db" ;use the system's bdb '(#:configure-flags '("--with-external-db" ;use the system's bdb
"--enable-python" "--enable-python")
"--without-lua")
#:phases (modify-phases %standard-phases #: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 (add-before 'configure 'set-nss-library-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(let ((nss (assoc-ref inputs "nss"))) (let ((nss (assoc-ref inputs "nss")))
(setenv "LIBRARY_PATH" (setenv "LIBRARY_PATH"
(string-append (getenv "LIBRARY_PATH") ":" (string-append (getenv "LIBRARY_PATH") ":"
nss "/lib/nss")) nss "/lib/nss"))))))))
#t))))))
(native-inputs (native-inputs
(list pkg-config)) (list pkg-config))
(inputs (inputs
(list python (list bdb
xz bzip2
bdb cpio
popt file
nss
nspr
libarchive libarchive
libgcrypt libgcrypt
file lua
bzip2 nspr
zlib nss
cpio)) popt
python
sqlite
xz
zlib))
(home-page "https://rpm.org/") (home-page "https://rpm.org/")
(synopsis "The RPM Package Manager") (synopsis "The RPM Package Manager")
(description (description