treewide: various warning fixups

ops/maint/update_nixpkgs/default.nix

@@ -1,9 +1,7 @@
 { depot, lib, ... }:
 let
   inherit (depot) pkgs;
-  mercurial = (pkgs.mercurial.overridePythonAttrs (origAttrs: {
+  inherit (depot.nix.pkgs) mercurial;
-    propagatedBuildInputs = [pkgs.python3Packages.hg-evolve];
-  }));
   updateNixpkgs = pkgs.runCommand "update_nixpkgs" {
     buildInputs = with pkgs; [ makeWrapper ];
   } ''
@@ -25,7 +23,9 @@ pkgs.dockerTools.buildImage {
     ];
   };
 
-  contents = [
+  copyToRoot = pkgs.buildEnv {
+    name = "update_nixpkgs-root";
+    paths = [
       pkgs.cacert updateNixpkgs
       (pkgs.runCommand "update_nixpkgs_content" {} ''
   mkdir $out $out/root $out/root/.ssh $out/etc $out/tmp
@@ -58,4 +58,5 @@ share =
 EOF
       '')
     ];
+  };
 }

ops/nixos/bvm-heptapod/default.nix

@@ -5,6 +5,7 @@
 { config, depot, lib, pkgs, ... }:
 let
   inherit (depot.ops) secrets;
+  systemConfig = config;
 in {
   imports = [
     ../lib/bvm.nix
@@ -182,6 +183,7 @@ in {
         vim rxvt-unicode-unwrapped.terminfo kitty.terminfo rsync jq
         depot.nix.pkgs.heptapod-runner-mercurial
       ];
+      system.stateVersion = systemConfig.system.stateVersion;
     };
   };
 

py/icalfilter/default.nix

@@ -12,6 +12,7 @@ let
     propagatedBuildInputs = with ps; [
       zope_interface
       pytz
+      setuptools
     ];
 
     src = pkgs.fetchFromGitHub {

third_party/default.nix

@@ -62,7 +62,10 @@ rec {
         in origOut // {
           dockerImage = nixpkgs.dockerTools.buildImage {
             name = args.name;
-            contents = dockerData;
+            copyToRoot = nixpkgs.buildEnv {
+              name = "${args.name}-env";
+              paths = dockerData;
+            };
             config = {
               Entrypoint = [ "${origOut}/bin/${args.name}" ];
               Env = [