Merge pull request #32 from hercules-ci/update

Update

.gitignore

@@ -0,0 +1,2 @@
+result
+result-*

README.md

@@ -8,8 +8,6 @@ machines in a network or cloud.
 * [Continuous build](http://hydra.nixos.org/jobset/nixops/master#tabs-jobs)
 * [Source code](https://github.com/NixOS/nixops)
 * [Issue Tracker](https://github.com/NixOS/nixops/issues)
-* [Mailing list / Google group](https://groups.google.com/forum/#!forum/nixops-users)
-* [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos)
 
 ## Quick Start
 

env.nix

@@ -0,0 +1,7 @@
+{ pkgs ? import <nixpkgs> {} }:
+let
+  overrides = import ./overrides.nix { inherit pkgs; };
+in pkgs.poetry2nix.mkPoetryEnv {
+  projectDir = ./.;
+  overrides = pkgs.poetry2nix.overrides.withDefaults overrides;
+}

nixops_virtd/backends/libvirtd.py

@@ -301,7 +301,10 @@ def read_file(stream, nbytes, f):
 
     def _get_qemu_executable(self):
         domaincaps_xml = self.conn.getDomainCapabilities(
-            emulatorbin=None, arch="x86_64", machine=None, virttype="kvm",
+            emulatorbin=None,
+            arch="x86_64",
+            machine=None,
+            virttype="kvm",
         )
         domaincaps = ElementTree.fromstring(domaincaps_xml)
         return domaincaps.find("./path").text.strip()

overrides.nix

@@ -12,4 +12,8 @@ self: super: {
     propagatedBuildInputs = [ pkgs.libvirt ];
   });
 
+  pathspec = super.pathspec.overridePythonAttrs({ nativeBuildInputs ? [], ... }: {
+    nativeBuildInputs = nativeBuildInputs ++ [ self.flit-core ];
+  });
+
 }

pyproject.toml

@@ -6,17 +6,17 @@ authors = ["Amine Chikhaoui <[email protected]>"]
 include = [ "nixops_libvirtd/nix/*.nix" ]
 
 [tool.poetry.dependencies]
-python = "^3.7"
+python = "^3.10"
 nixops = {git = "https://github.com/NixOS/nixops.git"}
-libvirt-python = "^8.0"
+libvirt-python = "^9.0"
 
 [tool.poetry.plugins."nixops"]
 virtd = "nixops_virtd.plugin"
 
 [tool.poetry.dev-dependencies]
 nose = "^1.3.7"
-mypy = "^0.770"
-black = "^19.10b0"
+mypy = "^0.961"
+black = "^22.6.0"
 flake8 = "^3.8.2"
 
 [build-system]

shell.nix

@@ -1,12 +1,8 @@
 { pkgs ? import <nixpkgs> {} }:
-let
-  overrides = import ./overrides.nix { inherit pkgs; };
-in pkgs.mkShell {
+
+pkgs.mkShell {
   buildInputs = [
-    (pkgs.poetry2nix.mkPoetryEnv {
-      projectDir = ./.;
-      overrides = pkgs.poetry2nix.overrides.withDefaults overrides;
-    })
+    (import ./env.nix { inherit pkgs; })
     pkgs.poetry
     pkgs.pkgconfig
     pkgs.libvirt