diff options
author | Alexander Bantyev | 2022-08-05 22:50:33 +0400 |
---|---|---|
committer | GitHub | 2022-08-05 22:50:33 +0400 |
commit | 41f15759dd8b638e7b4f299730d94d5aa46ab7eb (patch) | |
tree | ae57b487d36faa6b5d3da8e4016248508a26fb67 | |
parent | 184349d8149436748986d1bdba087e4149e9c160 (diff) | |
parent | 9e79e4028a8af2479233b5968f48f7f8d06376d1 (diff) |
Merge pull request #168 from rycee/runCommand
Replace runCommandNoCC by runCommand
-rw-r--r-- | flake.nix | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -19,7 +19,7 @@ { overlay = final: prev: let - system = final.system; + system = final.stdenv.hostPlatform.system; darwinOptions = final.lib.optionalAttrs final.stdenv.isDarwin { buildInputs = with final.darwin.apple_sdk.frameworks; [ SystemConfiguration @@ -101,7 +101,7 @@ }; deployChecks = deploy: builtins.mapAttrs (_: check: check deploy) { - schema = deploy: final.runCommandNoCC "jsonschema-deploy-system" { } '' + schema = deploy: final.runCommand "jsonschema-deploy-system" { } '' ${final.python3.pkgs.jsonschema}/bin/jsonschema -i ${final.writeText "deploy.json" (builtins.toJSON deploy)} ${./interface.json} && touch $out ''; @@ -109,7 +109,7 @@ let profiles = builtins.concatLists (final.lib.mapAttrsToList (nodeName: node: final.lib.mapAttrsToList (profileName: profile: [ (toString profile.path) nodeName profileName ]) node.profiles) deploy.nodes); in - final.runCommandNoCC "deploy-rs-check-activate" { } '' + final.runCommand "deploy-rs-check-activate" { } '' for x in ${builtins.concatStringsSep " " (map (p: builtins.concatStringsSep ":" p) profiles)}; do profile_path=$(echo $x | cut -f1 -d:) node_name=$(echo $x | cut -f2 -d:) |