diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/immich-cli/default.nix | 71 | ||||
-rw-r--r-- | pkgs/tools/misc/panoply/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/wyrd/default.nix | 2 |
3 files changed, 58 insertions, 19 deletions
diff --git a/pkgs/tools/misc/immich-cli/default.nix b/pkgs/tools/misc/immich-cli/default.nix index 82d8e96ec798a..21d0600d92b13 100644 --- a/pkgs/tools/misc/immich-cli/default.nix +++ b/pkgs/tools/misc/immich-cli/default.nix @@ -1,31 +1,70 @@ { lib , buildNpmPackage , fetchFromGitHub +, testers }: -buildNpmPackage { - pname = "immich-cli"; - version = "2.0.6"; - +let + version = "2.2.4"; src = fetchFromGitHub { owner = "immich-app"; repo = "immich"; # Using a fixed commit until upstream has release tags for cli. - rev = "014adf175ad50a61f92804666940e267ab329064"; - hash = "sha256-MK3Watq5/Zp+rymCIfWxAXSgBPDE13g23uDnW7A5x9g="; + rev = "8c2195c8205156f6e3168cc52fa34db334568ea9"; + hash = "sha256-Tseu6aIrYU4Af/jWDi2wDtP77n/aogp7Qkn9mosMaes="; }; - - npmDepsHash = "sha256-ssxOXKE1t/bSb972w/cBeK61IrqPLmx9ODMn6D+2Ezw="; - - postPatch = '' - cd cli - ''; - - meta = { + meta' = { description = "CLI utilities for Immich to help upload images and videos"; homepage = "https://github.com/immich-app/immich"; license = lib.licenses.mit; - mainProgram = "immich"; maintainers = with lib.maintainers; [ felschr pineapplehunter ]; + mainProgram = "immich"; + }; + + open-api-typescript-sdk = buildNpmPackage { + pname = "immich-cli-openapi-typescript-sdk"; + inherit src version; + + npmDepsHash = "sha256-WhNdFaFBwb6ehEQgbNJGdzPb3FdJk1Nefi8DcJfY9Wc="; + + postPatch = '' + cd open-api/typescript-sdk + ''; + meta = { + # using inherit for `builtin.unsafeGetAttrPos` to work correctly + inherit (meta') + description + homepage + license + maintainers; + }; + }; + + immich-cli = buildNpmPackage { + pname = "immich-cli"; + inherit src version; + + npmDepsHash = "sha256-aSTN+I8B/aLT2ItGoyZTlbdn1VCK0ZmOb1QG7ZQuz+Q="; + + postPatch = '' + ln -sv ${open-api-typescript-sdk}/lib/node_modules/@immich/sdk/{build,node_modules} open-api/typescript-sdk + cd cli + ''; + + passthru = { + inherit open-api-typescript-sdk; + tests.version = testers.testVersion { package = immich-cli; }; + }; + + meta = { + # using inherit for `builtin.unsafeGetAttrPos` to work correctly + inherit (meta') + description + homepage + license + maintainers + mainProgram; + }; }; -} +in +immich-cli diff --git a/pkgs/tools/misc/panoply/default.nix b/pkgs/tools/misc/panoply/default.nix index d2a04e3c38f7e..2aef5a0788a8d 100644 --- a/pkgs/tools/misc/panoply/default.nix +++ b/pkgs/tools/misc/panoply/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "panoply"; - version = "5.4.1"; + version = "5.4.3"; src = fetchurl { url = "https://www.giss.nasa.gov/tools/panoply/download/PanoplyJ-${version}.tgz"; - sha256 = "sha256-C/9kFWDpv4bzqpsUcGpZn7P+fqU6teU39HibYhhva3o="; + sha256 = "sha256-xey1Og0TEMgCc9Me/np7BGnUNYTz98gMFzLm2IcQHtw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix index 8f5ad8268e693..18647cae1a232 100644 --- a/pkgs/tools/misc/wyrd/default.nix +++ b/pkgs/tools/misc/wyrd/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { downloadPage = "http://pessimization.com/software/wyrd/"; license = licenses.gpl2Only; maintainers = [ maintainers.prikhi ]; - platforms = platforms.linux; + platforms = platforms.unix; mainProgram = "wyrd"; }; } |