Re: [PATCH] zlib: bump to 1.2.8.

[ludo@gnu.org (Ludovic Courtès)]

[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]

Cyril Roelandt <tipecaml@gmail.com> skribis:

> On 06/04/2013 09:10 AM, Ludovic Courtès wrote:
>> Can you check whether you have
>> /nix/var/nix/substitute-binary/cache/i35q1vm2sl27sjhs7mx8n2m05056ya9x,
>> and what its value is (use the right $localstatedir value)?
>>
>
> # cat
> /usr/local/var/nix/substitute-binary/cache/i35q1vm2sl27sjhs7mx8n2m05056ya9x
> (narinfo (version 0) (date 1370389238) (value #f))

OK, so that’s a negative cache–i.e., it cached the fact that there is no
substitute available.

>> If it’s there and has (value #f), which means that it’s a negative
>> cached lookup, can you remove it and try again ‘guix build -S
>> subversion’?
>
> # rm
> /usr/local/var/nix/substitute-binary/cache/i35q1vm2sl27sjhs7mx8n2m05056ya9x
>
> Then I tried building subversion and got the same error.

What are the contents of the above file now?  Still (value #f)?

Can you remove it, apply the patch below, and run:

  echo info /nix/store/i35q1vm2sl27sjhs7mx8n2m05056ya9x-subversion-1.7.8.tar.bz2 | \
    sudo ./pre-inst-env guix substitute-binary --query

(This is how the daemon invokes the substituter.)

BTW, I assume that ‘make check’ passes, right?

Thanks,
Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 574 bytes --]

diff --git a/guix/scripts/substitute-binary.scm b/guix/scripts/substitute-binary.scm
index 13c3828..786193a 100755
--- a/guix/scripts/substitute-binary.scm
+++ b/guix/scripts/substitute-binary.scm
@@ -238,7 +238,7 @@ reading PORT."
   (define (download url)
     ;; Download the .narinfo from URL, and return its contents as a list of
     ;; key/value pairs.
-    (false-if-exception (fetch (string->uri url))))
+    (fetch (string->uri url)))
 
   (and (string=? (cache-store-directory cache) (%store-prefix))
        (and=> (download (string-append (cache-url cache) "/"