Skip to content

Commit 41f1575

Browse files
authored
Merge pull request #168 from rycee/runCommand
Replace runCommandNoCC by runCommand
2 parents 184349d + 9e79e40 commit 41f1575

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
{
2020
overlay = final: prev:
2121
let
22-
system = final.system;
22+
system = final.stdenv.hostPlatform.system;
2323
darwinOptions = final.lib.optionalAttrs final.stdenv.isDarwin {
2424
buildInputs = with final.darwin.apple_sdk.frameworks; [
2525
SystemConfiguration
@@ -101,15 +101,15 @@
101101
};
102102

103103
deployChecks = deploy: builtins.mapAttrs (_: check: check deploy) {
104-
schema = deploy: final.runCommandNoCC "jsonschema-deploy-system" { } ''
104+
schema = deploy: final.runCommand "jsonschema-deploy-system" { } ''
105105
${final.python3.pkgs.jsonschema}/bin/jsonschema -i ${final.writeText "deploy.json" (builtins.toJSON deploy)} ${./interface.json} && touch $out
106106
'';
107107

108108
activate = deploy:
109109
let
110110
profiles = builtins.concatLists (final.lib.mapAttrsToList (nodeName: node: final.lib.mapAttrsToList (profileName: profile: [ (toString profile.path) nodeName profileName ]) node.profiles) deploy.nodes);
111111
in
112-
final.runCommandNoCC "deploy-rs-check-activate" { } ''
112+
final.runCommand "deploy-rs-check-activate" { } ''
113113
for x in ${builtins.concatStringsSep " " (map (p: builtins.concatStringsSep ":" p) profiles)}; do
114114
profile_path=$(echo $x | cut -f1 -d:)
115115
node_name=$(echo $x | cut -f2 -d:)

0 commit comments

Comments
 (0)