diff options
author | Marius Bakke <marius@gnu.org> | 2020-07-25 01:20:26 +0200 |
---|---|---|
committer | Marius Bakke <marius@gnu.org> | 2020-07-25 16:16:11 +0200 |
commit | e605d3bd54118605281a472c97db3d74e7b97b63 (patch) | |
tree | 377feb968aad6e9a67ec81a029c5ef01d74d09de | |
parent | c866b09d40eb17293db99f7c6caaef7fb77bfa33 (diff) | |
download | guix-e605d3bd54118605281a472c97db3d74e7b97b63.tar.gz |
gnu: popt: Update to 1.18.
* gnu/packages/popt.scm (popt): Update to 1.18. [source](uri): Change to new tarball URL. [arguments]: Adjust test substitutions for file renames.
-rw-r--r-- | gnu/packages/popt.scm | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/gnu/packages/popt.scm b/gnu/packages/popt.scm index df80f12077..11d2b1827d 100644 --- a/gnu/packages/popt.scm +++ b/gnu/packages/popt.scm @@ -59,27 +59,23 @@ line syntax.") (define-public popt (package (name "popt") - (version "1.16") + (version "1.18") (source (origin (method url-fetch) - ;; The original rpm5.org domain is not accessible since - ;; 2019-06-13, so use Debians copy of the tarball. - (uri (string-append "https://deb.debian.org/debian/pool/main" - "/p/popt/popt_" version ".orig.tar.gz")) - ;; Ensure the file name stays the same to prevent rebuilds. - (file-name (string-append "popt-" version ".tar.gz")) + (uri (string-append "http://ftp.rpm.org/popt/releases" + "/popt-1.x/popt-" version ".tar.gz")) (sha256 (base32 - "1j2c61nn2n351nhj4d25mnf3vpiddcykq005w2h6kw79dwlysa77")))) + "1lf5zlj5rbg6s4bww7hbhpca97prgprnarx978vcwa0bl81vqnai")))) (build-system gnu-build-system) (arguments '(#:phases (modify-phases %standard-phases (add-before 'configure 'patch-test (lambda _ - (substitute* "test-poptrc.in" + (substitute* "tests/test-poptrc.in" (("/bin/echo") (which "echo"))) - (substitute* "testit.sh" ; don't expect old libtool names + (substitute* "tests/testit.sh" ;don't expect old libtool names (("lt-test1") "test1")) #t))))) (home-page "http://rpm5.org/files/popt/") |