mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-25 05:48:07 -05:00
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:
parent
c3e61c8c1f
commit
2c3d1cdfcc
2 changed files with 6 additions and 6 deletions
|
@ -5199,7 +5199,7 @@ (define-public libsoup-minimal
|
|||
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
|
||||
|
|
|
@ -275,14 +275,14 @@ (define-public samba
|
|||
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 @@ (define-public samba/fixed
|
|||
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")
|
||||
|
|
Loading…
Reference in a new issue