From 448c978c5eba56822acaae7f63d73b35fba1097f Mon Sep 17 00:00:00 2001
From: Arthur Gautier <arthur.gautier@arista.com>
Date: Sun, 4 Sep 2022 17:42:37 -0700
Subject: [PATCH] ovmfvartool: use as a python package

---
 .../virtualization/ovmfvartool/default.nix    | 33 -------------------
 .../python-modules/ovmfvartool/default.nix    | 27 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 --
 pkgs/top-level/python-packages.nix            |  2 ++
 4 files changed, 29 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/ovmfvartool/default.nix
 create mode 100644 pkgs/development/python-modules/ovmfvartool/default.nix

diff --git a/pkgs/applications/virtualization/ovmfvartool/default.nix b/pkgs/applications/virtualization/ovmfvartool/default.nix
deleted file mode 100644
index 1367087e0832..000000000000
--- a/pkgs/applications/virtualization/ovmfvartool/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, stdenvNoCC, fetchFromGitHub, python3 }:
-
-stdenvNoCC.mkDerivation rec {
-  pname = "ovmfvartool";
-  version = "unstable-2021-06-16";
-
-  src = fetchFromGitHub {
-    owner = "hlandau";
-    repo = pname;
-    rev = "c4c0c24dce1d201f95dfd69fd7fd9d51ea301377";
-    hash = "sha256-3OvYAB41apPn1c2YTKBIEITmHSUMQ0oEijY5DhZWWGo=";
-  };
-
-  postPatch = let
-    pythonPkg = python3.withPackages (p: with p; [ pyyaml ]);
-  in ''
-    # needed in build but /usr/bin/env is not available in sandbox
-    substituteInPlace ovmfvartool \
-      --replace "/usr/bin/env python3" "${pythonPkg.interpreter}"
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    install -m 755 ovmfvartool $out/bin/
-  '';
-
-  meta = with lib; {
-    description = "Parse and generate OVMF_VARS.fd from Yaml";
-    homepage = "https://github.com/hlandau/ovmfvartool";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ baloo raitobezarius ];
-  };
-}
diff --git a/pkgs/development/python-modules/ovmfvartool/default.nix b/pkgs/development/python-modules/ovmfvartool/default.nix
new file mode 100644
index 000000000000..12f65fe86cf3
--- /dev/null
+++ b/pkgs/development/python-modules/ovmfvartool/default.nix
@@ -0,0 +1,27 @@
+{ lib, buildPythonPackage, fetchFromGitHub, pyyaml }:
+
+buildPythonPackage rec {
+  pname = "ovmfvartool";
+  version = "unstable-2022-09-04";
+
+  src = fetchFromGitHub {
+    owner = "hlandau";
+    repo = pname;
+    rev = "45e6b1e53967ee6590faae454c076febce096931";
+    hash = "sha256-XbvcE/MXNj5S5N7A7jxdwgEE5yMuB82Xg+PYBsFRIm0=";
+  };
+
+  propagatedBuildInputs = [ pyyaml ];
+
+  # has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "ovmfvartool" ];
+
+  meta = with lib; {
+    description = "Parse and generate OVMF_VARS.fd from Yaml";
+    homepage = "https://github.com/hlandau/ovmfvartool";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ baloo raitobezarius ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ff267fbc334..1656db9fb569 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23280,8 +23280,6 @@ with pkgs;
     tpmSupport = true;
   };
 
-  ovmfvartool = callPackage ../applications/virtualization/ovmfvartool { };
-
   ops = callPackage ../applications/virtualization/ops { };
 
   seabios = callPackage ../applications/virtualization/seabios { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec711739e657..f75a5c534cb6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6452,6 +6452,8 @@ in {
 
   ovh = callPackage ../development/python-modules/ovh { };
 
+  ovmfvartool = callPackage ../development/python-modules/ovmfvartool { };
+
   ovoenergy = callPackage ../development/python-modules/ovoenergy { };
 
   owslib = callPackage ../development/python-modules/owslib { };