about summary refs log tree commit diff
diff options
context:
space:
mode:
authorThiago Kenji Okada <thiagokokada@gmail.com>2024-03-23 00:41:34 +0000
committerGitHub <noreply@github.com>2024-03-23 00:41:34 +0000
commit555c3e43f121399e7b649528cd02a055676a5909 (patch)
tree942b3d43065fb6dea56fdbb7dfb3ba2877574255
parent8a42eb940f5c4cadd02e2848753e0e2f4a213d7e (diff)
parent6588a7e950018d2355ce6c434b71d69edb7e53ef (diff)
downloadnixlib-555c3e43f121399e7b649528cd02a055676a5909.tar
nixlib-555c3e43f121399e7b649528cd02a055676a5909.tar.gz
nixlib-555c3e43f121399e7b649528cd02a055676a5909.tar.bz2
nixlib-555c3e43f121399e7b649528cd02a055676a5909.tar.lz
nixlib-555c3e43f121399e7b649528cd02a055676a5909.tar.xz
nixlib-555c3e43f121399e7b649528cd02a055676a5909.tar.zst
nixlib-555c3e43f121399e7b649528cd02a055676a5909.zip
Merge pull request #298126 from thiagokokada/bump-retool
retool: unstable-2023-08-24 -> 2.02.2-unstable-2024-03-17
-rw-r--r--pkgs/by-name/re/retool/package.nix (renamed from pkgs/applications/misc/retool/default.nix)18
-rw-r--r--pkgs/top-level/all-packages.nix2
2 files changed, 7 insertions, 13 deletions
diff --git a/pkgs/applications/misc/retool/default.nix b/pkgs/by-name/re/retool/package.nix
index 8d7811120979..18a982176d9c 100644
--- a/pkgs/applications/misc/retool/default.nix
+++ b/pkgs/by-name/re/retool/package.nix
@@ -7,30 +7,25 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "retool";
-  version = "unstable-2023-08-24";
+  version = "2.02.2-unstable-2024-03-17";
 
-  format = "pyproject";
+  pyproject = true;
   disabled = python3.pkgs.pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "unexpectedpanda";
     repo = "retool";
-    rev =  "d8acdb960d35b5a6b01d7dc66b7e40b3ec451301";
-    hash = "sha256-6y/7RR7O2xYKXdxaFtkRfnSlwygp/LRDUozUJo6ue7s=";
+    rev = "30d547c7d04b8cbf7710b2037388bf18a00a0c22";
+    hash = "sha256-5Tmi3eVJh9STP9A0dDNPDs4SlIWHw8sk+g1GgpnmqeE=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
-    poetry-core
-    pythonRelaxDepsHook
+    hatchling
     qt6.wrapQtAppsHook
   ];
 
   pythonRelaxDeps = true;
 
-  # ERROR: Could not find a version that satisfies the requirement PySide6 (from retool) (from versions: none)
-  # ERROR: No matching distribution found for PySide6
-  pythonRemoveDeps = [ "PySide6" ];
-
   buildInputs = [
     qt6.qtbase
   ] ++
@@ -40,11 +35,12 @@ python3.pkgs.buildPythonApplication {
 
   propagatedBuildInputs = with python3.pkgs; [
     alive-progress
+    darkdetect
     lxml
     psutil
-    validators
     pyside6
     strictyaml
+    validators
   ];
 
   # Upstream has no tests
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e16291ca8a49..4c3c4b570d99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6252,8 +6252,6 @@ with pkgs;
 
   reg = callPackage ../tools/virtualization/reg { };
 
-  retool = callPackage ../applications/misc/retool { };
-
   rex = callPackage ../tools/system/rex { };
 
   river = callPackage ../applications/window-managers/river { };