Skip to content

Commit 7ae7873

Browse files
thomasjmthomasjm
authored
Clean build against nightly-2023-04-14 (#1675)
1 parent 79a29b0 commit 7ae7873

File tree

19 files changed

+84
-66
lines changed

19 files changed

+84
-66
lines changed

‎.github/workflows/master.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
name: CI
22

3-
# Trigger the workflow on push or pull request, but only for the master branch
43
on:
54
pull_request:
65
push:
7-
branches: [master]
86

97
jobs:
108
cabal:
@@ -19,8 +17,8 @@ jobs:
1917
- "8.8.4"
2018
- "8.10.7"
2119
- "9.0.2"
22-
- "9.2.2"
23-
- "9.4.2"
20+
- "9.2.7"
21+
- "9.4.4"
2422

2523
steps:
2624
- uses: actions/checkout@v2
@@ -117,11 +115,13 @@ jobs:
117115

118116
steps:
119117
- uses: actions/checkout@v2
120-
- uses: cachix/install-nix-action@v13
118+
- uses: cachix/install-nix-action@v20
121119
with:
122120
extra_nix_config: |
123121
trusted-public-keys = ryantrinkle.com-1:JJiAKaRv9mWgpVAz8dwewnZe0AzzEAzPkagE9SP5NWI=1aba6f367982bd6dd78ec2fda75ab246a62d32c5 cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
124122
substituters = https://nixcache.reflex-frp.org https://cache.nixos.org/
123+
nix_path: nixpkgs=channel:release-22.11
124+
125125
- name: Setup
126126
run: |
127127
# Override cabal.project with the lightweight GHCJS one

‎cabal.ghcjs.project‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,4 @@ tests: True
1212
-- Constraints so that reflex-platform provided packages are selected.
1313
constraints: attoparsec == 0.13.2.2
1414
constraints: hashable == 1.3.0.0
15+
constraints: hspec < 2.10

‎ghcjs.nix‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,30 @@
1-
let reflex-platform = import (builtins.fetchTarball
2-
{ name = "reflex-platform";
3-
url = "https://github.com/reflex-frp/reflex-platform/archive/1aba6f367982bd6dd78ec2fda75ab246a62d32c5.tar.gz";
4-
}) {};
5-
pkgs = import ./nix/nixpkgs.nix; in
1+
let
2+
reflex-platform = import (builtins.fetchTarball {
3+
name = "reflex-platform";
4+
url = "https://github.com/reflex-frp/reflex-platform/archive/1aba6f367982bd6dd78ec2fda75ab246a62d32c5.tar.gz";
5+
}) {};
6+
7+
pkgs = import ./nix/nixpkgs.nix;
8+
9+
in
610

711
pkgs.stdenv.mkDerivation {
812
name = "ghcjs-shell";
9-
buildInputs =
10-
[ (reflex-platform.ghcjs.ghcWithPackages (p: with p; [
11-
attoparsec
12-
hashable
13-
]))
14-
pkgs.cabal-install
15-
pkgs.gmp
16-
pkgs.haskellPackages.cabal-plan
17-
pkgs.haskellPackages.hspec-discover
18-
pkgs.nodejs
19-
pkgs.perl
20-
pkgs.zlib
21-
];
13+
buildInputs = [
14+
(reflex-platform.ghcjs.ghcWithPackages (p: with p; [
15+
attoparsec
16+
hashable
17+
]))
18+
] ++ (with pkgs; [
19+
cabal-install
20+
gmp
21+
haskellPackages.cabal-plan
22+
haskellPackages.hspec-discover
23+
nodejs
24+
perl
25+
zlib
26+
openssl
27+
openssl.dev
28+
postgresql
29+
]);
2230
}

‎servant-auth/servant-auth-client/servant-auth-client.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ maintainer: jkarni@gmail.com
1616
copyright: (c) Julian K. Arni
1717
license: BSD-3-Clause
1818
license-file: LICENSE
19-
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1
19+
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
2020
build-type: Simple
2121
extra-source-files:
2222
CHANGELOG.md
@@ -50,7 +50,7 @@ test-suite spec
5050
test
5151
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
5252
ghc-options: -Wall
53-
build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.10
53+
build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.11
5454

5555
-- dependencies with bounds inherited from the library stanza
5656
build-depends:
@@ -62,7 +62,7 @@ test-suite spec
6262

6363
-- test dependencies
6464
build-depends:
65-
hspec >= 2.5.5 && < 2.10
65+
hspec >= 2.5.5 && < 2.11
6666
, QuickCheck >= 2.11.3 && < 2.15
6767
, aeson >= 1.3.1.1 && < 3
6868
, bytestring >= 0.10.6.0 && < 0.12

‎servant-auth/servant-auth-docs/servant-auth-docs.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ maintainer: jkarni@gmail.com
1616
copyright: (c) Julian K. Arni
1717
license: BSD-3-Clause
1818
license-file: LICENSE
19-
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1
19+
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
2020
build-type: Custom
2121
extra-source-files:
2222
CHANGELOG.md
@@ -64,7 +64,7 @@ test-suite spec
6464
test
6565
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
6666
ghc-options: -Wall
67-
build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.10
67+
build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.11
6868

6969
-- dependencies with bounds inherited from the library stanza
7070
build-depends:
@@ -78,7 +78,7 @@ test-suite spec
7878
-- test dependencies
7979
build-depends:
8080
servant-auth-docs
81-
, hspec >= 2.5.5 && < 2.10
81+
, hspec >= 2.5.5 && < 2.11
8282
, QuickCheck >= 2.11.3 && < 2.15
8383

8484
default-language: Haskell2010

‎servant-auth/servant-auth-server/servant-auth-server.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ maintainer: jkarni@gmail.com
1616
copyright: (c) Julian K. Arni
1717
license: BSD-3-Clause
1818
license-file: LICENSE
19-
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1
19+
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
2020
build-type: Simple
2121
extra-source-files:
2222
CHANGELOG.md
@@ -102,7 +102,7 @@ test-suite spec
102102
test
103103
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
104104
ghc-options: -Wall
105-
build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.10
105+
build-tool-depends: hspec-discover:hspec-discover >=2.5.5 && <2.11
106106

107107
-- dependencies with bounds inherited from the library stanza
108108
build-depends:
@@ -123,7 +123,7 @@ test-suite spec
123123
-- test dependencies
124124
build-depends:
125125
servant-auth-server
126-
, hspec >= 2.5.5 && < 2.10
126+
, hspec >= 2.5.5 && < 2.11
127127
, QuickCheck >= 2.11.3 && < 2.15
128128
, http-client >= 0.5.13.1 && < 0.8
129129
, lens-aeson >= 1.0.2 && < 1.3

‎servant-auth/servant-auth-swagger/servant-auth-swagger.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ maintainer: jkarni@gmail.com
1616
copyright: (c) Julian K. Arni
1717
license: BSD-3-Clause
1818
license-file: LICENSE
19-
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.4
19+
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
2020
build-type: Simple
2121
extra-source-files:
2222
CHANGELOG.md
@@ -49,7 +49,7 @@ test-suite spec
4949
test
5050
default-extensions: ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings RankNTypes ScopedTypeVariables TypeFamilies TypeOperators
5151
ghc-options: -Wall
52-
build-tool-depends: hspec-discover:hspec-discover >= 2.5.5 && <2.10
52+
build-tool-depends: hspec-discover:hspec-discover >= 2.5.5 && <2.11
5353
-- dependencies with bounds inherited from the library stanza
5454
build-depends:
5555
base
@@ -63,7 +63,7 @@ test-suite spec
6363
-- test dependencies
6464
build-depends:
6565
servant-auth-swagger
66-
, hspec >= 2.5.5 && < 2.10
66+
, hspec >= 2.5.5 && < 2.11
6767
, QuickCheck >= 2.11.3 && < 2.15
6868
other-modules:
6969
Servant.Auth.SwaggerSpec

‎servant-auth/servant-auth/servant-auth.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ maintainer: jkarni@gmail.com
1818
copyright: (c) Julian K. Arni
1919
license: BSD-3-Clause
2020
license-file: LICENSE
21-
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.4 || ==9.0.1
21+
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
2222
build-type: Simple
2323
extra-source-files:
2424
CHANGELOG.md

‎servant-client-core/servant-client-core.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ author: Servant Contributors
1616
maintainer: haskell-servant-maintainers@googlegroups.com
1717
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
1818
build-type: Simple
19-
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
19+
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
2020
, GHCJS ==8.6.0.1
2121

2222
extra-source-files:
@@ -104,8 +104,8 @@ test-suite spec
104104
-- Additional dependencies
105105
build-depends:
106106
deepseq >= 1.4.2.0 && < 1.5
107-
, hspec >= 2.6.0 && < 2.10
107+
, hspec >= 2.6.0 && < 2.11
108108
, QuickCheck >= 2.12.6.1 && < 2.15
109109

110110
build-tool-depends:
111-
hspec-discover:hspec-discover >= 2.6.0 && <2.10
111+
hspec-discover:hspec-discover >= 2.6.0 && <2.11

‎servant-client/servant-client.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ author: Servant Contributors
2020
maintainer: haskell-servant-maintainers@googlegroups.com
2121
copyright: 2014-2016 Zalora South East Asia Pte Ltd, 2016-2019 Servant Contributors
2222
build-type: Simple
23-
tested-with: GHC ==8.6.5 || ==8.8.4 || ==8.10.2 || ==9.0.1
23+
tested-with: GHC==8.6.5, GHC==8.8.4, GHC ==8.10.7, GHC ==9.0.2, GHC ==9.2.7, GHC ==9.4.4
2424
, GHCJS ==8.6.0.1
2525

2626
extra-source-files:
@@ -124,15 +124,15 @@ test-suite spec
124124
-- Additional dependencies
125125
build-depends:
126126
entropy >= 0.4.1.3 && < 0.5
127-
, hspec >= 2.6.0 && < 2.10
127+
, hspec >= 2.6.0 && < 2.11
128128
, HUnit >= 1.6.0.0 && < 1.7
129129
, network >= 2.8.0.0 && < 3.2
130130
, QuickCheck >= 2.12.6.1 && < 2.15
131131
, servant == 0.19.*
132132
, servant-server == 0.19.*
133133

134134
build-tool-depends:
135-
hspec-discover:hspec-discover >= 2.6.0 && < 2.10
135+
hspec-discover:hspec-discover >= 2.6.0 && < 2.11
136136

137137
test-suite readme
138138
type: exitcode-stdio-1.0

0 commit comments

Comments
 (0)