[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/17: gnu: libsemanage: Remove input labels.
From: |
guix-commits |
Subject: |
11/17: gnu: libsemanage: Remove input labels. |
Date: |
Sat, 13 Aug 2022 13:26:50 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 9bfdd1e7cb4596e3aee68c21a4ad39e0540a8c3a
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Aug 13 13:46:01 2022 +0200
gnu: libsemanage: Remove input labels.
* gnu/packages/selinux.scm (libsemanage)[arguments]: Use G-expression.
[native-inputs, inputs]: Remove labels.
---
gnu/packages/selinux.scm | 56 +++++++++++++++++++++---------------------------
1 file changed, 24 insertions(+), 32 deletions(-)
diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm
index 93c256371a..3e7d55ff67 100644
--- a/gnu/packages/selinux.scm
+++ b/gnu/packages/selinux.scm
@@ -187,41 +187,33 @@ the core SELinux management utilities.")
(arguments
(substitute-keyword-arguments (package-arguments libsepol)
((#:make-flags flags)
- `(cons* "PYTHON=python3"
- (string-append "PYTHONLIBDIR="
- (assoc-ref %outputs "out")
- "/lib/python"
- ,(version-major+minor (package-version python))
- "/site-packages/")
- ,flags))
+ #~(cons* "PYTHON=python3"
+ (string-append "PYTHONLIBDIR="
+ #$output
+ "/lib/python"
+ #$(version-major+minor (package-version
python))
+ "/site-packages/")
+ #$flags))
((#:phases phases)
- `(modify-phases ,phases
- (delete 'portability)
- (replace 'enter-dir
- (lambda _ (chdir ,name)))
- (add-before 'install 'adjust-semanage-conf-location
- (lambda _
- (substitute* "src/Makefile"
- (("DEFAULT_SEMANAGE_CONF_LOCATION=/etc")
- "DEFAULT_SEMANAGE_CONF_LOCATION=$(PREFIX)/etc"))))
- (add-after 'build 'pywrap
- (lambda* (#:key make-flags #:allow-other-keys)
- (apply invoke "make" "pywrap" make-flags)))
- (add-after 'install 'install-pywrap
- (lambda* (#:key make-flags #:allow-other-keys)
- (apply invoke "make" "install-pywrap" make-flags)))))))
+ #~(modify-phases #$phases
+ (delete 'portability)
+ (replace 'enter-dir
+ (lambda _ (chdir #$name)))
+ (add-before 'install 'adjust-semanage-conf-location
+ (lambda _
+ (substitute* "src/Makefile"
+ (("DEFAULT_SEMANAGE_CONF_LOCATION=/etc")
+ "DEFAULT_SEMANAGE_CONF_LOCATION=$(PREFIX)/etc"))))
+ (add-after 'build 'pywrap
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "make" "pywrap" make-flags)))
+ (add-after 'install 'install-pywrap
+ (lambda* (#:key make-flags #:allow-other-keys)
+ (apply invoke "make" "install-pywrap" make-flags)))))))
(inputs
- `(("libsepol" ,libsepol)
- ("libselinux" ,libselinux)
- ("audit" ,audit)
- ;; For pywrap phase
- ("python" ,python-wrapper)))
+ (list audit libsepol libselinux python-wrapper))
(native-inputs
- `(("bison" ,bison)
- ("flex" ,flex)
- ;; For pywrap phase
- ("swig" ,swig)
- ("pkg-config" ,pkg-config)))
+ (list bison flex pkg-config swig))
(synopsis "SELinux policy management libraries")
(description
"The libsemanage library provides an API for the manipulation of SELinux
- 08/17: gnu: SELinux: Update to 3.4., (continued)
- 08/17: gnu: SELinux: Update to 3.4., guix-commits, 2022/08/13
- 09/17: gnu: checkpolicy: Remove input labels., guix-commits, 2022/08/13
- 13/17: gnu: python-sepolgen: Use G-expression and remove labels., guix-commits, 2022/08/13
- 06/17: gnu: qtractor: Fix build., guix-commits, 2022/08/13
- 16/17: gnu: policycoreutils: Use G-expression., guix-commits, 2022/08/13
- 07/17: gnu: serf: Add release-monitoring-url., guix-commits, 2022/08/13
- 10/17: gnu: libselinux: Remove input labels., guix-commits, 2022/08/13
- 15/17: gnu: libsepol: Use G-expression., guix-commits, 2022/08/13
- 02/17: gnu: python-pyaml: Update to 21.10.1., guix-commits, 2022/08/13
- 04/17: gnu: python-pre-commit: Remove unnecessary dependency., guix-commits, 2022/08/13
- 11/17: gnu: libsemanage: Remove input labels.,
guix-commits <=
- 14/17: gnu: policycoreutils: Remove input labels., guix-commits, 2022/08/13
- 12/17: gnu: secilc: Remove input labels., guix-commits, 2022/08/13