Skip to content

ghc@9.6 9.6.6 #178439

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.

Sign up for GitHub

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

Merged
BrewTestBot merged 4 commits into from
Jul 29, 2024
Merged

ghc@9.6 9.6.6 #178439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d03ae02
ghc@9.6 9.6.6
cho-m Jul 25, 2024
9c2a364
haskell-language-server: revision bump (ghc@9.6 9.6.6)
cho-m Jul 25, 2024
fff4b43
ghc@9.6: update 9.6.6 bottle.
BrewTestBot Jul 29, 2024
1308223
haskell-language-server: update 2.8.0.0_1 bottle.
BrewTestBot Jul 29, 2024
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
71 changes: 36 additions & 35 deletions Formula/g/ghc@9.6.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class GhcAT96 < Formula
desc "Glorious Glasgow Haskell Compilation System"
homepage "https://haskell.org/ghc/"
url "https://downloads.haskell.org/~ghc/9.6.3/ghc-9.6.3-src.tar.xz"
sha256 "dfcde67b4aa550a0b8a1a9bb8105835dc999fad6397cce33d72fd55d21eb77f5"
url "https://downloads.haskell.org/~ghc/9.6.6/ghc-9.6.6-src.tar.xz"
sha256 "008f7a04d89ad10baae6486c96645d7d726aaac7e1476199f6dd86c6bd9977ad"
# We build bundled copies of libffi and GMP so GHC inherits the licenses
license all_of: [
"BSD-3-Clause",
Expand All @@ -16,13 +16,13 @@ class GhcAT96 < Formula
end

bottle do
sha256 cellar: :any, arm64_sonoma: "4090536366174048455a6cbc22dfcfde6bd651a4514d1c5db2616dad6fa856b2"
sha256 cellar: :any, arm64_ventura: "4cb14f641c0528875106cd2da6467d16bb4a2f235668713ff53e65d59936b334"
sha256 cellar: :any, arm64_monterey: "4780ec3532aaa127f5af54da4b80852b185403cd3df62d6d862679836228716a"
sha256 cellar: :any, sonoma: "217e396300b2f4409280a60cf5cb0f807474ba60cc9fa7f94b2b30ebbdf5a170"
sha256 cellar: :any, ventura: "c120f617c6e869bf0f3665445da22c7c2ad5e5b87dc2845411d97519bdb4ba24"
sha256 cellar: :any, monterey: "6073bbdf81da5055ec819eeb19fd6c9c3a589755e63db5b2e1d3240ddcb8e9a0"
sha256 cellar: :any_skip_relocation, x86_64_linux: "c5a089e4157c5f5230050c272606661a902840f66bb8ebbb963548b6ca9e23e3"
sha256 cellar: :any, arm64_sonoma: "c743179f1acb1dd0587eb5c81afe4063b597b01e36f33df96ff91578041f4f59"
sha256 cellar: :any, arm64_ventura: "ca978842ded4cd067ae9fb240ea6f0265d5f5ddef3f66c53032ef9fa8c6fe628"
sha256 cellar: :any, arm64_monterey: "c45b5f329a05b78f0e1c37d70808d5026f19f5cb1a9ded56e9d4ef16118f3938"
sha256 cellar: :any, sonoma: "96bccb2f76d066ba34caca9fc810230d7354576c8e4f65f2ec0f2ce2b2116004"
sha256 cellar: :any, ventura: "f80fbe96a9def21638df7bdfbd10258f049ed7d0df84a256d225c0a856a8f042"
sha256 cellar: :any, monterey: "2069497d6c4847352cd1a38afa4e2581384ccb16d6e84692be22cdfb6a7012eb"
sha256 cellar: :any_skip_relocation, x86_64_linux: "2c7dce17539c201eaf653bb1d48fc68209eab4cd6a8f3f816d135abc47577d35"
end

keg_only :versioned_formula
Expand All @@ -49,49 +49,55 @@ class GhcAT96 < Formula
resource "binary" do
on_macos do
on_arm do
url "https://downloads.haskell.org/~ghc/9.4.7/ghc-9.4.7-aarch64-apple-darwin.tar.xz"
sha256 "5d85f9836d72d45634039218ed52e9faa0ed00c0db056f3d1162b4c2b3838e38"
url "https://downloads.haskell.org/~ghc/9.4.8/ghc-9.4.8-aarch64-apple-darwin.tar.xz"
sha256 "32385043d824a56983b484da5c0b3504d14b6504764731b0d48f3522ed8497ca"
end
on_intel do
url "https://downloads.haskell.org/~ghc/9.4.7/ghc-9.4.7-x86_64-apple-darwin.tar.xz"
sha256 "2c874dc685cb72b0c4d6f226b795051705a923c25080eeba05d546350474cb1e"
url "https://downloads.haskell.org/~ghc/9.4.8/ghc-9.4.8-x86_64-apple-darwin.tar.xz"
sha256 "fd9e21c2a9a10c60e39049e9cf1519b5b6a98a5b37e7623ba17bbd6e8dfc2036"
end
end
on_linux do
on_arm do
url "https://downloads.haskell.org/~ghc/9.4.7/ghc-9.4.7-aarch64-deb10-linux.tar.xz"
sha256 "05896fc4bc52c117d281eac9c621c6c3a0b14f9f9eed5e42cce5e1c4485c7623"
url "https://downloads.haskell.org/~ghc/9.4.8/ghc-9.4.8-aarch64-deb10-linux.tar.xz"
sha256 "278e287e1ee624712b9c6d7803d1cf915ca1cce56e013b0a16215eb8dfeb1531"
end
on_intel do
url "https://downloads.haskell.org/~ghc/9.4.7/ghc-9.4.7-x86_64-ubuntu20_04-linux.tar.xz"
sha256 "f1c5c4f9257d06acf9da655f0491cf897ed05dece95f6266fdd880998125467a"
url "https://downloads.haskell.org/~ghc/9.4.8/ghc-9.4.8-x86_64-ubuntu20_04-linux.tar.xz"
sha256 "da1a1ddce5b39f6e30d8a2392753835a41ffc5ec4b914e0845270fe3a2ba4761"
end
end
end

resource "cabal-install" do
on_macos do
on_arm do
url "https://downloads.haskell.org/~cabal/cabal-install-3.10.2.0/cabal-install-3.10.2.0-aarch64-darwin.tar.xz"
sha256 "d2bd336d7397cf4b76f3bb0d80dea24ca0fa047903e39c8305b136e855269d7b"
url "https://downloads.haskell.org/~cabal/cabal-install-3.12.1.0/cabal-install-3.12.1.0-aarch64-darwin.tar.xz"
sha256 "9c165ca9a2e593b12dbb0eca92c0b04f8d1c259871742d7e9afc352364fe7a3f"
end
on_intel do
url "https://downloads.haskell.org/~cabal/cabal-install-3.10.2.0/cabal-install-3.10.2.0-x86_64-darwin.tar.xz"
sha256 "cd64f2a8f476d0f320945105303c982448ca1379ff54b8625b79fb982b551d90"
url "https://downloads.haskell.org/~cabal/cabal-install-3.12.1.0/cabal-install-3.12.1.0-x86_64-darwin.tar.xz"
sha256 "e89392429f59bbcfaf07e1164e55bc63bba8e5c788afe43c94e00b515c1578af"
end
end
on_linux do
on_arm do
url "https://downloads.haskell.org/~cabal/cabal-install-3.10.2.0/cabal-install-3.10.2.0-aarch64-linux-deb10.tar.xz"
sha256 "004ed4a7ca890fadee23f58f9cb606c066236a43e16b34be2532b177b231b06d"
url "https://downloads.haskell.org/~cabal/cabal-install-3.12.1.0/cabal-install-3.12.1.0-aarch64-linux-deb10.tar.xz"
sha256 "c01f2e0b3ba1fe4104cf2933ee18558a9b81d85831a145e8aba33fa172c7c618"
end
on_intel do
url "https://downloads.haskell.org/~cabal/cabal-install-3.10.2.0/cabal-install-3.10.2.0-x86_64-linux-ubuntu20_04.tar.xz"
sha256 "c2a8048caa3dbfe021d0212804f7f2faad4df1154f1ff52bd2f3c68c1d445fe1"
url "https://downloads.haskell.org/~cabal/cabal-install-3.12.1.0/cabal-install-3.12.1.0-x86_64-linux-ubuntu20_04.tar.xz"
sha256 "3724f2aa22f330c5e6605978f3dd9adee4e052866321a8dd222944cd178c3c24"
end
end
end

# Backport fix for autoconf 2.72.
patch do
url "https://gitlab.haskell.org/ghc/ghc/-/commit/c9731d6d3cad01fccb88c99c4f26070a44680389.diff"
sha256 "f7e921f7096c97bd4e63ac488186a132eb0cc508d04f0c5a99e9ded51bf16b25"
end

# Backport fix for building docs with sphinx-doc 7.
# TODO: Remove patch if fix is backported to 9.6.
# Ref: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/10520
Expand All @@ -101,14 +107,9 @@ class GhcAT96 < Formula
end

def install
ENV["CC"] = ENV.cc
ENV["CC"] = ENV["ac_cv_path_CC"] = ENV.cc
ENV["LD"] = "ld"
ENV["PYTHON"] = which("python3.12")
# Work around `ENV["CC"]` no longer being used unless set to absolute path.
# Caused by https://gitlab.haskell.org/ghc/ghc/-/commit/6be2c5a7e9187fc14d51e1ec32ca235143bb0d8b
# Issue ref: https://gitlab.haskell.org/ghc/ghc/-/issues/22175
# TODO: remove once upstream issue is fixed
ENV["ac_cv_path_CC"] = ENV.cc

binary = buildpath/"binary"
resource("binary").stage do
Expand All @@ -120,12 +121,12 @@ def install

system "./configure", "--prefix=#{binary}", *binary_args
ENV.deparallelize { system "make", "install" }

ENV.prepend_path "PATH", binary/"bin"
# Build uses sed -r option, which is not available in Catalina shipped sed.
ENV.prepend_path "PATH", Formula["gnu-sed"].libexec/"gnubin" if OS.mac? && MacOS.version <= :catalina
end

ENV.prepend_path "PATH", binary/"bin"
# Build uses sed -r option, which is not available in Catalina shipped sed.
ENV.prepend_path "PATH", Formula["gnu-sed"].libexec/"gnubin" if OS.mac? && MacOS.version <= :catalina

resource("cabal-install").stage { (binary/"bin").install "cabal" }
system "cabal", "v2-update"

Expand Down
15 changes: 8 additions & 7 deletions Formula/h/haskell-language-server.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ class HaskellLanguageServer < Formula
url "https://github.com/haskell/haskell-language-server/archive/refs/tags/2.8.0.0.tar.gz"
sha256 "af6c76d21d577c2712ed7106d8ba00ec734c9285de58293f78e1cc1cc203d154"
license "Apache-2.0"
revision 1
head "https://github.com/haskell/haskell-language-server.git", branch: "master"

# we need :github_latest here because otherwise
Expand All @@ -14,13 +15,13 @@ class HaskellLanguageServer < Formula
end

bottle do
sha256 cellar: :any_skip_relocation, arm64_sonoma: "505d7b4ee2b01efdc08f118d25e56571644a20b59307f85674aec94751e46eea"
sha256 cellar: :any_skip_relocation, arm64_ventura: "3919af365fad785cef7cbe4a7a4dae370ec2da8f1f67412e786dd3446e2eba9b"
sha256 cellar: :any_skip_relocation, arm64_monterey: "06720b41aaad6db9d89b14eea83ad64e207d1aaab9d323074f8b883748526585"
sha256 cellar: :any_skip_relocation, sonoma: "e7871a9fc22cb17b90e25dd6c2f7b73a24342219c1381d8512e08f3f46433f83"
sha256 cellar: :any_skip_relocation, ventura: "b3bc88498494cbc92b7d8557af3dc772e73803af673d6cdedaded329b557ad34"
sha256 cellar: :any_skip_relocation, monterey: "837179ca16259f27e96687f167beb869438188ab195ad33faa82eafce7a5b587"
sha256 cellar: :any_skip_relocation, x86_64_linux: "f424fc867d3199ff6aeec9d70a09e7080d001f54b4a9e7fd79ed82c94f85b00c"
sha256 cellar: :any_skip_relocation, arm64_sonoma: "97f18e33ec1094435f890c03ebeecda4caaaee0b18d06ea32102be43e8ea4cce"
sha256 cellar: :any_skip_relocation, arm64_ventura: "a64099f8dc9bffef9e95ff477745f0330aa561591f9e2cacdbd0789a6a28289d"
sha256 cellar: :any_skip_relocation, arm64_monterey: "8d1c4e2a511ffba766a4770a499133eb85592b44beb36bd10cb5e3fa4ddf00af"
sha256 cellar: :any_skip_relocation, sonoma: "986b55e3f0674228d1b6148525f354fe780ec5d69082a619d6a8795677448aa5"
sha256 cellar: :any_skip_relocation, ventura: "6c97b66ae29e48f6bae313a496a15a9f69b2c61c1e2ac394b8d45bad1634fa8c"
sha256 cellar: :any_skip_relocation, monterey: "1470930b0cd2e62edc86fe4e2f514432ab53f06b03fdb1e5d43f434d6c1c931b"
sha256 cellar: :any_skip_relocation, x86_64_linux: "a4954a468414a4096ae9ceae894bb532571518c417ccfcc90aa5becfdf2212ee"
end

depends_on "cabal-install" => [:build, :test]
Expand Down