diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix index 092f2a9fe1ade..1214221f6e482 100644 --- a/pkgs/by-name/im/immich-cli/package.nix +++ b/pkgs/by-name/im/immich-cli/package.nix @@ -12,7 +12,7 @@ let in stdenv.mkDerivation rec { pname = "immich-cli"; - version = "2.2.86"; + version = "2.2.89"; inherit (immich) src pnpmDeps; postPatch = '' diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index f97adcb51b984..e6d7c84da0d13 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -34,7 +34,7 @@ }: let pnpm = pnpm_10; - version = "1.140.1"; + version = "1.142.0"; esbuild' = buildPackages.esbuild.override { buildGoModule = @@ -108,14 +108,14 @@ let owner = "immich-app"; repo = "immich"; tag = "v${version}"; - hash = "sha256-Bo9wFP0u39aoaNjc8K4Im3HRGZR/TLrDB7+UDAhV1xA="; + hash = "sha256-0nStZuSnb8tJ0+Y247MHitmMURl8vTuPLAhUm+OHctE="; }; pnpmDeps = pnpm.fetchDeps { pname = "immich"; inherit version src; fetcherVersion = 2; - hash = "sha256-DIcUKuU+ToRh/kSLcs4ZEHy7zhFir2nlbRx+/kMagrA="; + hash = "sha256-aYG5SpFZxhbz32YAdP39RYwn2GV+mFWhddd4IFuPuz8="; }; web = stdenv.mkDerivation { @@ -146,10 +146,6 @@ let runHook postInstall ''; }; - - vips' = vips.overrideAttrs (prev: { - mesonFlags = prev.mesonFlags ++ [ "-Dtiff=disabled" ]; - }); in stdenv.mkDerivation { pname = "immich"; @@ -186,7 +182,7 @@ stdenv.mkDerivation { pango pixman # Required for sharp - vips' + vips ]; env.SHARP_FORCE_GLOBAL_LIBVIPS = 1; diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix index 0a560aa192142..c0ea8a059fab1 100644 --- a/pkgs/by-name/vi/vips/package.nix +++ b/pkgs/by-name/vi/vips/package.nix @@ -5,8 +5,8 @@ # Native build inputs docbook-xsl-nons, + gi-docgen, gobject-introspection, - gtk-doc, meson, ninja, pkg-config, @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "vips"; - version = "8.16.1"; + version = "8.17.1"; outputs = [ "bin" @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "libvips"; repo = "libvips"; tag = "v${finalAttrs.version}"; - hash = "sha256-F2ymfvqwuCtNtFIOLgXvqRWATSMaeV7EQKYyQalCNfc="; + hash = "sha256-Sc2BWdQIgL/dI0zfbEQVCs3+1QBrLE7BsE3uFHe9C/c="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -74,6 +74,10 @@ stdenv.mkDerivation (finalAttrs: { ''; }; + postPatch = '' + patchShebangs . + ''; + nativeBuildInputs = [ docbook-xsl-nons gobject-introspection @@ -82,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { pkg-config ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) [ - gtk-doc + gi-docgen ]; buildInputs = [ @@ -127,10 +131,14 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "introspection" withIntrospection) ] ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isFreeBSD) ( - lib.mesonBool "gtk_doc" true + lib.mesonBool "docs" true ) ++ lib.optional (imagemagick == null) (lib.mesonEnable "magick" false); + postFixup = '' + moveToOutput "share/doc" "$devdoc" + ''; + passthru = { tests = { pkg-config = testers.hasPkgConfigModules { @@ -144,17 +152,17 @@ stdenv.mkDerivation (finalAttrs: { updateScript = nix-update-script { extraArgs = [ "--version-regex" - "v([0-9.]+)" + "^v([0-9.]+)$" ]; }; }; - meta = with lib; { + meta = { changelog = "https://github.com/libvips/libvips/blob/${finalAttrs.src.rev}/ChangeLog"; homepage = "https://www.libvips.org/"; description = "Image processing system for large images"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ + license = lib.licenses.lgpl2Plus; + maintainers = with lib.maintainers; [ kovirobi anthonyroussel ]; @@ -162,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: { "vips" "vips-cpp" ]; - platforms = platforms.unix; + platforms = lib.platforms.unix; mainProgram = "vips"; }; })