Skip to content

Commit e6fad06

Browse files
committed
Integration for Node release 11.1
1 parent d7b3276 commit e6fad06

459 files changed

Lines changed: 1869 additions & 1483 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

cabal.project

Lines changed: 54 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,49 @@ index-state:
1616
-- Bump this if you need newer packages from Hackage
1717
, hackage.haskell.org 2026-05-18T17:14:36Z
1818
-- Bump this if you need newer packages from CHaP
19-
, cardano-haskell-packages 2026-05-18T13:56:34Z
20-
21-
active-repositories:
22-
, :rest
23-
, cardano-haskell-packages:override
19+
, cardano-haskell-packages 2026-05-26T09:41:58Z
2420

2521
packages: .
2622

23+
-- kes-agent on branch f-f/allow-crypto-class-2.5
24+
source-repository-package
25+
type: git
26+
location: https://github.com/f-f/kes-agent.git
27+
tag: 32c1ed675d22a30735d9f22f7afa436a3ef3e64a
28+
--sha256: sha256-o7hFX1JnraS6Xq0WoXQwd9Z8GsPPv0Ls2DWvZ08o0ZU=
29+
subdir:
30+
kes-agent
31+
kes-agent-crypto
32+
33+
-- cardano-ledger on master 2026-06-18
34+
source-repository-package
35+
type: git
36+
location: https://github.com/IntersectMBO/cardano-ledger.git
37+
tag: 8dc1c431e06db2c8b5d44fb4b3cca6419197d763
38+
--sha256: sha256-xKtgNFxjbJE6UWGvTioGX81NgvlKH3mHEaYMWDm8/UA=
39+
subdir:
40+
eras/allegra/impl
41+
eras/alonzo/impl
42+
eras/babbage/impl
43+
eras/byron/chain/executable-spec
44+
eras/byron/crypto
45+
eras/byron/ledger/executable-spec
46+
eras/byron/ledger/impl
47+
eras/conway/impl
48+
eras/dijkstra/impl
49+
eras/mary/impl
50+
eras/shelley/impl
51+
eras/shelley/test-suite
52+
eras/shelley-ma/test-suite
53+
libs/cardano-data
54+
libs/cardano-ledger-api
55+
libs/cardano-ledger-binary
56+
libs/cardano-ledger-core
57+
libs/cardano-protocol-tpraos
58+
libs/non-integral
59+
libs/small-steps
60+
libs/vector-map
61+
2762
-- We want to always build the test-suites and benchmarks
2863
tests: true
2964
benchmarks: true
@@ -47,13 +82,24 @@ if os (windows)
4782
constraints:
4883
tasty <1.5.4,
4984

50-
-- ouroboros-network dependency after introducing `bracketKeepAlive` (PR#5371)
85+
-- on f-f/allow-quickcheck-218 branch
5186
source-repository-package
5287
type: git
5388
location: https://github.com/IntersectMBO/ouroboros-network
54-
tag: e8d59d8a219563760fc21ba5bc86fab77d886742
55-
--sha256: sha256-ElgaE5JeDTPfyDQnyZs5ZlOdzlnZYl7z1OgkzCBJjek=
89+
tag: 1881340e26ca98b3ee2b89ea536348406b79e051
90+
--sha256: sha256-O1Th+YI6LZqCLM6n75tVV+3InA4W8sC0yHEi09u8Fyw=
5691
subdir:
5792
ouroboros-network
5893
cardano-diffusion
5994
network-mux
95+
96+
-- plutus on branch master
97+
source-repository-package
98+
type: git
99+
location: https://github.com/IntersectMBO/plutus.git
100+
tag: b1db04cc425fab303ac3b79d7140dc2a17f29e6d
101+
--sha256: sha256-XtYzjNVx4+IGWpgm+p/YTf56DrJtK0I98umZCTE3U80=
102+
subdir:
103+
plutus-core
104+
plutus-ledger-api
105+
plutus-tx

cabal/newer-ghcs.cabal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ if impl (ghc >= 9.14)
8181
, serialise:base
8282
, serialise:containers
8383
, serialise:time
84+
, tdigest:base
8485
, these:base
8586
, time-compat:time
8687
, transformers:base
Lines changed: 14 additions & 0 deletions
Lines changed: 17 additions & 0 deletions
Lines changed: 5 additions & 0 deletions
Lines changed: 24 additions & 0 deletions

flake.lock

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

flake.nix

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,13 @@
8383
ghc912 = hydraJobs.native.haskell912.devShell;
8484
ghc912-profiled = hydraJobs.native.haskell912.devShellProfiled;
8585

86+
# 9.14 is not a hydra job yet
87+
ghc914 = import ./nix/shell.nix {
88+
inherit inputs pkgs;
89+
hsPkgs = pkgs.hsPkgs.projectVariants.ghc914;
90+
withHls = false;
91+
};
92+
8693
agda-spec = pkgs.agda-spec.shell;
8794

8895
website = pkgs.mkShell {

nix/haskell.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ let
3434
flake.variants = {
3535
ghc910 = { compiler-nix-name = lib.mkForce "ghc9103"; };
3636
ghc912 = { compiler-nix-name = lib.mkForce "ghc9122"; };
37+
ghc914 = { compiler-nix-name = lib.mkForce "ghc9141"; };
3738
};
3839
inputMap = {
3940
"https://chap.intersectmbo.org/" = inputs.CHaP;

nix/shell.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ inputs, pkgs, hsPkgs }:
1+
{ inputs, pkgs, hsPkgs, withHls ? true }:
22

33
let
44
inherit (pkgs) lib;
@@ -32,7 +32,7 @@ hsPkgs.shellFor {
3232

3333
# This is the place for tools that are required to be built with the same GHC
3434
# version as used in hsPkgs.
35-
tools = {
35+
tools = lib.optionalAttrs withHls {
3636
haskell-language-server = {
3737
src = inputs.hls;
3838
configureArgs = "--disable-benchmarks --disable-tests";

0 commit comments

Comments
 (0)