Skip to content

Commit 9a9a174

Browse files
committed
bumps
1 parent 2cffdf9 commit 9a9a174

File tree

7 files changed

+120
-225
lines changed

7 files changed

+120
-225
lines changed

.gitignore

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
result
2-
result-*
1+
/result
2+
/result-*
33
hie.yaml
4+
.envrc

either-list-functions/changelog.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
### 0.0.4.8
2+
3+
Version bumps
4+
15
### 0.0.4.7
26

37
Supports base-4.17 and GHC 9.4

either-list-functions/either-list-functions.cabal

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: either-list-functions
4-
version: 0.0.4.7
4+
version: 0.0.4.8
55
category: Data
66
synopsis: Functions involving lists of Either
77

@@ -26,7 +26,7 @@ common base
2626
default-language: Haskell2010
2727
ghc-options: -Wall
2828
build-depends:
29-
, base ^>= 4.14 || ^>= 4.15 || ^>= 4.16 || ^>= 4.17
29+
, base ^>= 4.18 || ^>= 4.19
3030

3131
library
3232
import: base
@@ -42,5 +42,5 @@ test-suite doctest
4242
ghc-options: -threaded
4343
hs-source-dirs: test
4444
build-depends:
45-
, doctest ^>= 0.18.2 || ^>= 0.19 || ^>= 0.20
45+
, doctest ^>= 0.22 || ^>= 0.23
4646
, either-list-functions

flake.lock

+61
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
inputs = {
3+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
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+
12+
inherit (pkgs.lib) fold composeExtensions concatMap attrValues;
13+
14+
hls = pkgs.haskell-language-server.override {
15+
supportedGhcVersions = [ "98" ];
16+
};
17+
18+
combineOverrides = old:
19+
fold composeExtensions (old.overrides or (_: _: { }));
20+
21+
in rec {
22+
23+
packages = let
24+
makeTestConfiguration = { ghcVersion, overrides ? new: old: { } }:
25+
let inherit (pkgs.haskell.lib) dontCheck packageSourceOverrides;
26+
in (pkgs.haskell.packages.${ghcVersion}.override (old: {
27+
overrides = combineOverrides old [
28+
(packageSourceOverrides {
29+
either-list-functions = ./either-list-functions;
30+
})
31+
overrides
32+
];
33+
})).either-list-functions;
34+
in rec {
35+
ghc-9-6 = makeTestConfiguration { ghcVersion = "ghc96"; };
36+
ghc-9-8 = makeTestConfiguration { ghcVersion = "ghc98"; };
37+
all = pkgs.symlinkJoin {
38+
name = "either-list-functions-all";
39+
paths = [ ghc-9-6 ghc-9-8 ];
40+
};
41+
};
42+
43+
devShells.default = pkgs.mkShell {
44+
inputsFrom = [ packages.ghc-9-8.env ];
45+
buildInputs = [ pkgs.cabal-install ];
46+
};
47+
48+
});
49+
}

nix/sources.json

-26
This file was deleted.

nix/sources.nix

-194
This file was deleted.

0 commit comments

Comments
 (0)