From ab01a9ec56dbd2a23bce791ffae27e6a60eea29e Mon Sep 17 00:00:00 2001 From: Malte Brandy Date: Mon, 6 Jun 2022 19:08:36 +0200 Subject: [PATCH] Revert "try fixing bump-config script" This reverts commit b786d551cd041857a79701b179a270cd834f2fbe. --- nixos/roles/laminar/test-config.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/nixos/roles/laminar/test-config.nix b/nixos/roles/laminar/test-config.nix index c75b35ca..04fe9d76 100644 --- a/nixos/roles/laminar/test-config.nix +++ b/nixos/roles/laminar/test-config.nix @@ -98,13 +98,18 @@ in { pkgs.writeShellScript "test-config" '' FLAGS="" PATH=${standardPath}:$PATH ${test-config} ''; - "bump-config.run" = pkgs.writeHaskell "bump-config" - { - libraries = builtins.attrValues pkgs.myHaskellScriptPackages; - ghcEnv.PATH = "${standardPath}:$PATH"; - ghcArgs = ["-threaded"]; - } - (builtins.readFile ./bump-config.hs); + "bump-config.run" = let + bump-config = pkgs.writeHaskell "bump-config" + { + libraries = builtins.attrValues pkgs.myHaskellScriptPackages; + ghcEnv.PATH = "${standardPath}:$PATH"; + ghcArgs = ["-threaded"]; + } + (builtins.readFile ./bump-config.hs); + in + pkgs.writeShellScript "bump-config" '' + PATH=${standardPath}:$PATH ${bump-config} + ''; } // lib.listToAttrs (map mkHomeJob homes) // lib.listToAttrs (map mkSystemJob homes);