diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/graphics')
86 files changed, 411 insertions, 834 deletions
diff --git a/nixpkgs/pkgs/applications/graphics/ahoviewer/default.nix b/nixpkgs/pkgs/applications/graphics/ahoviewer/default.nix index d903ce1adf8e..4c1d309ebbab 100644 --- a/nixpkgs/pkgs/applications/graphics/ahoviewer/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ahoviewer/default.nix @@ -42,6 +42,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/ahodesuka/ahoviewer"; description = "A GTK2 image viewer, manga reader, and booru browser"; + mainProgram = "ahoviewer"; maintainers = with maintainers; [ xzfc ]; license = licenses.mit; # Unintentionally not working on Darwin: diff --git a/nixpkgs/pkgs/applications/graphics/antimony/default.nix b/nixpkgs/pkgs/applications/graphics/antimony/default.nix index 50156802779c..56ee01f8bbe8 100644 --- a/nixpkgs/pkgs/applications/graphics/antimony/default.nix +++ b/nixpkgs/pkgs/applications/graphics/antimony/default.nix @@ -62,6 +62,7 @@ in meta = with lib; { description = "A computer-aided design (CAD) tool from a parallel universe"; + mainProgram = "antimony"; homepage = "https://github.com/mkeeter/antimony"; license = licenses.mit; maintainers = with maintainers; [ rnhmjoj ]; diff --git a/nixpkgs/pkgs/applications/graphics/apngasm/2.nix b/nixpkgs/pkgs/applications/graphics/apngasm/2.nix index 81d2915c96df..f581f9dd1245 100644 --- a/nixpkgs/pkgs/applications/graphics/apngasm/2.nix +++ b/nixpkgs/pkgs/applications/graphics/apngasm/2.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create highly optimized Animated PNG files from PNG/TGA images"; + mainProgram = "apngasm"; homepage = "https://apngasm.sourceforge.net/"; license = licenses.zlib; maintainers = with maintainers; [ orivej ]; diff --git a/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix b/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix index a5debbc21b02..ef9a2f7c7766 100644 --- a/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix +++ b/nixpkgs/pkgs/applications/graphics/awesomebump/default.nix @@ -14,7 +14,7 @@ let qtnproperty = mkDerivation { name = "qtnproperty"; inherit src; - sourceRoot = "AwesomeBump/Sources/utils/QtnProperty"; + sourceRoot = "${src.name}/Sources/utils/QtnProperty"; patches = [ ./qtnproperty-parallel-building.patch ]; buildInputs = [ qtscript qtbase qtdeclarative ]; nativeBuildInputs = [ qmake flex bison ]; diff --git a/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix b/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix deleted file mode 100644 index 50a10310546d..000000000000 --- a/nixpkgs/pkgs/applications/graphics/blockbench-electron/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ lib, stdenv, fetchurl, appimageTools, makeWrapper, electron_25 }: - -stdenv.mkDerivation rec { - pname = "blockbench-electron"; - version = "4.8.1"; - - src = fetchurl { - url = "https://github.com/JannisX11/blockbench/releases/download/v${version}/Blockbench_${version}.AppImage"; - sha256 = "sha256-CE2wDOt1WBcYmPs4sEyZ3LYvKLequFZH0B3huMYHlwA="; - name = "${pname}-${version}.AppImage"; - }; - - appimageContents = appimageTools.extractType2 { - name = "${pname}-${version}"; - inherit src; - }; - - dontUnpack = true; - dontConfigure = true; - dontBuild = true; - - nativeBuildInputs = [ makeWrapper ]; - - installPhase = '' - runHook preInstall - mkdir -p $out/bin $out/share/${pname} $out/share/applications - cp -a ${appimageContents}/{locales,resources} $out/share/${pname} - cp -a ${appimageContents}/blockbench.desktop $out/share/applications/${pname}.desktop - cp -a ${appimageContents}/usr/share/icons $out/share - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Exec=AppRun' 'Exec=${pname}' - runHook postInstall - ''; - - postFixup = '' - makeWrapper ${electron_25}/bin/electron $out/bin/${pname} \ - --add-flags $out/share/${pname}/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc ]}" - ''; - - meta = with lib; { - description = "A boxy 3D model editor powered by Electron"; - homepage = "https://blockbench.net/"; - license = licenses.gpl3Only; - maintainers = with maintainers; [ ckie ]; - platforms = [ "x86_64-linux" ]; - }; -} diff --git a/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix b/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix index 1ad3476e8091..e78b95c363b6 100644 --- a/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix +++ b/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix @@ -2,6 +2,8 @@ , stdenv , mkDerivation , fetchFromGitHub +, makeDesktopItem +, copyDesktopItems , cmake , boost , cgal @@ -23,13 +25,13 @@ mkDerivation rec { pname = "cloudcompare"; - version = "2.13"; + version = "2.13.1"; src = fetchFromGitHub { owner = "CloudCompare"; repo = "CloudCompare"; rev = "v${version}"; - hash = "sha256-tCmIdajizaTT1tvPA7YQoklfz7pYVKS0lJXrxV2fidg="; + hash = "sha256-QQwQt63tXxJnGaBLu+GvWkEazumYPhXnDe+giSu7wjk="; fetchSubmodules = true; }; @@ -37,6 +39,7 @@ mkDerivation rec { cmake eigen # header-only wrapGAppsHook + copyDesktopItems ]; buildInputs = [ @@ -96,12 +99,15 @@ mkDerivation rec { dontWrapGApps = true; postInstall = '' - install -Dm444 $src/snap/gui/{ccViewer,cloudcompare}.png -t $out/share/icons/hicolor/256x256/apps - install -Dm444 $src/snap/gui/{ccViewer,cloudcompare}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/{ccViewer,cloudcompare}.desktop \ - --replace 'Exec=cloudcompare.' 'Exec=' \ - --replace 'Icon=''${SNAP}/meta/gui/' 'Icon=' \ - --replace '.png' "" + install -Dm444 $src/qCC/images/icon/cc_icon_16.png $out/share/icons/hicolor/16x16/apps/CloudCompare.png + install -Dm444 $src/qCC/images/icon/cc_icon_32.png $out/share/icons/hicolor/32x32/apps/CloudCompare.png + install -Dm444 $src/qCC/images/icon/cc_icon_64.png $out/share/icons/hicolor/64x64/apps/CloudCompare.png + install -Dm444 $src/qCC/images/icon/cc_icon_256.png $out/share/icons/hicolor/256x256/apps/CloudCompare.png + + install -Dm444 $src/qCC/images/icon/cc_viewer_icon_16.png $out/share/icons/hicolor/16x16/apps/ccViewer.png + install -Dm444 $src/qCC/images/icon/cc_viewer_icon_32.png $out/share/icons/hicolor/32x32/apps/ccViewer.png + install -Dm444 $src/qCC/images/icon/cc_viewer_icon_64.png $out/share/icons/hicolor/64x64/apps/ccViewer.png + install -Dm444 $src/qCC/images/icon/cc_viewer_icon_256.png $out/share/icons/hicolor/256x256/apps/ccViewer.png ''; # fix file dialogs crashing on non-NixOS (and avoid double wrapping) @@ -109,11 +115,35 @@ mkDerivation rec { qtWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + desktopItems = [ + (makeDesktopItem { + name = "CloudCompare"; + desktopName = "CloudCompare"; + comment = "3D point cloud and mesh processing software"; + exec = "CloudCompare"; + terminal = false; + categories = [ "Graphics" "3DGraphics" "Viewer" ]; + keywords = [ "3d" "processing" ]; + icon = "CloudCompare"; + }) + (makeDesktopItem { + name = "ccViewer"; + desktopName = "CloudCompare Viewer"; + comment = "3D point cloud and mesh processing software"; + exec = "ccViewer"; + terminal = false; + categories = [ "Graphics" "3DGraphics" "Viewer" ]; + keywords = [ "3d" "viewer" ]; + icon = "ccViewer"; + }) + ]; + meta = with lib; { description = "3D point cloud and mesh processing software"; homepage = "https://cloudcompare.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ nh2 ]; + mainProgram = "CloudCompare"; platforms = with platforms; linux; # only tested here; might work on others }; } diff --git a/nixpkgs/pkgs/applications/graphics/conjure/default.nix b/nixpkgs/pkgs/applications/graphics/conjure/default.nix index b0b00369ffde..634cf7132b1d 100644 --- a/nixpkgs/pkgs/applications/graphics/conjure/default.nix +++ b/nixpkgs/pkgs/applications/graphics/conjure/default.nix @@ -57,6 +57,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "Magically transform your images"; + mainProgram = "conjure"; longDescription = '' Resize, crop, rotate, flip images, apply various filters and effects, adjust levels and brightness, and much more. An intuitive tool for designers, diff --git a/nixpkgs/pkgs/applications/graphics/curtail/default.nix b/nixpkgs/pkgs/applications/graphics/curtail/default.nix index 30ca2289526b..2a881c153f68 100644 --- a/nixpkgs/pkgs/applications/graphics/curtail/default.nix +++ b/nixpkgs/pkgs/applications/graphics/curtail/default.nix @@ -69,6 +69,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Simple & useful image compressor"; + mainProgram = "curtail"; homepage = "https://github.com/Huluti/Curtail"; license = licenses.gpl3Only; maintainers = with maintainers; [ anselmschueler ]; diff --git a/nixpkgs/pkgs/applications/graphics/dia/default.nix b/nixpkgs/pkgs/applications/graphics/dia/default.nix index eb9d54d5cfc1..c79f50e86d79 100644 --- a/nixpkgs/pkgs/applications/graphics/dia/default.nix +++ b/nixpkgs/pkgs/applications/graphics/dia/default.nix @@ -68,6 +68,7 @@ stdenv.mkDerivation { meta = with lib; { description = "Gnome Diagram drawing software"; + mainProgram = "dia"; homepage = "http://live.gnome.org/Dia"; maintainers = with maintainers; [ raskin ]; license = licenses.gpl2; diff --git a/nixpkgs/pkgs/applications/graphics/digikam/default.nix b/nixpkgs/pkgs/applications/graphics/digikam/default.nix deleted file mode 100644 index 8bc94f9c2b23..000000000000 --- a/nixpkgs/pkgs/applications/graphics/digikam/default.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ mkDerivation, config, lib, fetchpatch, fetchurl, cmake, doxygen, extra-cmake-modules, wrapGAppsHook - -# For `digitaglinktree` -, perl, sqlite - -, qtbase -, qtxmlpatterns -, qtsvg -, qtwebengine -, qtnetworkauth - -, akonadi-contacts -, kcalendarcore -, kconfigwidgets -, kcoreaddons -, kdoctools -, kfilemetadata -, knotifications -, knotifyconfig -, ktextwidgets -, kwidgetsaddons -, kxmlgui - -, bison -, boost -, eigen -, exiv2 -, ffmpeg_4 -, flex -, graphviz -, imagemagick -, lcms2 -, lensfun -, libgphoto2 -, libkipi -, libksane -, liblqr1 -, libqtav -, libusb1 -, marble -, libGL -, libGLU -, opencv -, pcre -, threadweaver -, x265 -, jasper - -# For panorama and focus stacking -, enblend-enfuse -, hugin -, gnumake - -, breeze-icons -, oxygen - -, cudaSupport ? config.cudaSupport -, cudaPackages ? {} -}: - -mkDerivation rec { - pname = "digikam"; - version = "8.1.0"; - - src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/digiKam-${version}.tar.xz"; - hash = "sha256-BQPANORF/0JPGKZxXAp6eb5KXgyCs+vEYaIc7DdFpbM="; - }; - - # Fix build against exiv2 0.28.1 - patches = [ - (fetchpatch { - url = "https://invent.kde.org/graphics/digikam/-/commit/f5ea91a7f6c1926815ec68f3e0176d6c15b83051.patch"; - hash = "sha256-5g2NaKKNKVfgW3dTO/IP/H/nZ0YAIOmdPAumy3NEaNg="; - }) - ]; - - nativeBuildInputs = [ - cmake - doxygen - extra-cmake-modules - kdoctools - wrapGAppsHook - ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_nvcc - ]); - - buildInputs = [ - bison - boost - eigen - exiv2 - ffmpeg_4 - flex - graphviz - imagemagick - lcms2 - lensfun - libgphoto2 - libkipi - libksane - liblqr1 - libqtav - libusb1 - libGL - libGLU - opencv - pcre - x265 - jasper - - qtbase - qtxmlpatterns - qtsvg - qtwebengine - qtnetworkauth - - akonadi-contacts - kcalendarcore - kconfigwidgets - kcoreaddons - kfilemetadata - knotifications - knotifyconfig - ktextwidgets - kwidgetsaddons - kxmlgui - - breeze-icons - marble - oxygen - threadweaver - ] ++ lib.optionals cudaSupport (with cudaPackages; [ - cuda_cudart - ]); - - cmakeFlags = [ - "-DENABLE_MYSQLSUPPORT=1" - "-DENABLE_INTERNALMYSQL=1" - "-DENABLE_MEDIAPLAYER=1" - "-DENABLE_QWEBENGINE=on" - "-DENABLE_APPSTYLES=on" - "-DCMAKE_CXX_FLAGS=-I${libksane}/include/KF5" # fix `#include <ksane_version.h>` - ]; - - dontWrapGApps = true; - - preFixup = '' - qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - qtWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]}) - qtWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname}) - substituteInPlace $out/bin/digitaglinktree \ - --replace "/usr/bin/perl" "${perl}/bin/perl" \ - --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3" - ''; - - meta = with lib; { - 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/displaycal/default.nix b/nixpkgs/pkgs/applications/graphics/displaycal/default.nix deleted file mode 100644 index 0eef148398cb..000000000000 --- a/nixpkgs/pkgs/applications/graphics/displaycal/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ lib -, python3 -, fetchPypi -, wrapGAppsHook -, gtk3 -, librsvg -, xorg -, argyllcms -}: - -python3.pkgs.buildPythonApplication rec { - pname = "displaycal"; - version = "3.9.11"; - format = "setuptools"; - - src = fetchPypi { - pname = "DisplayCAL"; - inherit version; - hash = "sha256-zAZW2eMjwRYevlz8KEzTxzGO8vx5AydfY3vGTapNo1c="; - }; - - nativeBuildInputs = [ - wrapGAppsHook - gtk3 - ]; - - propagatedBuildInputs = with python3.pkgs; [ - build - certifi - wxpython - dbus-python - distro - numpy - pillow - pychromecast - send2trash - zeroconf - ]; - - buildInputs = [ - gtk3 - librsvg - ] ++ (with xorg; [ - libX11 - libXxf86vm - libXext - libXinerama - libXrandr - ]); - - # Workaround for eoyilmaz/displaycal-py3#261 - setupPyGlobalFlags = [ "appdata" ]; - - doCheck = false; # Tests try to access an X11 session and dbus in weird locations. - - pythonImportsCheck = [ "DisplayCAL" ]; - - dontWrapGApps = true; - - preFixup = '' - makeWrapperArgs+=( - ''${gappsWrapperArgs[@]} - --prefix PATH : ${lib.makeBinPath [ argyllcms ]} - --prefix PYTHONPATH : $PYTHONPATH - ) - ''; - - meta = with lib; { - description = "Display calibration and characterization powered by Argyll CMS (Migrated to Python 3)"; - homepage = "https://github.com/eoyilmaz/displaycal-py3"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ toastal ]; - }; -} diff --git a/nixpkgs/pkgs/applications/graphics/djview/default.nix b/nixpkgs/pkgs/applications/graphics/djview/default.nix index 6386c39ce910..5bbbfc0c686c 100644 --- a/nixpkgs/pkgs/applications/graphics/djview/default.nix +++ b/nixpkgs/pkgs/applications/graphics/djview/default.nix @@ -46,6 +46,7 @@ mkDerivation rec { meta = with lib; { broken = stdenv.isDarwin; description = "A portable DjVu viewer (Qt5) and browser (nsdejavu) plugin"; + mainProgram = "djview"; homepage = "https://djvu.sourceforge.net/djview4.html"; license = licenses.gpl2; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/graphics/dosage/default.nix b/nixpkgs/pkgs/applications/graphics/dosage/default.nix index 6bdf149c9b97..1aaa53948619 100644 --- a/nixpkgs/pkgs/applications/graphics/dosage/default.nix +++ b/nixpkgs/pkgs/applications/graphics/dosage/default.nix @@ -23,6 +23,7 @@ python3Packages.buildPythonApplication rec { meta = { description = "A comic strip downloader and archiver"; + mainProgram = "dosage"; homepage = "https://dosage.rocks/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ toonn ]; diff --git a/nixpkgs/pkgs/applications/graphics/drawing/default.nix b/nixpkgs/pkgs/applications/graphics/drawing/default.nix index 693c0b213b54..90caf78d6313 100644 --- a/nixpkgs/pkgs/applications/graphics/drawing/default.nix +++ b/nixpkgs/pkgs/applications/graphics/drawing/default.nix @@ -63,6 +63,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A free basic image editor, similar to Microsoft Paint, but aiming at the GNOME desktop"; + mainProgram = "drawing"; homepage = "https://maoschanz.github.io/drawing/"; changelog = "https://github.com/maoschanz/drawing/releases/tag/${version}"; maintainers = with maintainers; [ mothsart ]; diff --git a/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 08a0ba5b8125..b9c56a01e006 100644 --- a/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -6,6 +6,7 @@ , copyDesktopItems , prefetch-yarn-deps , makeWrapper +, autoSignDarwinBinariesHook , nodejs , yarn , electron @@ -13,19 +14,24 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "23.1.5"; + version = "24.0.4"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-ThmTahuU0o/vr6h/T/zCyEB5/APJlVA6t1TNfZgqTJ0="; + hash = "sha256-+TCnVXcmAEpa7MiL0dyeoh2aUfIIO8eze9pEaHgKnME="; }; + # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead + postPatch = '' + sed -i -e 's/resetAdHocDarwinSignature:.*/resetAdHocDarwinSignature: false,/' build/fuses.js + ''; + offlineCache = fetchYarnDeps { yarnLock = src + "/yarn.lock"; - hash = "sha256-hL89WVYy/EQe6Zppmr17Q9T2o/UjBvydDIgGpr7AA5M="; + hash = "sha256-QS0bkDDQq3sn79TQ+pTZsmbmXgMccyLmlPLTsko7eGg="; }; nativeBuildInputs = [ @@ -35,6 +41,8 @@ stdenv.mkDerivation rec { yarn ] ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems + ] ++ lib.optionals stdenv.isDarwin [ + autoSignDarwinBinariesHook ]; ELECTRON_SKIP_BINARY_DOWNLOAD = true; diff --git a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix index ea07e2314217..5c43c609f31f 100644 --- a/nixpkgs/pkgs/applications/graphics/drawpile/default.nix +++ b/nixpkgs/pkgs/applications/graphics/drawpile/default.nix @@ -98,6 +98,7 @@ in mkDerivation rec { meta = { description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously"; + mainProgram = "drawpile-srv"; homepage = "https://drawpile.net/"; downloadPage = "https://drawpile.net/download/"; license = licenses.gpl3; diff --git a/nixpkgs/pkgs/applications/graphics/eddy/default.nix b/nixpkgs/pkgs/applications/graphics/eddy/default.nix index 58b8777bb223..6dac49fc5d15 100644 --- a/nixpkgs/pkgs/applications/graphics/eddy/default.nix +++ b/nixpkgs/pkgs/applications/graphics/eddy/default.nix @@ -40,6 +40,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { homepage = "http://www.obdasystems.com/eddy"; description = "Graphical editor for the specification and visualization of Graphol ontologies"; + mainProgram = "eddy"; license = licenses.gpl3Only; platforms = platforms.linux; maintainers = with maintainers; [ koslambrou ]; diff --git a/nixpkgs/pkgs/applications/graphics/emblem/default.nix b/nixpkgs/pkgs/applications/graphics/emblem/default.nix index b2df35c20c4b..6d490fc24141 100644 --- a/nixpkgs/pkgs/applications/graphics/emblem/default.nix +++ b/nixpkgs/pkgs/applications/graphics/emblem/default.nix @@ -57,6 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Generate project icons and avatars from a symbolic icon"; + mainProgram = "emblem"; homepage = "https://gitlab.gnome.org/World/design/emblem"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix b/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix index 8e6d8328a3cb..fb397239849b 100644 --- a/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix +++ b/nixpkgs/pkgs/applications/graphics/evilpixie/default.nix @@ -40,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Pixel-oriented paint program, modelled on Deluxe Paint"; + mainProgram = "evilpixie"; homepage = "https://github.com/bcampbell/evilpixie"; # http://evilpixie.scumways.com/ is gone downloadPage = "https://github.com/bcampbell/evilpixie/releases"; license = licenses.gpl3Only; diff --git a/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix b/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix index f531f8c16271..efa60ac32826 100644 --- a/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix +++ b/nixpkgs/pkgs/applications/graphics/eyedropper/default.nix @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Pick and format colors"; + mainProgram = "eyedropper"; homepage = "https://github.com/FineFindus/eyedropper"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/graphics/fiji/default.nix b/nixpkgs/pkgs/applications/graphics/fiji/default.nix index e3847b98d519..c5f4d08f30e4 100644 --- a/nixpkgs/pkgs/applications/graphics/fiji/default.nix +++ b/nixpkgs/pkgs/applications/graphics/fiji/default.nix @@ -65,6 +65,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://imagej.net/software/fiji/"; description = "batteries-included distribution of ImageJ2, bundling a lot of plugins which facilitate scientific image analysis"; + mainProgram = "fiji"; platforms = [ "x86_64-linux" ]; sourceProvenance = with sourceTypes; [ binaryBytecode diff --git a/nixpkgs/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch b/nixpkgs/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch deleted file mode 100644 index 27e5fb81b8d0..000000000000 --- a/nixpkgs/pkgs/applications/graphics/freecad/0001-NIXOS-don-t-ignore-PYTHONPATH.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c4f452ef6ae083ed21095313582f6d1bd775cbf3 Mon Sep 17 00:00:00 2001 -From: Andreas Rammhold <andreas@rammhold.de> -Date: Thu, 2 Nov 2023 17:32:07 +0100 -Subject: [PATCH] NIXOS: don't ignore PYTHONPATH - -On NixOS or rather within nixpkgs we provide the runtime Python -packages via the PYTHONPATH environment variable. FreeCAD tries its -best to ignore Python environment variables that are being inherited -from the environment. For Python versions >=3.11 it also tries to -initialize the interpreter config without any environmental data. We -have to initialize the configuration *with* the information from the -environment for our packaging to work. - -Upstream has purposely isolated the environments AFAIK and thus -shouldn't accept this patch (as is). What they might accept (once -support for older Python versions has been dropped) is removing the -PYTHONPATH specific putenv calls. ---- - src/Base/Interpreter.cpp | 2 +- - src/Main/MainGui.cpp | 3 --- - 2 files changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/Base/Interpreter.cpp b/src/Base/Interpreter.cpp -index 52c47168af..9966bd0013 100644 ---- a/src/Base/Interpreter.cpp -+++ b/src/Base/Interpreter.cpp -@@ -554,7 +554,9 @@ void initInterpreter(int argc,char *argv[]) - { - PyStatus status; - PyConfig config; - PyConfig_InitIsolatedConfig(&config); -+ config.isolated = 0; -+ config.use_environment = 1; - - status = PyConfig_SetBytesArgv(&config, argc, argv); - if (PyStatus_Exception(status)) { -diff --git a/src/Main/MainGui.cpp b/src/Main/MainGui.cpp -index 48ae847ef4..28813df383 100644 ---- a/src/Main/MainGui.cpp -+++ b/src/Main/MainGui.cpp -@@ -112,17 +112,14 @@ int main( int argc, char ** argv ) - // See https://forum.freecad.org/viewtopic.php?f=18&t=20600 - // See Gui::Application::runApplication() - putenv("LC_NUMERIC=C"); -- putenv("PYTHONPATH="); - #elif defined(FC_OS_MACOSX) - (void)QLocale::system(); -- putenv("PYTHONPATH="); - #elif defined(__MINGW32__) - const char* mingw_prefix = getenv("MINGW_PREFIX"); - const char* py_home = getenv("PYTHONHOME"); - if (!py_home && mingw_prefix) - _putenv_s("PYTHONHOME", mingw_prefix); - #else -- _putenv("PYTHONPATH="); - // https://forum.freecad.org/viewtopic.php?f=4&t=18288 - // https://forum.freecad.org/viewtopic.php?f=3&t=20515 - const char* fc_py_home = getenv("FC_PYTHONHOME"); --- -2.42.0 - diff --git a/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/nixpkgs/pkgs/applications/graphics/freecad/default.nix deleted file mode 100644 index 1ef114c9c496..000000000000 --- a/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ /dev/null @@ -1,190 +0,0 @@ -{ lib -, fmt -, stdenv -, fetchFromGitHub -, cmake -, doxygen -, ninja -, gitpython -, boost -, coin3d -, eigen -, freecad # for passthru.tests -, gfortran -, gts -, hdf5 -, libGLU -, libXmu -, libf2c -, libredwg -, libspnav -, matplotlib -, medfile -, mpi -, ode -, opencascade-occt -, pivy -, pkg-config -, ply -, pycollada -, pyside2 -, pyside2-tools -, python -, pyyaml -, qtbase -, qttools -, qtwebengine -, qtx11extras -, qtxmlpatterns -, runCommand # for passthru.tests -, scipy -, shiboken2 -, soqt -, spaceNavSupport ? stdenv.isLinux -, swig -, vtk -, wrapQtAppsHook -, wrapGAppsHook -, xercesc -, zlib -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "freecad"; - version = "0.21.2"; - - src = fetchFromGitHub { - owner = "FreeCAD"; - repo = "FreeCAD"; - rev = finalAttrs.version; - hash = "sha256-OX4s9rbGsAhH7tLJkUJYyq2A2vCdkq/73iqYo9adogs="; - }; - - nativeBuildInputs = [ - cmake - ninja - pkg-config - pyside2-tools - gfortran - wrapQtAppsHook - wrapGAppsHook - ]; - - buildInputs = [ - gitpython # for addon manager - boost - coin3d - doxygen - eigen - fmt - gts - hdf5 - libGLU - libXmu - libf2c - matplotlib - medfile - mpi - ode - opencascade-occt - pivy - ply # for openSCAD file support - pycollada - pyside2 - pyside2-tools - python - pyyaml # (at least for) PyrateWorkbench - qtbase - qttools - qtwebengine - qtxmlpatterns - scipy - shiboken2 - soqt - swig - vtk - xercesc - zlib - ] ++ lib.optionals spaceNavSupport [ - libspnav - qtx11extras - ]; - - patches = [ - ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch - ]; - - cmakeFlags = [ - "-Wno-dev" # turns off warnings which otherwise makes it hard to see what is going on - "-DBUILD_FLAT_MESH:BOOL=ON" - "-DBUILD_QT5=ON" - "-DSHIBOKEN_INCLUDE_DIR=${shiboken2}/include" - "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" - ("-DPYSIDE_INCLUDE_DIR=${pyside2}/include" - + ";${pyside2}/include/PySide2/QtCore" - + ";${pyside2}/include/PySide2/QtWidgets" - + ";${pyside2}/include/PySide2/QtGui" - ) - "-DPYSIDE_LIBRARY=PySide2::pyside2" - ]; - - # This should work on both x86_64, and i686 linux - preBuild = '' - export NIX_LDFLAGS="-L${gfortran.cc}/lib64 -L${gfortran.cc}/lib $NIX_LDFLAGS"; - ''; - - preConfigure = '' - qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") - ''; - - qtWrapperArgs = [ - "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" - "--prefix PATH : ${libredwg}/bin" - "--set QT_QPA_PLATFORM xcb" - ]; - - postFixup = '' - mv $out/share/doc $out - ln -s $out/bin/FreeCAD $out/bin/freecad - ln -s $out/bin/FreeCADCmd $out/bin/freecadcmd - ''; - - passthru.tests = { - # Check that things such as argument parsing still work correctly with - # the above PYTHONPATH patch. Previously the patch used above changed - # the `PyConfig_InitIsolatedConfig` to `PyConfig_InitPythonConfig`, - # which caused the built-in interpreter to attempt (and fail) to doubly - # parse argv. This should catch if that ever regresses and also ensures - # that PYTHONPATH is still respected enough for the FreeCAD console to - # successfully run and check that it was included in `sys.path`. - python-path = runCommand "freecad-test-console" { - nativeBuildInputs = [ freecad ]; - } '' - HOME="$(mktemp -d)" PYTHONPATH="$(pwd)/test" FreeCADCmd --log-file $out -c "if not '$(pwd)/test' in sys.path: sys.exit(1)" </dev/null - ''; - }; - - meta = { - homepage = "https://www.freecad.org"; - description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - longDescription = '' - FreeCAD is an open-source parametric 3D modeler made primarily to design - real-life objects of any size. Parametric modeling allows you to easily - modify your design by going back into your model history and changing its - parameters. - - FreeCAD allows you to sketch geometry constrained 2D shapes and use them - as a base to build other objects. It contains many components to adjust - dimensions or extract design details from 3D models to create high quality - production ready drawings. - - FreeCAD is designed to fit a wide range of uses including product design, - mechanical engineering and architecture. Whether you are a hobbyist, a - programmer, an experienced CAD user, a student or a teacher, you will feel - right at home with FreeCAD. - ''; - license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ viric gebner AndersonTorres ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/nixpkgs/pkgs/applications/graphics/fstl/default.nix b/nixpkgs/pkgs/applications/graphics/fstl/default.nix index c7faf43e24e8..a004c2dd8d77 100644 --- a/nixpkgs/pkgs/applications/graphics/fstl/default.nix +++ b/nixpkgs/pkgs/applications/graphics/fstl/default.nix @@ -24,6 +24,7 @@ mkDerivation rec { meta = with lib; { description = "The fastest STL file viewer"; + mainProgram = "fstl"; homepage = "https://github.com/fstl-app/fstl"; license = licenses.mit; platforms = platforms.linux ++ platforms.darwin; diff --git a/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix b/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix index 6895a334f1e5..ae36266f29c8 100644 --- a/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple color chooser written in GTK3"; + mainProgram = "gcolor3"; homepage = "https://gitlab.gnome.org/World/gcolor3"; license = licenses.gpl2Plus; maintainers = with maintainers; [ ]; diff --git a/nixpkgs/pkgs/applications/graphics/geeqie/default.nix b/nixpkgs/pkgs/applications/graphics/geeqie/default.nix index 653dad23b638..a064e27a6657 100644 --- a/nixpkgs/pkgs/applications/graphics/geeqie/default.nix +++ b/nixpkgs/pkgs/applications/graphics/geeqie/default.nix @@ -66,6 +66,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Lightweight GTK based image viewer"; + mainProgram = "geeqie"; longDescription = '' diff --git a/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix b/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix index 4ef13e7ad312..16d5ab6d33c1 100644 --- a/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix @@ -5,7 +5,7 @@ { config, lib, pkgs }: let - inherit (pkgs) stdenv fetchurl fetchpatch pkg-config intltool glib fetchFromGitHub; + inherit (pkgs) stdenv fetchurl fetchpatch pkg-config intltool glib fetchFromGitHub fetchFromGitLab; in lib.makeScope pkgs.newScope (self: @@ -111,13 +111,18 @@ in Video */ pname = "gap"; - version = "2.6.0"; - - src = fetchurl { - url = "https://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2"; - sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; + version = "2.6.0-unstable-2023-05-20"; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "Archive"; + repo = "gimp-gap"; + rev = "b2aa06cc7ee4ae1938f14640fe46b75ef5b15982"; + hash = "sha256-q5TgCy0+iIfxyqJRXsKxiFrWMFSzBqC0SA9MBGTHXcA="; }; + nativeBuildInputs = with pkgs; [autoreconfHook]; + hardeningDisable = [ "format" ]; env = { diff --git a/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix b/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix index 7a51f037f995..fbcc5ebcf478 100644 --- a/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix @@ -114,6 +114,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Access, organize and share your photos"; + mainProgram = "gnome-photos"; homepage = "https://wiki.gnome.org/Apps/Photos"; license = licenses.gpl3Plus; maintainers = teams.gnome.members; diff --git a/nixpkgs/pkgs/applications/graphics/goxel/default.nix b/nixpkgs/pkgs/applications/graphics/goxel/default.nix index 0b10cda884c7..000fd3719263 100644 --- a/nixpkgs/pkgs/applications/graphics/goxel/default.nix +++ b/nixpkgs/pkgs/applications/graphics/goxel/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, scons, pkg-config, wrapGAppsHook -, glfw3, gtk3, libpng12 }: +, glfw3, gtk3, libpng }: stdenv.mkDerivation (finalAttrs: { pname = "goxel"; @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { }; nativeBuildInputs = [ scons pkg-config wrapGAppsHook ]; - buildInputs = [ glfw3 gtk3 libpng12 ]; + buildInputs = [ glfw3 gtk3 libpng ]; buildPhase = '' make release @@ -33,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Open Source 3D voxel editor"; + mainProgram = "goxel"; homepage = "https://guillaumechereau.github.io/goxel/"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/graphics/gthumb/default.nix b/nixpkgs/pkgs/applications/graphics/gthumb/default.nix index 44a86c6447dc..79793c688711 100644 --- a/nixpkgs/pkgs/applications/graphics/gthumb/default.nix +++ b/nixpkgs/pkgs/applications/graphics/gthumb/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.12.5"; + version = "3.12.6"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-9jhd9F/oxyYuw0nhP4FRLpDpl5jdI3eTLkKR1jNZ86s="; + sha256 = "sha256-YIdwxsjnMHOh1AS2W9G3YeGsXcJecBMP8HJIj6kvXDM="; }; nativeBuildInputs = [ @@ -109,6 +109,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://wiki.gnome.org/Apps/Gthumb"; description = "Image browser and viewer for GNOME"; + mainProgram = "gthumb"; platforms = platforms.linux; license = licenses.gpl2Plus; maintainers = [ maintainers.mimame ]; diff --git a/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix b/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix index 827ee15af60a..cfd5fe516be5 100644 --- a/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix +++ b/nixpkgs/pkgs/applications/graphics/hdrmerge/default.nix @@ -72,6 +72,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://github.com/jcelaya/hdrmerge"; description = "Combines two or more raw images into an HDR"; + mainProgram = "hdrmerge"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = [ maintainers.paperdigits ]; diff --git a/nixpkgs/pkgs/applications/graphics/icon-library/default.nix b/nixpkgs/pkgs/applications/graphics/icon-library/default.nix index 6033843e4aeb..25cc1ebebfbc 100644 --- a/nixpkgs/pkgs/applications/graphics/icon-library/default.nix +++ b/nixpkgs/pkgs/applications/graphics/icon-library/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/World/design/icon-library"; description = "Symbolic icons for your apps"; + mainProgram = "icon-library"; maintainers = with maintainers; [ qyliss ]; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/graphics/identity/default.nix b/nixpkgs/pkgs/applications/graphics/identity/default.nix index a17ecf7a6fb2..8d9caa58543c 100644 --- a/nixpkgs/pkgs/applications/graphics/identity/default.nix +++ b/nixpkgs/pkgs/applications/graphics/identity/default.nix @@ -69,6 +69,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A program for comparing multiple versions of an image or video"; + mainProgram = "identity"; homepage = "https://gitlab.gnome.org/YaLTeR/identity"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/graphics/image-roll/default.nix b/nixpkgs/pkgs/applications/graphics/image-roll/default.nix index 461a07837d83..2c142b7bbb80 100644 --- a/nixpkgs/pkgs/applications/graphics/image-roll/default.nix +++ b/nixpkgs/pkgs/applications/graphics/image-roll/default.nix @@ -40,6 +40,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Simple and fast GTK image viewer with basic image manipulation tools"; + mainProgram = "image-roll"; homepage = "https://github.com/weclaw1/image-roll"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; diff --git a/nixpkgs/pkgs/applications/graphics/imgp/default.nix b/nixpkgs/pkgs/applications/graphics/imgp/default.nix index 995aaf2599df..bb2334222fb7 100644 --- a/nixpkgs/pkgs/applications/graphics/imgp/default.nix +++ b/nixpkgs/pkgs/applications/graphics/imgp/default.nix @@ -31,6 +31,7 @@ buildPythonApplication rec { meta = with lib; { description = "High-performance CLI batch image resizer & rotator"; + mainProgram = "imgp"; homepage = "https://github.com/jarun/imgp"; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix b/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix index 4b9b93505ad8..65ec4eb71d42 100644 --- a/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix +++ b/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix @@ -29,6 +29,7 @@ mkDerivation rec { meta = with lib; { description = "A Graphviz dot graph viewer for KDE"; + mainProgram = "kgraphviewer"; license = licenses.gpl2; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/graphics/komikku/default.nix b/nixpkgs/pkgs/applications/graphics/komikku/default.nix index 4a4b499ca4d0..d69475213439 100644 --- a/nixpkgs/pkgs/applications/graphics/komikku/default.nix +++ b/nixpkgs/pkgs/applications/graphics/komikku/default.nix @@ -88,6 +88,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "Manga reader for GNOME"; + mainProgram = "komikku"; homepage = "https://apps.gnome.org/Komikku/"; license = licenses.gpl3Plus; changelog = "https://codeberg.org/valos/Komikku/releases/tag/v${version}"; diff --git a/nixpkgs/pkgs/applications/graphics/krop/default.nix b/nixpkgs/pkgs/applications/graphics/krop/default.nix index 0adcf0b538d2..93e24b24b53b 100644 --- a/nixpkgs/pkgs/applications/graphics/krop/default.nix +++ b/nixpkgs/pkgs/applications/graphics/krop/default.nix @@ -37,6 +37,7 @@ python3Packages.buildPythonApplication rec { meta = { homepage = "http://arminstraub.com/software/krop"; description = "Graphical tool to crop the pages of PDF files"; + mainProgram = "krop"; longDescription = '' Krop is a tool that allows you to optimise your PDF files, and remove sections of the page you do not want. A unique feature of krop, at least to my diff --git a/nixpkgs/pkgs/applications/graphics/ktikz/default.nix b/nixpkgs/pkgs/applications/graphics/ktikz/default.nix index d176ce38f0ad..b7fe2e205fa8 100644 --- a/nixpkgs/pkgs/applications/graphics/ktikz/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ktikz/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Editor for the TikZ language"; + mainProgram = "qtikz"; homepage = "https://github.com/fhackenberger/ktikz"; license = licenses.gpl2; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/graphics/leocad/default.nix b/nixpkgs/pkgs/applications/graphics/leocad/default.nix index bb37dc5ef027..9a0bbaefe505 100644 --- a/nixpkgs/pkgs/applications/graphics/leocad/default.nix +++ b/nixpkgs/pkgs/applications/graphics/leocad/default.nix @@ -56,6 +56,7 @@ mkDerivation rec { meta = with lib; { description = "CAD program for creating virtual LEGO models"; + mainProgram = "leocad"; homepage = "https://www.leocad.org/"; license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; diff --git a/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/nixpkgs/pkgs/applications/graphics/lightburn/default.nix index 7ac16d934fa8..cd2a1f4b5184 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.5.02"; + version = "1.5.04"; 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-1gmiPWrNk3T8WJ9u/4UzrhwxOcPUKyWIqtwqJiXA4c4="; + sha256 = "sha256-cyQUv/KqdtDwCFo8CatJYdepgdWNwTSMyDLzOjvvO5c="; }; buildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix b/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix index 68e88bdea28a..1f1116096821 100644 --- a/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix +++ b/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix @@ -55,6 +55,7 @@ mkDerivation rec { meta = with lib; { description = "A 3D fractal rendering engine"; + mainProgram = "mandelbulber2"; longDescription = "Mandelbulber creatively generates three-dimensional fractals. Explore trigonometric, hyper-complex, Mandelbox, IFS, and many other 3D fractals."; homepage = "https://mandelbulber.com"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/applications/graphics/meshlab/default.nix b/nixpkgs/pkgs/applications/graphics/meshlab/default.nix index bee1e35ec129..32d528831539 100644 --- a/nixpkgs/pkgs/applications/graphics/meshlab/default.nix +++ b/nixpkgs/pkgs/applications/graphics/meshlab/default.nix @@ -86,6 +86,7 @@ mkDerivation rec { meta = { description = "A system for processing and editing 3D triangular meshes"; + mainProgram = "meshlab"; homepage = "https://www.meshlab.net/"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ viric ]; diff --git a/nixpkgs/pkgs/applications/graphics/oculante/default.nix b/nixpkgs/pkgs/applications/graphics/oculante/default.nix index d6f8c1d641cb..f83184a488aa 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.13"; + version = "0.8.16"; src = fetchFromGitHub { owner = "woelper"; repo = "oculante"; rev = version; - hash = "sha256-RbRvV3OkRZXc0n7qGzqbBtbU81wFc+/Ohg9pbVqdsw4="; + hash = "sha256-C8USTDW5C+mjj/fr242is/42RpmUvcK3lUeaq0/BSGA="; }; - cargoHash = "sha256-qt4bHCHpiP6yOce9hquVVlLFF906ADwhss4xAP9E0fA="; + cargoHash = "sha256-w8k0QG509PRHHB1e4WThYnM6R0PwWMbSBxs2B0zQ0ww="; nativeBuildInputs = [ cmake diff --git a/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix b/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix index 7fd9606f3abc..1dd460c2e1d2 100644 --- a/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix +++ b/nixpkgs/pkgs/applications/graphics/opentoonz/default.nix @@ -1,12 +1,93 @@ -{ boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint -, libpng, libtiff, libusb1, lz4, xz, lzo, openblas, opencv, pkg-config, qtbase -, qtmultimedia, qtscript, qtserialport, lib, stdenv, superlu, wrapQtAppsHook, }: -let source = import ./source.nix { inherit fetchFromGitHub; }; -in stdenv.mkDerivation rec { - inherit (source) src; +{ boost +, cmake +, fetchFromGitHub +, freeglut +, freetype +, glew +, libjpeg +, libmypaint +, libpng +, libusb1 +, lz4 +, xz +, lzo +, openblas +, opencv +, pkg-config +, qtbase +, qtmultimedia +, qtscript +, qtserialport +, lib +, stdenv +, superlu +, wrapQtAppsHook +, libtiff +, zlib +}: +let + libtiff-ver = "4.0.3"; # The version in thirdparty/tiff-* + opentoonz-ver = "1.7.1"; + + src = fetchFromGitHub { + owner = "opentoonz"; + repo = "opentoonz"; + rev = "v${opentoonz-ver}"; + hash = "sha256-5iXOvh4QTv+G0fjEHU62u7QCee+jbvKhK0+fQXbdJis="; + }; + + opentoonz-opencv = opencv.override { + inherit libtiff; + }; + + opentoonz-libtiff = stdenv.mkDerivation { + pname = "libtiff"; + version = "${libtiff-ver}-opentoonz"; + + inherit src; + outputs = [ "bin" "dev" "out" "man" "doc" ]; + + nativeBuildInputs = [ pkg-config ]; + propagatedBuildInputs = [ zlib libjpeg xz ]; + + postUnpack = '' + sourceRoot="$sourceRoot/thirdparty/tiff-${libtiff-ver}" + ''; + + # opentoonz uses internal libtiff headers + postInstall = '' + cp libtiff/{tif_config,tif_dir,tiffiop}.h $dev/include + ''; + + meta = libtiff.meta // { + knownVulnerabilities = [ + '' + Do not open untrusted files with Opentoonz: + Opentoonz uses an old custom fork of tibtiff from 2012 that is known to + be affected by at least these 50 vulnerabilities: + CVE-2012-4564 CVE-2013-4232 CVE-2013-4243 CVE-2013-4244 CVE-2014-8127 + CVE-2014-8128 CVE-2014-8129 CVE-2014-8130 CVE-2014-9330 CVE-2015-1547 + CVE-2015-8781 CVE-2015-8782 CVE-2015-8783 CVE-2015-8784 CVE-2015-8870 + CVE-2016-3620 CVE-2016-3621 CVE-2016-3623 CVE-2016-3624 CVE-2016-3625 + CVE-2016-3631 CVE-2016-3632 CVE-2016-3633 CVE-2016-3634 CVE-2016-3658 + CVE-2016-3945 CVE-2016-3990 CVE-2016-3991 CVE-2016-5102 CVE-2016-5314 + CVE-2016-5315 CVE-2016-5316 CVE-2016-5318 CVE-2016-5319 CVE-2016-5321 + CVE-2016-5322 CVE-2016-5323 CVE-2016-6223 CVE-2016-9453 CVE-2016-9532 + CVE-2017-9935 CVE-2017-9937 CVE-2018-10963 CVE-2018-5360 + CVE-2019-14973 CVE-2019-17546 CVE-2020-35521 CVE-2020-35522 + CVE-2020-35523 CVE-2020-35524 + More info at https://github.com/opentoonz/opentoonz/issues/4193 + '' + ]; + maintainers = with lib.maintainers; [ chkno ]; + }; + }; +in +stdenv.mkDerivation { + inherit src; pname = "opentoonz"; - version = source.versions.opentoonz; + version = opentoonz-ver; nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ]; @@ -18,13 +99,13 @@ in stdenv.mkDerivation rec { libjpeg libmypaint libpng - libtiff + opentoonz-libtiff libusb1 lz4 xz lzo openblas - opencv + opentoonz-opencv qtbase qtmultimedia qtscript @@ -36,8 +117,10 @@ in stdenv.mkDerivation rec { cmakeDir = "../sources"; cmakeFlags = [ - "-DTIFF_INCLUDE_DIR=${libtiff.dev}/include" - "-DTIFF_LIBRARY=${libtiff.out}/lib/libtiff.so" + "-DCMAKE_SKIP_BUILD_RPATH=ON" + "-DTIFF_INCLUDE_DIR=${opentoonz-libtiff.dev}/include" + "-DTIFF_LIBRARY=${opentoonz-libtiff.out}/lib/libtiff.so" + (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true) ]; postInstall = '' diff --git a/nixpkgs/pkgs/applications/graphics/opentoonz/libtiff.nix b/nixpkgs/pkgs/applications/graphics/opentoonz/libtiff.nix deleted file mode 100644 index 43ba1592ccc2..000000000000 --- a/nixpkgs/pkgs/applications/graphics/opentoonz/libtiff.nix +++ /dev/null @@ -1,56 +0,0 @@ -# Per https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md , -# opentoonz requires its own modified version of libtiff. We still build it as -# a separate package -# 1. For visibility for tools like vulnix, and -# 2. To avoid a diamond-dependency problem with opencv linking the normal libtiff -# and opentoonz linking opencv and this modified libtiff, we build an opencv -# against this modified libtiff as well. -# -# We use a separate mkDerivation rather than a minimal libtiff.overrideAttrs -# because the main libtiff builds with cmake and this version of libtiff was -# forked before libtiff gained CMake build capability (added in libtiff-4.0.5). - -{ lib, fetchFromGitHub, stdenv, pkg-config, zlib, libjpeg, xz, libtiff, }: - -let source = import ./source.nix { inherit fetchFromGitHub; }; - -in stdenv.mkDerivation { - pname = "libtiff"; - version = source.versions.libtiff + "-opentoonz"; - - inherit (source) src; - outputs = [ "bin" "dev" "out" "man" "doc" ]; - - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ zlib libjpeg xz ]; - - postUnpack = '' - sourceRoot="$sourceRoot/thirdparty/tiff-${source.versions.libtiff}" - ''; - - # opentoonz uses internal libtiff headers - postInstall = '' - cp libtiff/{tif_config,tif_dir,tiffiop}.h $dev/include - ''; - - meta = libtiff.meta // { - knownVulnerabilities = ['' - Do not open untrusted files with Opentoonz: - Opentoonz uses an old custom fork of tibtiff from 2012 that is known to - be affected by at least these 50 vulnerabilities: - CVE-2012-4564 CVE-2013-4232 CVE-2013-4243 CVE-2013-4244 CVE-2014-8127 - CVE-2014-8128 CVE-2014-8129 CVE-2014-8130 CVE-2014-9330 CVE-2015-1547 - CVE-2015-8781 CVE-2015-8782 CVE-2015-8783 CVE-2015-8784 CVE-2015-8870 - CVE-2016-3620 CVE-2016-3621 CVE-2016-3623 CVE-2016-3624 CVE-2016-3625 - CVE-2016-3631 CVE-2016-3632 CVE-2016-3633 CVE-2016-3634 CVE-2016-3658 - CVE-2016-3945 CVE-2016-3990 CVE-2016-3991 CVE-2016-5102 CVE-2016-5314 - CVE-2016-5315 CVE-2016-5316 CVE-2016-5318 CVE-2016-5319 CVE-2016-5321 - CVE-2016-5322 CVE-2016-5323 CVE-2016-6223 CVE-2016-9453 CVE-2016-9532 - CVE-2017-9935 CVE-2017-9937 CVE-2018-10963 CVE-2018-5360 - CVE-2019-14973 CVE-2019-17546 CVE-2020-35521 CVE-2020-35522 - CVE-2020-35523 CVE-2020-35524 - More info at https://github.com/opentoonz/opentoonz/issues/4193 - '']; - maintainers = with lib.maintainers; [ chkno ]; - }; -} diff --git a/nixpkgs/pkgs/applications/graphics/opentoonz/source.nix b/nixpkgs/pkgs/applications/graphics/opentoonz/source.nix deleted file mode 100644 index 27a4b8c0b0d2..000000000000 --- a/nixpkgs/pkgs/applications/graphics/opentoonz/source.nix +++ /dev/null @@ -1,16 +0,0 @@ -# opentoonz's source archive contains both opentoonz's source and a modified -# version of libtiff that opentoonz requires. - -{ fetchFromGitHub, }: rec { - versions = { - opentoonz = "1.5.0"; - libtiff = "4.0.3"; # The version in thirdparty/tiff-* - }; - - src = fetchFromGitHub { - owner = "opentoonz"; - repo = "opentoonz"; - rev = "v${versions.opentoonz}"; - sha256 = "1rw30ksw3zjph1cwxkfvqj0330v8wd4333gn0fdf3cln1w0549lk"; - }; -} diff --git a/nixpkgs/pkgs/applications/graphics/ovito/default.nix b/nixpkgs/pkgs/applications/graphics/ovito/default.nix index 596ae0d07a11..81ce2518cea7 100644 --- a/nixpkgs/pkgs/applications/graphics/ovito/default.nix +++ b/nixpkgs/pkgs/applications/graphics/ovito/default.nix @@ -54,6 +54,7 @@ mkDerivation rec { meta = with lib; { description = "Scientific visualization and analysis software for atomistic and particle simulation data"; + mainProgram = "ovito"; homepage = "https://ovito.org"; license = with licenses; [ gpl3Only mit ]; maintainers = with maintainers; [ twhitehead ]; diff --git a/nixpkgs/pkgs/applications/graphics/paleta/default.nix b/nixpkgs/pkgs/applications/graphics/paleta/default.nix index 062c157c3f02..6275b3d10e4c 100644 --- a/nixpkgs/pkgs/applications/graphics/paleta/default.nix +++ b/nixpkgs/pkgs/applications/graphics/paleta/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Extract the dominant colors from any image"; + mainProgram = "paleta"; homepage = "https://github.com/nate-xyz/paleta"; license = licenses.gpl3Only; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/graphics/pencil/default.nix b/nixpkgs/pkgs/applications/graphics/pencil/default.nix index ffd31bf7325a..9924e0b58c14 100644 --- a/nixpkgs/pkgs/applications/graphics/pencil/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pencil/default.nix @@ -98,6 +98,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "GUI prototyping/mockup tool"; + mainProgram = "pencil"; homepage = "https://pencil.evolus.vn/"; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl2; # Commercial license is also available diff --git a/nixpkgs/pkgs/applications/graphics/photoflare/default.nix b/nixpkgs/pkgs/applications/graphics/photoflare/default.nix index 6c6ea1059c73..3f47a0073d24 100644 --- a/nixpkgs/pkgs/applications/graphics/photoflare/default.nix +++ b/nixpkgs/pkgs/applications/graphics/photoflare/default.nix @@ -21,6 +21,7 @@ mkDerivation rec { meta = with lib; { description = "A cross-platform image editor with a powerful features and a very friendly graphical user interface"; + mainProgram = "photoflare"; homepage = "https://photoflare.io"; maintainers = [ maintainers.omgbebebe ]; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/applications/graphics/photoqt/default.nix b/nixpkgs/pkgs/applications/graphics/photoqt/default.nix index 5d1ce4129791..ccc95ac94216 100644 --- a/nixpkgs/pkgs/applications/graphics/photoqt/default.nix +++ b/nixpkgs/pkgs/applications/graphics/photoqt/default.nix @@ -20,16 +20,17 @@ , qtmultimedia , qtpositioning , qtsvg +, zxing-cpp , qtwayland }: stdenv.mkDerivation rec { pname = "photoqt"; - version = "4.2"; + version = "4.3"; src = fetchurl { url = "https://photoqt.org/pkgs/photoqt-${version}.tar.gz"; - hash = "sha256-OUqsyvmv6ccJDzcWAeS1OOmK2eXOCEgGktz6GEUzoA8="; + hash = "sha256-B0ZubvWIEZFnD2v74bpPv+/wr7vaHS9QP4//9/afjzQ="; }; nativeBuildInputs = [ @@ -55,20 +56,19 @@ stdenv.mkDerivation rec { qtmultimedia qtpositioning qtsvg + zxing-cpp ] ++ lib.optionals stdenv.isLinux [ qtwayland ]; cmakeFlags = [ - "-DDEVIL=OFF" - "-DCHROMECAST=OFF" - "-DFREEIMAGE=OFF" - "-DIMAGEMAGICK=OFF" + (lib.cmakeBool "DEVIL" false) + (lib.cmakeBool "CHROMECAST" false) + (lib.cmakeBool "FREEIMAGE" false) + (lib.cmakeBool "IMAGEMAGICK" false) ]; - preConfigure = '' - export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick" - ''; + env.MAGICK_LOCATION = "${graphicsmagick}/include/GraphicsMagick"; postInstall = lib.optionalString stdenv.isDarwin '' mkdir -p $out/Applications diff --git a/nixpkgs/pkgs/applications/graphics/phototonic/default.nix b/nixpkgs/pkgs/applications/graphics/phototonic/default.nix index 738f78cf347d..345398435a07 100644 --- a/nixpkgs/pkgs/applications/graphics/phototonic/default.nix +++ b/nixpkgs/pkgs/applications/graphics/phototonic/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An image viewer and organizer"; + mainProgram = "phototonic"; homepage = "https://github.com/oferkv/phototonic"; license = licenses.gpl3Plus; maintainers = with maintainers; [ pSub ]; diff --git a/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix b/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix index a4b8bbc9c2fd..bd9ab649d633 100644 --- a/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pick-colour-picker/default.nix @@ -47,6 +47,7 @@ buildPythonPackage rec { license = licenses.mit; platforms = platforms.linux; description = "A colour picker that remembers where you picked colours from"; + mainProgram = "pick-colour-picker"; maintainers = [ maintainers.mkg20001 ]; longDescription = '' diff --git a/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix b/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix index 816d9af62aa3..c65353143368 100644 --- a/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pikopixel/default.nix @@ -1,9 +1,10 @@ { lib +, clangStdenv , fetchurl , gnustep }: -gnustep.gsmakeDerivation rec { +clangStdenv.mkDerivation rec { pname = "pikopixel"; version = "1.0-b10"; @@ -14,6 +15,11 @@ gnustep.gsmakeDerivation rec { sourceRoot = "PikoPixel.Sources.${version}/PikoPixel"; + nativeBuildInputs = [ + gnustep.make + gnustep.wrapGNUstepAppsHook + ]; + buildInputs = [ gnustep.base gnustep.gui @@ -33,9 +39,10 @@ gnustep.gsmakeDerivation rec { meta = with lib; { description = "Application for drawing and editing pixel-art images"; + mainProgram = "PikoPixel"; homepage = "https://twilightedge.com/mac/pikopixel/"; downloadPage = "https://twilightedge.com/mac/pikopixel/"; - license = licenses.agpl3; + license = licenses.agpl3Plus; maintainers = with maintainers; [ fgaz ]; platforms = platforms.all; }; diff --git a/nixpkgs/pkgs/applications/graphics/pizarra/default.nix b/nixpkgs/pkgs/applications/graphics/pizarra/default.nix index f9d7fc650647..b53368439d75 100644 --- a/nixpkgs/pkgs/applications/graphics/pizarra/default.nix +++ b/nixpkgs/pkgs/applications/graphics/pizarra/default.nix @@ -41,6 +41,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "A simple blackboard written in GTK"; + mainProgram = "pizarra"; longDescription = '' A simple endless blackboard. Contains various features, such as: diff --git a/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix b/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix index 47bf2d950283..ee2296b391bb 100644 --- a/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix +++ b/nixpkgs/pkgs/applications/graphics/qcomicbook/default.nix @@ -27,6 +27,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://github.com/stolowski/QComicBook"; description = "Comic book reader in Qt5"; + mainProgram = "qcomicbook"; license = licenses.gpl2; longDescription = '' diff --git a/nixpkgs/pkgs/applications/graphics/qimgv/default.nix b/nixpkgs/pkgs/applications/graphics/qimgv/default.nix index 2cb5f8ddde24..c6789fd05738 100644 --- a/nixpkgs/pkgs/applications/graphics/qimgv/default.nix +++ b/nixpkgs/pkgs/applications/graphics/qimgv/default.nix @@ -55,6 +55,7 @@ mkDerivation rec { meta = with lib; { description = "A Qt5 image viewer with optional video support"; + mainProgram = "qimgv"; homepage = "https://github.com/easymodo/qimgv"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/graphics/qosmic/default.nix b/nixpkgs/pkgs/applications/graphics/qosmic/default.nix index 9e2248f896de..a3a688fd0366 100644 --- a/nixpkgs/pkgs/applications/graphics/qosmic/default.nix +++ b/nixpkgs/pkgs/applications/graphics/qosmic/default.nix @@ -72,6 +72,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A cosmic recursive flame fractal editor"; + mainProgram = "qosmic"; homepage = "https://github.com/bitsed/qosmic"; license = licenses.gpl3Plus; maintainers = [ maintainers.raboof ]; diff --git a/nixpkgs/pkgs/applications/graphics/qscreenshot/default.nix b/nixpkgs/pkgs/applications/graphics/qscreenshot/default.nix index efbab2e04bbb..761bd69d3520 100644 --- a/nixpkgs/pkgs/applications/graphics/qscreenshot/default.nix +++ b/nixpkgs/pkgs/applications/graphics/qscreenshot/default.nix @@ -31,6 +31,7 @@ stdenv.mkDerivation rec { ]; meta = with lib; { description = "Simple creation and editing of screenshots"; + mainProgram = "qScreenshot"; homepage = "https://sourceforge.net/projects/qscreenshot/"; license = licenses.gpl2; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/graphics/qvge/default.nix b/nixpkgs/pkgs/applications/graphics/qvge/default.nix index 442e3200e469..e7c6def43b91 100644 --- a/nixpkgs/pkgs/applications/graphics/qvge/default.nix +++ b/nixpkgs/pkgs/applications/graphics/qvge/default.nix @@ -33,6 +33,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Qt Visual Graph Editor"; + mainProgram = "qvgeapp"; homepage = "https://github.com/ArsMasiuk/qvge"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; diff --git a/nixpkgs/pkgs/applications/graphics/qview/default.nix b/nixpkgs/pkgs/applications/graphics/qview/default.nix index 9bba92a2b5b7..38ff606487c0 100644 --- a/nixpkgs/pkgs/applications/graphics/qview/default.nix +++ b/nixpkgs/pkgs/applications/graphics/qview/default.nix @@ -34,6 +34,7 @@ mkDerivation rec { meta = with lib; { description = "Practical and minimal image viewer"; + mainProgram = "qview"; homepage = "https://interversehq.com/qview/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ acowley ]; diff --git a/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix index e6d0319950d5..494815ac930b 100644 --- a/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix +++ b/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix @@ -97,6 +97,7 @@ mkDerivationWith python3Packages.buildPythonApplication rec { meta = with lib; { description = "Photo and video importer for cameras, phones, and memory cards"; + mainProgram = "rapid-photo-downloader"; homepage = "https://www.damonlynch.net/rapid/"; license = licenses.gpl3Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock b/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock index f36abca67e8c..07c7748de264 100644 --- a/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock +++ b/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock @@ -19,9 +19,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "ahash" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b79b82693f705137f8fb9b37871d99e4f9a7df12b917eed79c3d3954830a60b" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", "once_cell", @@ -46,14 +46,13 @@ checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" [[package]] name = "alsa" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" +checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce" dependencies = [ "alsa-sys", - "bitflags 1.3.2", + "bitflags 2.4.2", "libc", - "nix", ] [[package]] @@ -526,9 +525,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.3" +version = "3.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" +checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa" [[package]] name = "bytemuck" @@ -580,10 +579,11 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.88" +version = "1.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5" dependencies = [ + "jobserver", "libc", ] @@ -620,9 +620,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "8eaf5903dcbc0a39312feb77df2ff4c76387d591b9fc7b04a238dcf8bb62639a" dependencies = [ "android-tzdata", "iana-time-zone", @@ -645,9 +645,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" +checksum = "b230ab84b0ffdf890d5a10abdbc8b83ae1c4918275daea1ab8801f71536b2651" dependencies = [ "clap_builder", "clap_derive", @@ -655,9 +655,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.1" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", @@ -774,23 +774,21 @@ dependencies = [ [[package]] name = "cpal" -version = "0.15.2" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +checksum = "873dab07c8f743075e57f524c583985fbaf745602acbe916a01539364369a779" dependencies = [ "alsa", "core-foundation-sys", "coreaudio-rs", "dasp_sample", - "jni 0.19.0", + "jni", "js-sys", "libc", "mach2", "ndk", "ndk-context", "oboe", - "once_cell", - "parking_lot", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -871,9 +869,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.118" +version = "1.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673ca5ae28334544ec2a6b18ebe666c42a2650abfb48abbd532ed409a44be2b" +checksum = "635179be18797d7e10edb9cd06c859580237750c7351f39ed9b298bfc17544ad" dependencies = [ "cc", "cxxbridge-flags", @@ -883,9 +881,9 @@ dependencies = [ [[package]] name = "cxx-gen" -version = "0.7.118" +version = "0.7.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a94f02b4e45d7d00ecabff7635833f71c786576067b3d4158c8bef65d0a8e38b" +checksum = "5797d553b95704a6a49394acfdb93e2332b8aaa146713a1e8ebe362e86d9fa68" dependencies = [ "codespan-reporting", "proc-macro2", @@ -895,15 +893,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.118" +version = "1.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "886acf875df67811c11cd015506b3392b9e1820b1627af1a6f4e93ccdfc74d11" +checksum = "a87ff7342ffaa54b7c61618e0ce2bbcf827eba6d55b923b83d82551acbbecfe5" [[package]] name = "cxxbridge-macro" -version = "1.0.118" +version = "1.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d151cc139c3080e07f448f93a1284577ab2283d2a44acd902c6fba9ec20b6de" +checksum = "70b5b86cf65fa0626d85720619d80b288013477a91a0389fa8bc716bf4903ad1" dependencies = [ "proc-macro2", "quote", @@ -1469,9 +1467,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6771942f85a2beaa220c64739395e4401b9fab4a52aba9b503fa1e6ed4d4d806" +checksum = "9100b25604183f2fd97f55ef087fae96ab4934d7215118a35303e422688e6e4b" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1484,9 +1482,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eb95854fab65072023a7814434f003db571d6e45c287c0b0c540c1c78bdf6ae" +checksum = "d0b76874c40bb8d1c7d03a7231e23ac75fa577a456cd53af32ec17ec8f121626" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1653,7 +1651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f5897ca27a83e4cdc7b4666850bade0a2e73e17689aabafcc9acddad9d823b8" dependencies = [ "heck", - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.52", @@ -1711,9 +1709,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e8ce8dee0fd87a11002214b1204ff18c9272fbd530408f0884a0f9b25dc31de" +checksum = "c65036fc8f99579e8cb37b12487969b707ab23ec8ab953682ff347cbd15d396e" dependencies = [ "cairo-rs", "gdk4", @@ -1726,9 +1724,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2660a652da5b662d43924df19ba40d73f015ed427329ef51d2b1360a4e0dc0e4" +checksum = "bd24c814379f9c3199dc53e52253ee8d0f657eae389ab282c330505289d24738" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1742,9 +1740,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d26ffa3ec6316ccaa1df62d3e7f5bae1637c0acbb43f250fabef38319f73c64" +checksum = "aa82753b8c26277e4af1446c70e35b19aad4fb794a7b143859e7eeb9a4025d83" dependencies = [ "cairo-rs", "field-offset", @@ -1763,12 +1761,12 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b86439e9896f6f3f47c3d8077c5c8205174078760afdabd9098a8e9e937d97" +checksum = "40300bf071d2fcd4c94eacc09e84ec6fe73129d2ceb635cf7e55b026b5443567" dependencies = [ "anyhow", - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro-error", "proc-macro2", "quote", @@ -1777,9 +1775,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2abc0a6d356d59a3806021829ce6ed3e70bba3509b41a535fedcb09fae13fbc0" +checksum = "0db1b104138f087ccdc81d2c332de5dd049b89de3d384437cc1093b17cd2da18" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1886,7 +1884,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -2113,30 +2111,18 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni" -version = "0.20.0" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97" dependencies = [ "cesu8", + "cfg-if", "combine", "jni-sys", "log", "thiserror", "walkdir", + "windows-sys 0.45.0", ] [[package]] @@ -2146,6 +2132,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] +name = "jobserver" +version = "0.1.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6" +dependencies = [ + "libc", +] + +[[package]] name = "jpeg-decoder" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2156,9 +2151,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2266,12 +2261,12 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" [[package]] name = "libloading" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19" dependencies = [ "cfg-if", - "windows-sys 0.48.0", + "windows-targets 0.52.4", ] [[package]] @@ -2497,9 +2492,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" +checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", @@ -2546,15 +2541,15 @@ dependencies = [ [[package]] name = "ndk" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.2", "jni-sys", + "log", "ndk-sys", "num_enum", - "raw-window-handle", "thiserror", ] @@ -2566,9 +2561,9 @@ checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" [[package]] name = "ndk-sys" -version = "0.4.1+23.1.7779620" +version = "0.5.0+25.2.9519653" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +checksum = "8c196769dd60fd4f363e11d948139556a344e79d451aeb2fa2fd040738ef7691" dependencies = [ "jni-sys", ] @@ -2580,17 +2575,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", -] - -[[package]] name = "no-std-compat" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2661,17 +2645,6 @@ dependencies = [ [[package]] name = "num-derive" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "num-derive" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" @@ -2723,23 +2696,23 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" +checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ "num_enum_derive", ] [[package]] name = "num_enum_derive" -version = "0.5.11" +version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" +checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.52", ] [[package]] @@ -2797,23 +2770,23 @@ dependencies = [ [[package]] name = "oboe" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +checksum = "e8b61bebd49e5d43f5f8cc7ee2891c16e0f41ec7954d36bcb6c14c5e0de867fb" dependencies = [ - "jni 0.20.0", + "jni", "ndk", "ndk-context", - "num-derive 0.3.3", + "num-derive", "num-traits", "oboe-sys", ] [[package]] name = "oboe-sys" -version = "0.5.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" +checksum = "6c8bb09a4a2b1d668170cfe0a7d5bc103f8999fb316c98099b6a9939c9f2e79d" dependencies = [ "cc", ] @@ -2826,9 +2799,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "open" -version = "5.1.0" +version = "5.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f2588edf622de56e7a1fed57bf203344f63c03f3d43472ba0434a92373c8f27" +checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32" dependencies = [ "is-wsl", "libc", @@ -2961,7 +2934,7 @@ dependencies = [ "downcast-rs", "either", "nalgebra", - "num-derive 0.4.2", + "num-derive", "num-traits", "rustc-hash", "serde", @@ -3250,16 +3223,6 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - -[[package]] -name = "proc-macro-crate" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" @@ -3368,12 +3331,6 @@ dependencies = [ ] [[package]] -name = "raw-window-handle" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" - -[[package]] name = "rawpointer" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -3422,7 +3379,7 @@ checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.5", + "regex-automata 0.4.6", "regex-syntax 0.8.2", ] @@ -3437,9 +3394,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ "aho-corasick", "memchr", @@ -3469,7 +3426,7 @@ dependencies = [ [[package]] name = "rnote" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "async-fs", @@ -3487,7 +3444,7 @@ dependencies = [ "libadwaita", "nalgebra", "notify-debouncer-full", - "num-derive 0.4.2", + "num-derive", "num-traits", "numeric-sort", "once_cell", @@ -3519,7 +3476,7 @@ dependencies = [ [[package]] name = "rnote-cli" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "atty", @@ -3538,7 +3495,7 @@ dependencies = [ [[package]] name = "rnote-compose" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "approx", @@ -3547,7 +3504,7 @@ dependencies = [ "ink-stroke-modeler-rs", "kurbo 0.10.4", "nalgebra", - "num-derive 0.4.2", + "num-derive", "num-traits", "once_cell", "palette", @@ -3567,7 +3524,7 @@ dependencies = [ [[package]] name = "rnote-engine" -version = "0.10.0" +version = "0.10.1" dependencies = [ "anyhow", "approx", @@ -3587,7 +3544,7 @@ dependencies = [ "kurbo 0.10.4", "librsvg", "nalgebra", - "num-derive 0.4.2", + "num-derive", "num-traits", "once_cell", "parry2d-f64", @@ -4674,9 +4631,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -4690,9 +4647,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -4700,9 +4657,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", @@ -4715,9 +4672,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if", "js-sys", @@ -4727,9 +4684,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4737,9 +4694,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", @@ -4750,15 +4707,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -4825,11 +4782,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.46.0" +version = "0.54.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49" dependencies = [ - "windows-targets 0.42.2", + "windows-core 0.54.0", + "windows-targets 0.52.4", ] [[package]] @@ -4842,6 +4800,34 @@ dependencies = [ ] [[package]] +name = "windows-core" +version = "0.54.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65" +dependencies = [ + "windows-result", + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-result" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64" +dependencies = [ + "windows-targets 0.52.4", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/nixpkgs/pkgs/applications/graphics/rnote/default.nix b/nixpkgs/pkgs/applications/graphics/rnote/default.nix index 33ca80234711..cf4c2a54af07 100644 --- a/nixpkgs/pkgs/applications/graphics/rnote/default.nix +++ b/nixpkgs/pkgs/applications/graphics/rnote/default.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - hash = "sha256-PMg83eWcC21yNiRYdTS6/j9gerTctnDPHXIM4PWktrU="; + hash = "sha256-J9M1d6C40EpqcSU5vYVfsCruhECkPJOdhzG2IX1tTQ0="; }; cargoDeps = rustPlatform.importCargoLock { diff --git a/nixpkgs/pkgs/applications/graphics/rx/default.nix b/nixpkgs/pkgs/applications/graphics/rx/default.nix index fe3d10bae635..77ed3f49117c 100644 --- a/nixpkgs/pkgs/applications/graphics/rx/default.nix +++ b/nixpkgs/pkgs/applications/graphics/rx/default.nix @@ -37,6 +37,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Modern and extensible pixel editor implemented in Rust"; + mainProgram = "rx"; homepage = "https://rx.cloudhead.io/"; license = licenses.gpl3; maintainers = with maintainers; [ minijackson Br1ght0ne ]; diff --git a/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix b/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix index d88c7352d574..83530518aa7d 100644 --- a/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix +++ b/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -1,22 +1,23 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, avahi, libjpeg, libpng +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, avahi, libjpeg, libpng, libtiff , libxml2, gnutls, sane-backends }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.27"; + version = "0.99.29"; nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ avahi gnutls libjpeg libpng libxml2 sane-backends ]; + buildInputs = [ avahi gnutls libjpeg libpng libxml2 libtiff sane-backends ]; src = fetchFromGitHub { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "sha256-29IPoLF4rmq8sGTi5RmpT1Fq8RJJlaepTt+2GWDU3es="; + sha256 = "sha256-9ErTC9NztyO9o6y2FjQPl2lu1gICasZYm2tnaCVCLt8="; }; meta = with lib; { homepage = "https://github.com/alexpevzner/sane-airscan"; description = "Scanner Access Now Easy - Apple AirScan (eSCL) driver"; + mainProgram = "airscan-discover"; longDescription = '' sane-airscan: Linux support of Apple AirScan (eSCL) compatible document scanners. ''; diff --git a/nixpkgs/pkgs/applications/graphics/sane/xsane.nix b/nixpkgs/pkgs/applications/graphics/sane/xsane.nix index 471e2141b5b8..e9a1ca2c40de 100644 --- a/nixpkgs/pkgs/applications/graphics/sane/xsane.nix +++ b/nixpkgs/pkgs/applications/graphics/sane/xsane.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.sane-project.org/"; description = "Graphical scanning frontend for sane"; + mainProgram = "xsane"; license = licenses.gpl2Plus; platforms = platforms.linux; maintainers = with maintainers; [ melling ]; diff --git a/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix b/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix index 2ab5c5562670..b83b9df83b01 100644 --- a/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix +++ b/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix @@ -19,6 +19,7 @@ mkDerivation rec { meta = with lib; { homepage = "https://github.com/vigri/scantailor-advanced"; description = "Interactive post-processing tool for scanned pages (vigri's fork)"; + mainProgram = "scantailor"; license = licenses.gpl3Plus; maintainers = with maintainers; [ ]; platforms = with platforms; gnu ++ linux ++ darwin; diff --git a/nixpkgs/pkgs/applications/graphics/shotwell/default.nix b/nixpkgs/pkgs/applications/graphics/shotwell/default.nix index 9eb1fbb28ee4..e6d6eb41b9e0 100644 --- a/nixpkgs/pkgs/applications/graphics/shotwell/default.nix +++ b/nixpkgs/pkgs/applications/graphics/shotwell/default.nix @@ -96,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Popular photo organizer for the GNOME desktop"; + mainProgram = "shotwell"; homepage = "https://wiki.gnome.org/Apps/Shotwell"; license = licenses.lgpl21Plus; maintainers = with maintainers; []; diff --git a/nixpkgs/pkgs/applications/graphics/shutter/default.nix b/nixpkgs/pkgs/applications/graphics/shutter/default.nix index e5659fb7fe2a..d10e8487796f 100644 --- a/nixpkgs/pkgs/applications/graphics/shutter/default.nix +++ b/nixpkgs/pkgs/applications/graphics/shutter/default.nix @@ -104,6 +104,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Screenshot and annotation tool"; + mainProgram = "shutter"; homepage = "https://shutter-project.org/"; license = licenses.gpl3Plus; platforms = platforms.all; diff --git a/nixpkgs/pkgs/applications/graphics/smartdeblur/default.nix b/nixpkgs/pkgs/applications/graphics/smartdeblur/default.nix index 51c0f306f92d..592244455e98 100644 --- a/nixpkgs/pkgs/applications/graphics/smartdeblur/default.nix +++ b/nixpkgs/pkgs/applications/graphics/smartdeblur/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/Y-Vladimir/SmartDeblur"; description = "Tool for restoring blurry and defocused images"; + mainProgram = "SmartDeblur"; license = licenses.gpl3; maintainers = with maintainers; [ ]; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/graphics/structorizer/default.nix b/nixpkgs/pkgs/applications/graphics/structorizer/default.nix index bb6d2660836a..6bf2cf24d80e 100644 --- a/nixpkgs/pkgs/applications/graphics/structorizer/default.nix +++ b/nixpkgs/pkgs/applications/graphics/structorizer/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { pname = "structorizer"; - version = "3.32-16"; + version = "3.32-18"; desktopItems = [ (makeDesktopItem { @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { owner = "fesch"; repo = "Structorizer.Desktop"; rev = version; - hash = "sha256-K/ofwwlkZF13V0IZEL166n58ylm+qdh1jbXzH7LwXog="; + hash = "sha256-CA87j11TFUd0nmuPc1qyqdITkTPE/jauf31cO2iBQVg="; }; patches = [ ./makeStructorizer.patch ./makeBigJar.patch ]; diff --git a/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix b/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix index b73d481966b1..6f3103ecb8a6 100644 --- a/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix +++ b/nixpkgs/pkgs/applications/graphics/symbolic-preview/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.gnome.org/World/design/symbolic-preview"; description = "Symbolics made easy"; + mainProgram = "symbolic-preview"; maintainers = with maintainers; [ qyliss ]; license = licenses.gpl3Plus; platforms = platforms.unix; diff --git a/nixpkgs/pkgs/applications/graphics/tev/default.nix b/nixpkgs/pkgs/applications/graphics/tev/default.nix index ff97eb65f17c..ca70027eb202 100644 --- a/nixpkgs/pkgs/applications/graphics/tev/default.nix +++ b/nixpkgs/pkgs/applications/graphics/tev/default.nix @@ -35,6 +35,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A high dynamic range (HDR) image comparison tool"; + mainProgram = "tev"; longDescription = '' A high dynamic range (HDR) image comparison tool for graphics people. tev allows viewing images through various tonemapping operators and inspecting diff --git a/nixpkgs/pkgs/applications/graphics/timelapse-deflicker/default.nix b/nixpkgs/pkgs/applications/graphics/timelapse-deflicker/default.nix index f1757d51b1b3..511ed8a0134a 100644 --- a/nixpkgs/pkgs/applications/graphics/timelapse-deflicker/default.nix +++ b/nixpkgs/pkgs/applications/graphics/timelapse-deflicker/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple script to deflicker images taken for timelapses"; + mainProgram = "timelapse-deflicker"; homepage = "https://github.com/cyberang3l/timelapse-deflicker"; license = licenses.gpl3; maintainers = with maintainers; [ valeriangalliat ]; diff --git a/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix b/nixpkgs/pkgs/applications/graphics/vengi-tools/default.nix index 771ae49e220d..1c3bf8b6ede3 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 (finalAttrs: { pname = "vengi-tools"; - version = "0.0.28"; + version = "0.0.29"; src = fetchFromGitHub { owner = "mgerhardy"; repo = "vengi"; rev = "v${finalAttrs.version}"; - hash = "sha256-UjSm/J/y7MUg3Exmw0P56+bcjiLxXdGS2brocdzgJ+c="; + hash = "sha256-VGgmJPNLEsD1y6e6CRw1Wipmy9MKAQkydyHNNjPyvhQ="; }; nativeBuildInputs = [ diff --git a/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix b/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix index fc99ceb07144..c3e6e47adfba 100644 --- a/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix +++ b/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-all-formats.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { mkdir $out for format in vox qef qbt qb vxm vxr binvox gox cub vxl csv; do echo Testing $format export - ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools.src}/data/voxedit/chr_knight.qb --output $out/chr_knight.$format + ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools.src}/data/tests/chr_knight.qb --output $out/chr_knight.$format done ''; } diff --git a/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix b/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix index a6fbb65fedfd..a683bff7a10b 100644 --- a/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix +++ b/nixpkgs/pkgs/applications/graphics/vengi-tools/test-voxconvert-roundtrip.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "vengi-tools-test-voxconvert-roundtrip"; meta.timeout = 10; buildCommand = '' - ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools.src}/data/voxedit/chr_knight.qb --output chr_knight.vox + ${vengi-tools}/bin/vengi-voxconvert --input ${vengi-tools.src}/data/tests/chr_knight.qb --output chr_knight.vox ${vengi-tools}/bin/vengi-voxconvert --input chr_knight.vox --output chr_knight.qb ${vengi-tools}/bin/vengi-voxconvert --input chr_knight.qb --output chr_knight1.vox diff chr_knight.vox chr_knight1.vox diff --git a/nixpkgs/pkgs/applications/graphics/veusz/default.nix b/nixpkgs/pkgs/applications/graphics/veusz/default.nix index d630ceda6a58..67f5a76e5e97 100644 --- a/nixpkgs/pkgs/applications/graphics/veusz/default.nix +++ b/nixpkgs/pkgs/applications/graphics/veusz/default.nix @@ -62,6 +62,7 @@ python3Packages.buildPythonApplication rec { meta = with lib; { description = "A scientific plotting and graphing program with a GUI"; + mainProgram = "veusz"; homepage = "https://veusz.github.io/"; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/nixpkgs/pkgs/applications/graphics/weylus/default.nix b/nixpkgs/pkgs/applications/graphics/weylus/default.nix index 27021eab2132..36647a62aef2 100644 --- a/nixpkgs/pkgs/applications/graphics/weylus/default.nix +++ b/nixpkgs/pkgs/applications/graphics/weylus/default.nix @@ -99,6 +99,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { broken = stdenv.isDarwin; description = "Use your tablet as graphic tablet/touch screen on your computer"; + mainProgram = "weylus"; homepage = "https://github.com/H-M-H/Weylus"; license = with licenses; [ agpl3Only ]; maintainers = with maintainers; [ lom ]; diff --git a/nixpkgs/pkgs/applications/graphics/xaos/default.nix b/nixpkgs/pkgs/applications/graphics/xaos/default.nix index e79f322be5e4..dd717223fdbb 100644 --- a/nixpkgs/pkgs/applications/graphics/xaos/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xaos/default.nix @@ -42,6 +42,7 @@ in stdenv.mkDerivation rec { meta = src.meta // { description = "Real-time interactive fractal zoomer"; + mainProgram = "xaos"; homepage = "https://xaos-project.github.io/"; license = lib.licenses.gpl2Plus; platforms = [ "x86_64-linux" ]; diff --git a/nixpkgs/pkgs/applications/graphics/xfig/default.nix b/nixpkgs/pkgs/applications/graphics/xfig/default.nix index 00e736731f2f..cb96daeb1270 100644 --- a/nixpkgs/pkgs/applications/graphics/xfig/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xfig/default.nix @@ -61,6 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { changelog = "https://sourceforge.net/p/mcj/xfig/ci/${version}/tree/CHANGES"; description = "An interactive drawing tool for X11"; + mainProgram = "xfig"; longDescription = '' Note that you need to have the <literal>netpbm</literal> tools in your path to export bitmaps. diff --git a/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix b/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix index 923ee5deda13..7ff575acab66 100644 --- a/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix @@ -7,6 +7,7 @@ , pkg-config , alsa-lib +, binutils , glib , gsettings-desktop-schemas , gtk3 @@ -25,16 +26,22 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "xournalpp"; - repo = pname; + repo = "xournalpp"; rev = "v${version}"; - sha256 = "sha256-6ND0Y+TzdN2rRI10cusgSK1sYMC55Wn5qFCHP4hsdes="; + sha256 = "sha256-8UAAX/kixqiY9zEYs5eva0G2K2vlfnYd1yyVHMSfSeY="; }; + postPatch = '' + substituteInPlace src/util/Stacktrace.cpp \ + --replace-fail "addr2line" "${binutils}/bin/addr2line" + ''; + nativeBuildInputs = [ cmake gettext pkg-config wrapGAppsHook ]; + buildInputs = lib.optionals stdenv.isLinux [ alsa-lib @@ -56,8 +63,6 @@ stdenv.mkDerivation rec { buildFlags = [ "translations" ]; - hardeningDisable = [ "format" ]; - meta = with lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; homepage = "https://xournalpp.github.io/"; @@ -65,5 +70,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ andrew-d sikmir ]; platforms = platforms.unix; + mainProgram = "xournalpp"; }; } diff --git a/nixpkgs/pkgs/applications/graphics/xpano/default.nix b/nixpkgs/pkgs/applications/graphics/xpano/default.nix index 3ba27e66e66f..9842aca43dd8 100644 --- a/nixpkgs/pkgs/applications/graphics/xpano/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xpano/default.nix @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A panorama stitching tool"; + mainProgram = "Xpano"; homepage = "https://krupkat.github.io/xpano/"; changelog = "https://github.com/krupkat/xpano/releases/tag/v${version}"; license = licenses.gpl3Plus; diff --git a/nixpkgs/pkgs/applications/graphics/xrgears/default.nix b/nixpkgs/pkgs/applications/graphics/xrgears/default.nix index ac73412117cf..2f367e8a70d5 100644 --- a/nixpkgs/pkgs/applications/graphics/xrgears/default.nix +++ b/nixpkgs/pkgs/applications/graphics/xrgears/default.nix @@ -52,6 +52,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://gitlab.freedesktop.org/monado/demos/xrgears"; description = "An OpenXR example using Vulkan for rendering"; + mainProgram = "xrgears"; platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ expipiplus1 ]; |