Skip to content

Commit baf92ac

Browse files
angermanperturbing
andauthored
fix some issues (#211)
* Use summary instead of text fixes #208 * Use head.hackage only for GHC < 9.13 (we need to update this each time there is a release...) Might fix #195 * Use custom cabal-install Fixes #210 * Update haskell.nix * Use bootstrap project file for cabal. * Use more stable nixpgks * bump haskellNix * Update tool-map.nix (head.hackage hash) Co-authored-by: Thomas Vellekoop <[email protected]> --------- Co-authored-by: Thomas Vellekoop <[email protected]>
1 parent bede246 commit baf92ac

File tree

8 files changed

+93
-205
lines changed

8 files changed

+93
-205
lines changed

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
# Group the output by platform.
3838
RUNS=$(gh api "repos/$GITHUB_REPOSITORY/commits/$GITHUB_SHA/check-runs" --paginate)
3939
echo "checks..."
40-
FILTERED=$(jq -c -r '.check_runs[] | select(.name | endswith("-env")) | select(.name | startswith("${{ inputs.platform }}")) | { "config": .name, "build_path": .output.text, "short_name": .name | sub("${{ inputs.platform }}\\.";"") }' <<< "$RUNS")
40+
FILTERED=$(jq -c -r '.check_runs[] | select(.name | endswith("-env")) | select(.name | startswith("${{ inputs.platform }}")) | { "config": .name, "build_path": .output.summary, "short_name": .name | sub("${{ inputs.platform }}\\.";"") }' <<< "$RUNS")
4141
jq . <<< "$FILTERED"
4242
MATRIX=$(jq --slurp -c -r '.' <<< "$FILTERED")
4343
jq . <<< "$MATRIX"
@@ -86,7 +86,7 @@ jobs:
8686
# codespace-upload:
8787
# env:
8888
# IMAGE_NAME: input-output-hk/devx-devcontainer
89-
# needs: ghcr-upload
89+
# needs: process
9090
# permissions:
9191
# packages: write
9292
# runs-on: ubuntu-latest

cross-js.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ self, pkgs, compiler, compiler-nix-name, toolsModule, withHLS ? true, withHlint ? true, withIOG ? true }:
2-
let tool-version-map = import ./tool-map.nix;
2+
let tool-version-map = (import ./tool-map.nix) self;
33
tool = tool-name: pkgs.pkgsBuildBuild.haskell-nix.tool compiler-nix-name tool-name [(tool-version-map compiler-nix-name tool-name) toolsModule];
4-
cabal-install = pkgs.pkgsBuildBuild.haskell-nix.nix-tools-unchecked.exes.cabal;
4+
cabal-install = tool "cabal";
55
haskell-tools =
66
pkgs.lib.optionalAttrs (withHLS && (compiler-not-in (
77
# it appears we can't get HLS build with 9.8 yet.

cross-windows.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{ self, pkgs, compiler, compiler-nix-name, toolsModule, withHLS ? true, withHlint ? true, withIOG ? true }:
2-
let tool-version-map = import ./tool-map.nix;
2+
let tool-version-map = (import ./tool-map.nix) self;
33
tool = tool-name: pkgs.pkgsBuildBuild.haskell-nix.tool compiler-nix-name tool-name [(tool-version-map compiler-nix-name tool-name) toolsModule];
4-
cabal-install = pkgs.pkgsBuildBuild.haskell-nix.nix-tools-unchecked.exes.cabal;
4+
cabal-install = tool "cabal";
55
haskell-tools =
66
pkgs.lib.optionalAttrs (withHLS && (compiler-not-in (
77
# it appears we can't get HLS build with 9.8 yet.

dynamic.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# define a development shell for dynamically linked applications (default)
22
{ self, pkgs, compiler, compiler-nix-name, toolsModule, withHLS ? true, withHlint ? true, withIOG ? true, withIOGFull ? false, withGHCTooling ? false }:
3-
let tool-version-map = import ./tool-map.nix;
3+
let tool-version-map = (import ./tool-map.nix) self;
44
tool = tool-name: pkgs.pkgsBuildBuild.haskell-nix.tool compiler-nix-name tool-name [(tool-version-map compiler-nix-name tool-name) toolsModule];
5-
cabal-install = pkgs.pkgsBuildBuild.haskell-nix.nix-tools-unchecked.exes.cabal;
5+
cabal-install = tool "cabal";
66
haskell-tools =
77
pkgs.lib.optionalAttrs (withHLS && (compiler-not-in (
88
pkgs.lib.optional (builtins.compareVersions compiler.version "9.7" >= 0) compiler-nix-name

0 commit comments

Comments
 (0)