Merge pull request #168 from serokell/rvem/v8.3-release

v8.3 release
serokell · Apr 13, 2021 · 2fc1640 · 2fc1640
2 parents 4a64caf + 78a0ac6
commit 2fc1640
Show file tree

Hide file tree

Showing 21 changed files with 61 additions and 120 deletions.
diff --git a/Formula/tezos-accuser-008-PtEdo2Zk.rb b/Formula/tezos-accuser-008-PtEdo2Zk.rb
@@ -10,9 +10,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "v9.0-rc1", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "v8.3", :shallow => false
 
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]
   build_dependencies.each do |dependency|
@@ -27,8 +27,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser008Ptedo2zk.version}/"
-    sha256 "0d4c9f3cad4a8f2380ab49cb32c92b9159f4573da86c19cd4541ed9c585401e4" => :mojave
-    sha256 "2b126354cefcef1742906f2e62895ca1ef051febab8d6901256da3e7c745e13b" => :catalina
     cellar :any
   end
 

diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb
@@ -10,9 +10,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "v9.0-rc1", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "v8.3", :shallow => false
 
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]
   build_dependencies.each do |dependency|
@@ -27,8 +27,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/"
-    sha256 "dfdbff748687e5dc76fa97b5af334498ef4189c32b33ca652e1cd8be843be057" => :mojave
-    sha256 "c2cf408311226f88a79ad2aecd3fa12ff26051ca916f06fa46c128a5aa22f16e" => :catalina
     cellar :any
   end
 

diff --git a/Formula/tezos-baker-008-PtEdo2Zk.rb b/Formula/tezos-baker-008-PtEdo2Zk.rb
@@ -10,9 +10,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "v9.0-rc1", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "v8.3", :shallow => false
 
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]
   build_dependencies.each do |dependency|
@@ -27,8 +27,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker008Ptedo2zk.version}/"
-    sha256 "4adfe12e7463f9172bd7d608ed82fc71f4bfa50c32b33796d213f5ec8bf90da3" => :mojave
-    sha256 "95f75861ae641bd5790724f9e22591fa6f2428ca600a3385ab25a9367bbd249b" => :catalina
     cellar :any
   end
 

diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb
@@ -10,9 +10,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "v9.0-rc1", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "v8.3", :shallow => false
 
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]
   build_dependencies.each do |dependency|
@@ -27,8 +27,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/"
-    sha256 "6a82a5c9bb14724cf088dbae0aeef7eb41ca6a6ac27fb97dfd82fdc47f6c105e" => :mojave
-    sha256 "376424406212e03e335a40ce3023f93dfc7b0b681eea20cbfff6f17fe498d34b" => :catalina
     cellar :any
   end
 

diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb
@@ -10,9 +10,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "v9.0-rc1", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "v8.3", :shallow => false
 
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]
   build_dependencies.each do |dependency|
@@ -27,8 +27,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/"
-    sha256 "4bd4610ed9c92643869212d165ea31eb73909bd0d75aadc79531e6dca0058766" => :mojave
-    sha256 "0501539b35fb809b0ab1e40803fb0b0b7581437bbd1aacf7bffa81d16d9351a8" => :catalina
     cellar :any
   end
 

diff --git a/Formula/tezos-endorser-008-PtEdo2Zk.rb b/Formula/tezos-endorser-008-PtEdo2Zk.rb
@@ -10,9 +10,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "v9.0-rc1", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "v8.3", :shallow => false
 
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]
   build_dependencies.each do |dependency|
@@ -28,8 +28,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser008Ptedo2zk.version}/"
-    sha256 "7ae758d10d32bc6d6927d61d542319e4cf4ea6ff9830cc5df8775f68af734075" => :mojave
-    sha256 "c348900c80ad6c6058d34867bb66145b9381e3ec300b76f68452b1513b206a57" => :catalina
     cellar :any
   end
 

diff --git a/Formula/tezos-node-edo2net.rb b/Formula/tezos-node-edo2net.rb
@@ -4,7 +4,7 @@
 
 class TezosNodeEdo2net < Formula
   url "file:///dev/null"
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   bottle :unneeded
   depends_on "tezos-node"

diff --git a/Formula/tezos-node-mainnet.rb b/Formula/tezos-node-mainnet.rb
@@ -4,7 +4,7 @@
 
 class TezosNodeMainnet < Formula
   url "file:///dev/null"
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   bottle :unneeded
   depends_on "tezos-node"

diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb
@@ -10,9 +10,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "v9.0-rc1", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "v8.3", :shallow => false
 
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]
   build_dependencies.each do |dependency|
@@ -27,8 +27,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/"
-    sha256 "e39f02b1cf16b5e1859e563d6949504284198d3f9a42c7b6f3e2e808f2ee8b0f" => :mojave
-    sha256 "97ea6972a5a2abf55a44776e7ea0a5e1727f6df37ee8c22d51f55207cf51a239" => :catalina
     cellar :any
   end
 

diff --git a/Formula/tezos-sandbox.rb b/Formula/tezos-sandbox.rb
@@ -10,9 +10,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "v9.0-rc1", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "v8.3", :shallow => false
 
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]
   build_dependencies.each do |dependency|
