maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

try fixing bump-config script

Browse source
This commit is contained in:
Malte Brandy 2022-06-06 11:18:10 +02:00
parent 8e202d533b
commit b786d551cd
2 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/roles/laminar/bump-config.hs
View file

@ -22,7 +22,7 @@ load Absolute ["git", "niv"]
paths :: [Text]
paths =
$$( bindCode (runIO pathBinsAbs) \rawPaths ->
let wantedPaths :: [Text] = mapMaybe (\x -> foldr (<|>) Nothing $ (\bin -> Text.stripSuffix [i|/#{bin}|] $ toText x) <$> ["git", "tar", "nix-prefetch-url", "gzip"]) rawPaths
let wantedPaths :: [Text] = mapMaybe (\x -> foldr (<|>) Nothing $ (\bin -> Text.stripSuffix [i|/#{bin}|] $ toText x) <$> ["git", "tar", "nix-prefetch-url", "gzip", "ssh"]) rawPaths
in liftTyped wantedPaths
)

19
nixos/roles/laminar/test-config.nix
View file

@ -98,18 +98,13 @@ in {
pkgs.writeShellScript "test-config" ''
FLAGS="" PATH=${standardPath}:$PATH ${test-config}
'';
"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}
'';
"bump-config.run" = pkgs.writeHaskell "bump-config"
{
libraries = builtins.attrValues pkgs.myHaskellScriptPackages;
ghcEnv.PATH = "${standardPath}:$PATH";
ghcArgs = ["-threaded"];
}
(builtins.readFile ./bump-config.hs);
}
// lib.listToAttrs (map mkHomeJob homes)
// lib.listToAttrs (map mkSystemJob homes);