Merge pull request #312697 from mweinelt/pefile-pypi-sdist

python311Packages.pefile: fetch from pypi

2 files changed, 21 insertions, 16 deletions

diff --git a/pkgs/development/python-modules/pefile/default.nix b/pkgs/development/python-modules/pefile/default.nix
index 55bd8c0cc07d3..97b3419d7b55d 100644
--- a/pkgs/development/python-modules/pefile/default.nix
+++ b/pkgs/development/python-modules/pefile/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , future
-, fetchFromGitHub
+, fetchPypi
 , setuptools-scm
 , pythonOlder
 }:
@@ -13,11 +13,10 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.6";
 
-  src = fetchFromGitHub {
-    owner = "erocarrera";
-    repo = pname;
-    rev = "refs/tags/v${version}";
-    hash = "sha256-lD8GpNl+cVNYTZUKFRF1/2kDwEbn/ekRBNBTYuFmFW0=";
+  # DON'T fetch from github, the repo is >60 MB due to test artifacts, which we cannot use
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-guYRQASz1pEcd8OVPjg4ZUsEURuLZuhYPbcMZZmAF9w=";
   };
 
   nativeBuildInputs = [
@@ -28,7 +27,7 @@ buildPythonPackage rec {
     future
   ];
 
-  # Test data encrypted
+  # Test data contains properitary executables and malware, and is therefore encrypted
   doCheck = false;
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/virt-firmware/default.nix b/pkgs/development/python-modules/virt-firmware/default.nix
index d5da9d57c40f2..f319de6370fb3 100644
--- a/pkgs/development/python-modules/virt-firmware/default.nix
+++ b/pkgs/development/python-modules/virt-firmware/default.nix
@@ -1,4 +1,6 @@
 { lib
+, pkgs
+, stdenv
 , buildPythonPackage
 , fetchPypi
 , setuptools
@@ -10,7 +12,6 @@
 buildPythonPackage rec {
   pname = "virt-firmware";
   version = "24.4";
-
   pyproject = true;
 
   src = fetchPypi {
@@ -18,22 +19,27 @@ buildPythonPackage rec {
     hash = "sha256-rqhaKDOQEOj6bcRz3qZJ+a4yG1qTC9SUjuxMhZlnmwU=";
   };
 
-  pythonImportsCheck = [ "virt.firmware.efi" ];
+  build-system = [
+    setuptools
+  ];
 
-  nativeBuildInputs = [
+  dependencies = [
     setuptools
+    cryptography
+    pefile
   ];
 
+  # tests require systemd-detect-virt
+  doCheck = lib.meta.availableOn stdenv.hostPlatform pkgs.systemd;
+
   nativeCheckInputs = [
     pytestCheckHook
+    pkgs.systemd
   ];
-  pytestFlagsArray = ["tests/tests.py"];
 
-  propagatedBuildInputs = [
-    setuptools
-    cryptography
-    pefile
-  ];
+  pytestFlagsArray = [ "tests/tests.py" ];
+
+  pythonImportsCheck = [ "virt.firmware.efi" ];
 
   meta = with lib; {
     description = "Tools for virtual machine firmware volumes";