From 5daabc568f91cc4a569f40181a95151ea19a654e Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Wed, 31 Jul 2024 18:39:17 +0200 Subject: [PATCH] datalad-gooey: move to Python packages datalad-gooey expoes a module system. Therefore we move it to python-modules. Signed-off-by: Florian Brandes --- .../python-modules/datalad-gooey/default.nix} | 21 ++++++++++++------- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 18 insertions(+), 7 deletions(-) rename pkgs/{by-name/da/datalad-gooey/package.nix => development/python-modules/datalad-gooey/default.nix} (80%) diff --git a/pkgs/by-name/da/datalad-gooey/package.nix b/pkgs/development/python-modules/datalad-gooey/default.nix similarity index 80% rename from pkgs/by-name/da/datalad-gooey/package.nix rename to pkgs/development/python-modules/datalad-gooey/default.nix index c24bd27c87d7..a84e6c7a2be7 100644 --- a/pkgs/by-name/da/datalad-gooey/package.nix +++ b/pkgs/development/python-modules/datalad-gooey/default.nix @@ -1,15 +1,22 @@ { + buildPythonPackage, lib, git, - python3, fetchFromGitHub, - fetchpatch, darwin, + setuptools, stdenv, git-annex, + pyside6, + pyqtdarktheme, + datalad-next, + outdated, + datalad, + pytestCheckHook, + pytest-qt, }: -python3.pkgs.buildPythonApplication { +buildPythonPackage { pname = "datalad-gooey"; # many bug fixes on `master` but no new release version = "unstable-2024-02-20"; @@ -22,9 +29,9 @@ python3.pkgs.buildPythonApplication { hash = "sha256-8779SLcV4wwJ3124lteGzvimDxgijyxa818ZrumPMs4="; }; - build-system = with python3.pkgs; [ setuptools ]; + build-system = [ setuptools ]; - dependencies = with python3.pkgs; [ + dependencies = [ pyside6 pyqtdarktheme datalad-next @@ -39,8 +46,8 @@ python3.pkgs.buildPythonApplication { ''; nativeCheckInputs = [ - python3.pkgs.pytestCheckHook - python3.pkgs.pytest-qt + pytestCheckHook + pytest-qt git git-annex ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3ef5eb8a70bc..96ff9ea24f4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2185,6 +2185,8 @@ with pkgs; datalad = with python3Packages; toPythonApplication datalad; + datalad-gooey = with python3Packages; toPythonApplication datalad-gooey; + darcs-to-git = callPackage ../applications/version-management/darcs-to-git { }; degit = callPackage ../applications/version-management/degit { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b92cb57f4c6e..57d4f38b4c67 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2837,6 +2837,8 @@ self: super: with self; { datalad = callPackage ../development/python-modules/datalad { }; + datalad-gooey = callPackage ../development/python-modules/datalad-gooey { }; + datalad-next = callPackage ../development/python-modules/datalad-next { }; datamodeldict = callPackage ../development/python-modules/datamodeldict { };