diff options
| author | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-10-07 18:49:29 +0200 |
|---|---|---|
| committer | Jan (janneke) Nieuwenhuizen <janneke@gnu.org> | 2020-10-09 21:34:17 +0200 |
| commit | 165e0918da54643bfaf9a6cb6b866f8692e9f8f9 (patch) | |
| tree | f6742edf1e140e9af8d3bdec18da07c801507c1e /gnu | |
| parent | 9c1b8390ba36c0b9e3d5580b0f00206255f9b9a8 (diff) | |
| download | guix-165e0918da54643bfaf9a6cb6b866f8692e9f8f9.tar.gz guix-165e0918da54643bfaf9a6cb6b866f8692e9f8f9.zip | |
gnu: sudo: Remove support for Python plug-ins.
* gnu/packages/admin.scm (sudo)[inputs], [outputs]: Remove python.
[arguments]: Remove --enable-python/--disable-python configure flags.
Remove 'separate-python-output phase.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/admin.scm | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 275432cb96..d20becda3b 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1414,18 +1414,12 @@ system administrator.") (delete-file-recursively "lib/zlib") #t)))) (build-system gnu-build-system) - (outputs (list "out" "python")) + (outputs (list "out")) (arguments `(#:configure-flags (list (string-append "--docdir=" (assoc-ref %outputs "out") "/share/doc/" ,name "-" ,version) - ;; XXX: Disable Python support when cross-compiling because - ;; 'configure' tries to run 'python', which fails. - ,(if (%current-target-system) - "--disable-python" - "--enable-python") ; for plug-ins written in ~ - "--with-logpath=/var/log/sudo.log" "--with-rundir=/var/run/sudo" ; must be cleaned up at boot time "--with-vardir=/var/db/sudo" @@ -1472,22 +1466,7 @@ system administrator.") (substitute* "plugins/sudoers/Makefile.in" (("^pre-install:" match) (string-append match "\ndisabled-" match))) - #t)) - (add-after 'install 'separate-python-output - (lambda* (#:key target outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (out:python (assoc-ref outputs "python"))) - (if target - (mkdir-p (string-append out:python "/empty")) - (for-each - (lambda (file) - (let ((old (string-append out "/" file)) - (new (string-append out:python "/" file))) - (mkdir-p (dirname new)) - (rename-file old new))) - (list "libexec/sudo/python_plugin.so" - "libexec/sudo/python_plugin.la"))) - #t)))) + #t))) ;; XXX: The 'testsudoers' test series expects user 'root' to exist, but ;; the chroot's /etc/passwd doesn't have it. Turn off the tests. @@ -1497,9 +1476,6 @@ system administrator.") (inputs `(("coreutils" ,coreutils) ("linux-pam" ,linux-pam) - ,@(if (%current-target-system) - '() - `(("python" ,python))) ("zlib" ,zlib))) (home-page "https://www.sudo.ws/") (synopsis "Run commands as root") |