From cc614f97f038126bef43bdce188b58b3891675d2 Mon Sep 17 00:00:00 2001 From: Thiago Kenji Okada Date: Fri, 22 Mar 2024 17:49:25 +0000 Subject: retool: move to pkgs/by-name --- pkgs/applications/misc/retool/default.nix | 59 ------------------------------- pkgs/by-name/re/retool/package.nix | 59 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 59 insertions(+), 61 deletions(-) delete mode 100644 pkgs/applications/misc/retool/default.nix create mode 100644 pkgs/by-name/re/retool/package.nix diff --git a/pkgs/applications/misc/retool/default.nix b/pkgs/applications/misc/retool/default.nix deleted file mode 100644 index 8d7811120979..000000000000 --- a/pkgs/applications/misc/retool/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ lib -, stdenv -, python3 -, fetchFromGitHub -, qt6 -}: - -python3.pkgs.buildPythonApplication { - pname = "retool"; - version = "unstable-2023-08-24"; - - format = "pyproject"; - disabled = python3.pkgs.pythonOlder "3.10"; - - src = fetchFromGitHub { - owner = "unexpectedpanda"; - repo = "retool"; - rev = "d8acdb960d35b5a6b01d7dc66b7e40b3ec451301"; - hash = "sha256-6y/7RR7O2xYKXdxaFtkRfnSlwygp/LRDUozUJo6ue7s="; - }; - - nativeBuildInputs = with python3.pkgs; [ - poetry-core - pythonRelaxDepsHook - 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 - ] ++ - lib.optionals (stdenv.isLinux) [ - qt6.qtwayland - ]; - - propagatedBuildInputs = with python3.pkgs; [ - alive-progress - lxml - psutil - validators - pyside6 - strictyaml - ]; - - # Upstream has no tests - doCheck = false; - - meta = with lib; { - description = "A better filter tool for Redump and No-Intro dats"; - homepage = "https://github.com/unexpectedpanda/retool"; - license = licenses.bsd3; - maintainers = with maintainers; [ thiagokokada ]; - }; -} diff --git a/pkgs/by-name/re/retool/package.nix b/pkgs/by-name/re/retool/package.nix new file mode 100644 index 000000000000..8d7811120979 --- /dev/null +++ b/pkgs/by-name/re/retool/package.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, python3 +, fetchFromGitHub +, qt6 +}: + +python3.pkgs.buildPythonApplication { + pname = "retool"; + version = "unstable-2023-08-24"; + + format = "pyproject"; + disabled = python3.pkgs.pythonOlder "3.10"; + + src = fetchFromGitHub { + owner = "unexpectedpanda"; + repo = "retool"; + rev = "d8acdb960d35b5a6b01d7dc66b7e40b3ec451301"; + hash = "sha256-6y/7RR7O2xYKXdxaFtkRfnSlwygp/LRDUozUJo6ue7s="; + }; + + nativeBuildInputs = with python3.pkgs; [ + poetry-core + pythonRelaxDepsHook + 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 + ] ++ + lib.optionals (stdenv.isLinux) [ + qt6.qtwayland + ]; + + propagatedBuildInputs = with python3.pkgs; [ + alive-progress + lxml + psutil + validators + pyside6 + strictyaml + ]; + + # Upstream has no tests + doCheck = false; + + meta = with lib; { + description = "A better filter tool for Redump and No-Intro dats"; + homepage = "https://github.com/unexpectedpanda/retool"; + license = licenses.bsd3; + maintainers = with maintainers; [ thiagokokada ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c21673e4ff58..47d436fe6bf7 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 { }; -- cgit 1.4.1