refactor: add intrinsic default from tlp packages via patch

Also, make some test work and make minor package refactors
NixOS · Apr 9, 2023 · 21ffff0 · 21ffff0
1 parent 858edc1
commit 21ffff0
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 27 deletions.
diff --git a/pkgs/tools/misc/tlpui/default.nix b/pkgs/tools/misc/tlpui/default.nix
@@ -1,42 +1,52 @@
 {
   lib,
-  pkgs,
   wrapGAppsHook,
-  fetchFromGitHub,
   buildPythonPackage,
+  fetchFromGitHub,
+  isPy3k,
+  substituteAll,
+  tlp,
+  pytestCheckHook,
+  pycairo,
+  pygobject3,
+  pciutils,
+  usbutils,
+  gtk3,
+  cairo,
+  gobject-introspection,
 }:
+# FIX not working subprocess.CalledProcessError: Command '['pkexec', 'tlp-stat']'
 with lib;
   buildPythonPackage rec {
     pname = "tlpui";
-    version = "1.5.0-5";
-
-    # src = fetchFromGitHub {
-    #   owner = "d4nj1";
-    #   repo = "TLPUI";
-    #   rev = "tlpui-${version}";
-    #   sha256 = "sha256-Xzp+UrgPQ6OHEgnQ1aRvaZ+NWCSjeLdXG88zlgsaTw0=";
-    # };
+    version = "1.5.0-7";
+    # only python3 support
+    disabled = !isPy3k;
 
     src = fetchFromGitHub {
-      owner = "GeorgesAlkhouri";
+      owner = "d4nj1";
       repo = "TLPUI";
-      rev = "4c8b381f74cc7a21c0c16f86fc0626a17f984eea";
-      sha256 = "sha256-URdYZJh9dcWhdtTQee7KUUaQngTNHppL/rb2NSPrSSE=";
+      rev = "tlpui-${version}";
+      sha256 = "sha256-fhQgiMy829jdkQXtXgTayWXHtFwnHl8hgGVJzE0E8R0=";
     };
 
-    doCheck = false;
-    # TODO enable tests
-    # checkInputs = with pkgs.python3Packages; [tox pycodestyle];
-    # checkPhase = "tox";
-    nativeBuildInputs = [wrapGAppsHook];
+    patches = [
+      (substituteAll {
+        src = ./path.patch;
+        inherit tlp;
+      })
+    ];
+
+    # Fix test/test_tlp_settings.py
+    pytestFlagsArray = ["test/" "--ignore=test/test_tlp_settings.py"];
+    nativeCheckInputs = [pytestCheckHook gobject-introspection];
 
-    buildInputs = with pkgs; [
-      gtk3
-      cairo
-      gobject-introspection
+    nativeBuildInputs = [wrapGAppsHook];
+    buildInputs = [
+      tlp
     ];
     # sandbox = true;
-    propagatedBuildInputs = with pkgs; with pkgs.python3Packages; [pycairo pygobject3 tlp pciutils usbutils];
+    propagatedBuildInputs = [pycairo pygobject3 gtk3 pciutils usbutils gobject-introspection];
 
     meta = {
       homepage = "https://github.com/d4nj1/TLPUI";
@@ -47,9 +57,6 @@ with lib;
       '';
       license = licenses.gpl2Only;
       platforms = platforms.linux;
-      maintainers = with maintainers; [];
+      maintainers = with maintainers; [georgesalkhouri];
     };
   }
-# nix-build -E '((import <nixpkgs> {}).pkgs.python3Packages.callPackage (import ./default.nix) { })'
-# nix-build -E '((import ../../../../default.nix {}).pkgs.python3Packages.callPackage (import ./default.nix) { })'
-
diff --git a/pkgs/tools/misc/tlpui/path.patch b/pkgs/tools/misc/tlpui/path.patch
@@ -0,0 +1,13 @@
+diff --git a/tlpui/file.py b/tlpui/file.py
+index 4de5d58..f186bfa 100644
+--- a/tlpui/file.py
++++ b/tlpui/file.py
+@@ -27,7 +27,7 @@ def get_tlp_config_defaults(tlpversion: str):
+
+     if tlpversion not in ["0_8", "0_9", "1_0", "1_1", "1_2"]:
+         # update default values with intrinsic ones
+-        intrinsic_defaults_path = f"{settings.FOLDER_PREFIX}/usr/share/tlp/defaults.conf"
++        intrinsic_defaults_path = f"@tlp@/share/tlp/defaults.conf"
+         tlpconfig_defaults.update(extract_default_tlp_configs(intrinsic_defaults_path))
+
+     return tlpconfig_defaults