diff options
| author | Eugen Wissner <belka@caraus.de> | 2023-11-07 19:36:40 +0100 |
|---|---|---|
| committer | Eugen Wissner <belka@caraus.de> | 2023-11-07 19:36:40 +0100 |
| commit | 3414a69bc8e589a0fbfc52f932f6b7df8d05f365 (patch) | |
| tree | 5e90a37a332e955501a4d88120fc080c3ace4bb1 | |
| parent | 9770cc8829d6fdacd1ae02e1f78fcf270e5a5503 (diff) | |
| download | slackbuilder-3414a69bc8e589a0fbfc52f932f6b7df8d05f365.tar.gz | |
Support GHC 9.4
| -rw-r--r-- | lib/SlackBuilder/Download.hs | 2 | ||||
| -rw-r--r-- | slackbuilder.cabal | 4 | ||||
| -rw-r--r-- | src/Main.hs (renamed from app/Main.hs) | 0 | ||||
| -rw-r--r-- | src/SlackBuilder/CommandLine.hs (renamed from app/SlackBuilder/CommandLine.hs) | 0 | ||||
| -rw-r--r-- | src/SlackBuilder/Updater.hs (renamed from app/SlackBuilder/Updater.hs) | 0 |
5 files changed, 3 insertions, 3 deletions
diff --git a/lib/SlackBuilder/Download.hs b/lib/SlackBuilder/Download.hs index 7729b0b..2dc503d 100644 --- a/lib/SlackBuilder/Download.hs +++ b/lib/SlackBuilder/Download.hs @@ -77,7 +77,7 @@ updateSlackBuildVersion packagePath version additionalDownloads = do updateLineDependencyVersion dependencyName = updateLineVariable $ dependencyName <> "_VERSION" updateLineVariable variableName variableValue line - | Text.isSuffixOf (variableName <> "=") line = + | Text.isPrefixOf (variableName <> "=") line = variableName <> "=${" <> variableName <> ":-" <> variableValue <> "}" | otherwise = line diff --git a/slackbuilder.cabal b/slackbuilder.cabal index a6748d4..3334aa0 100644 --- a/slackbuilder.cabal +++ b/slackbuilder.cabal @@ -17,7 +17,7 @@ extra-source-files: CHANGELOG.md common dependencies build-depends: - base ^>= 4.16.4.0, + base >= 4.16 && < 5, bytestring ^>= 0.11.0, containers ^>= 0.6, cryptonite >= 0.30, @@ -77,7 +77,7 @@ executable slackbuilder slackbuilder, unordered-containers ^>= 0.2.19, vector ^>= 0.13.0 - hs-source-dirs: app + hs-source-dirs: src ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall diff --git a/app/Main.hs b/src/Main.hs index 535b655..535b655 100644 --- a/app/Main.hs +++ b/src/Main.hs diff --git a/app/SlackBuilder/CommandLine.hs b/src/SlackBuilder/CommandLine.hs index 7cfe747..7cfe747 100644 --- a/app/SlackBuilder/CommandLine.hs +++ b/src/SlackBuilder/CommandLine.hs diff --git a/app/SlackBuilder/Updater.hs b/src/SlackBuilder/Updater.hs index 1ebf7fe..1ebf7fe 100644 --- a/app/SlackBuilder/Updater.hs +++ b/src/SlackBuilder/Updater.hs |