From bd3186e144238caddf9406ac6fd21c8042d78f41 Mon Sep 17 00:00:00 2001
From: maralorn <mail@maralorn.de>
Date: Mon, 16 Jan 2023 01:57:43 +0100
Subject: [PATCH] Fix apollo build

---
 lib/update-system.nix                                   | 2 +-
 nix/sources.json                                        | 2 +-
 overlays/kassandra/default.nix                          | 4 ++--
 overlays/logfeed/default.nix                            | 2 +-
 overlays/{haskell-dialog => wizards-dialog}/default.nix | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename overlays/{haskell-dialog => wizards-dialog}/default.nix (67%)

diff --git a/lib/update-system.nix b/lib/update-system.nix
index fcf07daa..e611ad90 100644
--- a/lib/update-system.nix
+++ b/lib/update-system.nix
@@ -17,7 +17,7 @@ in {
           nom_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args)
           setEnv "WITH_SECRETS" "true"
           oldSystem <- readlink "-f" "/run/current-system" |> captureTrim
-          nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) &!> StdOut |> nom
+          nixos_rebuild (paths ++ ["switch", "--no-flake"] ++ fmap toString args) &!> StdOut |> nom
           newSystem <- readlink "-f" "/run/current-system" |> captureTrim
           nvd "diff" oldSystem newSystem
     '';
diff --git a/nix/sources.json b/nix/sources.json
index 4b2b14fe..2e7daad4 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -82,5 +82,5 @@
         "type": "tarball",
         "url": "https://github.com/NixOS/nixpkgs/archive/6c8644fc37b6e141cbfa6c7dc8d98846c4ff0c2e.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
-    },
+    }
 }
diff --git a/overlays/kassandra/default.nix b/overlays/kassandra/default.nix
index 5f665910..01d2f50c 100644
--- a/overlays/kassandra/default.nix
+++ b/overlays/kassandra/default.nix
@@ -1,7 +1,7 @@
 final: prev: let
   haskellPackages = prev.haskellPackages.extend (self: super: {
-    kassandra = self.callCabal2nix "kassandra" ../apps/kassandra/kassandra {};
-    standalone = self.callCabal2nix "standalone" ../apps/kassandra/standalone {};
+    kassandra = self.callCabal2nix "kassandra" ../../apps/kassandra/kassandra {};
+    standalone = self.callCabal2nix "standalone" ../../apps/kassandra/standalone {};
   });
 in {
   kassandra = haskellPackages.standalone;
diff --git a/overlays/logfeed/default.nix b/overlays/logfeed/default.nix
index 2f56becf..af252a10 100644
--- a/overlays/logfeed/default.nix
+++ b/overlays/logfeed/default.nix
@@ -1,3 +1,3 @@
 final: prev: {
-  logfeed = prev.haskellPackages.callCabal2nix "logfeed" ../apps/logfeed {};
+  logfeed = prev.haskellPackages.callCabal2nix "logfeed" ../../apps/logfeed {};
 }
diff --git a/overlays/haskell-dialog/default.nix b/overlays/wizards-dialog/default.nix
similarity index 67%
rename from overlays/haskell-dialog/default.nix
rename to overlays/wizards-dialog/default.nix
index b99dcfef..5f36f348 100644
--- a/overlays/haskell-dialog/default.nix
+++ b/overlays/wizards-dialog/default.nix
@@ -1,3 +1,3 @@
 _: prev: {
-  wizards-dialog = prev.haskellPackages.callCabal2nix "wizards-dialog" ../apps/wizard-dialog {};
+  wizards-dialog = prev.haskellPackages.callCabal2nix "wizards-dialog" ../../apps/wizards-dialog {};
 }