nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: rpm: Update to 4.14.2. 

* gnu/packages/package-management.scm (rpm): Update to 4.14.2.
[arguments]: Rename 'set-nspr-search-path' phase to
'set-nss-library-path' and remove CPATH work-around.
Remove obsolete 'fix-rpm-symlinks' phase.
[home-page]: Drop www.
This commit is contained in:
Tobias Geerinckx-Rice 2018-10-04 06:25:53 +02:00
parent 88abd73eeb
commit 91a3c8005d
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gnu/packages/package-management.scm
View File

@ -495,7 +495,7 @@ symlinks to the files in a common directory such as /usr/local.")
(define-public rpm (define-public rpm
(package (package
(name "rpm") (name "rpm")
(version "4.13.0.2") (version "4.14.2")
(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-"
@ -503,40 +503,20 @@ symlinks to the files in a common directory such as /usr/local.")
version ".tar.bz2")) version ".tar.bz2"))
(sha256 (sha256
(base32 (base32
"1521y4ghjns449kzpwkjn9cksh686383xnfx0linzlalqc3jqgig")))) "0armd7dqr8bl0isx8l4xlylm7dikasmxhhcbz336fkp2x30w5jw0"))))
(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") "--without-lua")
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-before 'configure 'set-nspr-search-path (add-before 'configure 'set-nss-library-path
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
;; nspr.pc contains the right -I flag pointing to (let ((nss (assoc-ref inputs "nss")))
;; 'include/nspr', but unfortunately 'configure' doesn't
;; use 'pkg-config'. Thus, augment CPATH.
;; Likewise for NSS.
(let ((nspr (assoc-ref inputs "nspr"))
(nss (assoc-ref inputs "nss")))
(setenv "CPATH"
(string-append (getenv "C_INCLUDE_PATH") ":"
nspr "/include/nspr:"
nss "/include/nss"))
(setenv "LIBRARY_PATH" (setenv "LIBRARY_PATH"
(string-append (getenv "LIBRARY_PATH") ":" (string-append (getenv "LIBRARY_PATH") ":"
nss "/lib/nss")) nss "/lib/nss"))
#t))) #t))))))
(add-after 'install 'fix-rpm-symlinks
(lambda* (#:key outputs #:allow-other-keys)
;; 'make install' gets these symlinks wrong. Fix them.
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(with-directory-excursion bin
(for-each (lambda (file)
(delete-file file)
(symlink "rpm" file))
'("rpmquery" "rpmverify"))
#t)))))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config))) `(("pkg-config" ,pkg-config)))
(inputs (inputs
@ -552,7 +532,7 @@ symlinks to the files in a common directory such as /usr/local.")
("bzip2" ,bzip2) ("bzip2" ,bzip2)
("zlib" ,zlib) ("zlib" ,zlib)
("cpio" ,cpio))) ("cpio" ,cpio)))
(home-page "http://www.rpm.org/") (home-page "http://rpm.org/")
(synopsis "The RPM Package Manager") (synopsis "The RPM Package Manager")
(description (description
"The RPM Package Manager (RPM) is a command-line driven package "The RPM Package Manager (RPM) is a command-line driven package