python3Packages.ixia: 1.3.2 → 2.0.0, oddsprout: 0.1.1 → 0.1.2 (#377152)

Author: FliegendeWurst

pkgs/by-name/od/oddsprout/package.nix

@@ -0,0 +1,5 @@
+{
+  python3Packages,
+}:
+
+python3Packages.toPythonApplication python3Packages.oddsprout

pkgs/development/python-modules/ixia/default.nix

@@ -2,22 +2,25 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
+  hatchling,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "ixia";
-  version = "1.3.2";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "trag1c";
     repo = "ixia";
     tag = version;
-    hash = "sha256-lsov5AIT5uRf9nmS8ZsFmInKUFAxUATTbpfhV1fabhA=";
+    hash = "sha256-8STtLL63V+XnDqDNZOx7X9mkjUu176SSyQOL55LXFz0=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
   pythonImportsCheck = [ "ixia" ];
 
   meta = {

pkgs/development/python-modules/oddsprout/default.nix

@@ -2,8 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
-  poetry-core,
+  hatchling,
   pytestCheckHook,
   pythonOlder,
   dahlia,
@@ -12,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "oddsprout";
-  version = "0.1.1";
+  version = "0.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -21,28 +20,16 @@ buildPythonPackage rec {
     owner = "trag1c";
     repo = "oddsprout";
     tag = "v${version}";
-    hash = "sha256-BOUYq4yny3ScgzCzx2cpeK4e7nxxwTj8mJ42nr59mFA=";
+    hash = "sha256-RfAU3/Je3aC8JjQ51DqRCSAIfW2tQmQPP6G0/bfa1ZE=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     dahlia
     ixia
   ];
 
-  patches = [
-    # https://github.com/trag1c/oddsprout/pull/8
-    (fetchpatch2 {
-      name = "allow-periods-in-path.patch";
-      url = "https://github.com/trag1c/oddsprout/commit/59713a797e7748d48f59f92397981c93a81f2c28.patch";
-      hash = "sha256-GAIQQi5s4D6KbTSgmP2hlBizLATxtJ/hzpWqPX4O0U4=";
-    })
-  ];
-
-  # has one test `test_main_recursion_error`
-  # that has a very low (~1%) but nonzero chance to fail,
-  # this is known upstream (https://github.com/trag1c/oddsprout/issues/5)
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "oddsprout" ];
@@ -56,5 +43,6 @@ buildPythonPackage rec {
       itepastra
       sigmanificient
     ];
+    mainProgram = "oddsprout";
   };
 }