Skip to content

Commit ae1e9f5

Browse files
committed
chore: update to real ghc 9.14
1 parent 0fc4bab commit ae1e9f5

2 files changed

Lines changed: 36 additions & 33 deletions

File tree

flake.lock

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

flake.nix

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
description = "PyF";
33

44
inputs.flake-utils.url = "github:numtide/flake-utils";
5-
inputs.nixpkgs.url = "github:guibou/nixpkgs/ghc-914";
5+
inputs.nixpkgs.url = "github:nixos/nixpkgs";
66
inputs.treefmt-nix.url = "github:numtide/treefmt-nix";
77

88
nixConfig.extra-substituters = [ "https://guibou.cachix.org" ];
@@ -11,12 +11,11 @@
1111
];
1212

1313
outputs =
14-
{
15-
self,
16-
nixpkgs,
17-
flake-utils,
18-
treefmt-nix,
19-
...
14+
{ self
15+
, nixpkgs
16+
, flake-utils
17+
, treefmt-nix
18+
, ...
2019
}:
2120
flake-utils.lib.eachDefaultSystem (
2221
system:
@@ -73,22 +72,27 @@
7372

7473
pyf_910 = pyfBuilder haskell.packages.ghc910;
7574
pyf_912 = pyfBuilder haskell.packages.ghc912;
76-
pyf_914 = pyfBuilder haskell.packages.ghc914;
75+
pyf_914 = pyfBuilder
76+
(haskell.packages.ghc914.override {
77+
overrides = self: super:
78+
{
79+
call-stack = haskell.lib.dontCheck super.call-stack;
80+
};});
7781

78-
default = pyfBuilder haskellPackages;
79-
};
82+
default = pyfBuilder haskellPackages;
83+
};
8084

81-
formatter = treefmtEval.config.build.wrapper;
85+
formatter = treefmtEval.config.build.wrapper;
8286

83-
devShells = (builtins.mapAttrs (name: value: value.shell) packages) // {
84-
treesitter = pkgs.mkShell {
85-
buildInputs = [
86-
pkgs.tree-sitter
87-
pkgs.nodejs
88-
];
87+
devShells = (builtins.mapAttrs (name: value: value.shell) packages) // {
88+
treesitter = pkgs.mkShell {
89+
buildInputs = [
90+
pkgs.tree-sitter
91+
pkgs.nodejs
92+
];
93+
};
94+
default = packages.default.shell_hls;
8995
};
90-
default = packages.default.shell_hls;
91-
};
96+
}
97+
);
9298
}
93-
);
94-
}

0 commit comments

Comments
 (0)