Skip to content

Commit 3fc8ec0

Browse files
csasarakcsasarak
authored
Quarterly Updates (#1410)
* Bump the index state. * Add a common file for shared project config. * Upgrade ansi-terminal. * Upgrade aeson. * Upgrade containers. * Upgrade crypton, deepseq, zip, hspec-hedgehog. * Format fix. * format .cabal
1 parent de7bdcd commit 3fc8ec0

7 files changed

+86
-255
lines changed

‎cabal.project

+3-62
Original file line numberDiff line numberDiff line change
@@ -6,72 +6,13 @@ package spectrometer
66
-- Building with file-embed fails on GHC >= 9.2 on Mac OS X when using no optimizations (-O0).
77
-- I found that we can keep most of the speed of compiling with -O0 and compile succesfully by enabling this one extension.
88
-- In CI, we use either -O1 or -O2 so this should not be a problem.
9-
--
9+
--
1010
-- When upgrading to GHC 9.4 consumers of spectrometer may also need to enable this flag if they use -O0.
1111
-- Bug filed here: https://github.com/snoyberg/file-embed/issues/45
1212
ghc-options: -ffull-laziness
13-
14-
allow-newer:
15-
-- git-config needs to relax its upper bound on megaparsec. PR submitted;
16-
-- no action from maintainer yet
17-
--
18-
-- we can remove this if/when 0.1.3 is released on hackage
19-
, git-config:megaparsec
20-
21-
-- codec-rpm needs a bump to its attoparsec bound. latest upload to hackage
22-
-- was in 2018, so we may have to fork when breakage occurs
23-
, codec-rpm:attoparsec
24-
25-
-- the semver package only exposes lens-style accessors for its Version type;
26-
-- normal accessors are in an un-exposed Internal module. on master, the
27-
-- Internal module is exposed, but a new release hasn't been cut to hackage yet
28-
--
29-
-- we can remove this if/when 0.4.0.2 is released on hackage
30-
source-repository-package
31-
type: git
32-
location: https://github.com/fossas/semver.git
33-
tag: 7bc42dd298e0d98e119486ceab4f74042d46b004
34-
35-
-- cpio-conduit-0.7.2 on hackage has an incompatibility with newer versions of
36-
-- base16-bytestring. we submitted a PR to fix this, and the PR was merged, but
37-
-- a new release was never cut to hackage
38-
-- We can remove this if/when 0.7.3 is released on hackage
39-
source-repository-package
40-
type: git
41-
location: https://github.com/da-x/cpio-conduit
42-
tag: 30d92919e82c5033fffac7b34288f5a7fd28e9be
43-
44-
-- Current implementation of yarn-lock throws runtime error, as described by patches:
45-
-- (a) https://github.com/Profpatsch/yarn2nix/pull/73
46-
-- (b) https://github.com/Profpatsch/yarn2nix/pull/72
47-
-- TODO: Remove once, both PRs are merged.
48-
source-repository-package
49-
type: git
50-
location: https://github.com/fossas/yarn2nix
51-
tag: 7d9f505b35750e54bf9d73e5a996df4a1c5ab117
52-
subdir: yarn-lock
53-
54-
-- Current hackage distribution does not support SSL_CERT_FILE, and SSL_CERT_DIR
55-
-- environment variable. Modified source code below, supports aforementioned environment variables.
56-
source-repository-package
57-
type: git
58-
location: https://github.com/fossas/hs-certificate
59-
tag: d93afd2dc78c2f6910766fabc2f5e4452bcae2f2
60-
subdir: x509-system
61-
62-
source-repository-package
63-
type: git
64-
location: https://github.com/fossas/tar
65-
tag: 5f833d3a6840edb436f6083bf6e7159cd7649490
66-
67-
-- This can be removed once https://github.com/weldr/codec-rpm/pull/40 merges and is available on hackage.
68-
source-repository-package
69-
type: git
70-
location: https://github.com/fossas/codec-rpm
71-
tag: 0f7431423d47fdf36945e4ff31fbee76005b7e68
72-
73-
index-state: hackage.haskell.org 2024-02-21T10:56:14Z
7413

14+
import: ./cabal.project.common
15+
7516
package *
7617
extra-include-dirs: /opt/homebrew/include
7718
extra-lib-dirs: /opt/homebrew/lib

‎cabal.project.ci.linux

+2-62
Original file line numberDiff line numberDiff line change
@@ -6,67 +6,7 @@ jobs: $ncpus
66

77
packages: .
88

9+
import: ./cabal.project.common
10+
911
package spectrometer
1012
ghc-options: -Werror
11-
12-
allow-newer:
13-
-- git-config needs to relax its upper bound on megaparsec. PR submitted;
14-
-- no action from maintainer yet
15-
--
16-
-- we can remove this if/when 0.1.3 is released on hackage
17-
, git-config:megaparsec
18-
19-
-- codec-rpm needs a bump to its attoparsec bound. latest upload to hackage
20-
-- was in 2018, so we may have to fork when breakage occurs
21-
, codec-rpm:attoparsec
22-
23-
-- the semver package only exposes lens-style accessors for its Version type;
24-
-- normal accessors are in an un-exposed Internal module. on master, the
25-
-- Internal module is exposed, but a new release hasn't been cut to hackage yet
26-
--
27-
-- we can remove this if/when 0.4.0.2 is released on hackage
28-
source-repository-package
29-
type: git
30-
location: https://github.com/fossas/semver.git
31-
tag: 7bc42dd298e0d98e119486ceab4f74042d46b004
32-
33-
-- cpio-conduit-0.7.2 on hackage has an incompatibility with newer versions of
34-
-- base16-bytestring. we submitted a PR to fix this, and the PR was merged, but
35-
-- a new release was never cut to hackage
36-
-- We can remove this if/when 0.7.3 is released on hackage
37-
source-repository-package
38-
type: git
39-
location: https://github.com/da-x/cpio-conduit
40-
tag: 30d92919e82c5033fffac7b34288f5a7fd28e9be
41-
42-
-- Current implementation of yarn-lock throws runtime error, as described by patches:
43-
-- (a) https://github.com/Profpatsch/yarn2nix/pull/73
44-
-- (b) https://github.com/Profpatsch/yarn2nix/pull/72
45-
-- TODO: Remove once, both PRs are merged.
46-
source-repository-package
47-
type: git
48-
location: https://github.com/fossas/yarn2nix
49-
tag: 7d9f505b35750e54bf9d73e5a996df4a1c5ab117
50-
subdir: yarn-lock
51-
52-
-- Current hackage distribution does not support SSL_CERT_FILE, and SSL_CERT_DIR
53-
-- environment variable. Modified source code below, supports aforementioned environment variables.
54-
source-repository-package
55-
type: git
56-
location: https://github.com/fossas/hs-certificate
57-
tag: d93afd2dc78c2f6910766fabc2f5e4452bcae2f2
58-
subdir: x509-system
59-
60-
source-repository-package
61-
type: git
62-
location: https://github.com/fossas/tar
63-
tag: 5f833d3a6840edb436f6083bf6e7159cd7649490
64-
65-
-- This can be removed once https://github.com/weldr/codec-rpm/pull/40 merges and is available on hackage.
66-
source-repository-package
67-
type: git
68-
location: https://github.com/fossas/codec-rpm
69-
tag: 0f7431423d47fdf36945e4ff31fbee76005b7e68
70-
71-
index-state: hackage.haskell.org 2024-02-21T10:56:14Z
72-

‎cabal.project.ci.macos

+2-61
Original file line numberDiff line numberDiff line change
@@ -4,66 +4,7 @@ jobs: $ncpus
44

55
packages: .
66

7+
import: ./cabal.project.common
8+
79
package spectrometer
810
ghc-options: -Werror
9-
10-
allow-newer:
11-
-- git-config needs to relax its upper bound on megaparsec. PR submitted;
12-
-- no action from maintainer yet
13-
--
14-
-- we can remove this if/when 0.1.3 is released on hackage
15-
, git-config:megaparsec
16-
17-
-- codec-rpm needs a bump to its attoparsec bound. latest upload to hackage
18-
-- was in 2018, so we may have to fork when breakage occurs
19-
, codec-rpm:attoparsec
20-
21-
-- the semver package only exposes lens-style accessors for its Version type;
22-
-- normal accessors are in an un-exposed Internal module. on master, the
23-
-- Internal module is exposed, but a new release hasn't been cut to hackage yet
24-
--
25-
-- we can remove this if/when 0.4.0.2 is released on hackage
26-
source-repository-package
27-
type: git
28-
location: https://github.com/fossas/semver.git
29-
tag: 7bc42dd298e0d98e119486ceab4f74042d46b004
30-
31-
-- cpio-conduit-0.7.2 on hackage has an incompatibility with newer versions of
32-
-- base16-bytestring. we submitted a PR to fix this, and the PR was merged, but
33-
-- a new release was never cut to hackage
34-
-- We can remove this if/when 0.7.3 is released on hackage
35-
source-repository-package
36-
type: git
37-
location: https://github.com/da-x/cpio-conduit
38-
tag: 30d92919e82c5033fffac7b34288f5a7fd28e9be
39-
40-
-- Current implementation of yarn-lock throws runtime error, as described by patches:
41-
-- (a) https://github.com/Profpatsch/yarn2nix/pull/73
42-
-- (b) https://github.com/Profpatsch/yarn2nix/pull/72
43-
-- TODO: Remove once, both PRs are merged.
44-
source-repository-package
45-
type: git
46-
location: https://github.com/fossas/yarn2nix
47-
tag: 7d9f505b35750e54bf9d73e5a996df4a1c5ab117
48-
subdir: yarn-lock
49-
50-
-- Current hackage distribution does not support SSL_CERT_FILE, and SSL_CERT_DIR
51-
-- environment variable. Modified source code below, supports aforementioned environment variables.
52-
source-repository-package
53-
type: git
54-
location: https://github.com/fossas/hs-certificate
55-
tag: d93afd2dc78c2f6910766fabc2f5e4452bcae2f2
56-
subdir: x509-system
57-
58-
source-repository-package
59-
type: git
60-
location: https://github.com/fossas/tar
61-
tag: 5f833d3a6840edb436f6083bf6e7159cd7649490
62-
63-
-- This can be removed once https://github.com/weldr/codec-rpm/pull/40 merges and is available on hackage.
64-
source-repository-package
65-
type: git
66-
location: https://github.com/fossas/codec-rpm
67-
tag: 0f7431423d47fdf36945e4ff31fbee76005b7e68
68-
69-
index-state: hackage.haskell.org 2024-02-21T10:56:14Z

‎cabal.project.ci.windows

+2-61
Original file line numberDiff line numberDiff line change
@@ -6,66 +6,7 @@ jobs: $ncpus
66

77
packages: .
88

9+
import: ./cabal.project.common
10+
911
package spectrometer
1012
ghc-options: -Werror
11-
12-
allow-newer:
13-
-- git-config needs to relax its upper bound on megaparsec. PR submitted;
14-
-- no action from maintainer yet
15-
--
16-
-- we can remove this if/when 0.1.3 is released on hackage
17-
, git-config:megaparsec
18-
19-
-- codec-rpm needs a bump to its attoparsec bound. latest upload to hackage
20-
-- was in 2018, so we may have to fork when breakage occurs
21-
, codec-rpm:attoparsec
22-
23-
-- the semver package only exposes lens-style accessors for its Version type;
24-
-- normal accessors are in an un-exposed Internal module. on master, the
25-
-- Internal module is exposed, but a new release hasn't been cut to hackage yet
26-
--
27-
-- we can remove this if/when 0.4.0.2 is released on hackage
28-
source-repository-package
29-
type: git
30-
location: https://github.com/fossas/semver.git
31-
tag: 7bc42dd298e0d98e119486ceab4f74042d46b004
32-
33-
-- cpio-conduit-0.7.2 on hackage has an incompatibility with newer versions of
34-
-- base16-bytestring. we submitted a PR to fix this, and the PR was merged, but
35-
-- a new release was never cut to hackage
36-
-- We can remove this if/when 0.7.3 is released on hackage
37-
source-repository-package
38-
type: git
39-
location: https://github.com/da-x/cpio-conduit
40-
tag: 30d92919e82c5033fffac7b34288f5a7fd28e9be
41-
42-
-- Current implementation of yarn-lock throws runtime error, as described by patches:
43-
-- (a) https://github.com/Profpatsch/yarn2nix/pull/73
44-
-- (b) https://github.com/Profpatsch/yarn2nix/pull/72
45-
-- TODO: Remove once, both PRs are merged.
46-
source-repository-package
47-
type: git
48-
location: https://github.com/fossas/yarn2nix
49-
tag: 7d9f505b35750e54bf9d73e5a996df4a1c5ab117
50-
subdir: yarn-lock
51-
52-
-- Current hackage distribution does not support SSL_CERT_FILE, and SSL_CERT_DIR
53-
-- environment variable. Modified source code below, supports aforementioned environment variables.
54-
source-repository-package
55-
type: git
56-
location: https://github.com/fossas/hs-certificate
57-
tag: d93afd2dc78c2f6910766fabc2f5e4452bcae2f2
58-
subdir: x509-system
59-
60-
source-repository-package
61-
type: git
62-
location: https://github.com/fossas/tar
63-
tag: 5f833d3a6840edb436f6083bf6e7159cd7649490
64-
65-
-- This can be removed once https://github.com/weldr/codec-rpm/pull/40 merges and is available on hackage.
66-
source-repository-package
67-
type: git
68-
location: https://github.com/fossas/codec-rpm.git
69-
tag: 0f7431423d47fdf36945e4ff31fbee76005b7e68
70-
71-
index-state: hackage.haskell.org 2024-02-21T10:56:14Z

‎cabal.project.common

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
tests: True
2+
jobs: $ncpus
3+
4+
package spectrometer
5+
6+
allow-newer:
7+
-- git-config needs to relax its upper bound on megaparsec. PR submitted;
8+
-- no action from maintainer yet
9+
--
10+
-- we can remove this if/when 0.1.3 is released on hackage
11+
, git-config:megaparsec
12+
13+
-- codec-rpm needs a bump to its attoparsec bound. latest upload to hackage
14+
-- was in 2018, so we may have to fork when breakage occurs
15+
, codec-rpm:attoparsec
16+
17+
-- the semver package only exposes lens-style accessors for its Version type;
18+
-- normal accessors are in an un-exposed Internal module. on master, the
19+
-- Internal module is exposed, but a new release hasn't been cut to hackage yet
20+
--
21+
-- we can remove this if/when 0.4.0.2 is released on hackage
22+
source-repository-package
23+
type: git
24+
location: https://github.com/fossas/semver.git
25+
tag: 7bc42dd298e0d98e119486ceab4f74042d46b004
26+
27+
-- cpio-conduit-0.7.2 on hackage has an incompatibility with newer versions of
28+
-- base16-bytestring. we submitted a PR to fix this, and the PR was merged, but
29+
-- a new release was never cut to hackage
30+
-- We can remove this if/when 0.7.3 is released on hackage
31+
source-repository-package
32+
type: git
33+
location: https://github.com/da-x/cpio-conduit
34+
tag: 30d92919e82c5033fffac7b34288f5a7fd28e9be
35+
36+
-- Current implementation of yarn-lock throws runtime error, as described by patches:
37+
-- (a) https://github.com/Profpatsch/yarn2nix/pull/73
38+
-- (b) https://github.com/Profpatsch/yarn2nix/pull/72
39+
-- TODO: Remove once, both PRs are merged.
40+
source-repository-package
41+
type: git
42+
location: https://github.com/fossas/yarn2nix
43+
tag: 7d9f505b35750e54bf9d73e5a996df4a1c5ab117
44+
subdir: yarn-lock
45+
46+
-- Current hackage distribution does not support SSL_CERT_FILE, and SSL_CERT_DIR
47+
-- environment variable. Modified source code below, supports aforementioned environment variables.
48+
source-repository-package
49+
type: git
50+
location: https://github.com/fossas/hs-certificate
51+
tag: d93afd2dc78c2f6910766fabc2f5e4452bcae2f2
52+
subdir: x509-system
53+
54+
source-repository-package
55+
type: git
56+
location: https://github.com/fossas/tar
57+
tag: 5f833d3a6840edb436f6083bf6e7159cd7649490
58+
59+
-- This can be removed once https://github.com/weldr/codec-rpm/pull/40 merges and is available on hackage.
60+
source-repository-package
61+
type: git
62+
location: https://github.com/fossas/codec-rpm
63+
tag: 0f7431423d47fdf36945e4ff31fbee76005b7e68
64+
65+
index-state: hackage.haskell.org 2024-04-12T15:16:26Z

‎spectrometer.cabal

+8-7
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,13 @@ common lang
8080
-- Upgrade zip after text is upgraded
8181
common deps
8282
build-depends:
83-
, aeson ^>=2.1.2.0
83+
, aeson ^>=2.2
8484
, aeson-pretty ^>=0.8.9
8585
, algebraic-graphs ^>=0.7
86-
, ansi-terminal ^>=1.0
86+
, ansi-terminal ^>=1.1
8787
, async ^>=2.2.2
8888
, attoparsec ^>=0.14.1
89+
, attoparsec-aeson ^>=2.2
8990
, base64-bytestring ^>=1.2.1.0
9091
, binary ^>=0.8.8.0
9192
, bytestring ^>=0.11
@@ -96,10 +97,10 @@ common deps
9697
, conduit ^>=1.3.2
9798
, conduit-extra ^>=1.3.5
9899
, conduit-zstd ^>=0.0.2.0
99-
, containers ^>=0.6.0
100+
, containers ^>=0.6.8
100101
, cpio-conduit ^>=0.7.0
101-
, crypton ^>=0.33
102-
, deepseq ^>=1.4
102+
, crypton ^>=0.34
103+
, deepseq ^>=1.4.8
103104
, direct-sqlite ^>=2.3.27
104105
, directory ^>=1.3.6.1
105106
, either ^>=5.0.2
@@ -158,7 +159,7 @@ common deps
158159
, xml ^>=1.3.14
159160
, yaml ^>=0.11.8
160161
, yarn-lock ^>=0.6.5
161-
, zip ^>=1.7.1
162+
, zip ^>=2.0.0
162163
, zlib ^>=0.6.2.1
163164

164165
if !os(windows)
@@ -701,7 +702,7 @@ test-suite unit-tests
701702
, hedgehog ^>=1.4
702703
, hspec ^>=2.11
703704
, hspec-core ^>=2.11
704-
, hspec-hedgehog ^>=0.0.1.2
705+
, hspec-hedgehog ^>=0.1
705706
, hspec-megaparsec ^>=2.2
706707
, HUnit ^>=1.6.0
707708
, spectrometer

0 commit comments

Comments
 (0)