diff options
Diffstat (limited to 'pkgs/applications/graphics')
36 files changed, 504 insertions, 84 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 256bdc329e2a7..8c7e3f2c4aa01 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -18,7 +18,7 @@ , libpngSupport ? true, libpng , liblqr1Support ? true, liblqr1 , librawSupport ? true, libraw -, librsvgSupport ? !stdenv.hostPlatform.isMinGW, librsvg +, librsvgSupport ? !stdenv.hostPlatform.isMinGW, librsvg, pango , libtiffSupport ? true, libtiff , libxml2Support ? true, libxml2 , openjpegSupport ? !stdenv.hostPlatform.isMinGW, openjpeg @@ -46,13 +46,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-47"; + version = "7.1.0-49"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-x5kC9nd38KgSpzJX3y6h2iBnte+UHrfZnbkRD/Dgqi8="; + hash = "sha256-5EbmAPEUPFMY8VDJmXfcFuUzFI0xVw7fpVteSI9gotg="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big @@ -64,6 +64,7 @@ stdenv.mkDerivation rec { "--with-frozenpaths" (lib.withFeatureAs (arch != null) "gcc-arch" arch) (lib.withFeature librsvgSupport "rsvg") + (lib.withFeature librsvgSupport "pango") (lib.withFeature liblqr1Support "lqr") (lib.withFeature libjxlSupport "jxl") (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript}/share/ghostscript/fonts") @@ -88,7 +89,10 @@ stdenv.mkDerivation rec { ++ lib.optional djvulibreSupport djvulibre ++ lib.optional libjxlSupport libjxl ++ lib.optional openexrSupport openexr - ++ lib.optional librsvgSupport librsvg + ++ lib.optionals librsvgSupport [ + librsvg + pango + ] ++ lib.optional openjpegSupport openjpeg ++ lib.optionals stdenv.isDarwin [ ApplicationServices diff --git a/pkgs/applications/graphics/artem/default.nix b/pkgs/applications/graphics/artem/default.nix new file mode 100644 index 0000000000000..5747c88b24bbf --- /dev/null +++ b/pkgs/applications/graphics/artem/default.nix @@ -0,0 +1,50 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, installShellFiles +, pkg-config +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "artem"; + version = "1.1.5"; + + src = fetchFromGitHub { + owner = "finefindus"; + repo = pname; + rev = "v${version}"; + sha256 = "1jax39gizlcbqnkjckxwm5h0wdk5dk8dasaj9wxv7yidbcbgj4zh"; + }; + + cargoSha256 = "sha256-n2NOWrgcMVHpNCHL7r8+Kl1e01XYadaNM7UdE8fQo1U="; + + nativeBuildInputs = [ installShellFiles pkg-config ]; + + buildInputs = [ openssl ]; + + OPENSSL_NO_VENDOR = 1; + + checkFlags = [ + # require internet access + "--skip=arguments::input::url_input" + "--skip=full_file_compare_url" + + # flaky + "--skip=full_file_compare_html" + ]; + + postInstall = '' + installManPage $releaseDir/build/artem-*/out/artem.1 + installShellCompletion $releaseDir/build/artem-*/out/artem.{bash,fish} \ + --zsh $releaseDir/build/artem-*/out/_artem + ''; + + meta = with lib; { + description = "A small CLI program to convert images to ASCII art"; + homepage = "https://github.com/finefindus/artem"; + changelog = "https://github.com/finefindus/artem/blob/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/pkgs/applications/graphics/batik/default.nix b/pkgs/applications/graphics/batik/default.nix index a88209bfbd891..b1259a543c734 100644 --- a/pkgs/applications/graphics/batik/default.nix +++ b/pkgs/applications/graphics/batik/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "batik"; - version = "1.14"; + version = "1.15"; src = fetchurl { url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz"; - sha256 = "sha256-D06qgb5wdS5AahnznDnAGISPCZY/CPqJdGQFRwUsRhg="; + sha256 = "sha256-NYo7+8DikUmDsioM1Q1YW1s3KwsQeTnwIKDr+RHxxyo="; }; meta = with lib; { diff --git a/pkgs/applications/graphics/drawing/default.nix b/pkgs/applications/graphics/drawing/default.nix index cd92a0d39ec76..546af551de9cd 100644 --- a/pkgs/applications/graphics/drawing/default.nix +++ b/pkgs/applications/graphics/drawing/default.nix @@ -1,6 +1,5 @@ { lib , fetchFromGitHub -, fetchpatch , meson , ninja , pkg-config @@ -19,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "drawing"; - version = "1.0.0"; + version = "1.0.1"; format = "other"; @@ -27,19 +26,9 @@ python3.pkgs.buildPythonApplication rec { owner = "maoschanz"; repo = pname; rev = version; - sha256 = "sha256-qNaljtuA5E/QaLJ9QILPRQCqOvKmX4ZGq/0z5unA8KA="; + sha256 = "sha256-9nosriI3Kdf1M5/TYFWn1jtQTqNKhBcFh7q3E4Uoq4s="; }; - patches = [ - # Fix build with meson 0.61, can be removed on next update. - # https://github.com/NixOS/nixpkgs/issues/167584 - (fetchpatch { - url = "https://github.com/maoschanz/drawing/commit/6dd271089af76b69322500778e3ad6615a117dcc.patch"; - sha256 = "sha256-4pKWm3LYstVxZ4+gGsZDfM4K+7WBY8EYjylzc/CQZmo="; - includes = [ "data/meson.build" "help/meson.build" ]; - }) - ]; - nativeBuildInputs = [ appstream-glib desktop-file-utils diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index 1080f56ebe916..e755b708a063f 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "20.2.3"; + version = "20.3.0"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/drawio-x86_64-${version}.rpm"; - sha256 = "sha256-O/gzXAzvaYJXpexjBSc6jNW1wX0ukwQcpFU8fq4qM4k="; + sha256 = "bfcd363f549ce8dc13ae2287cec5099e4bf1d0d4b6f8deef40a81279f78817e1"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/entwine/default.nix b/pkgs/applications/graphics/entwine/default.nix new file mode 100644 index 0000000000000..f9378c06ea4c9 --- /dev/null +++ b/pkgs/applications/graphics/entwine/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pdal +, curl +, openssl +}: + +stdenv.mkDerivation rec { + pname = "entwine"; + version = "unstable-2022-08-03"; + + src = fetchFromGitHub { + owner = "connormanning"; + repo = "entwine"; + rev = "c776d51fd6ab94705b74f78b26de7f853e6ceeae"; + sha256 = "sha256-dhYJhXtfMmqQLWuV3Dux/sGTsVxCI7RXR2sPlwIry0g="; + }; + + buildInputs = [ + openssl + pdal + curl + ]; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Point cloud organization for massive datasets"; + homepage = "https://entwine.io/"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ matthewcroughan ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/epick/default.nix b/pkgs/applications/graphics/epick/default.nix index 8144a901a40fa..fda56c0d8cb7a 100644 --- a/pkgs/applications/graphics/epick/default.nix +++ b/pkgs/applications/graphics/epick/default.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage rec { pname = "epick"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "vv9k"; repo = pname; rev = version; - sha256 = "sha256-LJg68YY8PqKF7Thn181XRFsCNJA0DkYKVFbIR1UkxGU="; + sha256 = "sha256-b4if2ggJY+8CsCX8jbnnWXy16k7sfB88CLlYYCrtltk="; }; - cargoSha256 = "sha256-j6tim6dS++ECfBMdyQlS3CqN+Tr5ozHqyZ1bPKhDKV0="; + cargoSha256 = "sha256-HyGSmeLJ+2Twkg94p1QqXZDix0mU2jGFfEot6hgUg34="; nativeBuildInputs = lib.optional stdenv.isLinux python3; diff --git a/pkgs/applications/graphics/eyedropper/default.nix b/pkgs/applications/graphics/eyedropper/default.nix new file mode 100644 index 0000000000000..fdb56440ed13d --- /dev/null +++ b/pkgs/applications/graphics/eyedropper/default.nix @@ -0,0 +1,59 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, meson +, ninja +, glib +, gtk4 +, libadwaita +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +}: + +stdenv.mkDerivation rec { + pname = "eyedropper"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "FineFindus"; + repo = pname; + rev = version; + hash = "sha256-dOB274OA7h1vwCuapzivHnMLLw/NTzsmOfFtHHaca1I="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-ymRl/nIUuT1BXa1dF5CMemBI8aYrdqeoVtghm6NF8cs="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ] ++ (with rustPlatform; [ + rust.cargo + rust.rustc + cargoSetupHook + ]); + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + meta = with lib; { + description = "An easy-to-use color picker and editor"; + homepage = "https://github.com/FineFindus/eyedropper"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/graphics/f3d/default.nix b/pkgs/applications/graphics/f3d/default.nix index 9e3374064e6e5..42671599a643c 100644 --- a/pkgs/applications/graphics/f3d/default.nix +++ b/pkgs/applications/graphics/f3d/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "f3d"; - version = "1.2.1"; + version = "1.3.1"; src = fetchFromGitHub { owner = "f3d-app"; repo = "f3d"; rev = "v${version}"; - sha256 = "sha256-Yn1IcGWAbXjG0wJQjRimvreozFu9mf0FMwyGNYc4P+U="; + hash = "sha256-dOpiX7xJWDKHqPLGvlgv7NHgfzyeZhJd898+KzAmD4Q="; }; nativeBuildInputs = [ cmake ]; @@ -17,6 +17,14 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ libGL libX11 ] ++ lib.optionals stdenv.isDarwin [ Cocoa OpenGL ]; + # conflict between VTK and Nixpkgs; + # see https://github.com/NixOS/nixpkgs/issues/89167 + cmakeFlags = [ + "-DCMAKE_INSTALL_LIBDIR=lib" + "-DCMAKE_INSTALL_INCLUDEDIR=include" + "-DCMAKE_INSTALL_BINDIR=bin" + ]; + meta = with lib; { description = "Fast and minimalist 3D viewer using VTK"; homepage = "https://f3d-app.github.io/f3d"; diff --git a/pkgs/applications/graphics/gnome-decoder/default.nix b/pkgs/applications/graphics/gnome-decoder/default.nix new file mode 100644 index 0000000000000..7ae618736ca19 --- /dev/null +++ b/pkgs/applications/graphics/gnome-decoder/default.nix @@ -0,0 +1,76 @@ +{ lib +, clangStdenv +, fetchFromGitLab +, libclang +, rustPlatform +, meson +, ninja +, pkg-config +, glib +, gtk4 +, libadwaita +, zbar +, sqlite +, pipewire +, gstreamer +, gst-plugins-base +, gst-plugins-bad +, wrapGAppsHook4 +, appstream-glib +, desktop-file-utils +}: + +clangStdenv.mkDerivation rec { + pname = "gnome-decoder"; + version = "0.3.1"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "World"; + repo = "decoder"; + rev = version; + hash = "sha256-WJIOaYSesvLmOzF1Q6o6aLr4KJanXVaNa+r+2LlpKHQ="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-RMHVrv/0q42qFUXyd5BSymzx+BxiyqTX0Jzmxnlhyr4="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + wrapGAppsHook4 + appstream-glib + desktop-file-utils + ] ++ (with rustPlatform; [ + rust.cargo + rust.rustc + cargoSetupHook + ]); + + buildInputs = [ + glib + gtk4 + libadwaita + zbar + sqlite + pipewire + gstreamer + gst-plugins-base + gst-plugins-bad + ]; + + LIBCLANG_PATH = "${libclang.lib}/lib"; + + meta = with lib; { + description = "Scan and Generate QR Codes"; + homepage = "https://gitlab.gnome.org/World/decoder"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + mainProgram = "decoder"; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/graphics/gnome-photos/default.nix b/pkgs/applications/graphics/gnome-photos/default.nix index 774e377ca031c..ef731caf1a20e 100644 --- a/pkgs/applications/graphics/gnome-photos/default.nix +++ b/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ stdenv +, lib , fetchurl , at-spi2-core , babl @@ -7,22 +8,19 @@ , dleyna-renderer , gdk-pixbuf , gegl -, geocode-glib +, geocode-glib_2 , gettext , gexiv2 -, gfbgraph , glib , gnome-online-accounts , gnome , gobject-introspection -, grilo -, grilo-plugins , gsettings-desktop-schemas , gtk3 , itstool , libdazzle +, libportal-gtk3 , libhandy -, libgdata , libxml2 , meson , ninja @@ -36,13 +34,13 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "42.0"; + version = "43.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "JcsoFCUZnex7BF8T8y+PlgNMsMuLlNlvnf+vT1vmhVE="; + sha256 = "x6x0WNUz8p2VUBHHS3YiTXnqMbzBLp1tDOe2w3BNCOE="; }; patches = [ @@ -73,18 +71,15 @@ stdenv.mkDerivation rec { dleyna-renderer gdk-pixbuf gegl - geocode-glib + geocode-glib_2 gexiv2 - gfbgraph glib gnome-online-accounts - grilo - grilo-plugins gsettings-desktop-schemas gtk3 libdazzle + libportal-gtk3 libhandy - libgdata tracker tracker-miners # For 'org.freedesktop.Tracker.Miner.Files' GSettings schema diff --git a/pkgs/applications/graphics/gpicview/default.nix b/pkgs/applications/graphics/gpicview/default.nix index ae1e64297bd57..06c3b03ae5330 100644 --- a/pkgs/applications/graphics/gpicview/default.nix +++ b/pkgs/applications/graphics/gpicview/default.nix @@ -16,9 +16,9 @@ stdenv.mkDerivation rec { }) ]; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ pkg-config intltool ]; - buildInputs = [ intltool gtk2 ]; + buildInputs = [ gtk2 ]; meta = with lib; { description = "A simple and fast image viewer for X"; diff --git a/pkgs/applications/graphics/gscan2pdf/default.nix b/pkgs/applications/graphics/gscan2pdf/default.nix index 214688b56f899..fc686ad1f2120 100644 --- a/pkgs/applications/graphics/gscan2pdf/default.nix +++ b/pkgs/applications/graphics/gscan2pdf/default.nix @@ -10,13 +10,17 @@ with lib; perlPackages.buildPerlPackage rec { pname = "gscan2pdf"; - version = "2.12.6"; + version = "2.12.8"; src = fetchurl { url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz"; - sha256 = "sha256-9ntpUEM3buT3EhneXz9G8bibvzOnEK6Xt0jJcTvLKT0="; + hash = "sha256-dmN2fMBDZqgvdHQryQgjmBHeH/h2dihRH8LkflFYzTk="; }; + patches = [ + ./ffmpeg5-compat.patch + ]; + nativeBuildInputs = [ wrapGAppsHook ]; buildInputs = diff --git a/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch b/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch new file mode 100644 index 0000000000000..ff522735fe350 --- /dev/null +++ b/pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch @@ -0,0 +1,15 @@ +--- a/t/351_unpaper.t ++++ b/t/351_unpaper.t +@@ -88,8 +88,10 @@ + + # if we use unlike, we no longer + # know how many tests there will be +- if ( $msg !~ +-/(deprecated|Encoder did not produce proper pts, making some up)/ ++ if ( $msg !~ /( deprecated | ++ \Qdoes not contain an image sequence pattern\E | ++ \QEncoder did not produce proper pts, making some up\E | ++ \Quse the -update option\E )/x + ) + { + fail 'no warnings'; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 79b505479c8c9..06cab430bc3f1 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "496"; + version = "501"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-Ng3ogPxyzn4cKVE/0iz56VWGyABkM2ZF7ktajaJ9Mn8="; + sha256 = "sha256-dmQD3CAAAhE6IOfT38PHUIlHdDFdk6HZ6ZEZmKw7+WM="; }; nativeBuildInputs = [ @@ -33,7 +33,6 @@ python3Packages.buildPythonPackage rec { html5lib lxml lz4 - nose numpy opencv4 pillow diff --git a/pkgs/applications/graphics/image-roll/default.nix b/pkgs/applications/graphics/image-roll/default.nix index 49cf0ff1b6057..461a07837d83b 100644 --- a/pkgs/applications/graphics/image-roll/default.nix +++ b/pkgs/applications/graphics/image-roll/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , glib , pkg-config -, wrapGAppsHook +, wrapGAppsHook4 , gtk4 }: @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk="; - nativeBuildInputs = [ glib pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ glib pkg-config wrapGAppsHook4 ]; buildInputs = [ gtk4 ]; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec { "--skip=file_list::tests" # sometimes fails on darwin - "image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none" + "--skip=image_list::tests::save_current_image_overwrites_image_at_current_image_path_when_filename_is_set_to_none" ]; postInstall = '' diff --git a/pkgs/applications/graphics/jpegoptim/default.nix b/pkgs/applications/graphics/jpegoptim/default.nix index 95ea902b5e693..d4582280079e3 100644 --- a/pkgs/applications/graphics/jpegoptim/default.nix +++ b/pkgs/applications/graphics/jpegoptim/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, libjpeg }: stdenv.mkDerivation rec { - version = "1.4.7"; + version = "1.5.0"; pname = "jpegoptim"; src = fetchFromGitHub { owner = "tjko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qae3OEG4CC/OGkmNdHrXFUv9CkoaB1ZJnFHX3RFoxhk="; + sha256 = "sha256-fTtNDjswxHv2kHU55RCzz9tdlXw+RUCSoe3qF4hQ7u4="; }; # There are no checks, it seems. diff --git a/pkgs/applications/graphics/kodelife/default.nix b/pkgs/applications/graphics/kodelife/default.nix index 291d63d11a0d9..a05dbc28be022 100644 --- a/pkgs/applications/graphics/kodelife/default.nix +++ b/pkgs/applications/graphics/kodelife/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { pname = "kodelife"; - version = "1.0.5.161"; + version = "1.0.6.163"; suffix = { aarch64-linux = "linux-arm64"; @@ -56,9 +56,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; hash = { - aarch64-linux = "sha256-6QZ5jCxINCH46GQx+V68FpkIAOIOFw4Kd0tUQTKBRzU="; - armv7l-linux = "sha256-eToNjPttY62EzNuRSVvJsHttO6Ux6LXRPRuuIKnvaxM="; - x86_64-linux = "sha256-5M2tgpF74RmrCLI44RBNXK5t0hMAOHtmcjWu7fypc0U="; + aarch64-linux = "sha256-BbNk/YfTx/J8ApgdiY/thnD2MFUUCSQt/CMjkewLcL0="; + armv7l-linux = "sha256-fp4YM2BgyTr4vvxw5FaqKyGm608q8fOpB3gAgPA9UQ4="; + x86_64-linux = "sha256-sLRdU/UW2JORAUOPzmr+VUkcLoesrshjdLvDCizX0iM="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; diff --git a/pkgs/applications/graphics/kphotoalbum/default.nix b/pkgs/applications/graphics/kphotoalbum/default.nix new file mode 100644 index 0000000000000..d32cf9d950c2c --- /dev/null +++ b/pkgs/applications/graphics/kphotoalbum/default.nix @@ -0,0 +1,47 @@ +{ mkDerivation +, fetchurl +, lib +, extra-cmake-modules +, kdoctools +, wrapGAppsHook +, exiv2 +, ffmpeg +, libkdcraw +, phonon +, libvlc +, kconfig +, kiconthemes +, kio +, kinit +, kpurpose +}: + +mkDerivation rec { + pname = "kphotoalbum"; + version = "5.9.1"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + hash = "sha256-kejzDYpBQEoGKgPzVcUVlGKmd1OoXx+W7t9p3MNNw/A="; + }; + + # not sure if we really need phonon when we have vlc, but on KDE it's bound to + # be on the system anyway, so there is no real harm including it + buildInputs = [ exiv2 phonon libvlc ]; + + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; + + propagatedBuildInputs = [ kconfig kiconthemes kio kinit kpurpose libkdcraw ]; + + qtWrapperArgs = [ + "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" + ]; + + meta = with lib; { + description = "Efficient image organization and indexing"; + homepage = "https://www.kphotoalbum.org/"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ peterhoeg ]; + inherit (kconfig.meta) platforms; + }; +} diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 6a7edb460eccc..90d51827f14fc 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "5.1.0"; + version = "5.1.1"; kde-channel = "stable"; - sha256 = "sha256-mjs/WFhIC3CRvUhEmSbmE1OOqKTcBiSchg/+PaWs2II="; + sha256 = "sha256-Tdv4l6+nsYcTFpfRKiO6OYlGOAaLLq4Ss7Q0/kKtjiQ="; }) diff --git a/pkgs/applications/graphics/mangareader/default.nix b/pkgs/applications/graphics/mangareader/default.nix new file mode 100644 index 0000000000000..5ae270cca8c19 --- /dev/null +++ b/pkgs/applications/graphics/mangareader/default.nix @@ -0,0 +1,56 @@ +{ lib +, stdenv +, fetchFromGitHub +, wrapQtAppsHook +, extra-cmake-modules +, cmake +, kio +, ki18n +, kxmlgui +, kconfig +, karchive +, kcoreaddons +, kconfigwidgets +, nix-update-script +}: + +stdenv.mkDerivation rec { + pname = "mangareader"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "g-fb"; + repo = pname; + rev = version; + hash = "sha256-j5b2O5OgDRaaxNssknTTgVscudk1+mFlGQN5KE6CwcU="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + wrapQtAppsHook + ]; + + buildInputs = [ + kio + ki18n + kxmlgui + kconfig + karchive + kcoreaddons + kconfigwidgets + ]; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "Qt manga reader for local files"; + homepage = "https://github.com/g-fb/mangareader"; + changelog = "https://github.com/g-fb/mangareader/releases/tag/${src.rev}"; + platforms = platforms.linux; + license = with licenses; [ gpl3Plus cc-by-nc-sa-40 ]; + maintainers = with maintainers; [ zendo ]; + }; +} diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix index b93b4794db81f..7f1ba67acce6a 100644 --- a/pkgs/applications/graphics/mypaint/default.nix +++ b/pkgs/applications/graphics/mypaint/default.nix @@ -23,6 +23,7 @@ let in buildPythonApplication rec { pname = "mypaint"; version = "2.0.1"; + format = "other"; src = fetchFromGitHub { owner = "mypaint"; @@ -48,6 +49,7 @@ in buildPythonApplication rec { wrapGAppsHook gobject-introspection # for setup hook hicolor-icon-theme # fór setup hook + python3.pkgs.setuptools ]; buildInputs = [ diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 646594d4afba7..94c30fe0a3213 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -30,6 +30,7 @@ , wayland , wayland-protocols , qtwayland +, cairo }: mkDerivation rec { @@ -61,7 +62,7 @@ mkDerivation rec { buildInputs = [ eigen boost glew opencsg cgal mpfr gmp glib harfbuzz lib3mf libzip double-conversion freetype fontconfig - qtbase qtmultimedia qscintilla + qtbase qtmultimedia qscintilla cairo ] ++ lib.optionals stdenv.isLinux [ libGLU libGL wayland wayland-protocols qtwayland ] ++ lib.optional stdenv.isDarwin qtmacextras ++ lib.optional spacenavSupport libspnav diff --git a/pkgs/applications/graphics/pineapple-pictures/default.nix b/pkgs/applications/graphics/pineapple-pictures/default.nix index 04677a3982acb..2877d81d4110f 100644 --- a/pkgs/applications/graphics/pineapple-pictures/default.nix +++ b/pkgs/applications/graphics/pineapple-pictures/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "pineapple-pictures"; - version = "0.6.2"; + version = "0.6.4"; src = fetchFromGitHub { owner = "BLumia"; repo = "pineapple-pictures"; rev = version; - sha256 = "sha256-1fsEHyepmoZfNOFEnW6RQJyccOlQr5LTp8TjRqyXkcw"; + sha256 = "sha256-HOZ1BQIXrjVi2Y+2czt64pb++KGyN+6yDZ5Inu8NhJY="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ qtsvg - exiv2.lib + exiv2 ]; meta = with lib; { diff --git a/pkgs/applications/graphics/pinta/deps.nix b/pkgs/applications/graphics/pinta/deps.nix index 57c2c152edf84..66f7e61267247 100644 --- a/pkgs/applications/graphics/pinta/deps.nix +++ b/pkgs/applications/graphics/pinta/deps.nix @@ -1,3 +1,6 @@ +# This file was automatically generated by passthru.fetch-deps. +# Please dont edit it manually, your changes might get overwritten! + { fetchNuGet }: [ (fetchNuGet { pname = "AtkSharp"; version = "3.24.24.34"; sha256 = "1jn1vgi9xm0jp7769k6sbdi8d273kigjrsh93i6s4c03hqxv7cqs"; }) (fetchNuGet { pname = "CairoSharp"; version = "3.24.24.34"; sha256 = "0pydn1k0cam1gclg9sc1sbnmbyzh28qlc5qanyxcylwghink3kgz"; }) diff --git a/pkgs/applications/graphics/pixinsight/default.nix b/pkgs/applications/graphics/pixinsight/default.nix index f54aef75ac15a..b6e03baace817 100644 --- a/pkgs/applications/graphics/pixinsight/default.nix +++ b/pkgs/applications/graphics/pixinsight/default.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation rec { license = licenses.unfree; platforms = [ "x86_64-linux" ]; maintainers = [ maintainers.sheepforce ]; + hydraPlatforms = []; mainProgram = "PixInsight"; }; } diff --git a/pkgs/applications/graphics/pizarra/default.nix b/pkgs/applications/graphics/pizarra/default.nix new file mode 100644 index 0000000000000..e428d02d9dcdc --- /dev/null +++ b/pkgs/applications/graphics/pizarra/default.nix @@ -0,0 +1,49 @@ +{ lib +, fetchFromGitLab +, rustPlatform +, cargo +, pkg-config +, binutils-unwrapped +, gtk3-x11 +, atk +, glib +, librsvg +, gdk-pixbuf +, wrapGAppsHook +}: + +rustPlatform.buildRustPackage rec { + pname = "pizarra"; + version = "1.7.4"; + + src = fetchFromGitLab { + owner = "categulario"; + repo = "pizarra-gtk"; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-fWwAmzF3ppCvJZ0K4EDrmP8SVPVRayEQTtbhNscZIF0="; + }; + + cargoSha256 = "sha256-pxRJXUeFGdVj6iCFZ4Y8b9z5hw83g8YywpKztTZ0g+4="; + + nativeBuildInputs = [ wrapGAppsHook pkg-config gdk-pixbuf ]; + + buildInputs = [ gtk3-x11 atk glib librsvg ]; + + meta = with lib; { + description = "A simple blackboard written in GTK"; + longDescription = '' + A simple endless blackboard. + Contains various features, such as: + - Pencil + - Rectangle + - Ellipse + - Line + - Text + - Grids + ''; + homepage = "https://pizarra.categulario.xyz/en/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ mglolenstine ]; + }; +} diff --git a/pkgs/applications/graphics/sane/backends/default.nix b/pkgs/applications/graphics/sane/backends/default.nix index 02f5025a563fd..2364b45083583 100644 --- a/pkgs/applications/graphics/sane/backends/default.nix +++ b/pkgs/applications/graphics/sane/backends/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, runtimeShell +{ stdenv, lib, fetchurl, fetchpatch, runtimeShell, buildPackages , gettext, pkg-config, python3 , avahi, libgphoto2, libieee1284, libjpeg, libpng, libtiff, libusb1, libv4l, net-snmp , curl, systemd, libxml2, poppler, gawk @@ -29,8 +29,26 @@ stdenv.mkDerivation { sha256 = "055iicihxa6b28iv5fnz13n67frdr5nrydq2c846f9x7q0vw4a1s"; }; + patches = [ + # sane-desc will be used in postInstall so compile it for build + # https://github.com/void-linux/void-packages/blob/master/srcpkgs/sane/patches/sane-desc-cross.patch + (fetchpatch { + name = "compile-sane-desc-for-build.patch"; + url = "https://raw.githubusercontent.com/void-linux/void-packages/4b97cd2fb4ec38712544438c2491b6d7d5ab334a/srcpkgs/sane/patches/sane-desc-cross.patch"; + sha256 = "sha256-y6BOXnOJBSTqvRp6LwAucqaqv+OLLyhCS/tXfLpnAPI="; + }) + ]; + + postPatch = '' + # related to the compile-sane-desc-for-build + substituteInPlace tools/Makefile.in \ + --replace 'cc -I' '$(CC_FOR_BUILD) -I' + ''; + outputs = [ "out" "doc" "man" ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + nativeBuildInputs = [ gettext pkg-config @@ -62,6 +80,10 @@ stdenv.mkDerivation { ++ lib.optional (libusb1 != null) "--with-usb" ; + # autoconf check for HAVE_MMAP is never set on cross compilation. + # The pieusb backend fails compilation if HAVE_MMAP is not set. + buildFlags = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ "CFLAGS=-DHAVE_MMAP=${if stdenv.hostPlatform.isLinux then "1" else "0"}" ]; + postInstall = let compatFirmware = extraFirmware diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index a4eb306823974..251dfdef32f43 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -6,11 +6,11 @@ , libexif , libgphoto2 , libwebp -, libsoup +, libsoup_3 , libxml2 , vala , sqlite -, webkitgtk +, webkitgtk_4_1 , pkg-config , gnome , gst_all_1 @@ -30,7 +30,6 @@ , wrapGAppsHook , gobject-introspection , itstool -, libgdata , libchamplain , libsecret , gsettings-desktop-schemas @@ -41,11 +40,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.30.16"; + version = "0.31.5"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-yYgs+9rTA8uBYbFJrLtMYX++fKn2q24i0XTiRH51GPo="; + sha256 = "sha256-OwSPxs6ZsjLR4OqbjbB0CDyGyI07bWMTaiz4IXqkXBk="; }; nativeBuildInputs = [ @@ -66,10 +65,10 @@ stdenv.mkDerivation rec { libexif libgphoto2 libwebp - libsoup + libsoup_3 libxml2 sqlite - webkitgtk + webkitgtk_4_1 gst_all_1.gstreamer gst_all_1.gst-libav gst_all_1.gst-plugins-base @@ -87,7 +86,6 @@ stdenv.mkDerivation rec { librest gcr gnome.adwaita-icon-theme - libgdata libchamplain libsecret ]; diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index a77a0313223bf..c87a71fdf6c7c 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -114,7 +114,6 @@ stdenv.mkDerivation { gtk3 gtkmm3 imagemagick - intltool libjack2 libsigcxx libxmlxx diff --git a/pkgs/applications/graphics/unigine-sanctuary/default.nix b/pkgs/applications/graphics/unigine-sanctuary/default.nix index 4b3f3ab547c66..b62df6f56eea0 100644 --- a/pkgs/applications/graphics/unigine-sanctuary/default.nix +++ b/pkgs/applications/graphics/unigine-sanctuary/default.nix @@ -20,8 +20,8 @@ stdenv.mkDerivation rec{ version = "2.3"; src = fetchurl { - url = "https://m12-assets.unigine.com/d/Unigine_Sanctuary-${version}.run"; - sha256 = "1m9r79q33hx213zg3c2kknnc7hi8jp2h88s9qynny4k4rg8vpa18"; + url = "https://assets.unigine.com/d/Unigine_Sanctuary-${version}.run"; + sha256 = "sha256-KKi70ctkEm+tx0kjBMWVKMLDrJ1TsPH+CKLDMXA6OdU="; }; libPath = lib.makeLibraryPath [ @@ -94,5 +94,6 @@ stdenv.mkDerivation rec{ license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" "i686-linux" ]; + mainProgram = "Sanctuary"; }; } diff --git a/pkgs/applications/graphics/unigine-tropics/default.nix b/pkgs/applications/graphics/unigine-tropics/default.nix index f0d5101b4be02..f75aa81e45f53 100644 --- a/pkgs/applications/graphics/unigine-tropics/default.nix +++ b/pkgs/applications/graphics/unigine-tropics/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation { inherit version; src = fetchurl { - url = "http://m12-assets.unigine.com/d/Unigine_Tropics-${version}.run"; - sha256 = "0icasdp46fjnic7gk83pknjx0gpap9j202dm0llcfg5zin5kbq7x"; + url = "https://assets.unigine.com/d/Unigine_Tropics-${version}.run"; + sha256 = "sha256-/eA1i42/PMcoBbUJIGS66j7QpZ13oPkOi1Y6Q27TikU="; }; libPath = lib.makeLibraryPath [ @@ -92,5 +92,6 @@ stdenv.mkDerivation { license = lib.licenses.unfree; maintainers = [ lib.maintainers.BarinovMaxim ]; platforms = [ "x86_64-linux" "i686-linux" ]; + mainProgram = "Tropics"; }; } diff --git a/pkgs/applications/graphics/unigine-valley/default.nix b/pkgs/applications/graphics/unigine-valley/default.nix index ee1c9e6c15f89..6d73cf82cd66e 100644 --- a/pkgs/applications/graphics/unigine-valley/default.nix +++ b/pkgs/applications/graphics/unigine-valley/default.nix @@ -38,8 +38,8 @@ stdenv.mkDerivation rec { inherit version; src = fetchurl { - url = "https://m11-assets.unigine.com/d/Unigine_Valley-${version}.run"; - sha256 = "5f0c8bd2431118551182babbf5f1c20fb14e7a40789697240dcaf546443660f4"; + url = "https://assets.unigine.com/d/Unigine_Valley-${version}.run"; + sha256 = "sha256-XwyL0kMRGFURgrq79fHCD7FOekB4lpckDcr1RkQ2YPQ="; }; sourceRoot = "Unigine_Valley-${version}"; @@ -132,6 +132,7 @@ stdenv.mkDerivation rec { license = lib.licenses.unfree; # see also: $out/$instPath/documentation/License.pdf maintainers = [ lib.maintainers.kierdavis ]; platforms = [ "x86_64-linux" "i686-linux" ]; + mainProgram = "valley"; }; } diff --git a/pkgs/applications/graphics/vengi-tools/default.nix b/pkgs/applications/graphics/vengi-tools/default.nix index fb44d36f62a6d..d54d4e06f0d46 100644 --- a/pkgs/applications/graphics/vengi-tools/default.nix +++ b/pkgs/applications/graphics/vengi-tools/default.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation rec { pname = "vengi-tools"; - version = "0.0.20"; + version = "0.0.21"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${version}"; - sha256 = "sha256-WsG6mjO90QQNsAarxdupZvXubdy06JjQmVYUzygl8l4="; + sha256 = "sha256-T9YBU/YhhOASdKnzLcwQGBLc4HcQspiOV9VRgotfq3c="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 15c2d468fb4f0..2ba96fda3f0b9 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -12,9 +12,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + nativeBuildInputs = [ intltool ]; buildInputs = [ aalib gsl libpng libX11 xorgproto libXext - libXt zlib gettext intltool perl + libXt zlib gettext perl ]; preConfigure = '' diff --git a/pkgs/applications/graphics/yacreader/default.nix b/pkgs/applications/graphics/yacreader/default.nix index 0a25889c2dcd8..44733d8bead75 100644 --- a/pkgs/applications/graphics/yacreader/default.nix +++ b/pkgs/applications/graphics/yacreader/default.nix @@ -1,26 +1,27 @@ { mkDerivation, lib, fetchFromGitHub, qmake, poppler, pkg-config, libunarr -, libGLU, qtdeclarative, qtgraphicaleffects, qtmultimedia, qtquickcontrols +, libGLU, qtdeclarative, qtgraphicaleffects, qtmultimedia, qtquickcontrols2 , qtscript }: mkDerivation rec { pname = "yacreader"; - version = "9.8.2"; + version = "9.9.2"; src = fetchFromGitHub { owner = "YACReader"; repo = pname; rev = version; - sha256 = "sha256-Xvf0xXtMs3x1fPgAvS4GJXrZgDZWhzIgrOF4yECr7/g="; + sha256 = "sha256-rurJkCIuHTWxIGb+TTHp8sQS26/5W/sdtWFxyeqVx54="; }; nativeBuildInputs = [ qmake pkg-config ]; buildInputs = [ poppler libunarr libGLU qtmultimedia qtscript ]; - propagatedBuildInputs = [ qtquickcontrols qtgraphicaleffects qtdeclarative ]; + propagatedBuildInputs = [ qtquickcontrols2 qtgraphicaleffects qtdeclarative ]; meta = { description = "A comic reader for cross-platform reading and managing your digital comic collection"; homepage = "http://www.yacreader.com"; license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ srapenne ]; }; } |