From 9e5d71e1109a03d440a0a583f01744ab969cb83c Mon Sep 17 00:00:00 2001
From: Vaibhav Sagar <vaibhavsagar@gmail.com>
Date: Sun, 10 Oct 2021 13:14:16 -0400
Subject: [PATCH] .github/workflows/nix.yml: build release-{9.0,9.2}.nix as
 well (#1285)

* .github/workflows/nix.yml: build release-{9.0,9.2}.nix as well

* release-9.2.nix: update

* Fix more hash mismatches

* release-9.2.nix: update

* .github/workflows/nix.yml: don't test for release-9.2.nix

* .github/workflows/nix.yml: fix comment indentation
---
 .github/workflows/nix.yml | 12 ++++++++----
 release-9.2.nix           |  4 ++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 7d33045d..a6dce28d 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -34,7 +34,9 @@ jobs:
     strategy:
       matrix:
         versions:
-          - compiler: 'ghc8104'
+          - release: 'release-8.10.nix'
+          - release: 'release-9.0.nix'
+          - release: 'release-9.2.nix'
     steps:
     - uses: actions/checkout@v2
     - uses: cachix/install-nix-action@v12
@@ -43,11 +45,13 @@ jobs:
         name: ihaskell
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
     - run: |
-        nix-build \
+        nix-build --keep-going \
         -I nixpkgs=https://github.com/NixOS/nixpkgs/tarball/nixos-21.05 \
-        release.nix \
-        --argstr compiler ${{ matrix.versions.compiler }} \
+        ${{ matrix.versions.release }} \
         --arg packages "haskellPackages: [ haskellPackages.ihaskell ]"
+    # release-9.2.nix doesn't include HLint support so the test fails
+    - if: ${{ matrix.versions.release != 'release-9.2.nix' }}
+      run: |
         nix-shell \
         -I nixpkgs=https://github.com/NixOS/nixpkgs/tarball/nixos-21.05 \
         -p jq --run \
diff --git a/release-9.2.nix b/release-9.2.nix
index 7aa25df5..5674b19c 100644
--- a/release-9.2.nix
+++ b/release-9.2.nix
@@ -1,8 +1,8 @@
 let
   # https://github.com/NixOS/nixpkgs/pull/141095
   nixpkgs-src = builtins.fetchTarball {
-    url = "https://github.com/NixOS/nixpkgs/tarball/bab822b583416305be6b98424cb2980f4fcf4f24";
-    sha256 = "1iwhb8i7v9734z0mk695klflry4kfrcs3m5l7g97brsyardcz9gj";
+    url = "https://github.com/NixOS/nixpkgs/tarball/af59d92b26f747663db59667c920678580807a33";
+    sha256 = "19jxi0c0d8rkxb4nl00m77wd1nhimi2ng66s6il6b5wnfn3736r3";
   };
 in