From a5115d39cfefc3a3d094262f5d5fa74c942aa4b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Mar 2022 11:27:49 +0000
Subject: [PATCH 1/8] Bump actions/cache from 2 to 3.0.1

Bumps [actions/cache](https://github.com/actions/cache) from 2 to 3.0.1.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v2...v3.0.1)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/Cabal-Linux-Remote.yml     | 2 +-
 .github/workflows/Core-Cabal-Linux.yml       | 2 +-
 .github/workflows/Core-Cabal-macOS.yml       | 2 +-
 .github/workflows/On-Release-Cabal-Linux.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/Cabal-Linux-Remote.yml b/.github/workflows/Cabal-Linux-Remote.yml
index 88f9ef0..7a6c0a6 100644
--- a/.github/workflows/Cabal-Linux-Remote.yml
+++ b/.github/workflows/Cabal-Linux-Remote.yml
@@ -60,7 +60,7 @@ jobs:
         run: cp -a cabal.project.freeze ../cabal.project.freeze
 
       - name: "Configuring GitHub cache"
-        uses: actions/cache@v2
+        uses: actions/cache@v3.0.1
         with:
           path: |
             ${{ steps.HaskEnvSetup.outputs.cabal-store }}
diff --git a/.github/workflows/Core-Cabal-Linux.yml b/.github/workflows/Core-Cabal-Linux.yml
index ba683f8..093717d 100644
--- a/.github/workflows/Core-Cabal-Linux.yml
+++ b/.github/workflows/Core-Cabal-Linux.yml
@@ -52,7 +52,7 @@ jobs:
         run: cp -a cabal.project.freeze ../cabal.project.freeze
 
       - name: "Configuring GitHub cache"
-        uses: actions/cache@v2
+        uses: actions/cache@v3.0.1
         with:
           path: |
             ${{ steps.HaskEnvSetup.outputs.cabal-store }}
diff --git a/.github/workflows/Core-Cabal-macOS.yml b/.github/workflows/Core-Cabal-macOS.yml
index 1116751..98a8fe1 100644
--- a/.github/workflows/Core-Cabal-macOS.yml
+++ b/.github/workflows/Core-Cabal-macOS.yml
@@ -49,7 +49,7 @@ jobs:
         run: cp -a cabal.project.freeze ../cabal.project.freeze
 
       - name: "Configuring GitHub cache"
-        uses: actions/cache@v2
+        uses: actions/cache@v3.0.1
         with:
           path: |
             ${{ steps.HaskEnvSetup.outputs.cabal-store }}
diff --git a/.github/workflows/On-Release-Cabal-Linux.yml b/.github/workflows/On-Release-Cabal-Linux.yml
index 800a934..77458af 100644
--- a/.github/workflows/On-Release-Cabal-Linux.yml
+++ b/.github/workflows/On-Release-Cabal-Linux.yml
@@ -59,7 +59,7 @@ jobs:
         run: cp -a cabal.project.freeze ../cabal.project.freeze
 
       - name: "Configuring GitHub cache"
-        uses: actions/cache@v2
+        uses: actions/cache@v3.0.1
         with:
           path: |
             ${{ steps.HaskEnvSetup.outputs.cabal-store }}

From 26d3a34e1a600dd17d1dd40861787a12cd1dc4cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Mar 2022 11:26:52 +0000
Subject: [PATCH 2/8] Bump actions/checkout from 2 to 3

Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/Cabal-Linux-Remote.yml        | 2 +-
 .github/workflows/Core-Cabal-Linux.yml          | 2 +-
 .github/workflows/Core-Cabal-macOS.yml          | 2 +-
 .github/workflows/On-Release-Cabal-Linux.yml    | 2 +-
 .github/workflows/Optional-Nix-dev-env-main.yml | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/Cabal-Linux-Remote.yml b/.github/workflows/Cabal-Linux-Remote.yml
index 7a6c0a6..438181c 100644
--- a/.github/workflows/Cabal-Linux-Remote.yml
+++ b/.github/workflows/Cabal-Linux-Remote.yml
@@ -26,7 +26,7 @@ jobs:
     steps:
 
       - name: "Git checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
diff --git a/.github/workflows/Core-Cabal-Linux.yml b/.github/workflows/Core-Cabal-Linux.yml
index 093717d..061be54 100644
--- a/.github/workflows/Core-Cabal-Linux.yml
+++ b/.github/workflows/Core-Cabal-Linux.yml
@@ -28,7 +28,7 @@ jobs:
     steps:
 
       - name: "Git checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
diff --git a/.github/workflows/Core-Cabal-macOS.yml b/.github/workflows/Core-Cabal-macOS.yml
index 98a8fe1..89ccec4 100644
--- a/.github/workflows/Core-Cabal-macOS.yml
+++ b/.github/workflows/Core-Cabal-macOS.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
 
       - name: "Git checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
diff --git a/.github/workflows/On-Release-Cabal-Linux.yml b/.github/workflows/On-Release-Cabal-Linux.yml
index 77458af..40afb61 100644
--- a/.github/workflows/On-Release-Cabal-Linux.yml
+++ b/.github/workflows/On-Release-Cabal-Linux.yml
@@ -25,7 +25,7 @@ jobs:
     steps:
 
       - name: "Git checkout"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
diff --git a/.github/workflows/Optional-Nix-dev-env-main.yml b/.github/workflows/Optional-Nix-dev-env-main.yml
index 8bc8beb..c4d92ee 100644
--- a/.github/workflows/Optional-Nix-dev-env-main.yml
+++ b/.github/workflows/Optional-Nix-dev-env-main.yml
@@ -28,7 +28,7 @@ jobs:
         working-directory: "./${{ matrix.packageRoot }}"
     steps:
     - name: "Git checkout"
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         submodules: recursive
     - name: "Install Nix"

From 5da143beac4c12c08f07e3ae09b11c483595196a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Apr 2022 11:34:46 +0000
Subject: [PATCH 3/8] Bump cachix/install-nix-action from 16 to 17

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 16 to 17.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v16...v17)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/Cabal-Linux-Remote.yml        | 2 +-
 .github/workflows/On-Release-Cabal-Linux.yml    | 2 +-
 .github/workflows/Optional-Nix-dev-env-main.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/Cabal-Linux-Remote.yml b/.github/workflows/Cabal-Linux-Remote.yml
