From 93ff8f23fc96805330196f50bd8d89d734ec2185 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 29 Jun 2024 14:34:59 +0200 Subject: clickable: Switch to buildPythonApplication --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/top-level') diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28f987a534bc8..8fa707e4a6cd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15171,7 +15171,7 @@ with pkgs; clean = callPackage ../development/compilers/clean { }; - clickable = python3Packages.callPackage ../development/tools/clickable { }; + clickable = callPackage ../development/tools/clickable { }; closurecompiler = callPackage ../development/compilers/closure { }; -- cgit 1.4.1 From 11caffc507cbdac11f3803c84da6fbee9bc1b4f9 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sat, 29 Jun 2024 14:35:52 +0200 Subject: clickable: Move to by-name --- pkgs/by-name/cl/clickable/package.nix | 78 ++++++++++++++++++++++++++++ pkgs/development/tools/clickable/default.nix | 78 ---------------------------- pkgs/top-level/all-packages.nix | 2 - 3 files changed, 78 insertions(+), 80 deletions(-) create mode 100644 pkgs/by-name/cl/clickable/package.nix delete mode 100644 pkgs/development/tools/clickable/default.nix (limited to 'pkgs/top-level') diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix new file mode 100644 index 0000000000000..dc03acd70b36c --- /dev/null +++ b/pkgs/by-name/cl/clickable/package.nix @@ -0,0 +1,78 @@ +{ lib +, fetchFromGitLab +, python3Packages +, stdenv +}: + +python3Packages.buildPythonApplication rec { + pname = "clickable"; + version = "7.11.0"; + + src = fetchFromGitLab { + owner = "clickable"; + repo = "clickable"; + rev = "v${version}"; + sha256 = "sha256-OVS+FK2ABoKbBFLDc3drcjeaa3yO9/8Ah8FzlN2fd8g="; + }; + + propagatedBuildInputs = with python3Packages; [ + cookiecutter + requests + pyyaml + jsonschema + argcomplete + watchdog + ]; + + nativeCheckInputs = [ python3Packages.pytestCheckHook ]; + + disabledTests = [ + # Tests require docker + "test_cpp_plugin" + "test_html" + "test_python" + "test_qml_only" + "test_rust" + "test_review" + "test_click_build" + "test_no_device" + "test_no_file_temp" + "test_update" + "test_lib_build" + "test_clean" + "test_temp_exception" + "test_create_interactive" + "test_create_non_interactive" + "test_kill" + "test_writable_image" + "test_no_desktop_mode" + "test_no_lock" + "test_run_default_command" + "test_run" + "test_no_container_mode_log" + "test_custom_mode_log" + "test_skip_desktop_mode" + "test_log" + "test_custom_lock_file" + "test_launch_custom" + "test_launch" + "test_devices" + "test_install" + "test_skip_container_mode" + ] ++ + # There are no docker images available for the aarch64 architecutre + # which are required for tests. + lib.optionals stdenv.isAarch64 [ + "test_arch" + "test_restricted_arch" + ]; + + meta = { + description = "Build system for Ubuntu Touch apps"; + mainProgram = "clickable"; + homepage = "https://clickable-ut.dev"; + changelog = "https://clickable-ut.dev/en/latest/changelog.html"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ ilyakooo0 ]; + }; +} diff --git a/pkgs/development/tools/clickable/default.nix b/pkgs/development/tools/clickable/default.nix deleted file mode 100644 index dc03acd70b36c..0000000000000 --- a/pkgs/development/tools/clickable/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ lib -, fetchFromGitLab -, python3Packages -, stdenv -}: - -python3Packages.buildPythonApplication rec { - pname = "clickable"; - version = "7.11.0"; - - src = fetchFromGitLab { - owner = "clickable"; - repo = "clickable"; - rev = "v${version}"; - sha256 = "sha256-OVS+FK2ABoKbBFLDc3drcjeaa3yO9/8Ah8FzlN2fd8g="; - }; - - propagatedBuildInputs = with python3Packages; [ - cookiecutter - requests - pyyaml - jsonschema - argcomplete - watchdog - ]; - - nativeCheckInputs = [ python3Packages.pytestCheckHook ]; - - disabledTests = [ - # Tests require docker - "test_cpp_plugin" - "test_html" - "test_python" - "test_qml_only" - "test_rust" - "test_review" - "test_click_build" - "test_no_device" - "test_no_file_temp" - "test_update" - "test_lib_build" - "test_clean" - "test_temp_exception" - "test_create_interactive" - "test_create_non_interactive" - "test_kill" - "test_writable_image" - "test_no_desktop_mode" - "test_no_lock" - "test_run_default_command" - "test_run" - "test_no_container_mode_log" - "test_custom_mode_log" - "test_skip_desktop_mode" - "test_log" - "test_custom_lock_file" - "test_launch_custom" - "test_launch" - "test_devices" - "test_install" - "test_skip_container_mode" - ] ++ - # There are no docker images available for the aarch64 architecutre - # which are required for tests. - lib.optionals stdenv.isAarch64 [ - "test_arch" - "test_restricted_arch" - ]; - - meta = { - description = "Build system for Ubuntu Touch apps"; - mainProgram = "clickable"; - homepage = "https://clickable-ut.dev"; - changelog = "https://clickable-ut.dev/en/latest/changelog.html"; - license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ ilyakooo0 ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8fa707e4a6cd5..a6d470272ab55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15171,8 +15171,6 @@ with pkgs; clean = callPackage ../development/compilers/clean { }; - clickable = callPackage ../development/tools/clickable { }; - closurecompiler = callPackage ../development/compilers/closure { }; cmdstan = callPackage ../development/compilers/cmdstan { }; -- cgit 1.4.1