From 7bf7cdc2d8e9e09e2b14c4a90b8d6055a3c10ecc Mon Sep 17 00:00:00 2001 From: "Rune K. Svendsen" Date: Sat, 28 Dec 2024 10:49:57 +0100 Subject: [PATCH] CI: add more GHC versions --- .github/workflows/cabal-in-nix-shell.yml | 2 +- shell.nix | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cabal-in-nix-shell.yml b/.github/workflows/cabal-in-nix-shell.yml index 963382e..5f16a79 100644 --- a/.github/workflows/cabal-in-nix-shell.yml +++ b/.github/workflows/cabal-in-nix-shell.yml @@ -9,7 +9,7 @@ jobs: strategy: matrix: os: [ubuntu-22.04, ubuntu-20.04, macos-13] - ghc: [ghc88, ghc96, ghc810, ghc884, ghc90] + ghc: [ghc7103, ghc802, ghc822, ghc844, ghc865Binary, ghc88, ghc96, ghc810, ghc884, ghc90] runs-on: ${{ matrix.os }} steps: - name: Checkout diff --git a/shell.nix b/shell.nix index 97ca082..6bceaba 100644 --- a/shell.nix +++ b/shell.nix @@ -7,15 +7,23 @@ let sha256 = "10wn0l08j9lgqcw8177nh2ljrnxdrpri7bp0g7nvrsn9rkawvlbf"; }) {}; + pkgs1809 = + import (builtins.fetchTarball { + url = "https://github.com/NixOS/nixpkgs/archive/925ff360bc33876fdb6ff967470e34ff375ce65e.tar.gz"; + sha256 = "1qbmp6x01ika4kdc7bhqawasnpmhyl857ldz25nmq9fsmqm1vl2s"; + }) {}; + pkgs2405 = import (builtins.fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/31ac92f9628682b294026f0860e14587a09ffb4b.tar.gz"; sha256 = "0qbyywfgjljfb4izdngxvbyvbrkilmpsmmx2a9spbwir2bcmbi14"; }) {}; + + ghc = pkgs.haskell.compiler.${ghcVersion} or pkgs1809.haskell.compiler.${ghcVersion}; in pkgs.mkShell { nativeBuildInputs = [ - pkgs.haskell.compiler.${ghcVersion} + ghc pkgs.cabal-install pkgs.git pkgs2405.gcc9 # later versions fail with issue https://github.com/jberthold/packman/issues/17