Merge pull request #250280 from dotlambda/immich-cli-buildNpmPackage

immich-cli: use buildNpmPackage
This commit is contained in:
Robert Schütz 2023-08-21 00:01:52 +00:00 committed by GitHub
commit 9daeb4c433
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 48 deletions

View file

@ -59,6 +59,7 @@ mapAliases {
gtop = pkgs.gtop; # added 2023-07-31
inherit (pkgs) htmlhint; # added 2023-08-19
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
inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
karma = pkgs.karma-runner; # added 2023-07-29

View file

@ -166,7 +166,6 @@
, "ijavascript"
, "inliner"
, "imapnotify"
, "immich"
, "insect"
, "intelephense"
, "ionic"

View file

@ -108600,53 +108600,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";

View file

@ -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 ];
};
}

View file

@ -1802,6 +1802,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 { };