diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics')
27 files changed, 136 insertions, 91 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix index 8ac049648889..261df37e9aa9 100644 --- a/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -49,13 +49,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.1-25"; + version = "7.1.1-28"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = finalAttrs.version; - hash = "sha256-HKDeeh8DNj0y7wS4DqctXhmNaOqZ02JeBXRFrEpH0M4="; + hash = "sha256-WT058DZzMrNKn9E56dH476iCgeOi7QQ3jNBxKAqT6h4="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big diff --git a/nixpkgs/pkgs/applications/graphics/digikam/default.nix b/nixpkgs/pkgs/applications/graphics/digikam/default.nix index be714028ec9a..8bc94f9c2b23 100644 --- a/nixpkgs/pkgs/applications/graphics/digikam/default.nix +++ b/nixpkgs/pkgs/applications/graphics/digikam/default.nix @@ -158,6 +158,7 @@ mkDerivation rec { description = "Photo Management Program"; license = licenses.gpl2; homepage = "https://www.digikam.org"; + maintainers = with maintainers; [ spacefault ]; platforms = platforms.linux; mainProgram = "digikam"; }; diff --git a/nixpkgs/pkgs/applications/graphics/djv/default.nix b/nixpkgs/pkgs/applications/graphics/djv/default.nix index 8e36e5b70db1..735807691af7 100644 --- a/nixpkgs/pkgs/applications/graphics/djv/default.nix +++ b/nixpkgs/pkgs/applications/graphics/djv/default.nix @@ -112,6 +112,11 @@ stdenv.mkDerivation rec { # Pull fix ending upstream inclusion for gcc-12+ support: # https://github.com/darbyjohnston/DJV/pull/477 (fetchpatch { + name = "gcc-13-cstdint-include.patch"; + url = "https://github.com/darbyjohnston/DJV/commit/be0dd90c256f30c0305ff7b180fd932a311e66e5.patch"; + hash = "sha256-x8GAfakhgjBiCKHbfgCukT5iFNad+zqURDJkQr092uk="; + }) + (fetchpatch { name = "gcc-11-limits.patch"; url = "https://github.com/darbyjohnston/DJV/commit/0544ffa1a263a6b8e8518b47277de7601b21b4f4.patch"; hash = "sha256-x6ye0xMwTlKyNW4cVFb64RvAayvo71kuOooPj3ROn0g="; diff --git a/nixpkgs/pkgs/applications/graphics/f3d/default.nix b/nixpkgs/pkgs/applications/graphics/f3d/default.nix index 0207d3fa13e0..2fef95222b5a 100644 --- a/nixpkgs/pkgs/applications/graphics/f3d/default.nix +++ b/nixpkgs/pkgs/applications/graphics/f3d/default.nix @@ -1,26 +1,48 @@ -{ lib, stdenv, fetchFromGitHub, cmake, vtk_9, libX11, libGL, Cocoa, OpenGL }: +{ lib +, stdenv +, fetchFromGitHub +, cmake +, help2man +, gzip +, vtk_9 +, autoPatchelfHook +, libX11 +, libGL +, Cocoa +, OpenGL +}: stdenv.mkDerivation rec { pname = "f3d"; - version = "2.2.1"; + version = "2.3.0"; + + outputs = [ "out" "man" ]; src = fetchFromGitHub { owner = "f3d-app"; repo = "f3d"; rev = "refs/tags/v${version}"; - hash = "sha256-3Pg8uvrUGPKPmsn24q5HPMg9dgvukAXBgSVTW0NiCME="; + hash = "sha256-pr2xuCy5yoUuj2cjkTh3Xwpg3g7zBspjErEi5luRD6Y="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + help2man + gzip + # https://github.com/f3d-app/f3d/pull/1217 + autoPatchelfHook + ]; buildInputs = [ vtk_9 ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; - # conflict between VTK and Nixpkgs; - # see https://github.com/NixOS/nixpkgs/issues/89167 cmakeFlags = [ + # conflict between VTK and Nixpkgs; + # see https://github.com/NixOS/nixpkgs/issues/89167 "-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_INCLUDEDIR=include" "-DCMAKE_INSTALL_BINDIR=bin" + + "-DF3D_LINUX_GENERATE_MAN=ON" ]; meta = with lib; { @@ -28,7 +50,7 @@ stdenv.mkDerivation rec { homepage = "https://f3d-app.github.io/f3d"; changelog = "https://github.com/f3d-app/f3d/releases/tag/v${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ bcdarwin ]; + maintainers = with maintainers; [ bcdarwin pbsds ]; platforms = with platforms; unix; }; } diff --git a/nixpkgs/pkgs/applications/graphics/figma-agent/default.nix b/nixpkgs/pkgs/applications/graphics/figma-agent/default.nix index d0569d828bf1..36ae271d7e16 100644 --- a/nixpkgs/pkgs/applications/graphics/figma-agent/default.nix +++ b/nixpkgs/pkgs/applications/graphics/figma-agent/default.nix @@ -8,7 +8,7 @@ let inherit (rustPlatform) buildRustPackage bindgenHook; - version = "0.2.8"; + version = "0.3.2"; in buildRustPackage { pname = "figma-agent"; @@ -18,10 +18,10 @@ buildRustPackage { owner = "neetly"; repo = "figma-agent-linux"; rev = version; - sha256 = "sha256-GtbONBAXoJ3AdpsWGk4zBCtGQr446siMtuj3or27wYw="; + sha256 = "sha256-iXLQOc8gomOik+HIIoviw19II5MD6FM0W5DT3aqtIcM="; }; - cargoHash = "sha256-EmBeRdnA59PdzSEX2x+sVYk/Cs7K3k0idDjbuEzI9j4="; + cargoHash = "sha256-ulYDKMMtKfBYur34CVhac4uaU0kfdkeBCCP/heuUZek="; nativeBuildInputs = [ pkg-config diff --git a/nixpkgs/pkgs/applications/graphics/foxotron/default.nix b/nixpkgs/pkgs/applications/graphics/foxotron/default.nix index af16095a7d5d..079515b4b214 100644 --- a/nixpkgs/pkgs/applications/graphics/foxotron/default.nix +++ b/nixpkgs/pkgs/applications/graphics/foxotron/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , nix-update-script , cmake , pkg-config @@ -35,9 +36,24 @@ stdenv.mkDerivation rec { sha256 = "sha256-s1eWZMVitVSP7nJJ5wXvnV8uI6yto7LmvlvocOwVAxw="; }; + patches = [ + (fetchpatch { + name = "0001-assimp-Include-cstdint-for-std-uint32_t.patch"; + url = "https://github.com/assimp/assimp/commit/108e3192a201635e49e99a91ff2044e1851a2953.patch"; + stripLen = 1; + extraPrefix = "externals/assimp/"; + hash = "sha256-rk0EFmgeZVwvx3NJOOob5Jwj9/J+eOtuAzfwp88o+J4="; + }) + ]; + postPatch = '' substituteInPlace CMakeLists.txt \ --replace "set(CMAKE_OSX_ARCHITECTURES x86_64)" "" + + # Outdated vendored assimp, many warnings with newer compilers, too old for CMake option to control this + # Note that this -Werror caused issues on darwin, so make sure to re-check builds there before removing this + substituteInPlace externals/assimp/code/CMakeLists.txt \ + --replace 'TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)' "" ''; nativeBuildInputs = [ cmake pkg-config makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/graphics/fstl/default.nix b/nixpkgs/pkgs/applications/graphics/fstl/default.nix index c6b77300cb31..c7faf43e24e8 100644 --- a/nixpkgs/pkgs/applications/graphics/fstl/default.nix +++ b/nixpkgs/pkgs/applications/graphics/fstl/default.nix @@ -1,34 +1,30 @@ -{ lib, stdenv, fetchFromGitHub, mkDerivation, qtbase, mesa_glu }: +{ lib, stdenv, fetchFromGitHub, mkDerivation, cmake }: mkDerivation rec { pname = "fstl"; - version = "0.9.4"; + version = "0.10.0"; - buildInputs = [qtbase mesa_glu]; + nativeBuildInputs = [ cmake ]; - prePatch = '' - sed -i "s|/usr/bin|$out/bin|g" qt/fstl.pro - ''; - - preBuild = '' - qmake qt/fstl.pro - ''; + installPhase = lib.optionalString stdenv.isDarwin '' + runHook preInstall - postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications mv fstl.app $out/Applications + + runHook postInstall ''; src = fetchFromGitHub { - owner = "mkeeter"; + owner = "fstl-app"; repo = "fstl"; rev = "v" + version; - sha256 = "028hzdv11hgvcpc36q5scf4nw1256qswh37xhfn5a0iv7wycmnif"; + hash = "sha256-z2X78GW/IeiPCnwkeLBCLjILhfMe2sT3V9Gbw4TSf4c="; }; meta = with lib; { description = "The fastest STL file viewer"; - homepage = "https://github.com/mkeeter/fstl"; + homepage = "https://github.com/fstl-app/fstl"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ tweber ]; diff --git a/nixpkgs/pkgs/applications/graphics/goxel/default.nix b/nixpkgs/pkgs/applications/graphics/goxel/default.nix index 64b2112b5675..968794ccec66 100644 --- a/nixpkgs/pkgs/applications/graphics/goxel/default.nix +++ b/nixpkgs/pkgs/applications/graphics/goxel/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goxel"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "guillaumechereau"; repo = "goxel"; rev = "v${version}"; - hash = "sha256-mB4ln2uIhK/hsX+hUpeZ8H4aumaAUl5vaFkqolJtLRg="; + hash = "sha256-ueA0YW2n/DXd9AytDzfPtvtXbvuUm4VDwcdvHWObKxc="; }; nativeBuildInputs = [ scons pkg-config wrapGAppsHook ]; diff --git a/nixpkgs/pkgs/applications/graphics/halftone/default.nix b/nixpkgs/pkgs/applications/graphics/halftone/default.nix index 16859b94a7b6..81e70e401fc8 100644 --- a/nixpkgs/pkgs/applications/graphics/halftone/default.nix +++ b/nixpkgs/pkgs/applications/graphics/halftone/default.nix @@ -15,13 +15,13 @@ python3Packages.buildPythonApplication rec { pname = "halftone"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "tfuxu"; repo = pname; rev = version; - hash = "sha256-Yh3LxeO90N45LSefV1RZoO+8C0TUmFELzXaaQ1rCo2o="; + hash = "sha256-7fa6afrGt8SXli2KHzzRIqTBBaN3Hk0coYwxe66jLsg="; }; format = "other"; @@ -56,6 +56,8 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/tfuxu/halftone"; description = "Simple app for giving images that pixel-art style"; license = licenses.gpl3Plus; + mainProgram = "halftone"; maintainers = with maintainers; [ foo-dogsquared ]; + platforms = platforms.linux; }; } diff --git a/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index 1792c6355862..89e2d8c20817 100644 --- a/nixpkgs/pkgs/applications/graphics/hydrus/default.nix +++ b/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -12,14 +12,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "557"; + version = "559"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - hash = "sha256-upijLCj+mxTQ9EO2mfvnfPjqIvRaAqtByeRY/N1ANlU="; + hash = "sha256-+aYrqt1sifCe6/qS4kZyx0CLSHEoutFk6cyxmOXmN7Q="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/komikku/default.nix b/nixpkgs/pkgs/applications/graphics/komikku/default.nix index bbe7bd88c9c4..91c70aa02782 100644 --- a/nixpkgs/pkgs/applications/graphics/komikku/default.nix +++ b/nixpkgs/pkgs/applications/graphics/komikku/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonApplication rec { pname = "komikku"; - version = "1.35.0"; + version = "1.37.1"; format = "other"; @@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec { owner = "valos"; repo = "Komikku"; rev = "v${version}"; - hash = "sha256-oyXeh+/9tzykt2fhsKNrk1iaO8556LyCHGVxAxRojLw="; + hash = "sha256-pGOut63+ST1Yqe1Fj0c4cI0du1q4JW7WVA4h+muWGJQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/krita/generic.nix b/nixpkgs/pkgs/applications/graphics/krita/generic.nix index affa411aaa3c..9416a4708e4c 100644 --- a/nixpkgs/pkgs/applications/graphics/krita/generic.nix +++ b/nixpkgs/pkgs/applications/graphics/krita/generic.nix @@ -28,6 +28,12 @@ mkDerivation rec { url = "https://invent.kde.org/graphics/krita/-/commit/2d71c47661d43a4e3c1ab0c27803de980bdf2bb2.diff"; hash = "sha256-U3E44nj4vra++PJV20h4YHjES78kgrJtr4ktNeQfOdA="; }) + # Fixes build with libjxl 0.9.0 + (fetchpatch { + name = "fix-build-with-libjxl-0.9.0.patch"; + url = "https://invent.kde.org/graphics/krita/-/commit/ace7edcca6ad322581ab39620f21ccf3ffbd3b5a.diff"; + hash = "sha256-dXk4+HNS0+Ie/8V4+Oj4rBJrJbNHG57gIzPymXLEc9M="; + }) ]; nativeBuildInputs = [ cmake extra-cmake-modules pkg-config python3Packages.sip makeWrapper ]; diff --git a/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix b/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix index 91562bb5d49e..d2d799dadaf6 100644 --- a/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix +++ b/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix @@ -1,30 +1,30 @@ { lib, stdenv, fetchFromGitHub, lazarus, fpc, pango, cairo, glib -, atk, gtk2, libX11, gdk-pixbuf, busybox, python3, makeWrapper }: - -with stdenv; +, atk, gtk2, libX11, gdk-pixbuf, busybox, python3 +, makeWrapper +}: let bgrabitmap = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgrabitmap"; - rev = "v11.5.3"; - sha256 = "sha256-qjBD9TVZQy1tKWHFWkuu6vdLjASzQb3+HRy0FLdd9a8="; + rev = "2814b069d55f726b9f3b4774d85d00dd72be9c05"; + hash = "sha256-YibwdhlgjgI30gqYsKchgDPlOSpBiDBDJNlUDFMygGs="; }; bgracontrols = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgracontrols"; - rev = "v7.6"; - sha256 = "sha256-btg9DMdYg+C8h0H7MU+uoo2Kb4OeLHoxFYHAv7LbLBA="; + rev = "v8.0"; + hash = "sha256-5L05eGVN+xncd0/0XLFN6EL2ux4aAOsiU0BMoy0dKgg="; }; in stdenv.mkDerivation rec { pname = "lazpaint"; - version = "7.2.2"; + version = "7.2.2-unstable-2024-01-20"; src = fetchFromGitHub { owner = "bgrabitmap"; repo = "lazpaint"; - rev = "v${version}"; - sha256 = "sha256-J6s0GnGJ7twEYW5+B72bB3EX4AYvLnhSPLbdhZWzlkw="; + rev = "fe54c2e2561c51218a5a2755842ce3fc2e0ebb35"; + hash = "sha256-LaOTJiS+COJUlyJiN9H2kEKwv5lbJqOHsUXOnb+IQFA="; }; nativeBuildInputs = [ lazarus fpc makeWrapper ]; @@ -49,23 +49,16 @@ in stdenv.mkDerivation rec { lazpaint/lazpaint.lpi ''; - installPhase = '' - # Reuse existing install script - substituteInPlace Makefile --replace "/bin/bash" $BASH - cd lazpaint/release/debian - substituteInPlace makedeb.sh --replace "rm -rf" "ls" - patchShebangs ./makedeb.sh - PATH=$PATH:${busybox}/bin ./makedeb.sh - cp -r staging/usr $out - + postBuild = '' # Python is needed for scripts - makeWrapper $out/share/lazpaint/lazpaint $out/bin/lazpaint \ + wrapProgram $out/bin/lazpaint \ --prefix PATH : ${lib.makeBinPath [ python3 ]} ''; meta = with lib; { description = "Image editor like PaintBrush or Paint.Net"; - homepage = "https://sourceforge.net/projects/lazpaint/"; + homepage = "https://lazpaint.github.io"; + downloadPage = "https://github.com/bgrabitmap/lazpaint/"; license = licenses.gpl3; platforms = platforms.linux; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/nixpkgs/pkgs/applications/graphics/lightburn/default.nix index 14b2320f09a8..c686ed41752a 100644 --- a/nixpkgs/pkgs/applications/graphics/lightburn/default.nix +++ b/nixpkgs/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "1.4.05"; + version = "1.5.00"; nativeBuildInputs = [ p7zip @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "sha256-GLwxzSTzunbFrfT5e1xeHuy3O+kokb4fi4BPsFZ9tOA="; + sha256 = "sha256-KnhwulPpYdN6x1n9TD89Gv1Y20tSmKWT2WcuhoTMg3Y="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix b/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix index 5dae49033215..ca1ca5bf4cf2 100644 --- a/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.30"; + version = "2.31"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "sha256-xDW1Fk0GpjJQWE4ljbYXanp5N4wJYJUCRxKUCi7yJm0="; + sha256 = "sha256-r3IuOdtBSrTK/pDChgq/M3yQkSz2R+FG6kvwjYPjR4A="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/oculante/default.nix b/nixpkgs/pkgs/applications/graphics/oculante/default.nix index f4a29a539c5c..e8a82a71aee4 100644 --- a/nixpkgs/pkgs/applications/graphics/oculante/default.nix +++ b/nixpkgs/pkgs/applications/graphics/oculante/default.nix @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage rec { pname = "oculante"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; rev = version; - hash = "sha256-AuHiOZuRhO6PVyDyOtmNG6n/CN5brvJ/Ppn25QCshmE="; + hash = "sha256-49reMm9woxekJUqHq7biHvlYii9BmLvq6u9RFkASpUw="; }; - cargoHash = "sha256-EYwey8dDiyYGJa+scENOpaNK2qAVagTJrAPkSZj12w0="; + cargoHash = "sha256-93J0/INcQEvu14pPZeLRfwKECeEGcsch9hUZ0IjYivM="; nativeBuildInputs = [ cmake diff --git a/nixpkgs/pkgs/applications/graphics/paraview/default.nix b/nixpkgs/pkgs/applications/graphics/paraview/default.nix index 48b98b36d5c4..4fec6b2ad13c 100644 --- a/nixpkgs/pkgs/applications/graphics/paraview/default.nix +++ b/nixpkgs/pkgs/applications/graphics/paraview/default.nix @@ -6,23 +6,23 @@ }: let - version = "5.11.1"; + version = "5.11.2"; docFiles = [ (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf"; name = "Tutorial.pdf"; - sha256 = "1knpirjbz3rv8p8n03p39vv8vi5imvxakjsssqgly09g0cnsikkw"; + hash = "sha256-KIcd5GG+1L3rbj4qdLbc+eDa5Wy4+nqiVIxfHu5Tdpg="; }) (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf"; name = "GettingStarted.pdf"; - sha256 = "14xhlvg7s7d5amqf4qfyamx2a6b66zf4cmlfm3s7iw3jq01x1lx6"; + hash = "sha256-ptPQA8By8Hj0qI5WRtw3ZhklelXeYeJwVaUdfd6msJM="; }) (fetchurl { url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewCatalystGuide-${version}.pdf"; name = "CatalystGuide.pdf"; - sha256 = "133vcfrbg2nh15igl51ns6gnfn1is20vq6j0rg37wha697pmcr4a"; + hash = "sha256-imRW70lGQX7Gy0AavIHQMVhnn9E2FPpiCdCKt7Jje4w="; }) ]; @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { owner = "paraview"; repo = "paraview"; rev = "v${version}"; - hash = "sha256-LatNHfiAqB2kqzERRnYae0WIXBb4nXQ79Be4kuh8NFQ="; + hash = "sha256-fe/4xxxlkal08vE971FudTnESFfGMYzuvSyAMS6HSxI="; fetchSubmodules = true; }; @@ -90,6 +90,8 @@ in stdenv.mkDerivation rec { ./dont-redefine-strlcat.patch ]; + env.CXXFLAGS = "-include cstdint"; + postInstall = let docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc"; in lib.optionalString withDocs '' mkdir -p ${docDir}; diff --git a/nixpkgs/pkgs/applications/graphics/photoqt/default.nix b/nixpkgs/pkgs/applications/graphics/photoqt/default.nix index 21febdc02b7e..5d1ce4129791 100644 --- a/nixpkgs/pkgs/applications/graphics/photoqt/default.nix +++ b/nixpkgs/pkgs/applications/graphics/photoqt/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "photoqt"; - version = "4.1"; + version = "4.2"; src = fetchurl { url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-vxQZFlS4C+Dg9I6BKeMUFOYHz74d28gbhJlIpxSKTvs="; + hash = "sha256-OUqsyvmv6ccJDzcWAeS1OOmK2eXOCEgGktz6GEUzoA8="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix b/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix index 0463958b4c6c..816d9af62aa3 100644 --- a/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix @@ -1,14 +1,9 @@ { lib , fetchurl , gnustep -, llvmPackages_9 }: -let - # Earlier llvm than 9 segfaults - gnustep' = gnustep.override { llvmPackages = llvmPackages_9; }; - -in gnustep'.gsmakeDerivation rec { +gnustep.gsmakeDerivation rec { pname = "pikopixel"; version = "1.0-b10"; @@ -20,9 +15,9 @@ in gnustep'.gsmakeDerivation rec { sourceRoot = "PikoPixel.Sources.${version}/PikoPixel"; buildInputs = [ - gnustep'.base - gnustep'.gui - gnustep'.back + gnustep.base + gnustep.gui + gnustep.back ]; # Fix the Exec and Icon paths in the .desktop file, and save the file in the diff --git a/nixpkgs/pkgs/applications/graphics/processing/default.nix b/nixpkgs/pkgs/applications/graphics/processing/default.nix index 54d6723f7427..65cd2bea4770 100644 --- a/nixpkgs/pkgs/applications/graphics/processing/default.nix +++ b/nixpkgs/pkgs/applications/graphics/processing/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, javaPackages, rsync, ffmpeg, batik, gsettings-desktop-schemas, xorg, wrapGAppsHook }: +{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, wrapGAppsHook }: let buildNumber = "1293"; vaqua = fetchurl { @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ ant unzip makeWrapper wrapGAppsHook ]; - buildInputs = [ jdk javaPackages.jogl_2_4_0 ant rsync ffmpeg batik ]; + buildInputs = [ jdk jogl ant rsync ffmpeg batik ]; dontWrapGApps = true; @@ -62,7 +62,7 @@ stdenv.mkDerivation rec { tar --checkpoint=10000 -czf build/linux/jdk-17.0.8-${arch}.tgz ${jdk} cp ${ant}/lib/ant/lib/{ant.jar,ant-launcher.jar} app/lib/ mkdir -p core/library - ln -s ${javaPackages.jogl_2_4_0}/share/java/* core/library/ + ln -s ${jogl}/share/java/* core/library/ ln -s ${vaqua} app/lib/VAqua9.jar ln -s ${flatlaf} app/lib/flatlaf.jar ln -s ${lsp4j} java/mode/org.eclipse.lsp4j.jar diff --git a/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix b/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix index 85bbd1414cd9..cbf4efce28f5 100644 --- a/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix +++ b/nixpkgs/pkgs/applications/graphics/rawtherapee/default.nix @@ -79,6 +79,7 @@ stdenv.mkDerivation rec { "-Wno-deprecated-declarations" "-Wno-unused-result" ]; + env.CXXFLAGS = "-include cstdint"; # needed at least with gcc13 on aarch64-linux postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications/RawTherapee.app $out/bin diff --git a/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix index 1dc46e1b5ebe..000e8c17f9c9 100644 --- a/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix +++ b/nixpkgs/pkgs/applications/graphics/sane/backends/default.nix @@ -3,6 +3,7 @@ , avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp , curl, systemd, libxml2, poppler, gawk , sane-drivers +, nixosTests # List of { src name backend } attibute sets - see installFirmware below: , extraFirmware ? [] @@ -132,6 +133,10 @@ stdenv.mkDerivation { # https://github.com/NixOS/nixpkgs/issues/224569 enableParallelInstalling = false; + passthru.tests = { + inherit (nixosTests) sane; + }; + meta = with lib; { description = "SANE (Scanner Access Now Easy) backends"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix b/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix index 791ce9ad9a63..b6d7e160818c 100644 --- a/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix +++ b/nixpkgs/pkgs/applications/graphics/tesseract/tesseract5.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tesseract"; - version = "5.3.3"; + version = "5.3.4"; src = fetchFromGitHub { owner = "tesseract-ocr"; repo = "tesseract"; rev = version; - sha256 = "sha256-/aGzwm2+0y8fheOnRi/OJXZy3o0xjY1cCq+B3GTzfos="; + sha256 = "sha256-IKxzDhSM+BPsKyQP3mADAkpRSGHs4OmdFIA+Txt084M="; }; enableParallelBuilding = true; diff --git a/nixpkgs/pkgs/applications/graphics/tev/default.nix b/nixpkgs/pkgs/applications/graphics/tev/default.nix index 88afa4a5fbca..ff97eb65f17c 100644 --- a/nixpkgs/pkgs/applications/graphics/tev/default.nix +++ b/nixpkgs/pkgs/applications/graphics/tev/default.nix @@ -31,6 +31,8 @@ stdenv.mkDerivation rec { --prefix PATH ":" "${gnome.zenity}/bin" ''; + env.CXXFLAGS = "-include cstdint"; + meta = with lib; { description = "A high dynamic range (HDR) image comparison tool"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/graphics/upscayl/default.nix b/nixpkgs/pkgs/applications/graphics/upscayl/default.nix index 5981a3037493..24b8bc1483b2 100644 --- a/nixpkgs/pkgs/applications/graphics/upscayl/default.nix +++ b/nixpkgs/pkgs/applications/graphics/upscayl/default.nix @@ -4,11 +4,11 @@ lib, }: let pname = "upscayl"; - version = "2.9.5"; + version = "2.9.8"; src = fetchurl { url = "https://github.com/upscayl/upscayl/releases/download/v${version}/upscayl-${version}-linux.AppImage"; - hash = "sha256-zEqdHWfMbxdOoZ3NfvOPZL0osrFVMxFN32gXfEjbKLs="; + hash = "sha256-hLK9AX87WbJdKTV/rzEzNeaUWeDz1+bvp/R2LkjHp+w="; }; appimageContents = appimageTools.extractType2 { diff --git a/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix b/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix index dd13f8ba4503..23b6f5009ce4 100644 --- a/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix +++ b/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.27"; + version = "0.0.28"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - hash = "sha256-A37IY66wZZK7Tv0zWsORO6CuRRRj7YmKLnEPSbfAvwI="; + hash = "sha256-UjSm/J/y7MUg3Exmw0P56+bcjiLxXdGS2brocdzgJ+c="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/xv/default.nix b/nixpkgs/pkgs/applications/graphics/xv/default.nix index b70c96ea8d39..d3708dd0c4a1 100644 --- a/nixpkgs/pkgs/applications/graphics/xv/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xv/default.nix @@ -7,26 +7,25 @@ libpng, libwebp, libtiff, - libjpeg, jasper, }: stdenv.mkDerivation rec { pname = "xv"; - version = "4.2.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "jasper-software"; repo = "xv"; rev = "v${version}"; - sha256 = "TXUcdrwtPNiS7z795RbzBXzNYRADeVtF5uz4aovLo/M="; + sha256 = "sha256-ATV/LxXQNJB6rjBmurx6a1gRPR8zNuILstvEJoQJhUs="; }; nativeBuildInputs = [ cmake ]; buildInputs = [ xorg.libX11 xorg.libXt libpng libwebp libtiff jasper ]; meta = { - description = "Classic image viewer and editor for X."; + description = "Classic image viewer and editor for X"; homepage = "http://www.trilon.com/xv/"; license = { fullName = "XV License"; |