From c2d60215e9418c152f53cec6fea05e18342c2067 Mon Sep 17 00:00:00 2001 From: Ed Reel Date: Fri, 19 Apr 2024 11:49:51 -0500 Subject: [PATCH] Cabal 2.4.1.0-1 => 3.10.3.0 (#9680) --- manifest/i686/c/cabal.filelist | 1 + packages/cabal.rb | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 12 deletions(-) create mode 100644 manifest/i686/c/cabal.filelist diff --git a/manifest/i686/c/cabal.filelist b/manifest/i686/c/cabal.filelist new file mode 100644 index 000000000..93bd3a662 --- /dev/null +++ b/manifest/i686/c/cabal.filelist @@ -0,0 +1 @@ +/usr/local/bin/cabal diff --git a/packages/cabal.rb b/packages/cabal.rb index 48a9e6e8f..8d2844059 100644 --- a/packages/cabal.rb +++ b/packages/cabal.rb @@ -3,21 +3,22 @@ require 'package' class Cabal < Package description 'Common Architecture for Building Applications and Libraries' homepage 'https://www.haskell.org/cabal/' - version '2.4.1.0-1' + version '3.10.3.0' license 'BSD' - compatibility 'i686,x86_64' - case ARCH - when 'i686' - source_url 'https://downloads.haskell.org/~cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-i386-unknown-linux.tar.xz' - source_sha256 'b2da736cc27609442b10f77fc1a687aba603a7a33045b722dbf1a0066fade198' - when 'x86_64' - source_url 'https://downloads.haskell.org/~cabal/cabal-install-2.4.1.0/cabal-install-2.4.1.0-x86_64-unknown-linux.tar.xz' - source_sha256 '6136c189ffccaa39916f9cb5788f757166444a2d0c473b987856a79ecbf0c714' - end + compatibility 'x86_64 i686' + source_url({ + x86_64: 'https://downloads.haskell.org/~cabal/cabal-install-3.10.3.0/cabal-install-3.10.3.0-x86_64-linux-alpine3_12.tar.xz', + i686: 'https://downloads.haskell.org/~cabal/cabal-install-3.10.3.0/cabal-install-3.10.3.0-i386-linux-alpine3_12.tar.xz' + }) + source_sha256({ + x86_64: '284978da43d9d52af678e52cbae8fb3359ec59180130b099913f5d3e6f19fda4', + i686: '284978da43d9d52af678e52cbae8fb3359ec59180130b099913f5d3e6f19fda4' + }) - depends_on 'ghc' + no_compile_needed + no_shrink def self.install - system "install -Dm755 cabal #{CREW_DEST_PREFIX}/bin/cabal" + FileUtils.install 'cabal', "#{CREW_DEST_PREFIX}/bin/cabal", mode: 0o755 end end