From d0aa935f90dfeb36c016455b900ce4e38e2cdaca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 19 Aug 2023 18:30:11 -0700
Subject: [PATCH] immich-cli: use buildNpmPackage

---
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 47 -------------------
 pkgs/tools/misc/immich-cli/default.nix        | 27 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 5 files changed, 30 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/tools/misc/immich-cli/default.nix

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index a889cc8cba7..f0957c1ca09 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -58,6 +58,7 @@ mapAliases {
   flood = pkgs.flood; # Added 2023-07-25
   gtop = pkgs.gtop; # added 2023-07-31
   hueadm = pkgs.hueadm; # added 2023-07-31
+  immich = pkgs.immich-cli; # added 2023-08-19
   indium = throw "indium was removed because it was broken"; # added 2023-08-19
   karma = pkgs.karma-runner; # added 2023-07-29
   manta = pkgs.node-manta; # Added 2023-05-06
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 1ce5bece441..1c573e76b7a 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -167,7 +167,6 @@
 , "ijavascript"
 , "inliner"
 , "imapnotify"
-, "immich"
 , "insect"
 , "intelephense"
 , "ionic"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 57a7d28a6fd..b88c425dd3f 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -108650,53 +108650,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  immich = nodeEnv.buildNodePackage {
-    name = "immich";
-    packageName = "immich";
-    version = "0.41.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/immich/-/immich-0.41.0.tgz";
-      sha512 = "F+DIJ41/1L4Cqs0NqubcD2qttYcxTs32DCZS2l6U7d+a4SVtbxYwtEkvljSKACka1vokmHetpveGyRau2FdZ8w==";
-    };
-    dependencies = [
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-3.2.1"
-      sources."asynckit-0.4.0"
-      sources."axios-0.26.1"
-      sources."chalk-2.4.2"
-      sources."cli-progress-3.12.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."combined-stream-1.0.8"
-      sources."commander-9.5.0"
-      sources."delayed-stream-1.0.0"
-      sources."emoji-regex-8.0.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."fdir-5.3.0"
-      sources."follow-redirects-1.15.2"
-      sources."form-data-4.0.0"
-      sources."has-flag-3.0.0"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."p-limit-3.1.0"
-      sources."picomatch-2.3.1"
-      sources."string-width-4.2.3"
-      sources."strip-ansi-6.0.1"
-      sources."supports-color-5.5.0"
-      sources."systeminformation-5.18.15"
-      sources."yocto-queue-0.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Immich CLI";
-      homepage = "https://github.com/alextran1502/immich-cli#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   insect = nodeEnv.buildNodePackage {
     name = "insect";
     packageName = "insect";
diff --git a/pkgs/tools/misc/immich-cli/default.nix b/pkgs/tools/misc/immich-cli/default.nix
new file mode 100644
index 00000000000..ec1483ccc0c
--- /dev/null
+++ b/pkgs/tools/misc/immich-cli/default.nix
@@ -0,0 +1,27 @@
+{ lib
+, buildNpmPackage
+, fetchFromGitHub
+}:
+
+buildNpmPackage rec {
+  pname = "immich-cli";
+  version = "0.41.0";
+
+  src = fetchFromGitHub {
+    owner = "immich-app";
+    repo = "CLI";
+    rev = "v${version}";
+    hash = "sha256-BpJNssNTJZASH5VTgTNJ0ILj0XucWvyn3Y7hQdfCEGQ=";
+  };
+
+  npmDepsHash = "sha256-GOYWPRAzV59iaX32I42dOOEv1niLiDIPagzQ/QBBbKc=";
+
+  meta = {
+    changelog = "https://github.com/immich-app/CLI/releases/tag/${src.rev}";
+    description = "CLI utilities for Immich to help upload images and videos";
+    homepage = "https://github.com/immich-app/CLI";
+    license = lib.licenses.mit;
+    mainProgram = "immich";
+    maintainers = with lib.maintainers; [ felschr ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d9a0880fdf..7d6107db7e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1798,6 +1798,8 @@ with pkgs;
 
   httm = darwin.apple_sdk_11_0.callPackage ../tools/filesystems/httm { };
 
+  immich-cli = callPackage ../tools/misc/immich-cli { };
+
   inherit (callPackage ../tools/networking/ivpn/default.nix {}) ivpn ivpn-service;
 
   jobber = callPackage ../tools/system/jobber { };