update to stack-2.9.1
This commit is contained in:
Jens Petersen
parent
ff636396f1
commit
784412798a
|
|
@ -53,3 +53,9 @@ haskell-platform-2010.2.0.0.tar.gz
|
|||
/mustache-2.3.2.tar.gz
|
||||
/neat-interpolation-0.5.1.3.tar.gz
|
||||
/pantry-0.5.3.tar.gz
|
||||
/stack-2.9.1.tar.gz
|
||||
/hi-file-parser-0.1.3.0.tar.gz
|
||||
/hpack-0.35.2.tar.gz
|
||||
/mintty-0.1.4.tar.gz
|
||||
/mustache-2.4.1.tar.gz
|
||||
/pantry-0.5.7.tar.gz
|
||||
|
|
|
|||
|
|
@ -0,0 +1,192 @@
|
|||
From f58b89550cba1f086287edec25f56b0f4adfa99b Mon Sep 17 00:00:00 2001
|
||||
From: Mike Pilgrem <mpilgrem@users.noreply.github.com>
|
||||
Date: Tue, 17 Jan 2023 00:20:42 +0000
|
||||
Subject: [PATCH] Fix #5866 Replace duff `forgivingAbsence $ resolveFile ...`
|
||||
|
||||
---
|
||||
src/Path/Extra.hs | 39 +++++++++++++++++++++++++++++++++++---
|
||||
src/Stack/Build/Execute.hs | 13 ++++++++-----
|
||||
src/Stack/ComponentFile.hs | 7 ++++---
|
||||
src/Stack/Ghci.hs | 4 ++--
|
||||
src/Stack/PackageFile.hs | 5 ++---
|
||||
5 files changed, 52 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/src/Path/Extra.hs b/src/Path/Extra.hs
|
||||
index 5f1069087..d6d15b937 100644
|
||||
--- a/src/Path/Extra.hs
|
||||
+++ b/src/Path/Extra.hs
|
||||
@@ -14,21 +14,27 @@ module Path.Extra
|
||||
, pathToLazyByteString
|
||||
, pathToText
|
||||
, tryGetModificationTime
|
||||
+ , forgivingResolveFile
|
||||
+ , forgivingResolveFile'
|
||||
) where
|
||||
|
||||
import Data.Time ( UTCTime )
|
||||
import Path
|
||||
- ( Abs, Dir, File, Rel, parseAbsDir, parseAbsFile
|
||||
- , toFilePath
|
||||
+ ( Abs, Dir, File, PathException (..), Rel, parseAbsDir
|
||||
+ , parseAbsFile, toFilePath
|
||||
)
|
||||
import Path.Internal ( Path (Path) )
|
||||
-import Path.IO ( doesDirExist, doesFileExist, getModificationTime )
|
||||
+import Path.IO
|
||||
+ ( doesDirExist, doesFileExist, getCurrentDir
|
||||
+ , getModificationTime
|
||||
+ )
|
||||
import RIO
|
||||
import System.IO.Error ( isDoesNotExistError )
|
||||
import qualified Data.ByteString.Char8 as BS
|
||||
import qualified Data.ByteString.Lazy.Char8 as BSL
|
||||
import qualified Data.Text as T
|
||||
import qualified Data.Text.Encoding as T
|
||||
+import qualified System.Directory as D
|
||||
import qualified System.FilePath as FP
|
||||
|
||||
-- | Convert to FilePath but don't add a trailing slash.
|
||||
@@ -123,3 +129,30 @@ pathToText = T.pack . toFilePath
|
||||
|
||||
tryGetModificationTime :: MonadIO m => Path Abs File -> m (Either () UTCTime)
|
||||
tryGetModificationTime = liftIO . tryJust (guard . isDoesNotExistError) . getModificationTime
|
||||
+
|
||||
+-- | 'Path.IO.resolveFile' (@path-io@ package) throws 'InvalidAbsFile' (@path@
|
||||
+-- package) if the file does not exist; this function yields 'Nothing'.
|
||||
+forgivingResolveFile ::
|
||||
+ MonadIO m
|
||||
+ => Path Abs Dir
|
||||
+ -- ^ Base directory
|
||||
+ -> FilePath
|
||||
+ -- ^ Path to resolve
|
||||
+ -> m (Maybe (Path Abs File))
|
||||
+forgivingResolveFile b p = liftIO $
|
||||
+ D.canonicalizePath (toFilePath b FP.</> p) >>= \cp ->
|
||||
+ catch
|
||||
+ (Just <$> parseAbsFile cp)
|
||||
+ ( \e -> case e of
|
||||
+ InvalidAbsFile _ -> pure Nothing
|
||||
+ _ -> throwIO e
|
||||
+ )
|
||||
+
|
||||
+-- | 'Path.IO.resolveFile'' (@path-io@ package) throws 'InvalidAbsFile' (@path@
|
||||
+-- package) if the file does not exist; this function yields 'Nothing'.
|
||||
+forgivingResolveFile' ::
|
||||
+ MonadIO m
|
||||
+ => FilePath
|
||||
+ -- ^ Path to resolve
|
||||
+ -> m (Maybe (Path Abs File))
|
||||
+forgivingResolveFile' p = getCurrentDir >>= flip forgivingResolveFile p
|
||||
diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs
|
||||
index a57550b29..c500f3d28 100644
|
||||
--- a/src/Stack/Build/Execute.hs
|
||||
+++ b/src/Stack/Build/Execute.hs
|
||||
@@ -76,11 +76,14 @@ import Path
|
||||
, stripProperPrefix
|
||||
)
|
||||
import Path.CheckInstall ( warnInstallSearchPathIssues )
|
||||
-import Path.Extra ( toFilePathNoTrailingSep, rejectMissingFile )
|
||||
+import Path.Extra
|
||||
+ ( forgivingResolveFile, rejectMissingFile
|
||||
+ , toFilePathNoTrailingSep
|
||||
+ )
|
||||
import Path.IO
|
||||
( copyFile, doesDirExist, doesFileExist, ensureDir
|
||||
- , forgivingAbsence, ignoringAbsence, removeDirRecur
|
||||
- , removeFile, renameDir, renameFile, resolveFile
|
||||
+ , ignoringAbsence, removeDirRecur, removeFile, renameDir
|
||||
+ , renameFile
|
||||
)
|
||||
import RIO.Process
|
||||
( HasProcessContext, byteStringInput, doesExecutableExist
|
||||
@@ -660,7 +663,7 @@ copyExecutables exes = do
|
||||
case loc of
|
||||
Snap -> snapBin
|
||||
Local -> localBin
|
||||
- mfp <- liftIO $ forgivingAbsence (resolveFile bindir $ T.unpack name ++ ext)
|
||||
+ mfp <- liftIO $ forgivingResolveFile bindir (T.unpack name ++ ext)
|
||||
>>= rejectMissingFile
|
||||
case mfp of
|
||||
Nothing -> do
|
||||
@@ -2541,7 +2544,7 @@ mungeBuildOutput excludeTHLoading makeAbsolute pkgDir compilerVer = void $
|
||||
if isValidSuffix y
|
||||
then liftIO $
|
||||
fmap (fmap ((T.takeWhile isSpace x <>) . T.pack . toFilePath)) $
|
||||
- forgivingAbsence (resolveFile pkgDir (T.unpack $ T.dropWhile isSpace x)) `catch`
|
||||
+ forgivingResolveFile pkgDir (T.unpack $ T.dropWhile isSpace x) `catch`
|
||||
\(_ :: PathException) -> pure Nothing
|
||||
else pure Nothing
|
||||
case mabs of
|
||||
diff --git a/src/Stack/ComponentFile.hs b/src/Stack/ComponentFile.hs
|
||||
index 8b5ad347d..d7dc6b6cf 100644
|
||||
--- a/src/Stack/ComponentFile.hs
|
||||
+++ b/src/Stack/ComponentFile.hs
|
||||
@@ -43,11 +43,12 @@ import Path
|
||||
, stripProperPrefix
|
||||
)
|
||||
import Path.Extra
|
||||
- ( parseCollapsedAbsFile, rejectMissingDir, rejectMissingFile
|
||||
+ ( forgivingResolveFile, parseCollapsedAbsFile
|
||||
+ , rejectMissingDir, rejectMissingFile
|
||||
)
|
||||
import Path.IO
|
||||
( doesDirExist, doesFileExist, forgivingAbsence
|
||||
- , getCurrentDir, listDir, resolveDir, resolveFile
|
||||
+ , getCurrentDir, listDir, resolveDir
|
||||
)
|
||||
import Stack.Constants
|
||||
( haskellDefaultPreprocessorExts, haskellFileExts
|
||||
@@ -294,7 +295,7 @@ parseHI hiPath = do
|
||||
Iface.unList . Iface.dmods . Iface.deps
|
||||
resolveFileDependency file = do
|
||||
resolved <-
|
||||
- liftIO (forgivingAbsence (resolveFile dir file)) >>=
|
||||
+ liftIO (forgivingResolveFile dir file) >>=
|
||||
rejectMissingFile
|
||||
when (isNothing resolved) $
|
||||
prettyWarnL
|
||||
diff --git a/src/Stack/Ghci.hs b/src/Stack/Ghci.hs
|
||||
index 933c20dde..d0e2a22a3 100644
|
||||
--- a/src/Stack/Ghci.hs
|
||||
+++ b/src/Stack/Ghci.hs
|
||||
@@ -30,7 +30,7 @@ import qualified Data.Text.Lazy as TL
|
||||
import qualified Data.Text.Lazy.Encoding as TLE
|
||||
import qualified Distribution.PackageDescription as C
|
||||
import Path
|
||||
-import Path.Extra ( toFilePathNoTrailingSep )
|
||||
+import Path.Extra ( forgivingResolveFile', toFilePathNoTrailingSep )
|
||||
import Path.IO hiding ( withSystemTempDir )
|
||||
import RIO.Process
|
||||
( HasProcessContext, exec, proc, readProcess_
|
||||
@@ -239,7 +239,7 @@ preprocessTargets buildOptsCLI sma rawTargets = do
|
||||
then do
|
||||
fileTargets <- forM fileTargetsRaw $ \fp0 -> do
|
||||
let fp = T.unpack fp0
|
||||
- mpath <- liftIO $ forgivingAbsence (resolveFile' fp)
|
||||
+ mpath <- liftIO $ forgivingResolveFile' fp
|
||||
case mpath of
|
||||
Nothing -> throwM (MissingFileTarget fp)
|
||||
Just path -> pure path
|
||||
diff --git a/src/Stack/PackageFile.hs b/src/Stack/PackageFile.hs
|
||||
index 99cc62d1d..e5d5424c7 100644
|
||||
--- a/src/Stack/PackageFile.hs
|
||||
+++ b/src/Stack/PackageFile.hs
|
||||
@@ -16,8 +16,7 @@ import Distribution.PackageDescription hiding ( FlagName )
|
||||
import Distribution.Simple.Glob ( matchDirFileGlob )
|
||||
import qualified Distribution.Types.UnqualComponentName as Cabal
|
||||
import Path ( parent )
|
||||
-import Path.Extra ( rejectMissingFile )
|
||||
-import Path.IO ( forgivingAbsence, resolveFile )
|
||||
+import Path.Extra ( forgivingResolveFile, rejectMissingFile )
|
||||
import Stack.ComponentFile
|
||||
( benchmarkFiles, executableFiles, libraryFiles
|
||||
, resolveOrWarn, testFiles
|
||||
@@ -37,7 +36,7 @@ resolveFileOrWarn :: FilePath.FilePath
|
||||
-> RIO GetPackageFileContext (Maybe (Path Abs File))
|
||||
resolveFileOrWarn = resolveOrWarn "File" f
|
||||
where
|
||||
- f p x = liftIO (forgivingAbsence (resolveFile p x)) >>= rejectMissingFile
|
||||
+ f p x = liftIO (forgivingResolveFile p x) >>= rejectMissingFile
|
||||
|
||||
-- | Get all files referenced by the package.
|
||||
packageDescModulesAndFiles ::
|
||||
|
|
@ -1,30 +1,29 @@
|
|||
# generated by cabal-rpm-2.0.10 --subpackage
|
||||
# generated by cabal-rpm-2.1.0 --subpackage
|
||||
# https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/
|
||||
|
||||
%global stack_ver 2.7.5
|
||||
%global stack_ver 2.9.1
|
||||
%global stack stack-%{stack_ver}
|
||||
|
||||
%global filelock filelock-0.1.1.5
|
||||
%global hifileparser hi-file-parser-0.1.2.0
|
||||
%global hpack hpack-0.34.6
|
||||
%global hifileparser hi-file-parser-0.1.3.0
|
||||
%global hpack hpack-0.35.2
|
||||
%global httpdownload http-download-0.2.0.0
|
||||
%global mintty mintty-0.1.3
|
||||
%global mustache mustache-2.3.2
|
||||
%global mintty mintty-0.1.4
|
||||
%global mustache mustache-2.4.1
|
||||
%global neatinterpolation neat-interpolation-0.5.1.3
|
||||
%global openbrowser open-browser-0.2.1.0
|
||||
%global pantry pantry-0.5.3
|
||||
%global pantry pantry-0.5.7
|
||||
%global projecttemplate project-template-0.2.1.0
|
||||
%global rioorphans rio-orphans-0.1.2.0
|
||||
%global casaclient casa-client-0.0.1
|
||||
%global casatypes casa-types-0.0.2
|
||||
|
||||
%global subpkgs %{filelock} %{hifileparser} %{hpack} %{httpdownload} %{mintty} %{mustache} %{neatinterpolation} %{openbrowser} %{rioorphans} %{casatypes} %{casaclient} %{pantry} %{projecttemplate} %{stack}
|
||||
|
||||
# testsuite missing deps: casa-client casa-types filelock hi-file-parser hpack http-download mintty mustache neat-interpolation open-browser pantry project-template raw-strings-qq
|
||||
# testsuite missing deps: raw-strings-qq
|
||||
|
||||
Name: haskell-platform
|
||||
Version: 2022.1
|
||||
Release: 20%{?dist}
|
||||
Version: 2022.2
|
||||
Release: 21%{?dist}
|
||||
Summary: Standard Haskell distribution
|
||||
|
||||
License: BSD
|
||||
|
|
@ -47,7 +46,8 @@ Source12: https://hackage.haskell.org/package/%{casaclient}/%{casaclient}.
|
|||
Source13: https://hackage.haskell.org/package/%{casatypes}/%{casatypes}.tar.gz
|
||||
Source20: stack-symlink-distro-ghc
|
||||
# End cabal-rpm sources
|
||||
Patch0: stack-2.7.5-ghc-Cabal-version-warnings.patch
|
||||
# https://github.com/commercialhaskell/stack/issues/5866
|
||||
Patch1: https://patch-diff.githubusercontent.com/raw/commercialhaskell/stack/pull/6028.patch
|
||||
|
||||
BuildRequires: ghc
|
||||
BuildRequires: alex
|
||||
|
|
@ -58,6 +58,94 @@ BuildRequires: hscolour
|
|||
# for stack:
|
||||
# Begin cabal-rpm deps:
|
||||
BuildRequires: ghc-rpm-macros-extra
|
||||
BuildRequires: ghc-Cabal-devel
|
||||
BuildRequires: ghc-aeson-devel
|
||||
BuildRequires: ghc-annotated-wl-pprint-devel
|
||||
BuildRequires: ghc-ansi-terminal-devel
|
||||
BuildRequires: ghc-array-devel
|
||||
BuildRequires: ghc-async-devel
|
||||
BuildRequires: ghc-attoparsec-devel
|
||||
BuildRequires: ghc-base-devel
|
||||
BuildRequires: ghc-base64-bytestring-devel
|
||||
BuildRequires: ghc-bytestring-devel
|
||||
#BuildRequires: ghc-casa-client-devel
|
||||
#BuildRequires: ghc-casa-types-devel
|
||||
BuildRequires: ghc-colour-devel
|
||||
BuildRequires: ghc-conduit-devel
|
||||
BuildRequires: ghc-conduit-extra-devel
|
||||
BuildRequires: ghc-containers-devel
|
||||
BuildRequires: ghc-cryptonite-devel
|
||||
BuildRequires: ghc-cryptonite-conduit-devel
|
||||
BuildRequires: ghc-deepseq-devel
|
||||
BuildRequires: ghc-directory-devel
|
||||
BuildRequires: ghc-echo-devel
|
||||
BuildRequires: ghc-exceptions-devel
|
||||
BuildRequires: ghc-extra-devel
|
||||
BuildRequires: ghc-file-embed-devel
|
||||
#BuildRequires: ghc-filelock-devel
|
||||
BuildRequires: ghc-filepath-devel
|
||||
BuildRequires: ghc-fsnotify-devel
|
||||
BuildRequires: ghc-generic-deriving-devel
|
||||
BuildRequires: ghc-githash-devel
|
||||
BuildRequires: ghc-hackage-security-devel
|
||||
BuildRequires: ghc-hashable-devel
|
||||
#BuildRequires: ghc-hi-file-parser-devel
|
||||
#BuildRequires: ghc-hpack-devel
|
||||
BuildRequires: ghc-hpc-devel
|
||||
BuildRequires: ghc-http-client-devel
|
||||
BuildRequires: ghc-http-client-tls-devel
|
||||
BuildRequires: ghc-http-conduit-devel
|
||||
#BuildRequires: ghc-http-download-devel
|
||||
BuildRequires: ghc-http-types-devel
|
||||
BuildRequires: ghc-memory-devel
|
||||
BuildRequires: ghc-microlens-devel
|
||||
#BuildRequires: ghc-mintty-devel
|
||||
BuildRequires: ghc-mono-traversable-devel
|
||||
BuildRequires: ghc-mtl-devel
|
||||
#BuildRequires: ghc-mustache-devel
|
||||
#BuildRequires: ghc-neat-interpolation-devel
|
||||
BuildRequires: ghc-network-uri-devel
|
||||
#BuildRequires: ghc-open-browser-devel
|
||||
BuildRequires: ghc-optparse-applicative-devel
|
||||
BuildRequires: ghc-optparse-simple-devel
|
||||
#BuildRequires: ghc-pantry-devel
|
||||
BuildRequires: ghc-path-devel
|
||||
BuildRequires: ghc-path-io-devel
|
||||
BuildRequires: ghc-persistent-devel
|
||||
BuildRequires: ghc-persistent-sqlite-devel
|
||||
BuildRequires: ghc-persistent-template-devel
|
||||
BuildRequires: ghc-pretty-devel
|
||||
BuildRequires: ghc-primitive-devel
|
||||
BuildRequires: ghc-process-devel
|
||||
#BuildRequires: ghc-project-template-devel
|
||||
BuildRequires: ghc-random-devel
|
||||
BuildRequires: ghc-retry-devel
|
||||
BuildRequires: ghc-rio-devel
|
||||
BuildRequires: ghc-rio-prettyprint-devel
|
||||
BuildRequires: ghc-semigroups-devel
|
||||
BuildRequires: ghc-split-devel
|
||||
BuildRequires: ghc-stm-devel
|
||||
BuildRequires: ghc-streaming-commons-devel
|
||||
BuildRequires: ghc-tar-devel
|
||||
BuildRequires: ghc-template-haskell-devel
|
||||
BuildRequires: ghc-temporary-devel
|
||||
BuildRequires: ghc-text-devel
|
||||
BuildRequires: ghc-text-metrics-devel
|
||||
BuildRequires: ghc-th-reify-many-devel
|
||||
BuildRequires: ghc-time-devel
|
||||
BuildRequires: ghc-tls-devel
|
||||
BuildRequires: ghc-transformers-devel
|
||||
BuildRequires: ghc-typed-process-devel
|
||||
BuildRequires: ghc-unicode-transforms-devel
|
||||
BuildRequires: ghc-unix-devel
|
||||
BuildRequires: ghc-unix-compat-devel
|
||||
BuildRequires: ghc-unliftio-devel
|
||||
BuildRequires: ghc-unordered-containers-devel
|
||||
BuildRequires: ghc-vector-devel
|
||||
BuildRequires: ghc-yaml-devel
|
||||
BuildRequires: ghc-zip-archive-devel
|
||||
BuildRequires: ghc-zlib-devel
|
||||
%if %{with ghc_prof}
|
||||
BuildRequires: ghc-Cabal-prof
|
||||
BuildRequires: ghc-aeson-prof
|
||||
BuildRequires: ghc-annotated-wl-pprint-prof
|
||||
|
|
@ -113,11 +201,13 @@ BuildRequires: ghc-path-prof
|
|||
BuildRequires: ghc-path-io-prof
|
||||
BuildRequires: ghc-persistent-prof
|
||||
BuildRequires: ghc-persistent-sqlite-prof
|
||||
BuildRequires: ghc-persistent-template-devel
|
||||
# no persistent-template prof:
|
||||
#BuildRequires: ghc-persistent-template-prof
|
||||
BuildRequires: ghc-pretty-prof
|
||||
BuildRequires: ghc-primitive-prof
|
||||
BuildRequires: ghc-process-prof
|
||||
#BuildRequires: ghc-project-template-prof
|
||||
BuildRequires: ghc-random-prof
|
||||
BuildRequires: ghc-retry-prof
|
||||
BuildRequires: ghc-rio-prof
|
||||
BuildRequires: ghc-rio-prettyprint-prof
|
||||
|
|
@ -144,42 +234,84 @@ BuildRequires: ghc-vector-prof
|
|||
BuildRequires: ghc-yaml-prof
|
||||
BuildRequires: ghc-zip-archive-prof
|
||||
BuildRequires: ghc-zlib-prof
|
||||
%endif
|
||||
# for missing dep 'hi-file-parser':
|
||||
BuildRequires: ghc-binary-devel
|
||||
%if %{with ghc_prof}
|
||||
BuildRequires: ghc-binary-prof
|
||||
%endif
|
||||
# for missing dep 'hpack':
|
||||
BuildRequires: ghc-Glob-devel
|
||||
BuildRequires: ghc-bifunctors-devel
|
||||
BuildRequires: ghc-scientific-devel
|
||||
%if %{with ghc_prof}
|
||||
BuildRequires: ghc-Glob-prof
|
||||
BuildRequires: ghc-bifunctors-prof
|
||||
BuildRequires: ghc-infer-license-prof
|
||||
BuildRequires: ghc-scientific-prof
|
||||
%endif
|
||||
# for missing dep 'mustache':
|
||||
BuildRequires: ghc-cmdargs-devel
|
||||
BuildRequires: ghc-parsec-devel
|
||||
BuildRequires: ghc-scientific-devel
|
||||
BuildRequires: ghc-th-lift-devel
|
||||
%if %{with ghc_prof}
|
||||
BuildRequires: ghc-cmdargs-prof
|
||||
BuildRequires: ghc-either-prof
|
||||
BuildRequires: ghc-parsec-prof
|
||||
BuildRequires: ghc-scientific-prof
|
||||
BuildRequires: ghc-th-lift-prof
|
||||
%endif
|
||||
# for missing dep 'neat-interpolation':
|
||||
BuildRequires: ghc-megaparsec-devel
|
||||
%if %{with ghc_prof}
|
||||
BuildRequires: ghc-megaparsec-prof
|
||||
%endif
|
||||
# for missing dep 'pantry':
|
||||
BuildRequires: ghc-digest-devel
|
||||
BuildRequires: ghc-resourcet-devel
|
||||
BuildRequires: ghc-tar-conduit-devel
|
||||
%if %{with ghc_prof}
|
||||
BuildRequires: ghc-digest-prof
|
||||
BuildRequires: ghc-resourcet-prof
|
||||
BuildRequires: ghc-tar-conduit-prof
|
||||
%endif
|
||||
# for missing dep 'project-template':
|
||||
BuildRequires: ghc-resourcet-devel
|
||||
%if %{with ghc_prof}
|
||||
BuildRequires: ghc-resourcet-prof
|
||||
%endif
|
||||
# for missing dep 'rio-orphans':
|
||||
BuildRequires: ghc-fast-logger-devel
|
||||
BuildRequires: ghc-monad-control-devel
|
||||
BuildRequires: ghc-monad-logger-devel
|
||||
BuildRequires: ghc-resourcet-devel
|
||||
BuildRequires: ghc-transformers-base-devel
|
||||
BuildRequires: ghc-unliftio-core-devel
|
||||
%if %{with ghc_prof}
|
||||
BuildRequires: ghc-fast-logger-prof
|
||||
BuildRequires: ghc-monad-control-prof
|
||||
BuildRequires: ghc-monad-logger-prof
|
||||
BuildRequires: ghc-resourcet-prof
|
||||
BuildRequires: ghc-transformers-base-prof
|
||||
BuildRequires: ghc-unliftio-core-prof
|
||||
%endif
|
||||
# for missing dep 'casa-client':
|
||||
BuildRequires: ghc-base16-bytestring-devel
|
||||
BuildRequires: ghc-resourcet-devel
|
||||
BuildRequires: ghc-th-lift-devel
|
||||
BuildRequires: ghc-unliftio-core-devel
|
||||
%if %{with ghc_prof}
|
||||
BuildRequires: ghc-base16-bytestring-prof
|
||||
BuildRequires: ghc-resourcet-prof
|
||||
BuildRequires: ghc-th-lift-prof
|
||||
BuildRequires: ghc-unliftio-core-prof
|
||||
%endif
|
||||
# for missing dep 'casa-types':
|
||||
BuildRequires: ghc-base16-bytestring-devel
|
||||
BuildRequires: ghc-path-pieces-devel
|
||||
%if %{with ghc_prof}
|
||||
BuildRequires: ghc-base16-bytestring-prof
|
||||
BuildRequires: ghc-path-pieces-prof
|
||||
%endif
|
||||
# End cabal-rpm deps
|
||||
|
||||
# pull in all of ghc for least surprise
|
||||
|
|
@ -212,20 +344,20 @@ Stack is a cross-platform program for developing Haskell projects.
|
|||
%global main_version %{version}
|
||||
|
||||
%if %{defined ghclibdir}
|
||||
%ghc_lib_subpackage -l CC0 %{filelock}
|
||||
%ghc_lib_subpackage -l BSD %{hifileparser}
|
||||
%ghc_lib_subpackage -l BSD-3-Clause %{casaclient}
|
||||
%ghc_lib_subpackage -l BSD-3-Clause %{casatypes}
|
||||
%ghc_lib_subpackage -l CC0-1.0 %{filelock}
|
||||
%ghc_lib_subpackage -l BSD-3-Clause %{hifileparser}
|
||||
%ghc_lib_subpackage -l MIT %{hpack}
|
||||
%ghc_lib_subpackage -l BSD %{httpdownload}
|
||||
%ghc_lib_subpackage -l BSD %{mintty}
|
||||
%ghc_lib_subpackage -l BSD %{mustache}
|
||||
%ghc_lib_subpackage -l BSD-3-Clause %{httpdownload}
|
||||
%ghc_lib_subpackage -l BSD-3-Clause %{mintty}
|
||||
%ghc_lib_subpackage -l BSD-3-Clause %{mustache}
|
||||
%ghc_lib_subpackage -l MIT %{neatinterpolation}
|
||||
%ghc_lib_subpackage -l BSD %{openbrowser}
|
||||
%ghc_lib_subpackage -l BSD %{pantry}
|
||||
%ghc_lib_subpackage -l BSD %{projecttemplate}
|
||||
%ghc_lib_subpackage -l BSD-3-Clause %{openbrowser}
|
||||
%ghc_lib_subpackage -l BSD-3-Clause %{pantry}
|
||||
%ghc_lib_subpackage -l BSD-3-Clause %{projecttemplate}
|
||||
%ghc_lib_subpackage -l MIT %{rioorphans}
|
||||
%ghc_lib_subpackage -l BSD %{casaclient}
|
||||
%ghc_lib_subpackage -l BSD %{casatypes}
|
||||
%ghc_lib_subpackage -l BSD %{stack}
|
||||
%ghc_lib_subpackage -l BSD-3-Clause %{stack}
|
||||
%endif
|
||||
|
||||
%global version %{main_version}
|
||||
|
|
@ -235,7 +367,7 @@ Stack is a cross-platform program for developing Haskell projects.
|
|||
# Begin cabal-rpm setup:
|
||||
%setup -q -c -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13
|
||||
# End cabal-rpm setup
|
||||
%patch0 -p0 -b .orig
|
||||
#%%patch1 -p0 -b .orig
|
||||
|
||||
|
||||
%build
|
||||
|
|
@ -275,6 +407,11 @@ install -p -m 644 %{SOURCE20} %{buildroot}%{_bindir}/stack-symlink-distro-ghc
|
|||
|
||||
|
||||
%changelog
|
||||
* Tue Feb 21 2023 Jens Petersen <petersen@redhat.com> - 2022.2-21
|
||||
- update to stack 2.9.1
|
||||
- https://hackage.haskell.org/package/stack-2.9.1/changelog
|
||||
- SPDX migration
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2022.1-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
12
sources
12
sources
|
|
@ -1,13 +1,13 @@
|
|||
SHA512 (stack-2.7.5.tar.gz) = fd51f990d3ccec6103c8699a8e39c970a0233a1185587a519eda659d2b45bc4496c4f261f6897c06781d0f76d2b1d526d5acdfb502fe1494f8cf048c78ba1a8d
|
||||
SHA512 (stack-2.9.1.tar.gz) = 23446a96b2326fb2dc4a9ba1e52cd09fef92508e8b1c7e50ecf886efc441d6f7dc79318fee9ecde886a2e781fc6766ec4bb702fa4e722daa530ef4bce6d3edd1
|
||||
SHA512 (filelock-0.1.1.5.tar.gz) = 6ccd0b671cec8d1c2daa3115a5b2d8cd10a31db0a1dc1c15e6cb80d679bd2e09208be8bebc0f4bb64d7cdd0fad2e7e170e8283b6be61edd5017b788f94a41048
|
||||
SHA512 (hi-file-parser-0.1.2.0.tar.gz) = a0e04ec071083c23e850264d9beb5d0346f3c2ed8ae99c86d1d4f0980cc5fe431ff8101beb94b03bf3bae6b5d6595070edd692596869252852ee2a45180fdb6a
|
||||
SHA512 (hpack-0.34.6.tar.gz) = a7fb819b06ccb8019b7a6fb26526190d8856c113cdee12e6db58372cbc9c57a3584202bb44d23a3f12076f784d27f5ca1c401ec68fd0ae11ab5caa52a472c43e
|
||||
SHA512 (hi-file-parser-0.1.3.0.tar.gz) = 2a2fa5e2e5574abeda360a0c5b5f80e7889ea83955c659460ff2c0c95411fc18652eac79a66e1d445e2d2df8b97bd21d32d1b4280f64785e7c23e51434cceb86
|
||||
SHA512 (hpack-0.35.2.tar.gz) = 0b07a509bc429199fefecfc6963aee71987540cdb8901b4d26034db426252d9a42f206607ee162c917343b7146a9cd1eb560703f4bb65594537d3f62255d0ca7
|
||||
SHA512 (http-download-0.2.0.0.tar.gz) = b31caa48c1ea2a01f1301ca63b2e0c135cd0d3d392b92518c7d70d89fd83da7fd95cffa3cb374900a45fb2da8d17f748de0de72fb4beb8ad11e203676f9864ae
|
||||
SHA512 (mintty-0.1.3.tar.gz) = a445b37c4c02eb901b390f2a17eef713f7e45a3a195be7c5921b72f43e73e89faebce42b4d2d54ae8861d1edee5ae9bc8acfca54d66fd06ba7447862068deb73
|
||||
SHA512 (mustache-2.3.2.tar.gz) = 763ab60bfd99c08b21b291af6b4da17c9265c09659c1c1d14c0b5d5871583f28db5eca4385b66107ed7d9d9c547429a0bbc88048f28d1f6ee80c988cf63fff98
|
||||
SHA512 (mintty-0.1.4.tar.gz) = f5c3231f342d24d7dc38b0281579aa6f272767451412ea84e1c248f77331d6740186cef0bb4144b7655a80914daa0b1f3573107a76c29c1d2e6a56e793532733
|
||||
SHA512 (mustache-2.4.1.tar.gz) = 389a418712fee9ff16c88f45014470e1cdd31f6e9dd2f418853a1a2d174ba7fd11ee05ba20f22b134d34b95377bf55c5add5b52cf423ecb49338bd4ff6534e13
|
||||
SHA512 (neat-interpolation-0.5.1.3.tar.gz) = d777ac442d0b32348470b64458a88c76836e84b9fe15f46c6ec05f8a84ebe4a5b79827b85ff9a0e2138bb8db10fc4493c2793e13091ee5f5decf5e28110d86ba
|
||||
SHA512 (open-browser-0.2.1.0.tar.gz) = 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1
|
||||
SHA512 (pantry-0.5.3.tar.gz) = 6147bc446400f84ab3ab41eb3ab572192cb8bfe91750a0f1217fe994b663bfc98cb95c789965ee8315515df79fbe7fca46eca14dad466ef9e11671f6999b3bf7
|
||||
SHA512 (pantry-0.5.7.tar.gz) = 05814d404f97873939e29f183cd74d2c8e6bf5b3e87a9c665694578faeab641d9b8d3efef0525727a881031a5bf815e39299388ce0207d5ef04c674f172e7618
|
||||
SHA512 (project-template-0.2.1.0.tar.gz) = ed70f640e5197f7a6158b851dcd3990e77b7266f716be248ecfb012c4827dc688028aa78d649313203a274357f57e45e94371a09446c4404d3282add0d1a158c
|
||||
SHA512 (rio-orphans-0.1.2.0.tar.gz) = 85e883977e161161e5ba8f4fa6d13026d71f7367bac262307f9a8cfdc0316b71a490fcb6c15737919a6b4e73b3355b413161e09f5167c95b1f0c5a22c045f7ac
|
||||
SHA512 (casa-client-0.0.1.tar.gz) = 2df03a0b1c2e01f2d24728e96fe446a25b630f5495c4e9995bcbde1ee9da530df1c6b40dde954cfaf6de2af6036fa6cfda7d9957b22106316557cc57d64114fa
|
||||
|
|
|
|||
|
|
@ -1,20 +0,0 @@
|
|||
--- stack-2.7.5/src/Stack/Setup.hs~ 2022-03-05 08:13:02.000000000 +0800
|
||||
+++ stack-2.7.5/src/Stack/Setup.hs 2022-03-21 17:34:33.423272288 +0800
|
||||
@@ -468,7 +468,7 @@
|
||||
logWarn "For more information, see: https://github.com/commercialhaskell/stack/issues/648"
|
||||
logWarn ""
|
||||
pure True
|
||||
- | ghcVersion >= mkVersion [9, 1] -> do
|
||||
+ | ghcVersion >= mkVersion [9, 3] -> do
|
||||
logWarn $
|
||||
"Stack has not been tested with GHC versions above 9.0, and using " <>
|
||||
fromString (versionString ghcVersion) <>
|
||||
@@ -495,7 +495,7 @@
|
||||
logWarn "This invocation will most likely fail."
|
||||
logWarn "To fix this, either use an older version of Stack or a newer resolver"
|
||||
logWarn "Acceptable resolvers: lts-3.0/nightly-2015-05-05 or later"
|
||||
- | cabalVersion >= mkVersion [3, 5] ->
|
||||
+ | cabalVersion >= mkVersion [3, 7] ->
|
||||
logWarn $
|
||||
"Stack has not been tested with Cabal versions above 3.4, but version " <>
|
||||
fromString (versionString cabalVersion) <>
|
||||
Loading…
Reference in New Issue