Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ghc 8.10.3 #67284

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Formula/agda.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@ class Agda < Formula
sha256 "3b1d3a8f93a2723b554d9f07b2cd136be1a7b2fcab1855b12b7aab5cbac8868c"
end

# Enable build with ghc 8.10.3. Remove at version bump, but verify that it includes:
# https://github.com/agda/agda/commit/76278c23d447b49f59fac581ca4ac605792aabbc
patch do
url "https://github.com/agda/agda/commit/76278c23d447b49f59fac581ca4ac605792aabbc.patch?full_index=1"
sha256 "c045c0426b867db1dedcee9c1b7a8514967226acf33e4be3ceba98d1d876aabb"
end

def install
ENV["CABAL_DIR"] = prefix/"cabal"
system "cabal", "v2-update"
Expand Down
1 change: 1 addition & 0 deletions Formula/allureofthestars.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class Allureofthestars < Formula
url "https://hackage.haskell.org/package/Allure-0.9.5.0/Allure-0.9.5.0.tar.gz"
sha256 "8180fe070633bfa5515de8f7443421044e7ad4ee050f0a92c048cec5f2c88132"
license all_of: ["AGPL-3.0-or-later", "GPL-2.0-or-later", "OFL-1.1", "MIT", :cannot_represent]
revision 1
head "https://github.com/AllureOfTheStars/Allure.git"

livecheck do
Expand Down
6 changes: 5 additions & 1 deletion Formula/bond.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,17 @@ class Bond < Formula
end

depends_on "cmake" => :build
depends_on "[email protected]" => :build
depends_on "haskell-stack" => :build
depends_on "boost"
depends_on "rapidjson"

def install
mkdir "build" do
system "cmake", "..", *std_cmake_args, "-DBOND_ENABLE_GRPC=FALSE", "-DBOND_FIND_RAPIDJSON=TRUE"
system "cmake", "..", *std_cmake_args,
"-DBOND_ENABLE_GRPC=FALSE",
"-DBOND_FIND_RAPIDJSON=TRUE",
"-DBOND_STACK_OPTIONS=--system-ghc;--no-install-ghc"
system "make"
system "make", "install"
end
Expand Down
4 changes: 3 additions & 1 deletion Formula/futhark.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ class Futhark < Formula

def install
system "cabal", "v2-update"
system "cabal", "v2-install", *std_cabal_v2_args
# Remove the `--constraint` flag at version bump
# see https://github.com/ddssff/listlike/issues/8#issuecomment-748985462 for detail
system "cabal", "v2-install", *std_cabal_v2_args, "--constraint=bytestring==0.10.10.1"

system "make", "-C", "docs", "man"
man1.install Dir["docs/_build/man/*.1"]
Expand Down
21 changes: 10 additions & 11 deletions Formula/ghc.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
class Ghc < Formula
desc "Glorious Glasgow Haskell Compilation System"
homepage "https://haskell.org/ghc/"
url "https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-src.tar.xz"
sha256 "4e3b07f83a266b3198310f19f71e371ebce97c769b14f0d688f4cbf2a2a1edf5"
url "https://downloads.haskell.org/~ghc/8.10.3/ghc-8.10.3-src.tar.xz"
sha256 "ccdc8319549028a708d7163e2967382677b1a5a379ff94d948195b5cf46eb931"
license "BSD-3-Clause"
revision 2

livecheck do
url :stable
Expand Down Expand Up @@ -34,24 +33,24 @@ class Ghc < Formula
depends_on "sphinx-doc" => :build

resource "gmp" do
url "https://ftp.gnu.org/gnu/gmp/gmp-6.1.2.tar.xz"
mirror "https://gmplib.org/download/gmp/gmp-6.1.2.tar.xz"
mirror "https://ftpmirror.gnu.org/gmp/gmp-6.1.2.tar.xz"
sha256 "87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912"
url "https://ftp.gnu.org/gnu/gmp/gmp-6.2.1.tar.xz"
mirror "https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz"
mirror "https://ftpmirror.gnu.org/gmp/gmp-6.2.1.tar.xz"
sha256 "fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2"
end

# https://www.haskell.org/ghc/download_ghc_8_10_1.html#macosx_x86_64
# "This is a distribution for Mac OS X, 10.7 or later."
# A binary of ghc is needed to bootstrap ghc
resource "binary" do
on_macos do
url "https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-apple-darwin.tar.xz"
sha256 "65b1ca361093de4804a7e40b3e68178e1ef720f84f743641ec8d95e56a45b3a8"
url "https://downloads.haskell.org/~ghc/8.10.3/ghc-8.10.3-x86_64-apple-darwin.tar.xz"
sha256 "2635f35d76e44e69afdfd37cae89d211975cc20f71f784363b72003e59f22015"
end

on_linux do
url "https://downloads.haskell.org/~ghc/8.10.1/ghc-8.10.1-x86_64-deb9-linux.tar.xz"
sha256 "d1cf7886f27af070f3b7dbe1975a78b43ef2d32b86362cbe953e79464fe70761"
url "https://downloads.haskell.org/~ghc/8.10.3/ghc-8.10.3-x86_64-deb9-linux.tar.xz"
sha256 "95e4aadea30701fe5ab84d15f757926d843ded7115e11c4cd827809ca830718d"
end
end

Expand Down
6 changes: 3 additions & 3 deletions Formula/git-annex.rb
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class GitAnnex < Formula
desc "Manage files with git without checking in file contents"
homepage "https://git-annex.branchable.com/"
url "https://hackage.haskell.org/package/git-annex-8.20201103/git-annex-8.20201103.tar.gz"
sha256 "f4a6ade8a86d9640b5b2d81e45fc4c93c8e35bd90a1fc49d47c4aff1f59d31fd"
url "https://hackage.haskell.org/package/git-annex-8.20201127/git-annex-8.20201127.tar.gz"
sha256 "e7ff248e49ee6acb5122d0f7975c8a9cf327f76179ea96a005bafef59c2b3559"
license all_of: ["AGPL-3.0-or-later", "BSD-2-Clause", "BSD-3-Clause",
"GPL-2.0-only", "GPL-3.0-or-later", "MIT"]
head "git://git-annex.branchable.com/"
Expand All @@ -19,7 +19,7 @@ class GitAnnex < Formula
end

depends_on "cabal-install" => :build
depends_on "ghc@8.6" => :build
depends_on "ghc" => :build
depends_on "pkg-config" => :build
depends_on "gsasl"
depends_on "libmagic"
Expand Down