On Tue, Jan 10, 2017 at 06:08:39PM -0500, Leo Famulari wrote: > On Tue, Jan 10, 2017 at 11:41:40PM +0100, Ludovic Courtès wrote: > > Leo Famulari skribis: > > > The last time I noticed an exported replacement, I found that it was > > > resolved non-deterministically (using `guix build -S` in a loop), and > > > we made the replacement private: > > > > > > http://git.savannah.gnu.org/cgit/guix.git/commit/?id=69aa6e0995b55a38d5ce174602a107645be726d5 > > > > I can’t seem to reproduce it here, but it sounds like an interesting > > bug. :-) > > Me neither. IIRC, it would manifest at least 1/10 iterations of the > loop. I can reproduce it by applying the diff below on 88f2dd1ddf8123f628ee0b64406b6fd2a6a9f076 and running: $ while true; do ./pre-inst-env guix build gnutls -S; done guix build: warning: ambiguous package specification `gnutls' guix build: warning: choosing gnutls-3.5.4 from gnu/packages/tls.scm:139:2 /gnu/store/kfjzkvlxjp98mcf356ay027vy5p5lsp3-gnutls-3.5.8.tar.xz guix build: warning: ambiguous package specification `gnutls' guix build: warning: choosing gnutls-3.5.4 from gnu/packages/tls.scm:216:2 /gnu/store/kfjzkvlxjp98mcf356ay027vy5p5lsp3-gnutls-3.5.8.tar.xz guix build: warning: ambiguous package specification `gnutls' guix build: warning: choosing gnutls-3.5.4 from gnu/packages/tls.scm:216:2 /gnu/store/kfjzkvlxjp98mcf356ay027vy5p5lsp3-gnutls-3.5.8.tar.xz guix build: warning: ambiguous package specification `gnutls' guix build: warning: choosing gnutls-3.5.4 from gnu/packages/tls.scm:139:2 /gnu/store/kfjzkvlxjp98mcf356ay027vy5p5lsp3-gnutls-3.5.8.tar.xz diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index e577421fa..19d5049c3 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -138,6 +138,7 @@ living in the same process.") (define-public gnutls (package (name "gnutls") + (replacement gnutls-3.5.8) (version "3.5.4") (source (origin (method url-fetch) @@ -211,6 +212,20 @@ required structures.") (properties '((ftp-server . "ftp.gnutls.org") (ftp-directory . "/gcrypt/gnutls"))))) +(define-public gnutls-3.5.8 + (package + (inherit gnutls) + (source + (let ((version "3.5.8")) + (origin + (method url-fetch) + (uri (string-append "mirror://gnupg/gnutls/v" + (version-major+minor version) + "/gnutls-" version ".tar.xz")) + (sha256 + (base32 + "1zyl2z63s68hx1dpxqx0lykmlf3rwrzlrf44sq3h7dvjmr1z55qf"))))))) + (define-public openssl (package (name "openssl")