From 2eeac83915a68b5dadc383775ef83314575801cf Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 2 May 2024 10:56:52 +0200
Subject: [PATCH] Downgrade nixpkgs because of MacOS build error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It seems https://github.com/NixOS/nixpkgs/pull/287609 caused the following
build error for us on MacOS:

```
error:
       … while evaluating a branch condition

         at /nix/store/hxvhrj46m6j9m1x2z4qa4s1r4gw18sqv-source/pkgs/stdenv/booter.nix:99:7:

           98|     thisStage =
           99|       if args.__raw or false
             |       ^
          100|       then args'

       … in the right operand of the update (//) operator

         at /nix/store/hxvhrj46m6j9m1x2z4qa4s1r4gw18sqv-source/pkgs/stdenv/booter.nix:84:7:

           83|       { allowCustomOverrides = index == 1; }
           84|       // (stageFun prevStage))
             |       ^
           85|     (lib.lists.reverseList stageFuns);

       (stack trace truncated; use '--show-trace' to show the full trace)

       error: value is a function while a set was expected
```

We should look into if this is an issue in nixpkgs or in our MacOS
environment (GitHub).

This commit changes the following Nix versions:

  * 2.21.2 -> 2.21.0
  * 2.20.6 -> 2.20.5
  * 2.19.4 -> 2.19.3
  * 2.3.18 -> 2.3.17
---
 .github/workflows/cicd.yml | 24 ++++++++++++------------
 flake.lock                 |  8 ++++----
 flake.nix                  |  2 +-
 3 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
index dbfcfb1..b8b2717 100644
--- a/.github/workflows/cicd.yml
+++ b/.github/workflows/cicd.yml
@@ -48,11 +48,11 @@ jobs:
           - macos-12
           - macos-11
         nix_version:
-          - 2.21.2
-          - 2.20.6
-          - 2.19.4
+          - 2.21.0
+          - 2.20.5
+          - 2.19.3
           - 2.18.2
-          - 2.3.18
+          - 2.3.17
     runs-on: ${{ matrix.os }}
     steps:
       - uses: divnix/nix-cache-action@v3.0.11-nix
@@ -92,11 +92,11 @@ jobs:
           - macos-12
           - macos-11
         nix_version:
-          - 2.21.2
-          - 2.20.6
-          - 2.19.4
+          - 2.21.0
+          - 2.20.5
+          - 2.19.3
           - 2.18.2
-          - 2.3.18
+          - 2.3.17
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -137,11 +137,11 @@ jobs:
           - macos-12
           - macos-11
         nix_version:
-          - 2.21.2
-          - 2.20.6
-          - 2.19.4
+          - 2.21.0
+          - 2.20.5
+          - 2.19.3
           - 2.18.2
-          - 2.3.18
+          - 2.3.17
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
diff --git a/flake.lock b/flake.lock
index 8c10d07..17710ff 100644
--- a/flake.lock
+++ b/flake.lock
@@ -17,16 +17,16 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1714556388,
-        "narHash": "sha256-Mxp8hX2gH30HoIQ+INvWY5P0sKBli8BmiGzZcKVD6co=",
+        "lastModified": 1711733423,
+        "narHash": "sha256-C3ti1qWyAc7lFxpTlI/Dxvb8V4Qp0e+DAQg/VPJWxM0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c10b1bb002e7414ecf7c9d9e5f7ebaeaeae32c92",
+        "rev": "276624921a196180387832713961b1b8d06ec178",
         "type": "github"
       },
       "original": {
         "id": "nixpkgs",
-        "rev": "c10b1bb002e7414ecf7c9d9e5f7ebaeaeae32c92",
+        "rev": "276624921a196180387832713961b1b8d06ec178",
         "type": "indirect"
       }
     },
diff --git a/flake.nix b/flake.nix
index 068cabf..ae2e3d6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
-    nixpkgs-unstable.url = "nixpkgs/c10b1bb002e7414ecf7c9d9e5f7ebaeaeae32c92";
+    nixpkgs-unstable.url = "nixpkgs/276624921a196180387832713961b1b8d06ec178";
   };
 
   nixConfig = {