amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master' into core-updates

Browse source 
Conflicts:
	doc/guix.texi
	gnu/local.mk
	gnu/packages/admin.scm
	gnu/packages/base.scm
	gnu/packages/chromium.scm
	gnu/packages/compression.scm
	gnu/packages/databases.scm
	gnu/packages/diffoscope.scm
	gnu/packages/freedesktop.scm
	gnu/packages/gnome.scm
	gnu/packages/gnupg.scm
	gnu/packages/guile.scm
	gnu/packages/inkscape.scm
	gnu/packages/llvm.scm
	gnu/packages/openldap.scm
	gnu/packages/pciutils.scm
	gnu/packages/ruby.scm
	gnu/packages/samba.scm
	gnu/packages/sqlite.scm
	gnu/packages/statistics.scm
	gnu/packages/syndication.scm
	gnu/packages/tex.scm
	gnu/packages/tls.scm
	gnu/packages/version-control.scm
	gnu/packages/xml.scm
	guix/build-system/copy.scm
	guix/scripts/home.scm
This commit is contained in:
Efraim Flashner 2023-01-30 11:33:18 +02:00
commit 4cf1acc7f3
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
740 changed files with 619028 additions and 314277 deletions
Download patch file Download diff file Expand all files Collapse all files

49
gnu/packages/samba.scm
View file

@ -74,49 +74,34 @@
(define-public cifs-utils
(package
(name "cifs-utils")
(version "6.14")
(version "7.0")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.samba.org/pub/linux-cifs/"
"cifs-utils/cifs-utils-" version ".tar.bz2"))
(sha256 (base32
"1f2n0yzqsy5v5qv83731bi0mi86rrh11z8qjy1gjj8al9c3yh2b6"))))
"0qc1ph94yvg87m87xangw9dd0m5ds2q1zd2sqkzldsnkbfwamvqd"))))
(build-system gnu-build-system)
(native-inputs
(list autoconf automake pkg-config
;; To generate the manpages.
python-docutils)) ; rst2man
(inputs
`(("keytuils" ,keyutils)
("linux-pam" ,linux-pam)
("libcap-ng" ,libcap-ng)
("mit-krb5" ,mit-krb5)
("samba" ,samba)
("talloc" ,talloc)))
(list keyutils libcap-ng linux-pam mit-krb5 samba talloc))
(arguments
`(#:configure-flags
(list "--enable-man")
#:phases
(modify-phases %standard-phases
(add-before 'bootstrap 'trigger-bootstrap
;; The shipped configure script is buggy, e.g., it contains a
;; unexpanded literal ‘LIBCAP_NG_PATH’ line).
(lambda _
(delete-file "configure")))
(add-before 'configure 'set-root-sbin
(lambda* (#:key outputs #:allow-other-keys)
;; Don't try to install into "/sbin".
(setenv "ROOTSBINDIR"
(string-append (assoc-ref outputs "out") "/sbin"))))
(add-before 'install 'install-man-pages
;; Create a directory that isn't created since version 6.10.
(lambda* (#:key make-flags parallel-build? #:allow-other-keys)
(apply invoke "make" "install-man"
`(,@(if parallel-build?
`("-j" ,(number->string (parallel-job-count)))
'())
,@make-flags)))))))
(list #:configure-flags #~(list "--enable-man")
#:phases
#~(modify-phases %standard-phases
(add-before 'bootstrap 'trigger-bootstrap
;; The shipped configure script is buggy, e.g., it contains a
;; unexpanded literal ‘LIBCAP_NG_PATH’ line).
(lambda _
(delete-file "configure")))
(add-before 'configure 'set-root-sbin
;; Don't try to install into "/sbin".
(lambda _
(setenv "ROOTSBINDIR" (string-append #$output "/sbin")))))))
(synopsis "User-space utilities for Linux CIFS (Samba) mounts")
(description "@code{cifs-utils} is a set of user-space utilities for
mounting and managing @acronym{CIFS, Common Internet File System} shares using
@ -535,9 +520,9 @@ and IPV6 and the protocols layered above them, such as TCP and UDP.")
'(("src/wsdd.py" "bin/wsdd")
("man/wsdd.1" "share/man/man1/"))))
(home-page "https://github.com/christgau/wsdd")
(synopsis "A Web Service Discovery host daemon")
(synopsis "Web Service Discovery host daemon")
(description "This daemon allows (Samba) hosts to be found by Web
Service Dicovery Clients. It also implements the client side of the
discovery protocol which allows to search for devices implementing
discovery protocol which searches for devices implementing
WSD.")
(license license:expat)))