diff options
Diffstat (limited to 'pkgs/applications/graphics')
-rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/graphics/artem/default.nix | 50 | ||||
-rw-r--r-- | pkgs/applications/graphics/batik/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/graphics/gnome-decoder/default.nix | 76 | ||||
-rw-r--r-- | pkgs/applications/graphics/gscan2pdf/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/graphics/gscan2pdf/ffmpeg5-compat.patch | 15 | ||||
-rw-r--r-- | pkgs/applications/graphics/hydrus/default.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/graphics/kodelife/default.nix | 8 | ||||
-rw-r--r-- | pkgs/applications/graphics/mypaint/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/graphics/pinta/deps.nix | 3 | ||||
-rw-r--r-- | pkgs/applications/graphics/vengi-tools/default.nix | 4 |
11 files changed, 170 insertions, 17 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 1e34527ce6c42..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-48"; + version = "7.1.0-49"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-ExGeZVqRajuYcck0JrIFGDEam4PfUCXF/jI2dudHh+E="; + 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/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/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 6b991e8dd398e..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 = "497"; + version = "501"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-dQ6a3jys6V1ihT6q8FUaX7jOA1ZDZdX5EUy03ILk7vM="; + 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/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/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/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/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 = [ |