aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2020-02-16 16:39:30 +0100
committerTobias Geerinckx-Rice <me@tobias.gr>2020-02-16 22:46:38 +0100
commit8bb9f9971cd45c075b8ad9c9d454911ca6468764 (patch)
tree78f919654f008d7b9df4d21d57d06a46b82ba1d3
parent3bc39f0c5dc3a6e5ad2feca7438e1f1d55e24771 (diff)
downloadguix-8bb9f9971cd45c075b8ad9c9d454911ca6468764.tar.gz
guix-8bb9f9971cd45c075b8ad9c9d454911ca6468764.zip
gnu: ddclient: Update to 3.9.1.
* gnu/packages/dns.scm (ddclient): Update to 3.9.1. [source]: Use GIT-FETCH and add a FILE-NAME. [native-inputs]: Remove gzip and tar. [arguments]: Adapt to git checkout source.
-rw-r--r--gnu/packages/dns.scm96
1 files changed, 47 insertions, 49 deletions
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 1ed751b7e1..ee95b8f396 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -741,20 +741,20 @@ LuaJIT, both a resolver library and a daemon.")
(define-public ddclient
(package
(name "ddclient")
- (version "3.9.0")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://sourceforge/ddclient/ddclient/ddclient-"
- version "/ddclient-" version ".tar.gz"))
- (sha256
- (base32
- "0fwyhab8yga2yi1kdfkbqxa83wxhwpagmj1w1mwkg2iffh1fjjlw"))))
+ (version "3.9.1")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/ddclient/ddclient.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0hf377g4j9r9sac75xp17nk2h58mazswz4vkg4g2gl2yyhvzq91w"))))
(build-system trivial-build-system) ; no Makefile.PL
(native-inputs
`(("bash" ,bash)
- ("gzip" ,gzip)
- ("perl" ,perl)
- ("tar" ,tar)))
+ ("perl" ,perl)))
(inputs
`(("inetutils" ,inetutils) ; logger
("net-tools" ,net-tools)
@@ -770,47 +770,45 @@ LuaJIT, both a resolver library and a daemon.")
(use-modules (guix build utils)
(ice-9 match)
(srfi srfi-26))
- ;; bootstrap
(setenv "PATH" (string-append
(assoc-ref %build-inputs "bash") "/bin" ":"
- (assoc-ref %build-inputs "tar") "/bin" ":"
- (assoc-ref %build-inputs "gzip") "/bin" ":"
(assoc-ref %build-inputs "perl") "/bin"))
- ;; extract source
- (invoke "tar" "xvf" (assoc-ref %build-inputs "source"))
- ;; package
- (with-directory-excursion (string-append ,name "-" ,version)
- (let* ((out (assoc-ref %outputs "out"))
- (bin (string-append out "/bin")))
- (let ((file "ddclient"))
- (substitute* file
- (("/usr/bin/perl") (which "perl"))
- ;; Strictly use ‘/etc/ddclient/ddclient.conf’.
- (("\\$\\{program\\}\\.conf") "/etc/ddclient/ddclient.conf")
- (("\\$etc\\$program.conf") "/etc/ddclient/ddclient.conf")
- ;; Strictly use ‘/var/cache/ddclient/ddclient.cache’
- (("\\$cachedir\\$program\\.cache")
- "/var/cache/ddclient/ddclient.cache"))
- (install-file file bin)
- (wrap-program (string-append bin "/" file)
- `("PATH" ":" =
- ("$PATH"
- ,@(map (lambda (input)
- (match input
- ((name . store)
- (string-append store "/bin"))))
- %build-inputs)))
- `("PERL5LIB" ":" =
- ,(delete
- ""
- (map (match-lambda
- (((? (cut string-prefix? "perl-" <>) name) . dir)
- (string-append dir "/lib/perl5/site_perl"))
- (_ ""))
- %build-inputs)))))
- (for-each (cut install-file <> (string-append out
- "/share/ddclient"))
- (find-files "." "sample.*$")))))))
+
+ ;; Copy the (read-only) source into the (writable) build directory.
+ (copy-recursively (assoc-ref %build-inputs "source") ".")
+
+ ;; Install.
+ (let* ((out (assoc-ref %outputs "out"))
+ (bin (string-append out "/bin")))
+ (let ((file "ddclient"))
+ (substitute* file
+ (("/usr/bin/perl") (which "perl"))
+ ;; Strictly use ‘/etc/ddclient/ddclient.conf’.
+ (("\\$\\{program\\}\\.conf") "/etc/ddclient/ddclient.conf")
+ (("\\$etc\\$program.conf") "/etc/ddclient/ddclient.conf")
+ ;; Strictly use ‘/var/cache/ddclient/ddclient.cache’
+ (("\\$cachedir\\$program\\.cache")
+ "/var/cache/ddclient/ddclient.cache"))
+ (install-file file bin)
+ (wrap-program (string-append bin "/" file)
+ `("PATH" ":" =
+ ("$PATH"
+ ,@(map (lambda (input)
+ (match input
+ ((name . store)
+ (string-append store "/bin"))))
+ %build-inputs)))
+ `("PERL5LIB" ":" =
+ ,(delete
+ ""
+ (map (match-lambda
+ (((? (cut string-prefix? "perl-" <>) name) . dir)
+ (string-append dir "/lib/perl5/site_perl"))
+ (_ ""))
+ %build-inputs)))))
+ (for-each (cut install-file <> (string-append out
+ "/share/ddclient"))
+ (find-files "." "sample.*$"))))))
(home-page "https://sourceforge.net/projects/ddclient/")
(synopsis "Address updating utility for dynamic DNS services")
(description "This package provides a client to update dynamic IP