guix_mirror_bot pushed a commit to branch core-packages-team
in repository guix.

commit 479cd7805615e6469bc9e53d82fa52a6b303812a
Author: Zheng Junjie <[email protected]>
AuthorDate: Tue Nov 3 10:41:39 2026 +0800

    gnu: samba: Unvendor some dependencies.
    
    * gnu/packages/samba.scm (samba/pinned)[source]: Remove some vendor
    dependencies.
    [arguments]: Add --bundled-libraries=libquic,NONE.
    [inputs]: Add ngtcp2.
    [native-inputs]: Add socket-wrapper, nss-wrapper, pam-wrapper, 
resolv-wrapper,
    uid-wrapper.
    Merges: guix/guix#12146
---
 gnu/packages/samba.scm | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm
index 409d69a0ef3..7bfa57d8392 100644
--- a/gnu/packages/samba.scm
+++ b/gnu/packages/samba.scm
@@ -65,6 +65,7 @@
   #:use-module (gnu packages gnupg)
   #:use-module (gnu packages kerberos)
   #:use-module (gnu packages linux)
+  #:use-module (gnu packages networking)
   #:use-module (gnu packages onc-rpc)
   #:use-module (gnu packages openldap)
   #:use-module (gnu packages perl)
@@ -314,7 +315,17 @@ following features:
         (uri (string-append "https://download.samba.org/pub/samba/stable/";
                             "samba-" version ".tar.gz"))
         (sha256
-         (base32 "1y2z4rl88mfmj5187bmgqxdlda6cxx35k3lqp5m65v318fmm2b6z"))))
+         (base32 "1y2z4rl88mfmj5187bmgqxdlda6cxx35k3lqp5m65v318fmm2b6z"))
+        (modules '((guix build utils)))
+        (snippet
+         '(begin
+            (for-each
+             (lambda (file)
+               (unless (or (string-prefix? "third_party/quic" file)
+                           (string-prefix? "third_party/waf" file)
+                           (string-suffix? "wscript" file))
+                 (delete-file file)))
+             (find-files "third_party"))))))
      (build-system gnu-build-system)
      (arguments
       (list
@@ -351,6 +362,8 @@ following features:
                                 '("--enable-selftest")
                                 '())
                          "--enable-fhs"
+                         ;; TODO: Package libquic
+                         "--bundled-libraries=libquic,NONE"
                          (string-append "--prefix=" #$output)
                          "--sysconfdir=/etc"
                          "--localstatedir=/var"
@@ -387,6 +400,7 @@ following features:
             linux-pam
             lmdb
             mit-krb5
+            ngtcp2
             openldap
             perl
             python
@@ -406,7 +420,12 @@ following features:
        (if (member (%current-system)
                    (package-transitive-supported-systems
                     python-cryptography))
-           (list python-cryptography)
+           (list python-cryptography
+                 socket-wrapper
+                 nss-wrapper
+                 pam-wrapper
+                 resolv-wrapper
+                 uid-wrapper)
            '())
        (list python-dnspython-minimal
              python-iso8601/pinned

Reply via email to