Skip to content

Commit 5a29bb6

Browse files
isovectorisovector
authored
Merge branch 'haskell:master' into mirror-fix
2 parents 03bc67f + 23111c7 commit 5a29bb6

8 files changed

Lines changed: 52 additions & 41 deletions

File tree

‎.github/workflows/haskell-ci.yml‎

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#
99
# For more information, see https://github.com/haskell-CI/haskell-ci
1010
#
11-
# version: 0.19.20250506
11+
# version: 0.19.20260209
1212
#
13-
# REGENDATA ("0.19.20250506",["github","hackage-server.cabal"])
13+
# REGENDATA ("0.19.20260209",["github","hackage-server.cabal"])
1414
#
1515
name: Haskell-CI
1616
on:
@@ -20,6 +20,11 @@ on:
2020
pull_request:
2121
branches:
2222
- master
23+
merge_group:
24+
branches:
25+
- master
26+
workflow_dispatch:
27+
{}
2328
jobs:
2429
linux:
2530
name: Haskell-CI - Linux - ${{ matrix.compiler }}
@@ -32,14 +37,19 @@ jobs:
3237
strategy:
3338
matrix:
3439
include:
35-
- compiler: ghc-9.12.2
40+
- compiler: ghc-9.14.1
41+
compilerKind: ghc
42+
compilerVersion: 9.14.1
43+
setup-method: ghcup
44+
allow-failure: false
45+
- compiler: ghc-9.12.4
3646
compilerKind: ghc
37-
compilerVersion: 9.12.2
47+
compilerVersion: 9.12.4
3848
setup-method: ghcup
3949
allow-failure: false
40-
- compiler: ghc-9.10.2
50+
- compiler: ghc-9.10.3
4151
compilerKind: ghc
42-
compilerVersion: 9.10.2
52+
compilerVersion: 9.10.3
4353
setup-method: ghcup
4454
allow-failure: false
4555
- compiler: ghc-9.8.4
@@ -66,8 +76,8 @@ jobs:
6676
chmod a+x "$HOME/.ghcup/bin/ghcup"
6777
- name: Install cabal-install
6878
run: |
69-
"$HOME/.ghcup/bin/ghcup" install cabal 3.14.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
70-
echo "CABAL=$HOME/.ghcup/bin/cabal-3.14.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"
79+
"$HOME/.ghcup/bin/ghcup" install cabal 3.16.0.0 || (cat "$HOME"/.ghcup/logs/*.* && false)
80+
echo "CABAL=$HOME/.ghcup/bin/cabal-3.16.0.0 -vnormal+nowrap" >> "$GITHUB_ENV"
7181
- name: Install GHC (GHCup)
7282
if: matrix.setup-method == 'ghcup'
7383
run: |
@@ -143,7 +153,7 @@ jobs:
143153
chmod a+x $HOME/.cabal/bin/cabal-plan
144154
cabal-plan --version
145155
- name: checkout
146-
uses: actions/checkout@v6
156+
uses: actions/checkout@v7
147157
with:
148158
path: source
149159
- name: initial cabal.project for sdist
@@ -167,8 +177,6 @@ jobs:
167177
touch cabal.project
168178
touch cabal.project.local
169179
echo "packages: ${PKGDIR_hackage_server}" >> cabal.project
170-
echo "package hackage-server" >> cabal.project
171-
echo " ghc-options: -Werror=missing-methods" >> cabal.project
172180
cat >> cabal.project <<EOF
173181
EOF
174182
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: any.$_ installed\n" unless /^(Cabal|Cabal-syntax|hackage-server|parsec|process|text)$/; }' >> cabal.project.local
@@ -179,7 +187,7 @@ jobs:
179187
$CABAL v2-build $ARG_COMPILER $ARG_TESTS $ARG_BENCH --dry-run all
180188
cabal-plan
181189
- name: restore cache
182-
uses: actions/cache/restore@v5
190+
uses: actions/cache/restore@v6
183191
with:
184192
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
185193
path: ~/.cabal/store
@@ -210,7 +218,7 @@ jobs:
210218
$CABAL v2-build $ARG_COMPILER --disable-tests --disable-benchmarks all
211219
- name: save cache
212220
if: always()
213-
uses: actions/cache/save@v5
221+
uses: actions/cache/save@v6
214222
with:
215223
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ github.sha }}
216224
path: ~/.cabal/store

‎.github/workflows/nix-flake.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
name: Nix on ${{ matrix.os }}
1919
runs-on: ${{ matrix.os }}
2020
steps:
21-
- uses: actions/checkout@v6
21+
- uses: actions/checkout@v7
2222
- uses: wimpysworld/nothing-but-nix@main
2323
if: runner.os == 'Linux'
2424
with:
@@ -53,7 +53,7 @@ jobs:
5353
name: Nix on ${{ matrix.os }}
5454
runs-on: ${{ matrix.os }}
5555
steps:
56-
- uses: actions/checkout@v6
56+
- uses: actions/checkout@v7
5757
- uses: wimpysworld/nothing-but-nix@main
5858
if: runner.os == 'Linux'
5959
with:

‎.github/workflows/update-flake-lock.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout repository
13-
uses: actions/checkout@v6
13+
uses: actions/checkout@v7
1414
- name: Install Nix
1515
uses: DeterminateSystems/nix-installer-action@main
1616
- name: Update flake.lock

‎cabal.haskell-ci‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
branches: master
22

3+
error-incomplete-patterns: False
4+
error-unused-packages: False
5+
error-missing-methods: none
6+
37
installed: +all -Cabal -Cabal-syntax -text -parsec -process
48

59
-- Does not work with GHA:

‎cabal.project‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ packages:
99
-----------------------------------------------------------------------------
1010
-- Anti-constraints
1111

12-
-- make sure we don't accidentally pick up blacklisted packages
13-
constraints: foundation -none, cryptonite -none, cryptohash -none
12+
-- make sure we don't accidentally pick up forbidden packages
13+
constraints: foundation < 0, cryptonite < 0, cryptohash < 0
1414

1515
-----------------------------------------------------------------------------
1616
-- Modded lib:Cabal

‎flake.lock‎

Lines changed: 9 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎hackage-server.cabal‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ license: BSD-3-Clause
2828
license-file: LICENSE
2929

3030
tested-with:
31-
GHC == 9.12.2
32-
GHC == 9.10.2
31+
GHC == 9.14.1
32+
GHC == 9.12.4
33+
GHC == 9.10.3
3334
GHC == 9.8.4
3435
GHC == 9.6.7
3536
-- Constraint transformers >= 0.6 forces GHC >= 9.6 for CI
@@ -147,7 +148,7 @@ common defaults
147148
-- see `cabal.project.local-ghc-${VERSION}` files
148149
build-depends:
149150
, array >= 0.5 && < 0.6
150-
, base >= 4.18 && < 4.22
151+
, base >= 4.18 && < 4.23
151152
, binary >= 0.8 && < 0.9
152153
, bytestring >= 0.11.2 && < 0.13
153154
, containers >= 0.6.0 && < 0.9
@@ -158,15 +159,15 @@ common defaults
158159
-- we use Control.Monad.Except, introduced in mtl-2.2.1
159160
, pretty >= 1.1 && < 1.2
160161
, text ^>= 1.2.5.0 || >= 2.0 && < 2.2
161-
, time >= 1.9 && < 1.15
162+
, time >= 1.9 && < 1.16
162163
, transformers >= 0.5 && < 0.7
163164
, unix >= 2.7 && < 2.9
164165
, scientific
165166
-- other dependencies shared by most components
166167
build-depends:
167168
, aeson >= 2.1.0.0 && < 2.3
168-
, Cabal >= 3.14.2.0 && < 3.18
169-
, Cabal-syntax >= 3.14.2.0 && < 3.18
169+
, Cabal >= 3.16.0.0 && < 3.18
170+
, Cabal-syntax >= 3.16.0.0 && < 3.18
170171
-- Cabal-syntax needs to be bound to constrain hackage-security
171172
-- see https://github.com/haskell/hackage-server/issues/1130
172173
, network-bsd ^>= 2.8
@@ -430,11 +431,11 @@ library
430431
-- NB: see also build-depends in `common defaults`!
431432
build-depends:
432433
, HStringTemplate ^>= 0.8
433-
, HTTP ^>= 4000.3.16 || ^>= 4000.4.1
434+
, HTTP >= 4000.3.16 && < 4000.6
434435
, http-client ^>= 0.7 && < 0.8
435436
, http-client-tls ^>= 0.3
436437
, http-types >= 0.10 && < 0.13
437-
, QuickCheck >= 2.14 && < 2.16
438+
, QuickCheck >= 2.14 && < 2.19
438439
, acid-state ^>= 0.16
439440
, safecopy >= 0.6 && < 0.11
440441
, async ^>= 2.2.1
@@ -638,7 +639,7 @@ test-suite ReverseDependenciesTest
638639
, tasty-hedgehog ^>= 1.4
639640
, tasty-hunit ^>= 0.10
640641
, HUnit ^>= 1.6
641-
, hedgehog >= 1.4 && < 1.6
642+
, hedgehog >= 1.4 && < 1.8
642643
, exceptions
643644
, bimap
644645
, mime-mail
@@ -653,7 +654,7 @@ benchmark RevDeps
653654
main-is: RevDeps.hs
654655
build-tool-depends: hackage-server:hackage-server
655656
build-depends:
656-
, random ^>= 1.2
657+
, random >= 1.2
657658
, gauge
658659
-- gauge does not support base-4.20
659660
if impl(ghc >= 9.10)

‎src/Distribution/Server/Features/UserNotify/Backup.hs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ import Distribution.Server.Framework.BackupRestore
1111

1212
import qualified Data.Map as Map
1313

14-
import Data.Maybe (fromJust)
15-
import Data.Time (defaultTimeLocale)
16-
import Data.Time.Format.Internal (buildTime)
14+
import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
1715
import Distribution.Text (display)
1816
import Text.CSV (CSV, Record)
1917

@@ -38,7 +36,7 @@ userNotifyBackup = go []
3836
_ -> return (go st)
3937

4038
, restoreFinalize =
41-
return (Acid.NotifyData (Map.fromList st, fromJust (buildTime defaultTimeLocale []))) -- defaults to unixstart time
39+
return (Acid.NotifyData (Map.fromList st, posixSecondsToUTCTime 0)) -- unixstart time
4240
}
4341

4442
importNotifyPref :: CSV -> Restore [(UserId, Acid.NotifyPref)]

0 commit comments

Comments
 (0)