diff --git a/srcpkgs/stack/patches/datakinds.patch b/srcpkgs/stack/patches/datakinds.patch deleted file mode 100644 index 6da5cf5d61c..00000000000 --- a/srcpkgs/stack/patches/datakinds.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/src/Stack/Storage/User.hs 2020-10-15 15:51:28.000000000 +0200 -+++ b/src/Stack/Storage/User.hs 2020-12-06 20:51:06.632607164 +0100 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE DataKinds #-} - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE FlexibleInstances #-} - {-# LANGUAGE GADTs #-} ---- a/src/Stack/Storage/Project.hs 2020-10-15 15:51:28.000000000 +0200 -+++ b/src/Stack/Storage/Project.hs 2020-12-06 21:55:21.349484738 +0100 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE DataKinds #-} - {-# LANGUAGE DerivingStrategies #-} - {-# LANGUAGE FlexibleInstances #-} - {-# LANGUAGE GADTs #-} diff --git a/srcpkgs/stack/patches/ghc-8.8.4.patch b/srcpkgs/stack/patches/ghc-8.8.4.patch deleted file mode 100644 index e4cd0618da1..00000000000 --- a/srcpkgs/stack/patches/ghc-8.8.4.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- a/masterdir/builddir/stack-2.5.1/stack.cabal 2020-10-17 17:19:10.724179166 +0200 -+++ b/stack.cabal 2020-10-17 17:18:03.803498792 +0200 -@@ -234,6 +234,7 @@ - , base >=4.10 && <5 - , base64-bytestring - , bytestring -+ , base16-bytestring == 0.1.1.7 - , casa-client - , casa-types - , colour -@@ -272,7 +273,7 @@ - , neat-interpolation - , network-uri - , open-browser -- , optparse-applicative -+ , optparse-applicative == 0.15.1.0 - , pantry >=0.5.1.3 - , path - , path-io -@@ -359,6 +360,7 @@ - , base >=4.10 && <5 - , base64-bytestring - , bytestring -+ , base16-bytestring == 0.1.1.7 - , casa-client - , casa-types - , colour -@@ -396,7 +398,7 @@ - , neat-interpolation - , network-uri - , open-browser -- , optparse-applicative -+ , optparse-applicative == 0.15.1.0 - , pantry >=0.5.1.3 - , path - , path-io -@@ -480,6 +482,7 @@ - , base >=4.10 && <5 - , base64-bytestring - , bytestring -+ , base16-bytestring == 0.1.1.7 - , casa-client - , casa-types - , colour -@@ -518,7 +521,7 @@ - , neat-interpolation - , network-uri - , open-browser -- , optparse-applicative -+ , optparse-applicative == 0.15.1.0 - , optparse-generic - , pantry >=0.5.1.3 - , path -@@ -609,6 +612,7 @@ - , base >=4.10 && <5 - , base64-bytestring - , bytestring -+ , base16-bytestring == 0.1.1.7 - , casa-client - , casa-types - , colour -@@ -647,7 +651,7 @@ - , neat-interpolation - , network-uri - , open-browser -- , optparse-applicative -+ , optparse-applicative == 0.15.1.0 - , pantry >=0.5.1.3 - , path - , path-io diff --git a/srcpkgs/stack/patches/ppc.patch b/srcpkgs/stack/patches/ppc.patch index ef661e16b5b..fc4c540f0f9 100644 --- a/srcpkgs/stack/patches/ppc.patch +++ b/srcpkgs/stack/patches/ppc.patch @@ -1,13 +1,14 @@ --- a/src/Stack/Setup.hs +++ b/src/Stack/Setup.hs -@@ -95,5 +95,6 @@ import System.IO.Error (isPermissionError) +@@ -91,6 +91,7 @@ import System.FilePath (searchPathSeparator) import qualified System.FilePath as FP import System.Permissions (setFileExecutable) +import System.Endian (getSystemEndianness, Endianness (..)) import System.Uname (getRelease) import Data.List.Split (splitOn) -@@ -1264,4 +1265,9 @@ getOSKey platform = + +@@ -1241,6 +1242,11 @@ Platform X86_64 Cabal.Windows -> return "windows64" Platform Arm Cabal.Linux -> return "linux-armv7" Platform AArch64 Cabal.Linux -> return "linux-aarch64" @@ -16,16 +17,16 @@ + case getSystemEndianness of + LittleEndian -> return "linux-powerpc64le" + BigEndian -> return "linux-powerpc64" + Platform Sparc Cabal.Linux -> return "linux-sparc" Platform arch os -> throwM $ UnsupportedSetupCombo os arch - downloadFromInfo --- a/stack.cabal +++ b/stack.cabal -@@ -235,6 +235,7 @@ library - , conduit - , conduit-extra - , containers -+ , cpu >=0.1.2 - , cryptonite - , cryptonite-conduit - , deepseq +@@ -246,6 +246,7 @@ + conduit >=1.3.4.1, + conduit-extra >=1.3.5, + containers >=0.6.2.1, ++ cpu >=0.1.2, + cryptonite >=0.27, + cryptonite-conduit >=0.2.2, + deepseq >=1.4.4.0, diff --git a/srcpkgs/stack/template b/srcpkgs/stack/template index 257aba10e50..b95bf9ec59e 100644 --- a/srcpkgs/stack/template +++ b/srcpkgs/stack/template @@ -1,8 +1,8 @@ # Template file for 'stack' pkgname=stack -version=2.5.1 +version=2.7.1 revision=1 -_stackage="lts-16.13" +_stackage="lts-17.5" hostmakedepends="cabal-install pkg-config unzip" makedepends="zlib-devel pcre-devel" depends="git gmp-devel iana-etc" @@ -10,10 +10,10 @@ short_desc="Cross-platform program for developing Haskell projects" maintainer="Leah Neukirchen " license="BSD-3-Clause" homepage="https://haskellstack.org" -distfiles="https://github.com/commercialhaskell/${pkgname}/archive/v${version}.tar.gz +distfiles="https://hackage.haskell.org/package/${pkgname}-${version}/${pkgname}-${version}.tar.gz https://www.stackage.org/${_stackage}/cabal.config>cabal.config-${_stackage}" -checksum="f29d63b91ff2bddd130b29ddee90a1f450706271a13d5d80b653b50379ffa076 - b9ac16e957c91b698bc8c06166b5fa61e8443ef97f87ab591a21d6fda4327b58" +checksum="605bd8368b6fef9323ea71b79b08dd62270c49089a86b79fe67355f6b82cbc26 + d03bee7e51bbdec5053573f94f644a6baeb140cdd95dbe47261e03c04306b252" skip_extraction="cabal.config-${_stackage}" nocross=yes nopie_files="/usr/bin/stack"