Merge pull request #323368 from OPNA2608/update/clickable

clickable: Add Lomiri team to maintainers, 7.11.0 -> 8.2.0

3 files changed, 87 insertions, 87 deletions

diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix
new file mode 100644
index 0000000000000..28ead1ee695fc
--- /dev/null
+++ b/pkgs/by-name/cl/clickable/package.nix
@@ -0,0 +1,87 @@
+{
+  lib,
+  fetchFromGitLab,
+  gitUpdater,
+  python3Packages,
+  stdenv,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "clickable";
+  version = "8.2.0";
+
+  src = fetchFromGitLab {
+    owner = "clickable";
+    repo = "clickable";
+    rev = "v${version}";
+    sha256 = "sha256-MFzpeiWeqJ0MG8ouwRkYXD1e6Nsxshmz1NSzCIBRjZ0=";
+  };
+
+  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"
+      "test_godot_plugin"
+    ]
+    ++
+    # There are no docker images available for the aarch64 architecutre
+    # which are required for tests.
+    lib.optionals stdenv.isAarch64 [
+      "test_arch"
+      "test_restricted_arch"
+    ];
+
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
+
+  meta = {
+    description = "Build system for Ubuntu Touch apps";
+    mainProgram = "clickable";
+    homepage = "https://clickable-ut.dev";
+    changelog = "https://clickable-ut.dev/en/latest/changelog.html#changes-in-v${
+      lib.strings.replaceStrings [ "." ] [ "-" ] version
+    }";
+    license = lib.licenses.gpl3Only;
+    maintainers = lib.teams.lomiri.members ++ (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 5400e4189379d..0000000000000
--- a/pkgs/development/tools/clickable/default.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ lib
-, fetchFromGitLab
-, buildPythonPackage
-, cookiecutter
-, requests
-, pyyaml
-, jsonschema
-, argcomplete
-, pytestCheckHook
-, watchdog
-, stdenv
-}:
-
-buildPythonPackage rec {
-  pname = "clickable";
-  version = "7.11.0";
-
-  src = fetchFromGitLab {
-    owner = "clickable";
-    repo = "clickable";
-    rev = "v${version}";
-    sha256 = "sha256-OVS+FK2ABoKbBFLDc3drcjeaa3yO9/8Ah8FzlN2fd8g=";
-  };
-
-  propagatedBuildInputs = [
-    cookiecutter
-    requests
-    pyyaml
-    jsonschema
-    argcomplete
-    watchdog
-  ];
-
-  nativeCheckInputs = [ 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 51d0241cfdc92..a5020c42dfb9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15175,8 +15175,6 @@ with pkgs;
 
   clean = callPackage ../development/compilers/clean { };
 
-  clickable = python3Packages.callPackage ../development/tools/clickable { };
-
   closurecompiler = callPackage ../development/compilers/closure { };
 
   cmdstan = callPackage ../development/compilers/cmdstan { };