diff options
| -rw-r--r-- | gnu/packages/avahi.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/base.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/linux.scm | 15 | ||||
| -rw-r--r-- | gnu/packages/ntp.scm | 4 |
4 files changed, 14 insertions, 9 deletions
diff --git a/gnu/packages/avahi.scm b/gnu/packages/avahi.scm index 602f9d7997..b2aeeadf47 100644 --- a/gnu/packages/avahi.scm +++ b/gnu/packages/avahi.scm @@ -74,7 +74,7 @@ ("expat" ,expat) ("gdbm" ,gdbm) ("glib" ,glib) - ("libcap" ,libcap) ;to enable chroot support in avahi-daemon + ("libcap" ,libcap-2.31) ;to enable chroot support in avahi-daemon ("libdaemon" ,libdaemon) ("libevent" ,libevent))) (native-inputs diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 1005899490..e8f7bb5f9c 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -324,7 +324,7 @@ used to apply commands with arbitrarily long arguments.") ,@(if (and (not (%current-target-system)) (member (%current-system) (package-supported-systems libcap))) - `(("libcap" ,libcap)) ;capability support in 'ls', etc. + `(("libcap" ,libcap-2.31)) ;capability support in 'ls', etc. '()))) (native-inputs ;; Perl is needed to run tests in native builds, and to run the bundled diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index a1a482f290..293b873fc2 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -157,6 +157,7 @@ #:use-module (guix store) #:use-module (guix monads) #:use-module (guix utils) + #:use-module (guix deprecation) ;for libcap/next #:use-module (srfi srfi-1) #:use-module (srfi srfi-2) #:use-module (srfi srfi-26) @@ -2404,7 +2405,7 @@ network hardware types (plipconfig, slattach) and advanced aspects of IP configuration (iptunnel, ipmaddr).") (license license:gpl2+)))) -(define-public libcap +(define-public libcap-2.31 (package (name "libcap") (version "2.31") @@ -2443,11 +2444,12 @@ Linux-based operating systems.") ;; License is BSD-3 or GPLv2, at the user's choice. (license license:gpl2))) -;; libcap 2.31 causes problems for 'fakeroot', so provide this newer variant. +;; libcap 2.31 has problems with newer kernels, so provide this newer variant. +;; Keep the old libcap around to avoid rebuilding 'coreutils' and 'avahi'. ;; To be merged with libcap on the next rebuild cycle. -(define-public libcap/next +(define-public libcap (package - (inherit libcap) + (inherit libcap-2.31) (version "2.34") (source (origin (method url-fetch) @@ -2458,6 +2460,9 @@ Linux-based operating systems.") (base32 "048n1gy2p48vl9hkrr9wymfxxcpwj2aslz2bv79nhl4m2lhd9kdf")))))) +(define-deprecated libcap/next libcap) +(export libcap/next) + (define-public bridge-utils (package (name "bridge-utils") @@ -7076,7 +7081,7 @@ the superuser to make device nodes.") ("xz" ,xz))) (inputs `(("acl" ,acl) - ("libcap" ,libcap/next) + ("libcap" ,libcap) ("util-linux" ,util-linux) ("sed" ,sed) ("coreutils" ,coreutils))) diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index 2372c6138b..95d784c62a 100644 --- a/gnu/packages/ntp.scm +++ b/gnu/packages/ntp.scm @@ -81,7 +81,7 @@ `(("pkg-config" ,pkg-config))) (inputs `(("gnutls" ,gnutls) - ("libcap" ,libcap/next) + ("libcap" ,libcap) ("libseccomp" ,libseccomp) ("nettle" ,nettle))) (home-page "https://chrony.tuxfamily.org/") @@ -144,7 +144,7 @@ time-stamping or reference clock, sub-microsecond accuracy is possible.") ;; to run as non-root (when invoked with '-u'.) ,@(if (string-suffix? "-linux" (or (%current-target-system) (%current-system))) - `(("libcap" ,libcap/next)) + `(("libcap" ,libcap)) '()))) (arguments `(#:phases |