@@ -27,8 +27,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/"
-    sha256 "9e9df080bf327ff247cf637ef24de62dee0b19cfdbf8bfbd6a6bf216ed4c1171" => :mojave
-    sha256 "012ae6d0fc289f390538199e3e7cdbcd048363ddae3e8828bcd4388af0cf6749" => :catalina
     cellar :any
   end
 

diff --git a/Formula/tezos-signer-http.rb b/Formula/tezos-signer-http.rb
@@ -4,7 +4,7 @@
 
 class TezosSignerHttp < Formula
   url "file:///dev/null"
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   bottle :unneeded
   depends_on "tezos-signer"

diff --git a/Formula/tezos-signer-https.rb b/Formula/tezos-signer-https.rb
@@ -4,7 +4,7 @@
 
 class TezosSignerHttps < Formula
   url "file:///dev/null"
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   bottle :unneeded
   depends_on "tezos-signer"

diff --git a/Formula/tezos-signer-tcp.rb b/Formula/tezos-signer-tcp.rb
@@ -4,7 +4,7 @@
 
 class TezosSignerTcp < Formula
   url "file:///dev/null"
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   bottle :unneeded
   depends_on "tezos-signer"

diff --git a/Formula/tezos-signer-unix.rb b/Formula/tezos-signer-unix.rb
@@ -4,7 +4,7 @@
 
 class TezosSignerUnix < Formula
   url "file:///dev/null"
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   bottle :unneeded
   depends_on "tezos-signer"

diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb
@@ -10,9 +10,9 @@ class << self
   end
   homepage "https://gitlab.com/tezos/tezos"
 
-  url "https://gitlab.com/tezos/tezos.git", :tag => "v9.0-rc1", :shallow => false
+  url "https://gitlab.com/tezos/tezos.git", :tag => "v8.3", :shallow => false
 
-  version "v9.0-rc1-1"
+  version "v8.3-1"
 
   build_dependencies = %w[pkg-config autoconf rsync wget opam rustup-init]
   build_dependencies.each do |dependency|
@@ -27,8 +27,6 @@ class << self
 
   bottle do
     root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/"
-    sha256 "6899a00c8cd29af55e583594588149127684b8c27aca8c16942b37c4a504c566" => :mojave
-    sha256 "9d28767c28154ab2d05c56be32d69adaf1bef4e03a3bdf3267e93db9fe1ff735" => :catalina
     cellar :any
   end
 

