From 87a4ccd0d3ee78b7f82310fe81f7f0bf3dcf331d Mon Sep 17 00:00:00 2001
From: ners <ners@gmx.ch>
Date: Thu, 14 Nov 2024 19:09:22 +0100
Subject: [PATCH 1/2] Fix monad-schedule flake input

---
 flake.lock | 34 ++++++++++------------------------
 flake.nix  |  5 ++++-
 2 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock
index 2ab0d3e3..7e6dd274 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,14 +2,16 @@
   "nodes": {
     "monad-schedule": {
       "inputs": {
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
-        "lastModified": 1730099708,
-        "narHash": "sha256-Usw6nWADyK3LL9dQ98H3GAxwI+FgtbzA4Us3MngyF64=",
+        "lastModified": 1731107003,
+        "narHash": "sha256-au6hQM8V4lZtYiwYZl88pAr7xNtFit3pQR0AXvUTuyo=",
         "owner": "turion",
         "repo": "monad-schedule",
-        "rev": "a891aa90747bc01fa6f34794d748aa316d905ce2",
+        "rev": "f6651c56975bd9e126b9d1d5c8eed0a304d38a30",
         "type": "github"
       },
       "original": {
@@ -20,27 +22,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1721258662,
-        "narHash": "sha256-EgRErDL4Xj0Mkz2ZqDJ1fIcebLJpvMKtF/lb+WJ8y+I=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ede8a2b8473fae013cfc0cca9400a8fcbd7cc021",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1730858696,
-        "narHash": "sha256-us4xhqqW6OkjCihXYuFArhwx91cTzns8FEY8lE4v7JQ=",
+        "lastModified": 1731569569,
+        "narHash": "sha256-yUjNI34R68uLg95nHzINg8ulpL77p4kOqUsCkMm1F28=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8541b4db5adb9dd835ed5d0023dec229987b7391",
+        "rev": "7f2d3d2febedabd8f5c9761373c99b9dcfa917e1",
         "type": "github"
       },
       "original": {
@@ -53,7 +39,7 @@
     "root": {
       "inputs": {
         "monad-schedule": "monad-schedule",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 560dc6e2..63909265 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,10 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
-    monad-schedule.url = "github:turion/monad-schedule";
+    monad-schedule = {
+      url = "github:turion/monad-schedule";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs:

From ea8cc3b667285b7eabc4b28ed4acd87bc1955717 Mon Sep 17 00:00:00 2001
From: ners <ners@gmx.ch>
Date: Thu, 14 Nov 2024 19:12:55 +0100
Subject: [PATCH 2/2] Enable flake checks in CI

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 393b5f1f..132035d7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -129,14 +129,14 @@ jobs:
         run: |
           nix fmt
           git diff --exit-code
+      - name: Flake check
+        run: nix flake check
       - name: Build all packages
         run: nix build --accept-flake-config
       - name: Run tests
         run: |
           nix develop --accept-flake-config -c cabal update
           nix develop --accept-flake-config -c cabal test all
-      # nix flake check breaks on IFD in multi-platform flake https://github.com/NixOS/nix/issues/4265
-      # - run: nix flake check
 
   cabal-check:
     name: Check and format all cabal files