TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gnu: Rename 'samba/fixed' to 'samba/pinned'. 

* gnu/packages/samba.scm: Rename variable 'samba/fixed' to 'samba/pinned' and
'samba/fixed-patched' to 'samba/fixed'.
* gnu/packages/gnome.scm (libsoup-minimal)[inputs]: Replace 'samba/fixed' with
'samba/pinned'.

Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
Simon Tournier 2023-02-01 10:36:03 +01:00 committed by Liliana Marie Prikler
parent c3e61c8c1f
commit 2c3d1cdfcc
No known key found for this signature in database
GPG Key ID: 442A84B8C70E2F87
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/gnome.scm
View File

@ -5199,7 +5199,7 @@ as OpenStreetMap, OpenCycleMap, OpenAerialMap and Maps.")
sqlite
zlib))
(inputs
(list mit-krb5 samba/fixed)) ; For ntlm_auth support
(list mit-krb5 samba/pinned)) ; For ntlm_auth support
(home-page "https://wiki.gnome.org/Projects/libsoup")
(synopsis "GLib-based HTTP Library")
(description

10
gnu/packages/samba.scm
View File

@ -275,14 +275,14 @@ Samba is an important component to seamlessly integrate Linux/Unix Servers and
Desktops into Active Directory environments using the winbind daemon.")
(license license:gpl3+)))
;;; FIXME: Invert inheritance relationship; the "fixed" package shouldn't be
;;; FIXME: Invert inheritance relationship; the "pinned" package shouldn't be
;;; susceptible to changes in the free one.
(define-public samba/fixed
(define-public samba/pinned
;; Version that rarely changes, depended on by libsoup.
(hidden-package
(package
(inherit samba)
(replacement samba/fixed-patched)
(replacement samba/fixed)
(version "4.15.3")
(source
(origin
@ -306,9 +306,9 @@ Desktops into Active Directory environments using the winbind daemon.")
libxslt
libxml2)))))
(define-public samba/fixed-patched
(define-public samba/fixed
(package
(inherit samba/fixed)
(inherit samba/pinned)
;; This is 4.15.13, but we need to trim the store file name to have
;; the same length as the one we are grafting above.
(version "4.15.A")