diff options
| author | Christopher Baines <mail@cbaines.net> | 2023-03-02 10:37:28 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2023-03-02 10:55:08 +0000 |
| commit | 7df09ee0ab3e7962ef27859ce87e06a323059284 (patch) | |
| tree | d81334f742ddcb9a1ee63961ca6410922980af1c /gnu/packages/samba.scm | |
| parent | 2ac51ec99b58b50c08ba719a8c7e9dba0330b065 (diff) | |
| parent | af95f2d8f98eb2c8c64954bb2fd0b70838899174 (diff) | |
Merge remote-tracking branch 'savannah/master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/autotools.scm
gnu/packages/cmake.scm
gnu/packages/gnuzilla.scm
gnu/packages/haskell.scm
gnu/packages/pdf.scm
gnu/packages/python-xyz.scm
gnu/packages/samba.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/wxwidgets.scm
Diffstat (limited to 'gnu/packages/samba.scm')
| -rw-r--r-- | gnu/packages/samba.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index fdba37d1b8..8c004a1aac 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -172,7 +172,7 @@ The library is small, thread safe, and written in portable ANSI C with no external dependencies.") (license license:x11))) -(define-public samba/fixed +(define-public samba/pinned (hidden-package (package (name "samba") @@ -282,7 +282,7 @@ Desktops into Active Directory environments using the winbind daemon.") (define-public samba (package - (inherit samba/fixed) + (inherit samba/pinned) (name "samba") (version "4.17.0") (source @@ -294,7 +294,7 @@ Desktops into Active Directory environments using the winbind daemon.") "samba-" version ".tar.gz")) (sha256 (base32 "0fl2y5avmyxjadh6zz0fwz35akd6c4j9lldzp2kyvjrgm36qx1h4")))) - (properties (alist-delete 'hidden? (package-properties samba/fixed))))) + (properties (alist-delete 'hidden? (package-properties samba/pinned))))) (define-public talloc (package |