From 6564bee9ee7390f1d4612b1ff654ac82a8b14d17 Mon Sep 17 00:00:00 2001
From: Robert Helgesson
Date: Thu, 4 Aug 2022 21:43:35 +0200
Subject: Replace runCommandNoCC by runCommand

The `runCommand` function has been using `stdenvNoCC` for quite a
while and `runCommandNoCC` is correspondingly deprecated. See

  https://github.com/NixOS/nixpkgs/commit/9feb144c8cc4f4b71a9c23b2f7fd6b2ea55649e5
---
 flake.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/flake.nix b/flake.nix
index 7a75d7c..bfb0b77 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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:)
-- 
cgit v1.2.3


From 9e79e4028a8af2479233b5968f48f7f8d06376d1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson
Date: Thu, 4 Aug 2022 22:44:47 +0200
Subject: Fetch system from `stdenv.hostPlatform`

The top-level `system` attribute has been deprecated for quite a
while. See

  https://github.com/NixOS/nixpkgs/commit/4246d6ce21d2d8d33e2d30f42b3d9d446c5dc143
---
 flake.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index bfb0b77..66ba60b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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
-- 
cgit v1.2.3