chore: prepare for poetry2nix removal/nixops packaging changes in nixpkgs

doc/release-notes/index.rst

@@ -797,7 +797,7 @@ This a minor bugfix release.
    completed. Previously this was done before, but that could lead to
    volumes not being able to detach without needing to stop the machine.
 
--  Added a command-line option ``--repair`` as a convient way to pass this
+-  Added a command-line option ``--repair`` as a convenient way to pass this
    option, which allows repairing of broken or changed paths in the nix
    store, to nix-build calls that nixops performs. Note that this option
    only works in nix setups that run without the nix daemon.

flake.nix

@@ -1,20 +1,20 @@
 {
   description = "NixOps: a tool for deploying to [NixOS](https://nixos.org) machines in a network or the cloud";
 
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
+
+  inputs.poetry2nix.url = "github:nix-community/poetry2nix";
+  inputs.poetry2nix.inputs.nixpkgs.follows = "nixpkgs";
 
   inputs.utils.url = "github:numtide/flake-utils";
 
-  outputs = { self, nixpkgs, utils }: utils.lib.eachDefaultSystem (system: let
+  outputs = { self, nixpkgs, poetry2nix, utils }: utils.lib.eachDefaultSystem (system: let
     pkgs = import nixpkgs { inherit system; };
+    poetry2nix' = import poetry2nix { inherit pkgs; };
 
-    pythonEnv = (pkgs.poetry2nix.mkPoetryEnv {
+    pythonEnv = poetry2nix'.mkPoetryEnv {
       projectDir = ./.;
-      overrides = [
-        pkgs.poetry2nix.defaultPoetryOverrides
-        (import ./overrides.nix { inherit pkgs; })
-      ];
-    });
+    };
     linters.doc = pkgs.writers.writeBashBin "lint-docs" ''
       set -eux
       # When running it in the Nix sandbox, there is no git repository
@@ -57,22 +57,14 @@
 
     defaultApp = apps.default;
 
-    packages.default = let
-      overrides = import ./overrides.nix { inherit pkgs; };
-
-    in pkgs.poetry2nix.mkPoetryApplication {
+    packages.default = poetry2nix'.mkPoetryApplication {
       projectDir = ./.;
 
       propagatedBuildInputs = [
         pkgs.openssh
         pkgs.rsync
       ];
 
-      overrides = [
-        pkgs.poetry2nix.defaultPoetryOverrides
-        overrides
-      ];
-
       # TODO: Re-add manual build
     };
 
@@ -118,7 +110,7 @@
       name = "nixops-docs";
       # we use cleanPythonSources because the default gitignore
       # implementation doesn't support the restricted evaluation
-      src = pkgs.poetry2nix.cleanPythonSources {
+      src = poetry2nix'.cleanPythonSources {
         src = ./.;
       };
 
@@ -138,7 +130,7 @@
         name = "check-lint-docs";
         # we use cleanPythonSources because the default gitignore
         # implementation doesn't support the restricted evaluation
-        src = pkgs.poetry2nix.cleanPythonSources {
+        src = poetry2nix'.cleanPythonSources {
           src = ./.;
         };
         dontBuild = true;

nixops/nix_expr.py

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 import functools
 import string
-from typing import Iterable, Optional, Any, List, Tuple, Union, Dict
+from typing import Iterable, Optional, Any, List, Sequence, Tuple, Union, Dict
 from textwrap import dedent
 
 __all__ = ["py2nix", "nix2py", "nixmerge", "expand_dict", "RawValue", "Function"]
@@ -81,12 +81,12 @@ class Container(object):
     def __init__(
         self,
         prefix: str,
-        children: List,
+        children: Sequence[Union[RawValue, "Container"]],
         suffix: str,
         inline_variant: Optional[ValueLike] = None,
     ):
         self.prefix: str = prefix
-        self.children: List = children
+        self.children = children
         self.suffix: str = suffix
         self.inline_variant = inline_variant
 
@@ -99,7 +99,7 @@ def get_min_length(self) -> int:
             + len(self.suffix)
             + 1
             + len(self.children)
-            + sum([child.get_min_length() for child in self.children])
+            + sum([child.get_min_length() or 0 for child in self.children])
         )
 
     def is_inlineable(self) -> bool:

nixops/plugins/hookspecs.py

@@ -11,3 +11,4 @@ def plugin() -> Plugin:
     """
     Register a plugin base class
     """
+    raise NotImplementedError

nixops/util.py

@@ -15,6 +15,7 @@
 import logging
 import atexit
 import re
+import typing
 import typeguard  # type: ignore
 import inspect
 import shlex
@@ -139,9 +140,7 @@ def __init__(self, *args: ImmutableValidatedObject, **kwargs):
         # Support inheritance
         anno: Dict = {}
         for x in reversed(self.__class__.mro()):
-            if not hasattr(x, "__annotations__"):
-                continue
-            anno.update(x.__annotations__)
+            anno.update(typing.get_type_hints(x))
 
         def _transform_value(key: Any, value: Any) -> Any:
             ann = anno.get(key)
@@ -166,7 +165,7 @@ def _transform_value(key: Any, value: Any) -> Any:
                             new_value.append(v)
                 value = tuple(new_value)
 
-            typeguard.check_type(key, value, ann)
+            typeguard.check_type(value, ann)
 
             return value