diff --git a/docker/build/static_libs.patch b/docker/build/static_libs.patch
@@ -186,48 +186,3 @@ index 81ebe6075..43e57a2d0 100644
 
  (rule
   (alias runtest_lint)
-diff --git a/src/proto_009_PsFLoren/bin_accuser/dune b/src/proto_009_PsFLoren/bin_accuser/dune
-index 11c77973e3..43515f16ed 100644
---- a/src/proto_009_PsFLoren/bin_accuser/dune
-+++ b/src/proto_009_PsFLoren/bin_accuser/dune
-@@ -10,7 +10,9 @@
-                    -open Tezos_client_commands
-                    -open Tezos_baking_009_PsFLoren_commands
-                    -open Tezos_stdlib_unix
--                   -open Tezos_client_base_unix)))
-+                   -open Tezos_client_base_unix
-+                   -ccopt -static
-+                   -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))
-
- (rule
-  (alias runtest_lint)
-diff --git a/src/proto_009_PsFLoren/bin_baker/dune b/src/proto_009_PsFLoren/bin_baker/dune
-index 0535edf13c..f0c85ad447 100644
---- a/src/proto_009_PsFLoren/bin_baker/dune
-+++ b/src/proto_009_PsFLoren/bin_baker/dune
-@@ -10,7 +10,9 @@
-                    -open Tezos_client_commands
-                    -open Tezos_baking_009_PsFLoren_commands
-                    -open Tezos_stdlib_unix
--                   -open Tezos_client_base_unix)))
-+                   -open Tezos_client_base_unix
-+                   -ccopt -static
-+                   -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))
-
- (rule
-  (alias runtest_lint)
-diff --git a/src/proto_009_PsFLoren/bin_endorser/dune b/src/proto_009_PsFLoren/bin_endorser/dune
-index c19a310a8f..6c38226293 100644
---- a/src/proto_009_PsFLoren/bin_endorser/dune
-+++ b/src/proto_009_PsFLoren/bin_endorser/dune
-@@ -10,7 +10,9 @@
-                    -open Tezos_client_commands
-                    -open Tezos_baking_009_PsFLoren_commands
-                    -open Tezos_stdlib_unix
--                   -open Tezos_client_base_unix)))
-+                   -open Tezos_client_base_unix
-+                   -ccopt -static
-+                   -cclib "-lusb-1.0 -lhidapi-libusb -ludev")))
-
- (rule
-  (alias runtest_lint)
diff --git a/meta.json b/meta.json
@@ -1,4 +1,4 @@
 {
-    "release": "4",
+    "release": "1",
     "maintainer": "Serokell <[email protected]>"
 }
diff --git a/nix/build/hacks.nix b/nix/build/hacks.nix
@@ -66,15 +66,23 @@ rec {
   hacl-star = osuper.hacl-star.overrideAttrs (_: rec {
     sourceRoot = ".";
   });
-  index = osuper.index.versions."1.3.0";
-  irmin = osuper.irmin.versions."2.5.1";
-  irmin-pack = osuper.irmin-pack.versions."2.5.1";
-  irmin-layers = osuper.irmin-layers.versions."2.5.1";
+  index = osuper.index.versions."1.2.1";
+  irmin = osuper.irmin.versions."2.2.0";
+  irmin-pack = osuper.irmin-pack.versions."2.2.0";
+  irmin-layers = osuper.irmin-layers.versions."2.2.0";
   pcre = osuper.pcre.overrideAttrs (o: rec {
     buildInputs = o.buildInputs ++ [ odoc ];
     propagatedBuildInputs = buildInputs;
   });
 
+  resto-directory = osuper.resto-directory.versions."0.5";
+  resto-cohttp = osuper.resto-cohttp.versions."0.5";
+  resto-cohttp-client = osuper.resto-cohttp-client.versions."0.5";
+  resto-cohttp-server = osuper.resto-cohttp-server.versions."0.5";
+  data-encoding = osuper.data-encoding.versions."0.2";
+  json-data-encoding = osuper.json-data-encoding.versions."0.8";
+  json-data-encoding-bson = osuper.json-data-encoding-bson.versions."0.8";
+  lwt-canceler = osuper.lwt-canceler.versions."0.2";
   ff = osuper.ff.versions."0.4.0";
   bls12-381 = osuper.bls12-381.overrideAttrs (o:
     rec {
@@ -177,11 +185,11 @@ rec {
       buildInputs = o.buildInputs ++ [ librustzcash ];
       XDG_DATA_DIRS = "${zcash-params}:$XDG_DATA_DIRS";
     });
-  tezos-protocol-009-PsFLoren-parameters = osuper.tezos-protocol-009-PsFLoren-parameters.overrideAttrs
-    (o: rec {
-      buildInputs = o.buildInputs ++ [ librustzcash ];
-      XDG_DATA_DIRS = "${zcash-params}:$XDG_DATA_DIRS";
-    });
+  # tezos-protocol-009-PsFLoren-parameters = osuper.tezos-protocol-009-PsFLoren-parameters.overrideAttrs
+  #   (o: rec {
+  #     buildInputs = o.buildInputs ++ [ librustzcash ];
+  #     XDG_DATA_DIRS = "${zcash-params}:$XDG_DATA_DIRS";
+  #   });
 
   # FIXME apply this patch upstream
   tezos-stdlib-unix = osuper.tezos-stdlib-unix.overrideAttrs
@@ -209,21 +217,21 @@ rec {
       buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];
       postFixup = zcash-post-fixup o;
     });
-  tezos-accuser-009-PsFLoren = osuper.tezos-accuser-009-PsFLoren.overrideAttrs
-    (o: {
-      buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];
-      postFixup = zcash-post-fixup o;
-    });
-  tezos-baker-009-PsFLoren = osuper.tezos-baker-009-PsFLoren.overrideAttrs
-    (o: {
-      buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];
-      postFixup = zcash-post-fixup o;
-    });
-  tezos-endorser-009-PsFLoren = osuper.tezos-endorser-009-PsFLoren.overrideAttrs
-    (o: {
-      buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];
-      postFixup = zcash-post-fixup o;
-    });
+  # tezos-accuser-009-PsFLoren = osuper.tezos-accuser-009-PsFLoren.overrideAttrs
+  #   (o: {
+  #     buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];
+  #     postFixup = zcash-post-fixup o;
+  #   });
+  # tezos-baker-009-PsFLoren = osuper.tezos-baker-009-PsFLoren.overrideAttrs
+  #   (o: {
+  #     buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];
+  #     postFixup = zcash-post-fixup o;
+  #   });
+  # tezos-endorser-009-PsFLoren = osuper.tezos-endorser-009-PsFLoren.overrideAttrs
+  #   (o: {
+  #     buildInputs = o.buildInputs ++ [ librustzcash self.makeWrapper ];
+  #     postFixup = zcash-post-fixup o;
+  #   });
   tezos-codec = osuper.tezos-codec.overrideAttrs
     (o: {
       buildInputs = o.buildInputs ++ [ rustc-bls12-381 librustzcash self.makeWrapper ];

diff --git a/nix/nix/sources.json b/nix/nix/sources.json
@@ -48,9 +48,9 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "tezos": {
-        "ref": "refs/tags/v9.0-rc1",
+        "ref": "refs/tags/v8.3",
         "repo": "https://gitlab.com/tezos/tezos",
-        "rev": "69e08d4b7ac903d2e96fdbf0c4ae4099c28b5f75",
+        "rev": "cbbfffdb15f3f9dac3abf667f4511f1f4622492f",
         "type": "git"
     }
 }