Merge pull request #124 from serokell/rvem/8.0-release

v8.0 release
serokell · Dec 23, 2020 · 6fd4df2 · 6fd4df2
2 parents b2b3687 + 97cc99d
commit 6fd4df2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/docker/build/Dockerfile b/docker/build/Dockerfile
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>
 #
 # SPDX-License-Identifier: LicenseRef-MIT-TQ
-FROM alpine:3.11
+FROM alpine:3.12
 RUN apk update
 RUN apk --no-cache --virtual add rsync git m4 build-base patch unzip \
   bubblewrap wget pkgconfig gmp-dev libev-dev hidapi-dev eudev-dev perl opam libusb-dev bash \

diff --git a/docker/build/Dockerfile.aarch64 b/docker/build/Dockerfile.aarch64
@@ -1,12 +1,12 @@
 # SPDX-FileCopyrightText: 2020 TQ Tezos <https://tqtezos.com/>
 #
 # SPDX-License-Identifier: LicenseRef-MIT-TQ
-FROM alpine:3.11 as binary-fetch
+FROM alpine:3.12 as binary-fetch
 # Latest v5.0.0-2 qemu-user-static has some weird bug that causes curl and wget to segfault.
 # See https://bugs.launchpad.net/qemu/+bug/1892684.
 RUN wget https://github.com/multiarch/qemu-user-static/releases/download/v4.2.0-7/qemu-aarch64-static
 RUN chmod +x qemu-aarch64-static
-FROM arm64v8/alpine:3.11
+FROM arm64v8/alpine:3.12
 COPY --from=binary-fetch qemu-aarch64-static /usr/bin/qemu-aarch64-static
 RUN apk update
 RUN apk --no-cache --virtual add rsync git m4 build-base patch unzip \

diff --git a/nix/build/hacks.nix b/nix/build/hacks.nix
@@ -74,7 +74,7 @@ rec {
       '' + o.buildPhase;
   });
 
-  sapling = osuper.sapling.overrideAttrs (o:
+  tezos-sapling = osuper.tezos-sapling.overrideAttrs (o:
     let extern-C-patch = ./librustzcash-extern-C.patch; in
     rec {
       buildInputs = o.buildInputs ++ [ librustzcash rustc-bls12-381 self.gcc self.git ];

diff --git a/nix/nix/sources.json b/nix/nix/sources.json
@@ -36,9 +36,9 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "tezos": {
-        "ref": "refs/tags/v8.0-rc2",
+        "ref": "refs/tags/v8.0",
         "repo": "https://gitlab.com/tezos/tezos",
-        "rev": "c4907703d66e5f75d2da525a6b66a893f80d8093",
+        "rev": "567be003173390a40d3bc267360deade3ef14d49",
         "type": "git"
     }
 }