pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #215074 from dotlambda/vips-8.14.1


authored by Sandro and committed by GitHub c9fbcf04 06216485

+22 -10
unified split
+2
pkgs/servers/imaginary/default.nix
··· 39 "-X main.Version=${version}" 40 ]; 41 42 meta = with lib; { 43 homepage = "https://fly.io/docs/app-guides/run-a-global-image-service"; 44 changelog = "https://github.com/h2non/${pname}/releases/tag/v${version}";
··· 39 "-X main.Version=${version}" 40 ]; 41 42 + __darwinAllowLocalNetworking = true; 43 + 44 meta = with lib; { 45 homepage = "https://fly.io/docs/app-guides/run-a-global-image-service"; 46 changelog = "https://github.com/h2non/${pname}/releases/tag/v${version}";
+20 -10
pkgs/tools/graphics/vips/default.nix
··· 8 , Foundation 9 , python3 10 , fetchFromGitHub 11 - , fetchpatch 12 - , autoreconfHook 13 , gtk-doc 14 , gobject-introspection 15 # Optional dependencies 16 , libjpeg ··· 38 39 stdenv.mkDerivation rec { 40 pname = "vips"; 41 - version = "8.13.3"; 42 43 - outputs = [ "bin" "out" "man" "dev" ]; 44 45 src = fetchFromGitHub { 46 owner = "libvips"; 47 repo = "libvips"; 48 rev = "v${version}"; 49 - sha256 = "sha256-JkG1f2SGLI6tSNlFJ//S37PXIo+L318Mej0bI7p/dVo="; 50 # Remove unicode file names which leads to different checksums on HFS+ 51 # vs. other filesystems because of unicode normalisation. 52 postFetch = '' ··· 56 57 nativeBuildInputs = [ 58 pkg-config 59 - autoreconfHook 60 - gtk-doc 61 gobject-introspection 62 ]; 63 64 buildInputs = [ ··· 95 glib 96 ]; 97 98 - autoreconfPhase = '' 99 - NOCONFIGURE=1 ./autogen.sh 100 - ''; 101 102 meta = with lib; { 103 homepage = "https://libvips.github.io/libvips/"; 104 description = "Image processing system for large images"; 105 license = licenses.lgpl2Plus;
··· 8 , Foundation 9 , python3 10 , fetchFromGitHub 11 + , meson 12 + , ninja 13 , gtk-doc 14 + , docbook-xsl-nons 15 , gobject-introspection 16 # Optional dependencies 17 , libjpeg ··· 39 40 stdenv.mkDerivation rec { 41 pname = "vips"; 42 + version = "8.14.1"; 43 44 + outputs = [ "bin" "out" "man" "dev" ] ++ lib.optionals (!stdenv.isDarwin) [ "devdoc" ]; 45 46 src = fetchFromGitHub { 47 owner = "libvips"; 48 repo = "libvips"; 49 rev = "v${version}"; 50 + hash = "sha256-ajGVSVjnv78S/Xd3Aqn0N87I7m39DWKZHAQjwbog+5U="; 51 # Remove unicode file names which leads to different checksums on HFS+ 52 # vs. other filesystems because of unicode normalisation. 53 postFetch = '' ··· 57 58 nativeBuildInputs = [ 59 pkg-config 60 + meson 61 + ninja 62 + docbook-xsl-nons 63 gobject-introspection 64 + ] ++ lib.optionals (!stdenv.isDarwin) [ 65 + gtk-doc 66 ]; 67 68 buildInputs = [ ··· 99 glib 100 ]; 101 102 + mesonFlags = [ 103 + "-Dcgif=disabled" 104 + "-Dspng=disabled" 105 + "-Dpdfium=disabled" 106 + "-Dnifti=disabled" 107 + ] ++ lib.optionals (!stdenv.isDarwin) [ 108 + "-Dgtk_doc=true" 109 + ]; 110 111 meta = with lib; { 112 + changelog = "https://github.com/libvips/libvips/blob/${src.rev}/ChangeLog"; 113 homepage = "https://libvips.github.io/libvips/"; 114 description = "Image processing system for large images"; 115 license = licenses.lgpl2Plus;