Nom workaround
This commit is contained in:
parent
e98b000787
commit
94820a6334
|
@ -37,9 +37,9 @@ in
|
||||||
say "Building ~/.modes for ${hostName}"
|
say "Building ~/.modes for ${hostName}"
|
||||||
nixPath <- myNixPath "${configPath}"
|
nixPath <- myNixPath "${configPath}"
|
||||||
setEnv "WITH_SECRETS" "false"
|
setEnv "WITH_SECRETS" "false"
|
||||||
nom_build nixPath (params ++ remoteBuildParams)
|
nix_build nixPath (params ++ remoteBuildParams) &!> StdOut |> nom
|
||||||
setEnv "WITH_SECRETS" "true"
|
setEnv "WITH_SECRETS" "true"
|
||||||
nom_build nixPath params
|
nix_build nixPath params &!> StdOut |> nom
|
||||||
activate_mode
|
activate_mode
|
||||||
'';
|
'';
|
||||||
quickUpdateMode = pkgs.writeHaskellScript
|
quickUpdateMode = pkgs.writeHaskellScript
|
||||||
|
|
|
@ -12,7 +12,7 @@ in
|
||||||
paths <- myNixPath "${configPath}"
|
paths <- myNixPath "${configPath}"
|
||||||
args <- getArgs
|
args <- getArgs
|
||||||
setEnv "WITH_SECRETS" "false"
|
setEnv "WITH_SECRETS" "false"
|
||||||
nom_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args)
|
nix_build (paths ++ buildSystemParams ++ ["--no-out-link"] ++ remoteBuildParams ++ fmap toString args) &!> StdOut |> nom
|
||||||
setEnv "WITH_SECRETS" "true"
|
setEnv "WITH_SECRETS" "true"
|
||||||
oldSystem <- readlink "-f" "/run/current-system" |> captureTrim
|
oldSystem <- readlink "-f" "/run/current-system" |> captureTrim
|
||||||
nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) &!> StdOut |> nom
|
nixos_rebuild (paths ++ ["switch"] ++ fmap toString args) &!> StdOut |> nom
|
||||||
|
|
Loading…
Reference in a new issue