index 438181c..200e337 100644
--- a/.github/workflows/Cabal-Linux-Remote.yml
+++ b/.github/workflows/Cabal-Linux-Remote.yml
@@ -44,7 +44,7 @@ jobs:
 
       # Still required for Remote
       - name: "Install Nix"
-        uses: cachix/install-nix-action@v16
+        uses: cachix/install-nix-action@v17
         if: matrix.packageRoot == 'hnix-store-remote'
 
       # Remote: Enabling testsuite, because it requires networking in the default Nix environment.
diff --git a/.github/workflows/On-Release-Cabal-Linux.yml b/.github/workflows/On-Release-Cabal-Linux.yml
index 40afb61..10339fd 100644
--- a/.github/workflows/On-Release-Cabal-Linux.yml
+++ b/.github/workflows/On-Release-Cabal-Linux.yml
@@ -43,7 +43,7 @@ jobs:
 
       # Still required for Remote
       - name: "Install Nix"
-        uses: cachix/install-nix-action@v16
+        uses: cachix/install-nix-action@v17
         if: matrix.packageRoot == 'hnix-store-remote'
 
       # Remote: Enabling testsuite, because it requires networking in the default Nix environment.
diff --git a/.github/workflows/Optional-Nix-dev-env-main.yml b/.github/workflows/Optional-Nix-dev-env-main.yml
index c4d92ee..e628c29 100644
--- a/.github/workflows/Optional-Nix-dev-env-main.yml
+++ b/.github/workflows/Optional-Nix-dev-env-main.yml
@@ -32,7 +32,7 @@ jobs:
       with:
         submodules: recursive
     - name: "Install Nix"
