From cd88d2f8d01e760cda2c2e4d0e8abdfa0f02c8cd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Nov 2021 22:02:58 +0000
Subject: [PATCH 1/2] Bump cachix/install-nix-action from 14 to 15

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 14 to 15.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v14...v15)

---
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/test-flakes.yml | 2 +-
 .github/workflows/test.yml        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-flakes.yml b/.github/workflows/test-flakes.yml
index d4da47a..028e080 100644
--- a/.github/workflows/test-flakes.yml
+++ b/.github/workflows/test-flakes.yml
@@ -14,7 +14,7 @@ jobs:
       with:
           # Nix Flakes doesn't work on shallow clones
           fetch-depth: 0
-    - uses: cachix/install-nix-action@v14
+    - uses: cachix/install-nix-action@v15
       with:
         extra_nix_config: |
           experimental-features = nix-command flakes
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 05ad242..eca315b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v14
+    - uses: cachix/install-nix-action@v15
       with:
         nix_path: "${{ matrix.nixPath }}"
         extra_nix_config: "system-features = nixos-test benchmark big-parallel kvm"

From 9989dfc9e03f54f481c7d14eff5779e59fe583c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 16 Nov 2021 09:03:10 +0100
Subject: [PATCH 2/2] unify ci jobs

---
 .github/workflows/test-flakes.yml | 30 ------------------------------
 .github/workflows/test.yml        |  6 +++++-
 2 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 .github/workflows/test-flakes.yml

diff --git a/.github/workflows/test-flakes.yml b/.github/workflows/test-flakes.yml
deleted file mode 100644
index 028e080..0000000
--- a/.github/workflows/test-flakes.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-name: "Flake test"
-on:
-  pull_request:
-  schedule:
-    - cron:  '51 2 * * *'
-jobs:
-  tests:
-    strategy:
-      matrix:
-        os: [ ubuntu-latest, macos-latest ]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v2
-      with:
-          # Nix Flakes doesn't work on shallow clones
-          fetch-depth: 0
-    - uses: cachix/install-nix-action@v15
-      with:
-        extra_nix_config: |
-          experimental-features = nix-command flakes
-          system-features = nixos-test benchmark big-parallel kvm
-    - name: Setup cachix
-      uses: cachix/cachix-action@v10
-      with:
-        name: mic92
-        signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
-    - name: List flake structure
-      run: nix flake show
-    - name: Run flake check (flake)
-      run: nix flake check -L
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index eca315b..ad6c209 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -17,7 +17,6 @@ jobs:
     - uses: cachix/install-nix-action@v15
       with:
         nix_path: "${{ matrix.nixPath }}"
-        extra_nix_config: "system-features = nixos-test benchmark big-parallel kvm"
     - name: Setup cachix
       uses: cachix/cachix-action@v10
       with:
@@ -29,6 +28,11 @@ jobs:
     - name: Run lint
       run: nix-build --no-out-link default.nix -A lint
       if: matrix.os == 'ubuntu-latest'
+    - name: List flake structure
+      run: nix flake show
+    - name: Run flake check (flake)
+      run: nix flake check -L
+    # this should be the same as `nix flake check`
     - name: Build nix packages
       run: nix-build --no-out-link release.nix
     - name: Run unit tests