From d5fa9fd1fe90ad024ec5a14c21c95407e1f78441 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Apr 2017 23:20:47 +0300 Subject: gnu: lsof: Add to mirror list. * gnu/packages/lsof.scm (lsof)[source]: Add to mirror list. --- gnu/packages/lsof.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/lsof.scm') diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm index da42957fee..e4730baa8b 100644 --- a/gnu/packages/lsof.scm +++ b/gnu/packages/lsof.scm @@ -43,6 +43,9 @@ (string-append "ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/lsof_" version ".tar.bz2") + (string-append + "ftp://ftp.fu-berlin.de/pub/unix/tools/lsof/OLD/lsof_" + version ".tar.bz2") (string-append "ftp://sunsite.ualberta.ca/pub/Mirror/lsof/lsof_" version ".tar.bz2"))) -- cgit 1.4.1 From b6ea329a32f1d1da17ff72affab2e1fe16aff51f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Apr 2017 23:23:54 +0300 Subject: gnu: lsof: Use 'modify-phases' syntax. * gnu/packages/lsof.scm (lsof)[arguments]: Use 'modify-phases' syntax. --- gnu/packages/lsof.scm | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) (limited to 'gnu/packages/lsof.scm') diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm index e4730baa8b..97658c856a 100644 --- a/gnu/packages/lsof.scm +++ b/gnu/packages/lsof.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013 Andreas Enge +;;; Copyright © 2017 Efraim Flashner ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,31 +58,27 @@ (arguments `(#:tests? #f ; no test target #:phases - (alist-replace - 'unpack - (lambda* (#:key source #:allow-other-keys) - (let ((unpack (assoc-ref %standard-phases 'unpack))) - (unpack #:source source) - (unpack #:source (car (find-files "." "\\.tar$"))))) - (alist-replace - 'configure - (lambda _ - (setenv "LSOF_CC" "gcc") - (setenv "LSOF_MAKE" "make") - (system* "./Configure" "linux")) - (alist-replace - 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir out) - (mkdir (string-append out "/bin")) - (copy-file "lsof" (string-append out "/bin/lsof")) - (mkdir (string-append out "/share")) - (mkdir (string-append out "/share/man")) - (mkdir (string-append out "/share/man/man8")) - (copy-file "lsof.8" (string-append out "/share/man/man8/lsof.8")) - )) - %standard-phases))))) + (modify-phases %standard-phases + (replace 'unpack + (lambda* (#:key source #:allow-other-keys) + (let ((unpack (assoc-ref %standard-phases 'unpack))) + (unpack #:source source) + (unpack #:source (car (find-files "." "\\.tar$")))))) + (replace 'configure + (lambda _ + (setenv "LSOF_CC" "gcc") + (setenv "LSOF_MAKE" "make") + (zero? (system* "./Configure" "linux")))) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (mkdir out) + (mkdir (string-append out "/bin")) + (copy-file "lsof" (string-append out "/bin/lsof")) + (mkdir (string-append out "/share")) + (mkdir (string-append out "/share/man")) + (mkdir (string-append out "/share/man/man8")) + (copy-file "lsof.8" (string-append out "/share/man/man8/lsof.8")))))))) (synopsis "Display information about open files") (description "Lsof stands for LiSt Open Files, and it does just that. -- cgit 1.4.1 From 4ae3549f7cd57ecd09ebd957ec512dd530dc83d0 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Apr 2017 23:39:53 +0300 Subject: gnu: lsof: Shorten 'install phase. * gnu/packages/lsof.scm (lsof)[arguments]: Use 'install-file during the 'install phase. --- gnu/packages/lsof.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'gnu/packages/lsof.scm') diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm index 97658c856a..5442936a49 100644 --- a/gnu/packages/lsof.scm +++ b/gnu/packages/lsof.scm @@ -72,13 +72,9 @@ (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - (mkdir out) - (mkdir (string-append out "/bin")) - (copy-file "lsof" (string-append out "/bin/lsof")) - (mkdir (string-append out "/share")) - (mkdir (string-append out "/share/man")) - (mkdir (string-append out "/share/man/man8")) - (copy-file "lsof.8" (string-append out "/share/man/man8/lsof.8")))))))) + (install-file "lsof" (string-append out "/bin")) + (install-file "lsof.8" (string-append out "/share/man/man8"))) + #t))))) (synopsis "Display information about open files") (description "Lsof stands for LiSt Open Files, and it does just that. -- cgit 1.4.1 From e18e17ea4ea9172402e782d69477bf15c1c25776 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sat, 29 Apr 2017 23:31:39 +0300 Subject: gnu: lsof: Update to 4.89. * gnu/packages/lsof.scm (lsof): Update to 4.89. --- gnu/packages/lsof.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/lsof.scm') diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm index 5442936a49..0c1d950d4c 100644 --- a/gnu/packages/lsof.scm +++ b/gnu/packages/lsof.scm @@ -30,7 +30,7 @@ (define-public lsof (package (name "lsof") - (version "4.88") + (version "4.89") (source (origin (method url-fetch) (uri (list (string-append %ftp-base "lsof_" @@ -52,7 +52,7 @@ version ".tar.bz2"))) (sha256 (base32 - "16y9wm26rg81mihnzcbdg8h8vhxmq8kn62ssxb8cqydp4q79nvzy")))) + "061p18v0mhzq517791xkjs8a5dfynq1418a1mwxpji69zp2jzb41")))) (build-system gnu-build-system) (inputs `(("perl" ,perl))) (arguments -- cgit 1.4.1