Skip to content

Commit 58adbb8

Browse files
authored
Merge pull request #103 from guibou/release_3_0_1
Release 3 0 1
2 parents 3378787 + 703a807 commit 58adbb8

7 files changed

Lines changed: 41 additions & 62 deletions

File tree

.github/workflows/ci.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,20 @@ on:
77
branches: [ main ]
88

99
jobs:
10-
build:
10+
nix-matrix:
11+
strategy:
12+
matrix:
13+
ghc: [94, 96, 98, 910, 912]
1114
runs-on: ubuntu-latest
1215

1316
steps:
14-
- uses: actions/checkout@v2
15-
- uses: cachix/install-nix-action@v18
16-
- uses: cachix/cachix-action@v10
17-
with:
18-
name: guibou
19-
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
17+
- uses: actions/checkout@v2
18+
- uses: cachix/install-nix-action@v31
19+
- uses: cachix/cachix-action@v15
20+
with:
21+
name: guibou
22+
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
2023

21-
# Builds
22-
- name: Build current GHC
23-
run: nix build
24+
# Builds
25+
- name: Build with GHC ${{ matrix.ghc }}
26+
run: nix build .#krank_${{ matrix.ghc }}

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# Revision history for krank
22

3+
## 0.3.1 -- 2025-12-07
4+
5+
* Support for GHC up to 9.12
36
* Fix build with http-client >= 0.7.16
47
* Fix url parsing in markdown
58

flake.lock

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

flake.nix

Lines changed: 18 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66

77
outputs = { self, nixpkgs, flake-utils }:
88
flake-utils.lib.eachDefaultSystem (system:
9-
let pkgs = nixpkgs.legacyPackages.${system};
10-
11-
in
12-
rec {
9+
let
10+
pkgs = nixpkgs.legacyPackages.${system};
1311
krankBuilder = hPkgs:
1412
let
1513
shell = pkg.env.overrideAttrs (old: {
@@ -24,42 +22,30 @@
2422
});
2523

2624
pkg = (
27-
(pkgs.haskell.lib.dontCheck (hPkgs.callCabal2nix "krank" ./. { }))).overrideAttrs
25+
(pkgs.haskell.lib.dontCheck (hPkgs.callCabal2nix "krank" ./. { }))
26+
).overrideAttrs
2827
(oldAttrs: {
2928
buildInputs = oldAttrs.buildInputs;
3029
passthru = oldAttrs.passthru // { inherit shell shell_hls; };
3130
});
3231
# Add the GHC version in the package name
33-
in pkg.overrideAttrs (old: { name = "krank-ghc${hPkgs.ghc.version}"; });
34-
35-
defaultPackage = packages.krank;
36-
32+
in
33+
pkg.overrideAttrs (old: { name = "krank-ghc${hPkgs.ghc.version}"; });
34+
in
35+
rec {
3736
packages = {
38-
krank = krankBuilder pkgs.haskellPackages;
39-
#krank_88 = krankBuilder pkgs.haskell.packages.ghc88;
40-
krank_90 = krankBuilder pkgs.haskell.packages.ghc90;
41-
krank_92 = krankBuilder pkgs.haskell.packages.ghc92;
42-
krank_94 = krankBuilder pkgs.haskell.packages.ghc94;
43-
krank_96 = krankBuilder pkgs.haskell.packages.ghc96;
44-
krank_98 = krankBuilder pkgs.haskell.packages.ghc98;
45-
#krank_810 = krankBuilder pkgs.haskell.packages.ghc810;
37+
default = krankBuilder pkgs.haskellPackages;
38+
krank_94 = krankBuilder pkgs.haskell.packages.ghc94;
39+
krank_96 = krankBuilder pkgs.haskell.packages.ghc96;
40+
krank_98 = krankBuilder pkgs.haskell.packages.ghc98;
41+
krank_910 = krankBuilder pkgs.haskell.packages.ghc910;
42+
krank_912 = krankBuilder pkgs.haskell.packages.ghc912;
4643
};
4744

48-
devShell = packages.krank.shell_hls;
49-
devShells = {
50-
shell = packages.krank.shell;
51-
shell_hls = packages.krank.shell_hls;
52-
};
53-
54-
all = pkgs.linkFarmFromDrvs "all" (builtins.attrValues packages);
55-
56-
apps = {
57-
ormolu = {
58-
type = "app";
59-
program = "${pkgs.writeScript "ormolu" ''
60-
${pkgs.ormolu}/bin/ormolu --mode inplace $(git ls-files | grep '\.hs$')
61-
''}";
62-
};
45+
devShells = rec {
46+
shell = packages.default.shell;
47+
shell_hls = packages.default.shell_hls;
48+
default = shell_hls;
6349
};
6450
});
6551
}

krank.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.2
22
name: krank
3-
version: 0.3.0
3+
version: 0.3.1
44
synopsis: Krank checks issue tracker link status in your source code
55
-- description:
66
bug-reports: https://github.com/guibou/krank/issues

nixpkgs.nix

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

shell.nix

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

0 commit comments

Comments
 (0)