diff options
| -rw-r--r-- | doc/manual/expressions/builtins.xml | 3 | ||||
| -rw-r--r-- | misc/docker/Dockerfile | 4 | ||||
| -rw-r--r-- | src/libstore/s3-binary-cache-store.cc | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/doc/manual/expressions/builtins.xml b/doc/manual/expressions/builtins.xml index c7a7b49be9f7..07d8357b40b5 100644 --- a/doc/manual/expressions/builtins.xml +++ b/doc/manual/expressions/builtins.xml @@ -509,8 +509,7 @@ builtins.fromJSON ''{"x": [1, 2, 3], "y": null}'' </programlisting> returns the value <literal>{ x = [ 1 2 3 ]; y = null; - }</literal>. Floating point numbers are not - supported.</para></listitem> + }</literal>.</para></listitem> </varlistentry> diff --git a/misc/docker/Dockerfile b/misc/docker/Dockerfile index 0f69d02df25f..eeca12353d98 100644 --- a/misc/docker/Dockerfile +++ b/misc/docker/Dockerfile @@ -4,8 +4,8 @@ FROM alpine RUN apk add --update openssl # Download Nix and install it into the system. -RUN wget https://nixos.org/releases/nix/nix-2.0.2/nix-2.0.2-x86_64-linux.tar.bz2 \ - && echo "d0c2492d7d8f824e3b1ace15a1a58f64a0a8faacc59936ebedfe18905d982d7c nix-2.0.2-x86_64-linux.tar.bz2" | sha256sum -c \ +RUN wget https://nixos.org/releases/nix/nix-2.0.4/nix-2.0.4-x86_64-linux.tar.bz2 \ + && echo "d6db178007014ed47ad5460c1bd5b2cb9403b1ec543a0d6507cb27e15358341f nix-2.0.4-x86_64-linux.tar.bz2" | sha256sum -c \ && tar xjf nix-*-x86_64-linux.tar.bz2 \ && addgroup -g 30000 -S nixbld \ && for i in $(seq 1 30); do adduser -S -D -h /var/empty -g "Nix build user $i" -u $((30000 + i)) -G nixbld nixbld$i ; done \ diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc index 239739bae832..26144ccb40cc 100644 --- a/src/libstore/s3-binary-cache-store.cc +++ b/src/libstore/s3-binary-cache-store.cc @@ -299,7 +299,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore &transferHandle) { //FIXME: find a way to properly abort the multipart upload. checkInterrupt(); - printTalkative("upload progress ('%s'): '%d' of '%d' bytes", + debug("upload progress ('%s'): '%d' of '%d' bytes", path, transferHandle->GetBytesTransferred(), transferHandle->GetBytesTotalSize()); |