From cf82d345079fb943dc5deae31abd738e34f8910d Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 16 Jan 2023 03:21:58 +0100 Subject: [PATCH] Fix laminar confis --- nixos/roles/laminar/projects.nix | 1 - nixos/roles/laminar/test-config.hs | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/roles/laminar/projects.nix b/nixos/roles/laminar/projects.nix index ff85537b..d3d6e6d7 100644 --- a/nixos/roles/laminar/projects.nix +++ b/nixos/roles/laminar/projects.nix @@ -25,7 +25,6 @@ ''; in { services.laminar.cfgFiles.jobs = { - "logfeed.run" = mkJob "logfeed"; "blog.run" = mkJob "blog"; "haskell-taskwarrior.run" = mkJob "haskell-taskwarrior"; "nix-output-monitor.run" = mkJob "nix-output-monitor"; diff --git a/nixos/roles/laminar/test-config.hs b/nixos/roles/laminar/test-config.hs index 00bcded8..2c42693f 100644 --- a/nixos/roles/laminar/test-config.hs +++ b/nixos/roles/laminar/test-config.hs @@ -20,7 +20,7 @@ import Say import Shh import System.Environment (getEnv, setEnv) -load Absolute ["laminarc", "git", "nix-build"] +load Absolute ["laminarc", "git", "nix"] repo = "git@hera.m-0.eu:nixos-config" @@ -51,7 +51,7 @@ main = do git "checkout" (toString branch) setEnv "LAMINAR_REASON" [i|Building config branch #{branch} for all systems in #{jobId}:#{runId}|] say [i|Starting builds of branch #{branch} for all systems.|] - concurrently_ (mapConcurrently_ (\x -> laminarc ["run", x, [i|BRANCH=#{branch}|]]) jobs) $ nix_build "test.nix" + concurrently_ (mapConcurrently_ (\x -> laminarc ["run", x, [i|BRANCH=#{branch}|]]) jobs) $ nix "flake" "check" say [i|Builds succeeded.|] when (branch == "main") $ do say [i|Deploying new config to localhost.|]