[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/09: gnu: nmap: Don't hardcode python version.
From: |
guix-commits |
Subject: |
01/09: gnu: nmap: Don't hardcode python version. |
Date: |
Mon, 17 Dec 2018 05:41:31 -0500 (EST) |
efraim pushed a commit to branch master
in repository guix.
commit cc729d257cf6a2cb865a4075fe9135716b3736c9
Author: Efraim Flashner <address@hidden>
Date: Sun Dec 16 19:56:50 2018 +0200
gnu: nmap: Don't hardcode python version.
* gnu/packages/admin.scm (nmap)[arguments]: Replace hardcoded python
version with parameterized one.
---
gnu/packages/admin.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 3e41b45..36d0ea8 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -1887,7 +1887,7 @@ done with the @code{auditctl} utility.")
;; TODO Add zenmap output.
(outputs '("out" "ndiff"))
(arguments
- '(#:configure-flags '("--without-zenmap")
+ `(#:configure-flags '("--without-zenmap")
#:phases
(modify-phases %standard-phases
(add-after 'configure 'patch-Makefile
@@ -1903,7 +1903,10 @@ done with the @code{auditctl} utility.")
(string-append "prefix=" out)
args))
(define (python-path dir)
- (string-append dir "/lib/python2.7/site-packages"))
+ (string-append dir "/lib/python"
+ ,(version-major+minor
+ (package-version python))
+ "/site-packages"))
(let ((out (assoc-ref outputs "out"))
(ndiff (assoc-ref outputs "ndiff")))
(for-each mkdir-p (list out ndiff))
- branch master updated (f8be766 -> 1e2ebf7), guix-commits, 2018/12/17
- 01/09: gnu: nmap: Don't hardcode python version.,
guix-commits <=
- 04/09: gnu: kicad: Don't hardcode version numbers., guix-commits, 2018/12/17
- 02/09: gnu: gess: Don't hardcode python version., guix-commits, 2018/12/17
- 05/09: gnu: z3: Declare source-file-name., guix-commits, 2018/12/17
- 03/09: gnu: avogadro: Don't hardcode python version., guix-commits, 2018/12/17
- 09/09: gnu: tree: Update to 1.8.0., guix-commits, 2018/12/17
- 08/09: gnu: elemental: Don't use unstable tarball., guix-commits, 2018/12/17
- 06/09: gnu: z3: Fix building on non-Intel machines., guix-commits, 2018/12/17
- 07/09: gnu: elemental: Fix indentation., guix-commits, 2018/12/17