-      uses: cachix/install-nix-action@v16
+      uses: cachix/install-nix-action@v17
       with:
         nix_path: nixpkgs=channel:nixos-unstable
     - name: "Install Cachix"

From f2fe84f83e8d030671890f81bd85f9009875b9f9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 21 Apr 2022 11:23:23 +0000
Subject: [PATCH 4/8] Bump haskell/actions from 1 to 2

Bumps [haskell/actions](https://github.com/haskell/actions) from 1 to 2.
- [Release notes](https://github.com/haskell/actions/releases)
- [Commits](https://github.com/haskell/actions/compare/v1...v2)

---
updated-dependencies:
- dependency-name: haskell/actions
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/Cabal-Linux-Remote.yml     | 2 +-
 .github/workflows/Core-Cabal-Linux.yml       | 2 +-
 .github/workflows/Core-Cabal-macOS.yml       | 2 +-
 .github/workflows/On-Release-Cabal-Linux.yml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/Cabal-Linux-Remote.yml b/.github/workflows/Cabal-Linux-Remote.yml
index 200e337..8a1e54c 100644
--- a/.github/workflows/Cabal-Linux-Remote.yml
+++ b/.github/workflows/Cabal-Linux-Remote.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: "Haskell env setup"
         id: HaskEnvSetup
-        uses: haskell/actions/setup@v1
+        uses: haskell/actions/setup@v2
         with:
           ghc-version: ${{ matrix.ghc }}
 
diff --git a/.github/workflows/Core-Cabal-Linux.yml b/.github/workflows/Core-Cabal-Linux.yml
index 061be54..92b06cd 100644
--- a/.github/workflows/Core-Cabal-Linux.yml
+++ b/.github/workflows/Core-Cabal-Linux.yml
@@ -34,7 +34,7 @@ jobs:
 
       - name: "Haskell env setup"
         id: HaskEnvSetup
-        uses: haskell/actions/setup@v1
+        uses: haskell/actions/setup@v2
         with:
           ghc-version: ${{ matrix.ghc }}
 
diff --git a/.github/workflows/Core-Cabal-macOS.yml b/.github/workflows/Core-Cabal-macOS.yml
index 89ccec4..e6cde8e 100644
--- a/.github/workflows/Core-Cabal-macOS.yml
+++ b/.github/workflows/Core-Cabal-macOS.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: "Haskell env setup"
         id: HaskEnvSetup
-        uses: haskell/actions/setup@v1
+        uses: haskell/actions/setup@v2
         with:
           ghc-version: '9.0'
 
diff --git a/.github/workflows/On-Release-Cabal-Linux.yml b/.github/workflows/On-Release-Cabal-Linux.yml
index 10339fd..24f4efc 100644
--- a/.github/workflows/On-Release-Cabal-Linux.yml
+++ b/.github/workflows/On-Release-Cabal-Linux.yml
@@ -31,7 +31,7 @@ jobs:
 
       - name: "Haskell env setup"
         id: HaskEnvSetup
-        uses: haskell/actions/setup@v1
+        uses: haskell/actions/setup@v2
         with:
           ghc-version: ${{ matrix.ghc }}
 

From d34710a046d5431ef19698d8457463749982fbc0 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Fri, 22 Apr 2022 12:49:07 +0200
Subject: [PATCH 5/8] Pin nixpkgs

---
 default.nix | 12 +++++++++++-
 overlay.nix |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/default.nix b/default.nix
index da64968..d80828a 100644
--- a/default.nix
+++ b/default.nix
@@ -1,4 +1,14 @@
-{ pkgs ? import <nixpkgs> {} }: let
+{ rev ?  "c542baa0c894796c92a8173dead027f3b952c22e"
+, pkgs ?
+    if ((rev == "") || (rev == "default") || (rev == "local"))
+      then import <nixpkgs> {}
+      # Do not guard with hash, so the project is able to use current channels (rolling `rev`) of Nixpkgs
+      else import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/${rev}.tar.gz") {}
+    // {
+      # Try to build dependencies even if they are marked broken.
+      config.allowBroken = true;
+    }
+}: let
   overlay = import ./overlay.nix pkgs pkgs.haskell.lib;
   overrideHaskellPackages = orig: {
     buildHaskellPackages =
diff --git a/overlay.nix b/overlay.nix
index 819a40d..0687a6e 100644
--- a/overlay.nix
+++ b/overlay.nix
@@ -1,6 +1,6 @@
 pkgs: hlib: helf: huper: {
   hnix-store-remote =
-    ( helf.callCabal2nixWithOptions "hnix-store-remote" ./hnix-store-remote "-fio-testsuite" { relude = helf.relude_1_0_0_1; }
+    ( helf.callCabal2nixWithOptions "hnix-store-remote" ./hnix-store-remote "-fio-testsuite" { }
     ).overrideAttrs (attrs: {
         buildInputs = attrs.buildInputs ++ [
           pkgs.nix

From af0d69d992859f0ce9493f3349cd0ad720915fab Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Fri, 22 Apr 2022 12:56:37 +0200
Subject: [PATCH 6/8] CI: invalidate caches

https://github.com/actions/cache/issues/2
---
 .github/workflows/Cabal-Linux-Remote.yml     | 3 ++-
 .github/workflows/Core-Cabal-Linux.yml       | 3 ++-
 .github/workflows/On-Release-Cabal-Linux.yml | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/Cabal-Linux-Remote.yml b/.github/workflows/Cabal-Linux-Remote.yml
index 8a1e54c..8ae8472 100644
--- a/.github/workflows/Cabal-Linux-Remote.yml
+++ b/.github/workflows/Cabal-Linux-Remote.yml
@@ -66,7 +66,8 @@ jobs:
             ${{ steps.HaskEnvSetup.outputs.cabal-store }}
             dist-newstyle
           key: ${{ matrix.packageRoot }}-${{ runner.os }}-Cabal-${{ matrix.ghc }}-${{ hashFiles( 'cabal.project.freeze' ) }}
-          restore-keys: ${{ matrix.packageRoot }}-${{ runner.os }}-Cabal-${{ matrix.ghc }}-
+          # 2022-04-22: `v2-` added to invalidate corrupted caches, can be removed after one week
+          restore-keys: ${{ matrix.packageRoot }}-${{ runner.os }}-Cabal-${{ matrix.ghc }}-v2
 
       - name: "Build"
         run: cabal v2-build $cabalConfig
diff --git a/.github/workflows/Core-Cabal-Linux.yml b/.github/workflows/Core-Cabal-Linux.yml
index 92b06cd..da03e6b 100644
--- a/.github/workflows/Core-Cabal-Linux.yml
+++ b/.github/workflows/Core-Cabal-Linux.yml
@@ -58,7 +58,8 @@ jobs:
             ${{ steps.HaskEnvSetup.outputs.cabal-store }}
             dist-newstyle
           key: ${{ matrix.packageRoot }}-${{ runner.os }}-Cabal-${{ matrix.ghc }}-${{ hashFiles( 'cabal.project.freeze' ) }}
-          restore-keys: ${{ matrix.packageRoot }}-${{ runner.os }}-Cabal-${{ matrix.ghc }}-
+          # 2022-04-22: `v2-` added to invalidate corrupted caches, can be removed after one week
+          restore-keys: ${{ matrix.packageRoot }}-${{ runner.os }}-Cabal-${{ matrix.ghc }}-v2-
 
       - name: "Build"
         run: cabal v2-build $cabalConfig
diff --git a/.github/workflows/On-Release-Cabal-Linux.yml b/.github/workflows/On-Release-Cabal-Linux.yml
index 24f4efc..e6b5c35 100644
--- a/.github/workflows/On-Release-Cabal-Linux.yml
+++ b/.github/workflows/On-Release-Cabal-Linux.yml
@@ -65,6 +65,7 @@ jobs:
             ${{ steps.HaskEnvSetup.outputs.cabal-store }}
             dist-newstyle
           key: ${{ matrix.packageRoot }}-${{ runner.os }}-Cabal-${{ matrix.ghc }}-${{ hashFiles( 'cabal.project.freeze' ) }}
+          # 2022-04-22: `v2-` added to invalidate corrupted caches, can be removed after one week
           restore-keys: ${{ matrix.packageRoot }}-${{ runner.os }}-Cabal-${{ matrix.ghc }}-
 
       - name: "Build"

From 690e7a6e4b40c13373a61bb1bf5bd6b965f97058 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Fri, 22 Apr 2022 13:17:16 +0200
Subject: [PATCH 7/8] CI: actions/cache@v3.0.1 -> actions/cache@v3

---
 .github/workflows/Cabal-Linux-Remote.yml     | 2 +-
 .github/workflows/Core-Cabal-Linux.yml       | 2 +-
 .github/workflows/On-Release-Cabal-Linux.yml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/Cabal-Linux-Remote.yml b/.github/workflows/Cabal-Linux-Remote.yml
index 8ae8472..74bd2a9 100644
--- a/.github/workflows/Cabal-Linux-Remote.yml
+++ b/.github/workflows/Cabal-Linux-Remote.yml
@@ -60,7 +60,7 @@ jobs:
         run: cp -a cabal.project.freeze ../cabal.project.freeze
 
       - name: "Configuring GitHub cache"
-        uses: actions/cache@v3.0.1
+        uses: actions/cache@v3
         with:
           path: |
             ${{ steps.HaskEnvSetup.outputs.cabal-store }}
diff --git a/.github/workflows/Core-Cabal-Linux.yml b/.github/workflows/Core-Cabal-Linux.yml
index da03e6b..a7c0fd5 100644
--- a/.github/workflows/Core-Cabal-Linux.yml
+++ b/.github/workflows/Core-Cabal-Linux.yml
@@ -52,7 +52,7 @@ jobs:
         run: cp -a cabal.project.freeze ../cabal.project.freeze
 
       - name: "Configuring GitHub cache"
-        uses: actions/cache@v3.0.1
+        uses: actions/cache@v3
         with:
           path: |
             ${{ steps.HaskEnvSetup.outputs.cabal-store }}
diff --git a/.github/workflows/On-Release-Cabal-Linux.yml b/.github/workflows/On-Release-Cabal-Linux.yml
index e6b5c35..dc3d388 100644
--- a/.github/workflows/On-Release-Cabal-Linux.yml
+++ b/.github/workflows/On-Release-Cabal-Linux.yml
@@ -59,7 +59,7 @@ jobs:
         run: cp -a cabal.project.freeze ../cabal.project.freeze
 
       - name: "Configuring GitHub cache"
-        uses: actions/cache@v3.0.1
+        uses: actions/cache@v3
         with:
           path: |
             ${{ steps.HaskEnvSetup.outputs.cabal-store }}

From ade0ba5a58644becae5ddcce522505151e86d24c Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Fri, 22 Apr 2022 13:43:47 +0200
Subject: [PATCH 8/8] CI: drop NIXPKGS_ALLOW_BROKEN env

---
 .github/workflows/Optional-Nix-dev-env-main.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.github/workflows/Optional-Nix-dev-env-main.yml b/.github/workflows/Optional-Nix-dev-env-main.yml
index e628c29..29bc7e4 100644
--- a/.github/workflows/Optional-Nix-dev-env-main.yml
+++ b/.github/workflows/Optional-Nix-dev-env-main.yml
@@ -42,9 +42,3 @@ jobs:
         signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
     - name: "Determined Nix-build"
       run: nix-build ../ -A "haskellPackages.${{ matrix.packageRoot }}"
-      env:
-        #  2020-12-22: NOTE: allowBroken ideally should be temporary.
-        NIXPKGS_ALLOW_BROKEN: "1"
-
-
-