diff --git a/Formula/tezos-accuser-011-PtHangz2.rb b/Formula/tezos-accuser-011-PtHangz2.rb index ffd9ce606..49caf58fe 100644 --- a/Formula/tezos-accuser-011-PtHangz2.rb +++ b/Formula/tezos-accuser-011-PtHangz2.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0-rc2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0", :shallow => false - version "v12.0-rc2-1" + version "v12.0-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser011Pthangz2.version}/" - sha256 cellar: :any, big_sur: "793616eb1d79459eab5303bf193421b8829bef11d541db4d369abb75d2c93532" - sha256 cellar: :any, catalina: "c1a964093c606926305ac0ae1b6ea9189cd96a6e7c09dd47acdf6a914e71ae1f" - sha256 cellar: :any, arm64_big_sur: "d98c8c477142a258217b2bb693567300a7ad58e6feb3ece5f1d8a7bd5c9d91c2" end def make_deps diff --git a/Formula/tezos-accuser-012-Psithaca.rb b/Formula/tezos-accuser-012-Psithaca.rb index f61b31bcb..567f5d40d 100644 --- a/Formula/tezos-accuser-012-Psithaca.rb +++ b/Formula/tezos-accuser-012-Psithaca.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0-rc2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0", :shallow => false - version "v12.0-rc2-1" + version "v12.0-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAccuser012Psithaca.version}/" - sha256 cellar: :any, big_sur: "7482453e303c9f5e3e69ea2927ecbf46d47fe14fb3c4e99daff0e48ee560b812" - sha256 cellar: :any, catalina: "bb2c7d979897728296f34e35ff14f2f2ba610aa7b4a9d64d42ac3c7615c1b8f0" - sha256 cellar: :any, arm64_big_sur: "0db7e9e561da6e3d7a61161cbec7f72ece1ba62e61cd957afea107ef31c8af3f" end def make_deps diff --git a/Formula/tezos-admin-client.rb b/Formula/tezos-admin-client.rb index f186d4766..5b45078a2 100644 --- 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 => "v12.0-rc2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0", :shallow => false - version "v12.0-rc2-1" + version "v12.0-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosAdminClient.version}/" - sha256 cellar: :any, big_sur: "3d070f65ed6fe77eec99337b9e24faa359aaa08f122b7a3f8cb77b5b26d6379a" - sha256 cellar: :any, catalina: "7ef988653032cf21b4b283123e1873b66a46b5e1d17c1daf413204d24588b8a2" - sha256 cellar: :any, arm64_big_sur: "b79b33de7c42f86b9c5c26e3d2857f44bbe653604f0a77eeb8ce12471fe3c0ae" end def make_deps diff --git a/Formula/tezos-baker-011-PtHangz2.rb b/Formula/tezos-baker-011-PtHangz2.rb index b966d9248..d13d4c42b 100644 --- a/Formula/tezos-baker-011-PtHangz2.rb +++ b/Formula/tezos-baker-011-PtHangz2.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0-rc2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0", :shallow => false - version "v12.0-rc2-1" + version "v12.0-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker011Pthangz2.version}/" - sha256 cellar: :any, big_sur: "fb52e4f581f7cc8580be8f91c485212635664b55d842505bb98d42a943905125" - sha256 cellar: :any, catalina: "c8493f92e3c462a36f19905be2c342af9ed1a3657e0343bd94a9dea95d4ccadb" - sha256 cellar: :any, arm64_big_sur: "2d748cf7c93add9f5c179233c0204ff72983d715b42e5e2d35d91e1c2bf759f8" end def make_deps diff --git a/Formula/tezos-baker-012-Psithaca.rb b/Formula/tezos-baker-012-Psithaca.rb index 2b05c196d..96dc2237a 100644 --- a/Formula/tezos-baker-012-Psithaca.rb +++ b/Formula/tezos-baker-012-Psithaca.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0-rc2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0", :shallow => false - version "v12.0-rc2-1" + version "v12.0-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosBaker012Psithaca.version}/" - sha256 cellar: :any, big_sur: "22b3a2bcc83335d4cf538b96f4cc4cce8d301a98a5c42d3b899e886c0c255cce" - sha256 cellar: :any, catalina: "52e969d49b2d5396df162cfab808cdac6b0048b4437edeb475686cbd22104348" - sha256 cellar: :any, arm64_big_sur: "76191aae7c364365707df775458257cf46bc25fc6913a27f3037d5e7310bf8a4" end def make_deps diff --git a/Formula/tezos-client.rb b/Formula/tezos-client.rb index e37edb8ce..3ef605297 100644 --- 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 => "v12.0-rc2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0", :shallow => false - version "v12.0-rc2-1" + version "v12.0-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosClient.version}/" - sha256 cellar: :any, big_sur: "ef719a065d95935f3ecab6462088341d05243ef37801b9255e50679ed1e5ee43" - sha256 cellar: :any, catalina: "28de6e30561ffce0d6ef4811a1085b2c2e8b4ec2a1a3db5fd48a2980ad6a1412" - sha256 cellar: :any, arm64_big_sur: "e95e99633e9f8d37ac0a9fa9c33ffc5ea2e6e9a154a12cd6170494fd460aeeb0" end def make_deps diff --git a/Formula/tezos-codec.rb b/Formula/tezos-codec.rb index 4c97e8d09..d575ac868 100644 --- 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 => "v12.0-rc2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0", :shallow => false - version "v12.0-rc2-1" + version "v12.0-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosCodec.version}/" - sha256 cellar: :any, big_sur: "e4cdfbcf42590ddbe152fcb6c0ce84ddf673317c47e3bad0f40982b7a56f6805" - sha256 cellar: :any, catalina: "17b51c17e6ffb620c1ebeb6ae7ea9f0ede12d13846c77f9f96e279a68e43e923" - sha256 cellar: :any, arm64_big_sur: "b3ebd24859f786d8c069f81c2a382ba52e5d0231df83135b21d9071cc1ea2599" end def make_deps diff --git a/Formula/tezos-endorser-011-PtHangz2.rb b/Formula/tezos-endorser-011-PtHangz2.rb index 156ff7f46..ab43cb95b 100644 --- a/Formula/tezos-endorser-011-PtHangz2.rb +++ b/Formula/tezos-endorser-011-PtHangz2.rb @@ -10,9 +10,9 @@ class << self end homepage "https://gitlab.com/tezos/tezos" - url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0-rc2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0", :shallow => false - version "v12.0-rc2-1" + version "v12.0-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -28,9 +28,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosEndorser011Pthangz2.version}/" - sha256 cellar: :any, big_sur: "bc3e823e40e7811bd4339c8dabd2cc0cd6ef5b4219bfd6514279a8cce521ed05" - sha256 cellar: :any, catalina: "dea3f61b94751ebae2b6035a17e9fa5d6b85dec3865b202fb67967f26cc1e53b" - sha256 cellar: :any, arm64_big_sur: "b6baf5c2120c53c54487b7f13d2802467fc3e6c4ae780e2cede1239c64202db6" end def make_deps diff --git a/Formula/tezos-node-hangzhounet.rb b/Formula/tezos-node-hangzhounet.rb index 598fcff8a..a3a0ab107 100644 --- a/Formula/tezos-node-hangzhounet.rb +++ b/Formula/tezos-node-hangzhounet.rb @@ -4,7 +4,7 @@ class TezosNodeHangzhounet < Formula url "file:///dev/null" - version "v12.0-rc2-1" + version "v12.0-1" bottle :unneeded depends_on "tezos-node" diff --git a/Formula/tezos-node-ithacanet.rb b/Formula/tezos-node-ithacanet.rb index cf2c8afda..ec28eb980 100644 --- a/Formula/tezos-node-ithacanet.rb +++ b/Formula/tezos-node-ithacanet.rb @@ -4,7 +4,7 @@ class TezosNodeIthacanet < Formula url "file:///dev/null" - version "v12.0-rc2-1" + version "v12.0-1" bottle :unneeded depends_on "tezos-node" diff --git a/Formula/tezos-node-mainnet.rb b/Formula/tezos-node-mainnet.rb index f5d15514e..985d94b21 100644 --- a/Formula/tezos-node-mainnet.rb +++ b/Formula/tezos-node-mainnet.rb @@ -4,7 +4,7 @@ class TezosNodeMainnet < Formula url "file:///dev/null" - version "v12.0-rc2-1" + version "v12.0-1" bottle :unneeded depends_on "tezos-node" diff --git a/Formula/tezos-node.rb b/Formula/tezos-node.rb index aec81234c..aee572c6b 100644 --- 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 => "v12.0-rc2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0", :shallow => false - version "v12.0-rc2-1" + version "v12.0-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosNode.version}/" - sha256 cellar: :any, big_sur: "ab9509eada388cc7331b858ca51b53dd7c6be360d2393f4a1cde51466aa27a35" - sha256 cellar: :any, catalina: "f43414dceedad367cd937eb3a5dba23a27ede1caab54be67fa049f5005b2d241" - sha256 cellar: :any, arm64_big_sur: "593dccdcfcde55fc57a8c95715169a142478ee86f02c27055dbea30cfceb4e36" end def make_deps diff --git a/Formula/tezos-sandbox.rb b/Formula/tezos-sandbox.rb index 5cf0e28ae..2741d679f 100644 --- 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 => "v12.0-rc2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0", :shallow => false - version "v12.0-rc2-1" + version "v12.0-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSandbox.version}/" - sha256 cellar: :any, big_sur: "0912fc8b78dfb4142beaf69183be38e6c97b88354df36cc98827fd0eb9d3961b" - sha256 cellar: :any, catalina: "365453d6c764adeb4cec3fa9b1e259864106b6f73fe1ab10642b4cf2c9e9ffc2" - sha256 cellar: :any, arm64_big_sur: "0f27b3f4bd300d9627fd86096035b3822bf5f5e94fc167ea556d1631a0540d47" end def make_deps diff --git a/Formula/tezos-signer-http.rb b/Formula/tezos-signer-http.rb index 6120a6ed7..5adf0abad 100644 --- a/Formula/tezos-signer-http.rb +++ b/Formula/tezos-signer-http.rb @@ -4,7 +4,7 @@ class TezosSignerHttp < Formula url "file:///dev/null" - version "v12.0-rc2-1" + version "v12.0-1" bottle :unneeded depends_on "tezos-signer" diff --git a/Formula/tezos-signer-https.rb b/Formula/tezos-signer-https.rb index 9064f4a62..628f9fe8e 100644 --- a/Formula/tezos-signer-https.rb +++ b/Formula/tezos-signer-https.rb @@ -4,7 +4,7 @@ class TezosSignerHttps < Formula url "file:///dev/null" - version "v12.0-rc2-1" + version "v12.0-1" bottle :unneeded depends_on "tezos-signer" diff --git a/Formula/tezos-signer-tcp.rb b/Formula/tezos-signer-tcp.rb index 84a46ef1d..fc025bb3d 100644 --- a/Formula/tezos-signer-tcp.rb +++ b/Formula/tezos-signer-tcp.rb @@ -4,7 +4,7 @@ class TezosSignerTcp < Formula url "file:///dev/null" - version "v12.0-rc2-1" + version "v12.0-1" bottle :unneeded depends_on "tezos-signer" diff --git a/Formula/tezos-signer-unix.rb b/Formula/tezos-signer-unix.rb index 25ef615ce..b8e4072df 100644 --- a/Formula/tezos-signer-unix.rb +++ b/Formula/tezos-signer-unix.rb @@ -4,7 +4,7 @@ class TezosSignerUnix < Formula url "file:///dev/null" - version "v12.0-rc2-1" + version "v12.0-1" bottle :unneeded depends_on "tezos-signer" diff --git a/Formula/tezos-signer.rb b/Formula/tezos-signer.rb index bb378780f..d13c0a164 100644 --- 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 => "v12.0-rc2", :shallow => false + url "https://gitlab.com/tezos/tezos.git", :tag => "v12.0", :shallow => false - version "v12.0-rc2-1" + version "v12.0-1" build_dependencies = %w[pkg-config autoconf rsync wget rustup-init] build_dependencies.each do |dependency| @@ -27,9 +27,6 @@ class << self bottle do root_url "https://github.com/serokell/tezos-packaging/releases/download/#{TezosSigner.version}/" - sha256 cellar: :any, big_sur: "eec08f340baabd8a3b2d6810a29c7eed6715ea581fd13db07a59e606da25af3c" - sha256 cellar: :any, catalina: "09c7ce9145558f7fc639f73b04c5b9df69ddbf97e7d6298e1bff17d08cd0b6ce" - sha256 cellar: :any, arm64_big_sur: "446cfe397a6e63ef1fc4044a287f8f01b476a93dc8fdf3a654c2d283613a6e11" end def make_deps diff --git a/nix/build/hacks.nix b/nix/build/hacks.nix index b5321cfa0..73343b02d 100644 --- a/nix/build/hacks.nix +++ b/nix/build/hacks.nix @@ -68,18 +68,18 @@ rec { ''; }); - irmin = osuper.irmin.versions."2.9.0".overrideAttrs (o: { + irmin = osuper.irmin.versions."2.9.1".overrideAttrs (o: { useDune2 = true; }); - irmin-pack = osuper.irmin-pack.versions."2.9.0".overrideAttrs ( o: { + irmin-pack = osuper.irmin-pack.versions."2.9.1".overrideAttrs ( o: { buildPhase = '' runHook preBuild dune build -p irmin-pack -j $NIX_BUILD_CORES runHook postBuild ''; }); - irmin-layers = osuper.irmin-layers.versions."2.9.0"; - ppx_irmin = osuper.ppx_irmin.versions."2.9.0"; + irmin-layers = osuper.irmin-layers.versions."2.9.1"; + ppx_irmin = osuper.ppx_irmin.versions."2.9.1"; index = osuper.index.versions."1.5.0"; progress = osuper.progress.versions."0.2.1".overrideAttrs (o: { @@ -95,13 +95,13 @@ rec { lwt-canceler = osuper.lwt-canceler.versions."0.3"; data-encoding = osuper.data-encoding.versions."0.4"; - json-data-encoding = osuper.json-data-encoding.versions."0.10"; - json-data-encoding-bson = osuper.json-data-encoding-bson.versions."0.10"; + json-data-encoding = osuper.json-data-encoding.versions."0.11"; + json-data-encoding-bson = osuper.json-data-encoding-bson.versions."0.11"; ocamlformat = osuper.ocamlformat.overrideAttrs (o: { buildInputs = o.buildInputs ++ [ alcotest ocp-indent ]; }); - bls12-381 = osuper.bls12-381.versions."1.1.0".overrideAttrs (o: + bls12-381 = osuper.bls12-381.versions."1.1.1".overrideAttrs (o: rec { buildInputs = o.buildInputs ++ [ rustc-bls12-381 ]; buildPhase = '' diff --git a/nix/nix/sources.json b/nix/nix/sources.json index b263e3536..230a53313 100644 --- a/nix/nix/sources.json +++ b/nix/nix/sources.json @@ -36,10 +36,10 @@ "url_template": "https://github.com///archive/.tar.gz" }, "opam-repository": { - "branch": "master", - "ref": "master", + "branch": "v12-release", + "ref": "v12-release", "repo": "https://gitlab.com/tezos/opam-repository", - "rev": "8ce29151e3b8965bfc74dd8bd114f48df3d5733c", + "rev": "049f2433bd7f4b4fb24dc7cb7faa4b9d77589138", "type": "git" }, "serokell-nix": { @@ -56,9 +56,9 @@ }, "tezos": { "branch": "master", - "ref": "refs/tags/v12.0-rc2", + "ref": "refs/tags/v12.0", "repo": "https://gitlab.com/tezos/tezos", - "rev": "7985fafe19003eb6ab495e7d6ce83e747c4e01fc", + "rev": "409a3f3fe491ba5c9ac51c7124833f4f70006c07", "type": "git" } }