diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6a4d3182b2..19a96ef9f4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -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 diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 00442d9645..da103ed839 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -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")