Skip to content

Commit

Permalink
Merge pull request #745 from serokell/krendelhoff/#723-opam-brew
Browse files Browse the repository at this point in the history 
[#723] Use opam from homebrew in formulae
  • Loading branch information
@krendelhoff2
krendelhoff2 authored Nov 13, 2023
2 parents 323170b + 85cc06c commit 1e48cf8
Show file tree
Hide file tree
Showing 16 changed files with 16 additions and 64 deletions.
5 changes: 1 addition & 4 deletions Formula/tezos-accuser-Proxford.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -42,9 +42,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-accuser-PtNairob.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -42,9 +42,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-admin-client.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -42,9 +42,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-baker-Proxford.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -42,9 +42,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-baker-PtNairob.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -42,9 +42,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-client.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -42,9 +42,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-codec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -42,9 +42,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-dac-client.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -42,9 +42,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-dac-node.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -42,9 +42,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-node.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -42,9 +42,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-signer.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -42,9 +42,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-smart-rollup-client-Proxford.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -43,9 +43,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-smart-rollup-client-PtNairob.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -43,9 +43,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-smart-rollup-node-Proxford.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -44,9 +44,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-smart-rollup-node-PtNairob.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -44,9 +44,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down
5 changes: 1 addition & 4 deletions Formula/tezos-smart-rollup-wasm-debugger.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ class << self

version "v18.0-1"

build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake]
build_dependencies = %w[pkg-config coreutils autoconf rsync wget rustup-init cmake opam]
build_dependencies.each do |dependency|
depends_on dependency => :build
end
Expand Down Expand Up @@ -43,9 +43,6 @@ def make_deps
ENV["LDFLAGS"] = "-L#{HOMEBREW_PREFIX}/lib"
# Here is the workaround to use opam 2.0.9 because Tezos is currently not compatible with opam 2.1.0 and newer
arch = RUBY_PLATFORM.include?("arm64") ? "arm64" : "x86_64"
system "curl", "-L", "https://github.com/ocaml/opam/releases/download/2.0.9/opam-2.0.9-#{arch}-macos", "--create-dirs", "-o", "#{ENV["HOME"]}/.opam-bin/opam"
system "chmod", "+x", "#{ENV["HOME"]}/.opam-bin/opam"
ENV["PATH"]="#{ENV["HOME"]}/.opam-bin:#{ENV["PATH"]}"
system "rustup-init", "--default-toolchain", "1.64.0", "-y"
system "opam", "init", "--bare", "--debug", "--auto-setup", "--disable-sandboxing"
system ["source .cargo/env", "make build-deps"].join(" && ")
Expand Down

0 comments on commit 1e48cf8

Please sign in to comment.