Skip to content

Commit 94cc8bf

Browse files
committed
ghc2021
1 parent 250d06b commit 94cc8bf

File tree

16 files changed

+804
-973
lines changed

16 files changed

+804
-973
lines changed

.envrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
use flake
2+
3+
watch_file **/*.cabal cabal.project.freeze **/*.nix flake.lock

flake.lock

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

flake.nix

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
inputs = {
3+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
4+
flake-utils.url = "github:numtide/flake-utils";
5+
};
6+
7+
outputs = inputs:
8+
inputs.flake-utils.lib.eachDefaultSystem (system:
9+
let
10+
pkgs = import inputs.nixpkgs { inherit system; };
11+
in
12+
import ./nix { inherit pkgs; }
13+
);
14+
}

license.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

nix/default.nix

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{ pkgs }:
2+
3+
let
4+
inherit (pkgs.lib) fold composeExtensions concatMap attrValues;
5+
6+
hls = pkgs.haskell-language-server.override {
7+
supportedGhcVersions = [ "96" ];
8+
};
9+
10+
combineOverrides = old:
11+
fold composeExtensions (old.overrides or (_: _: { }));
12+
13+
testConfigurations =
14+
let
15+
makeTestConfiguration = { ghcVersion, overrides ? new: old: { } }:
16+
let
17+
inherit (pkgs.haskell.lib) dontCheck packageSourceOverrides;
18+
in
19+
(pkgs.haskell.packages.${ghcVersion}.override (old: {
20+
overrides =
21+
combineOverrides old [
22+
(packageSourceOverrides { partial-semigroup = ../partial-semigroup; })
23+
overrides
24+
];
25+
})).partial-semigroup;
26+
in
27+
rec {
28+
ghc-9-2 = makeTestConfiguration {
29+
ghcVersion = "ghc92";
30+
};
31+
ghc-9-4 = makeTestConfiguration {
32+
ghcVersion = "ghc94";
33+
};
34+
ghc-9-6 = makeTestConfiguration {
35+
ghcVersion = "ghc96";
36+
overrides = new: old: {
37+
# x = new.callPackage ./haskell/x.nix { };
38+
};
39+
};
40+
all = pkgs.symlinkJoin {
41+
name = "partial-semigroup-tests";
42+
paths = [ ghc-9-2 ghc-9-4 ghc-9-6 ];
43+
};
44+
};
45+
46+
in
47+
{
48+
49+
packages = { inherit testConfigurations; };
50+
51+
devShells.default = pkgs.mkShell {
52+
inputsFrom = [ testConfigurations.ghc-9-6.env ];
53+
buildInputs = [ hls pkgs.cabal-install ];
54+
};
55+
56+
}

nix/sources.json

Lines changed: 0 additions & 26 deletions
This file was deleted.

nix/sources.nix

Lines changed: 0 additions & 194 deletions
This file was deleted.

partial-semigroup/changelog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
0.6.0.2 - 2023 June 26
2+
3+
* Raise language version to GHC2021
4+
15
0.6.0.1 - 2023 Jan 10
26

37
* Support GHC 9.4

0 commit comments

Comments
 (0)