diff options
Diffstat (limited to 'pkgs/tools/graphics')
92 files changed, 161 insertions, 50 deletions
diff --git a/pkgs/tools/graphics/aaphoto/default.nix b/pkgs/tools/graphics/aaphoto/default.nix index 6df3ed9166131..57744eb6b8ec3 100644 --- a/pkgs/tools/graphics/aaphoto/default.nix +++ b/pkgs/tools/graphics/aaphoto/default.nix @@ -48,5 +48,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + mainProgram = "aaphoto"; }; } diff --git a/pkgs/tools/graphics/adriconf/default.nix b/pkgs/tools/graphics/adriconf/default.nix index 35de292a36c87..3d516f8ee113b 100644 --- a/pkgs/tools/graphics/adriconf/default.nix +++ b/pkgs/tools/graphics/adriconf/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ muscaln ]; platforms = platforms.linux; + mainProgram = "adriconf"; }; } diff --git a/pkgs/tools/graphics/argyllcms/default.nix b/pkgs/tools/graphics/argyllcms/default.nix index 271d5a5754f9b..941e4cfec22c0 100644 --- a/pkgs/tools/graphics/argyllcms/default.nix +++ b/pkgs/tools/graphics/argyllcms/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "argyllcms"; - version = "3.0.2"; + version = "3.1.0"; src = fetchzip { # Kind of flacky URL, it was reaturning 406 and inconsistent binaries for a # while on me. It might be good to find a mirror url = "https://www.argyllcms.com/Argyll_V${version}_src.zip"; - hash = "sha256-9+rUhZVwSzAM9Ko6FYyl2OVvsOFBaUCA1PJs9kaLWaE="; + hash = "sha256-IZScf+xpvvMt5YFlYQprg51cw2ztMdOrqcLm7l5uBhU="; }; nativeBuildInputs = [ jam unzip ]; diff --git a/pkgs/tools/graphics/astc-encoder/default.nix b/pkgs/tools/graphics/astc-encoder/default.nix index dd7ebc6f3b434..eb0222ba84483 100644 --- a/pkgs/tools/graphics/astc-encoder/default.nix +++ b/pkgs/tools/graphics/astc-encoder/default.nix @@ -29,13 +29,13 @@ with rec { stdenv.mkDerivation rec { pname = "astc-encoder"; - version = "4.6.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-COZO4LTrM/kZp85uNGwB9eaF27Xf7NVg4hcshaCJBwI="; + sha256 = "sha256-7/GBzqgXh8sU3Pl30eH9Mi24PPIqayQqNuhkMnn5Lq0="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/graphics/blockhash/default.nix b/pkgs/tools/graphics/blockhash/default.nix index 0a08e0cd31ff9..a58fcc4e8ec61 100644 --- a/pkgs/tools/graphics/blockhash/default.nix +++ b/pkgs/tools/graphics/blockhash/default.nix @@ -26,5 +26,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = [ maintainers.infinisil ]; platforms = platforms.unix; + mainProgram = "blockhash"; }; } diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/tools/graphics/blur-effect/default.nix index e393da508323c..cc88bb0889498 100644 --- a/pkgs/tools/graphics/blur-effect/default.nix +++ b/pkgs/tools/graphics/blur-effect/default.nix @@ -29,5 +29,6 @@ stdenv.mkDerivation rec { platforms = platforms.unix; broken = stdenv.hostPlatform.isDarwin; # packages 'libdrm' and 'gbm' not found maintainers = with maintainers; [ romildo ]; + mainProgram = "blur_image"; }; } diff --git a/pkgs/tools/graphics/briss/default.nix b/pkgs/tools/graphics/briss/default.nix index f95c9b527c146..801b8f5a4862c 100644 --- a/pkgs/tools/graphics/briss/default.nix +++ b/pkgs/tools/graphics/briss/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl3; platforms = lib.platforms.unix; + mainProgram = "briss"; }; } diff --git a/pkgs/tools/graphics/cfdg/default.nix b/pkgs/tools/graphics/cfdg/default.nix index 2f8b506c65bd7..496255c57953b 100644 --- a/pkgs/tools/graphics/cfdg/default.nix +++ b/pkgs/tools/graphics/cfdg/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; homepage = "https://contextfreeart.org/"; license = licenses.gpl2Only; + mainProgram = "cfdg"; }; } diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 1a1b52502f7d1..9332b25babfb1 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -1,6 +1,6 @@ -{ lib, stdenv, fetchurl, cmake, imagemagick }: +{ lib, stdenv, fetchurl, cmake, imagemagick, testers }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "cuneiform"; version = "1.1.0"; @@ -30,15 +30,29 @@ stdenv.mkDerivation { rm cuneiform_src/Kern/hhh/tigerh/h/strings.h ''; + # make the install path match the rpath + postInstall = '' + if [[ -d ''${!outputLib}/lib64 ]]; then + mv ''${!outputLib}/lib64 ''${!outputLib}/lib + ln -s lib ''${!outputLib}/lib64 + fi + ''; + buildInputs = [ imagemagick ]; nativeBuildInputs = [ cmake ]; + passthru.tests = testers.testVersion { + package = finalAttrs.finalPackage; + command = "cuneiform"; + }; + meta = with lib; { description = "Multi-language OCR system"; homepage = "https://launchpad.net/cuneiform-linux"; license = licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.raskin ]; + mainProgram = "cuneiform"; }; -} +}) diff --git a/pkgs/tools/graphics/didder/default.nix b/pkgs/tools/graphics/didder/default.nix index e42a89c72d620..10e97e356daf4 100644 --- a/pkgs/tools/graphics/didder/default.nix +++ b/pkgs/tools/graphics/didder/default.nix @@ -29,5 +29,6 @@ buildGoModule rec { "An extensive, fast, and accurate command-line image dithering tool"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ehmry ]; + mainProgram = "didder"; }; } diff --git a/pkgs/tools/graphics/dippi/default.nix b/pkgs/tools/graphics/dippi/default.nix index 9e3cc25327f82..1a094c2750e2a 100644 --- a/pkgs/tools/graphics/dippi/default.nix +++ b/pkgs/tools/graphics/dippi/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "dippi"; - version = "4.0.2"; + version = "4.0.6"; src = fetchFromGitHub { owner = "cassidyjames"; repo = "dippi"; rev = version; - hash = "sha256-OYeSPh3m3udmGbIKoithCdsqWSAFnRhnAtQ0nTzFxzs="; + hash = "sha256-oZy8WfaAPABZRm8dm4zpI4v9RwT46F6WL6Wj767FcZg="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/ditaa/default.nix b/pkgs/tools/graphics/ditaa/default.nix index ab1c6ff74ec31..c6823fbed3696 100644 --- a/pkgs/tools/graphics/ditaa/default.nix +++ b/pkgs/tools/graphics/ditaa/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.lgpl3; platforms = platforms.unix; maintainers = [ maintainers.bjornfor ]; + mainProgram = "ditaa"; }; } diff --git a/pkgs/tools/graphics/dnglab/default.nix b/pkgs/tools/graphics/dnglab/default.nix index cb865e51a9c59..9088a1110b7bf 100644 --- a/pkgs/tools/graphics/dnglab/default.nix +++ b/pkgs/tools/graphics/dnglab/default.nix @@ -24,5 +24,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/dnglab/dnglab"; license = licenses.lgpl21Only; maintainers = with maintainers; [ dit7ya ]; + mainProgram = "dnglab"; }; } diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix index 1a4161dd62062..fb3e0c19bf826 100644 --- a/pkgs/tools/graphics/dpic/default.nix +++ b/pkgs/tools/graphics/dpic/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ aespinosa ]; platforms = platforms.all; + mainProgram = "dpic"; }; } diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix index ca9be631942a4..ce8b2e0a4ff6a 100644 --- a/pkgs/tools/graphics/editres/default.nix +++ b/pkgs/tools/graphics/editres/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "A dynamic resource editor for X Toolkit applications"; license = licenses.mit; platforms = platforms.linux; + mainProgram = "editres"; }; } diff --git a/pkgs/tools/graphics/epstool/default.nix b/pkgs/tools/graphics/epstool/default.nix index cdb1f75cb2c39..5952734e45822 100644 --- a/pkgs/tools/graphics/epstool/default.nix +++ b/pkgs/tools/graphics/epstool/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.asppsa ]; platforms = platforms.all; + mainProgram = "epstool"; }; } diff --git a/pkgs/tools/graphics/escrotum/default.nix b/pkgs/tools/graphics/escrotum/default.nix index 04c245dbd9a63..c2e5a7ec9a719 100644 --- a/pkgs/tools/graphics/escrotum/default.nix +++ b/pkgs/tools/graphics/escrotum/default.nix @@ -47,5 +47,6 @@ with python3Packages; buildPythonApplication { platforms = platforms.linux; maintainers = with maintainers; [ rasendubi ]; license = licenses.gpl3; + mainProgram = "escrotum"; }; } diff --git a/pkgs/tools/graphics/esshader/default.nix b/pkgs/tools/graphics/esshader/default.nix index 2e2e9ddbd65e4..38bd4d1b7f0ad 100644 --- a/pkgs/tools/graphics/esshader/default.nix +++ b/pkgs/tools/graphics/esshader/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; # never built on aarch64-darwin, x86_64-darwin since first introduction in nixpkgs broken = stdenv.isDarwin; + mainProgram = "esshader"; }; } diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix index f07f3d05541e9..437ae29a2f50b 100644 --- a/pkgs/tools/graphics/exif/default.nix +++ b/pkgs/tools/graphics/exif/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { description = "A utility to read and manipulate EXIF data in digital photographs"; platforms = platforms.unix; license = licenses.lgpl21Plus; + mainProgram = "exif"; }; } diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix index d62f077e06d7d..d83501d26da6f 100644 --- a/pkgs/tools/graphics/facedetect/default.nix +++ b/pkgs/tools/graphics/facedetect/default.nix @@ -41,5 +41,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; platforms = platforms.all; maintainers = [ maintainers.rycee ]; + mainProgram = "facedetect"; }; } diff --git a/pkgs/tools/graphics/fbv/default.nix b/pkgs/tools/graphics/fbv/default.nix index 5b46d5d2268dc..659a661fded8a 100644 --- a/pkgs/tools/graphics/fbv/default.nix +++ b/pkgs/tools/graphics/fbv/default.nix @@ -32,5 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://s-tech.elsat.net.pl/fbv/"; license = licenses.gpl2Only; maintainers = with maintainers; [ peterhoeg ]; + mainProgram = "fbv"; }; } diff --git a/pkgs/tools/graphics/feedgnuplot/default.nix b/pkgs/tools/graphics/feedgnuplot/default.nix index 827481af497c1..6503a2887ab2f 100644 --- a/pkgs/tools/graphics/feedgnuplot/default.nix +++ b/pkgs/tools/graphics/feedgnuplot/default.nix @@ -62,5 +62,6 @@ perlPackages.buildPerlPackage rec { license = with licenses; [ artistic1 gpl1Plus ]; platforms = platforms.unix; maintainers = with maintainers; [ mnacamura ]; + mainProgram = "feedgnuplot"; }; } diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 7af5c6129f252..be8bc4eb6eabe 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; platforms = platforms.all; maintainers = [ maintainers.bjornfor ]; + mainProgram = "fgallery"; }; } diff --git a/pkgs/tools/graphics/ggobi/default.nix b/pkgs/tools/graphics/ggobi/default.nix index 4e1b851735f06..2bd5abf006663 100644 --- a/pkgs/tools/graphics/ggobi/default.nix +++ b/pkgs/tools/graphics/ggobi/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.cpl10; platforms = platforms.linux; maintainers = [ maintainers.michelk ]; + mainProgram = "ggobi"; }; } diff --git a/pkgs/tools/graphics/gifski/Cargo.lock b/pkgs/tools/graphics/gifski/Cargo.lock index ee579a5e9799d..bc840dec7f1fb 100644 --- a/pkgs/tools/graphics/gifski/Cargo.lock +++ b/pkgs/tools/graphics/gifski/Cargo.lock @@ -318,7 +318,7 @@ dependencies = [ [[package]] name = "gifski" -version = "1.13.0" +version = "1.13.1" dependencies = [ "clap", "crossbeam-channel", diff --git a/pkgs/tools/graphics/gifski/default.nix b/pkgs/tools/graphics/gifski/default.nix index 53180d0094a83..312388a9742fd 100644 --- a/pkgs/tools/graphics/gifski/default.nix +++ b/pkgs/tools/graphics/gifski/default.nix @@ -7,13 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; - rev = version; - hash = "sha256-Ij+bgL935uLCZeh8GQnTFlPIuUloNCn8LUdvMd+6okM="; + # rev = version; + rev = "1.31.1"; # upstream tagged incorrectly + hash = "sha256-JzQReCX1AfFhbVbSPOIAKAVvNoddrWFHaJ1AxlsIPA0="; }; cargoLock = { @@ -44,6 +45,11 @@ rustPlatform.buildRustPackage rec { # checkType = "debug"; + # Cargo.lock is outdated + postPatch = '' + cargo metadata --offline + ''; + meta = with lib; { description = "GIF encoder based on libimagequant (pngquant)"; homepage = "https://gif.ski/"; diff --git a/pkgs/tools/graphics/gmic-qt/default.nix b/pkgs/tools/graphics/gmic-qt/default.nix index fdff56a446dcd..684d6abadfed5 100644 --- a/pkgs/tools/graphics/gmic-qt/default.nix +++ b/pkgs/tools/graphics/gmic-qt/default.nix @@ -54,11 +54,11 @@ assert lib.assertMsg stdenv.mkDerivation (finalAttrs: { pname = "gmic-qt${lib.optionalString (variant != "standalone") "-${variant}"}"; - version = "3.3.1"; + version = "3.3.2"; src = fetchzip { url = "https://gmic.eu/files/source/gmic_${finalAttrs.version}.tar.gz"; - hash = "sha256-d9FRNW/MXM9ZJ1xgIZvGTUPDDnHgTJU0DuWyPkzNAmo="; + hash = "sha256-VaGYjCp1KVRTxEKzUdMCavZBIGEnEvP5fdFqQeKGa44="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix index f0fa45e59e4d9..fa9635f0cb8aa 100644 --- a/pkgs/tools/graphics/gnuplot/default.nix +++ b/pkgs/tools/graphics/gnuplot/default.nix @@ -21,11 +21,11 @@ let in (if withQt then mkDerivation else stdenv.mkDerivation) rec { pname = "gnuplot"; - version = "5.4.9"; + version = "5.4.10"; src = fetchurl { url = "mirror://sourceforge/gnuplot/${pname}-${version}.tar.gz"; - sha256 = "sha256-oyigIfU9wFRZvmBmAg6acejqtiVdM4HiJpYSDUZcapc="; + sha256 = "sha256-l12MHMLEHHztxOMjr/A12Xf+ual/ApbdKopm0Zelsnw="; }; nativeBuildInputs = [ makeWrapper pkg-config texinfo ] ++ lib.optional withQt qttools; @@ -88,5 +88,6 @@ in url = "https://sourceforge.net/p/gnuplot/gnuplot-main/ci/master/tree/Copyright"; }; maintainers = with maintainers; [ lovek323 ]; + mainProgram = "gnuplot"; }; } diff --git a/pkgs/tools/graphics/goverlay/default.nix b/pkgs/tools/graphics/goverlay/default.nix index d4f88a770a01d..b73216a7875c2 100644 --- a/pkgs/tools/graphics/goverlay/default.nix +++ b/pkgs/tools/graphics/goverlay/default.nix @@ -113,5 +113,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = platforms.linux; + mainProgram = "goverlay"; }; } diff --git a/pkgs/tools/graphics/graph-cli/default.nix b/pkgs/tools/graphics/graph-cli/default.nix index c504d6b271562..be6769d85e9ad 100644 --- a/pkgs/tools/graphics/graph-cli/default.nix +++ b/pkgs/tools/graphics/graph-cli/default.nix @@ -28,5 +28,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/mcastorina/graph-cli/"; license = with licenses; [ gpl3Only ]; maintainers = with maintainers; [ leungbk ]; + mainProgram = "graph"; }; } diff --git a/pkgs/tools/graphics/graph-easy/default.nix b/pkgs/tools/graphics/graph-easy/default.nix index 4f3b89eea9170..668c7527e9e4f 100644 --- a/pkgs/tools/graphics/graph-easy/default.nix +++ b/pkgs/tools/graphics/graph-easy/default.nix @@ -13,5 +13,6 @@ perlPackages.buildPerlPackage { license = licenses.gpl1Only; platforms = platforms.unix; maintainers = [ maintainers.jensbin ]; + mainProgram = "graph-easy"; }; } diff --git a/pkgs/tools/graphics/gromit-mpx/default.nix b/pkgs/tools/graphics/gromit-mpx/default.nix index d98ee8733a04c..0a54626419b59 100644 --- a/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/pkgs/tools/graphics/gromit-mpx/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ pjones ]; platforms = platforms.linux; license = licenses.gpl2Plus; + mainProgram = "gromit-mpx"; }; } diff --git a/pkgs/tools/graphics/guff/default.nix b/pkgs/tools/graphics/guff/default.nix index daca6f4344eb7..2ca68376baa27 100644 --- a/pkgs/tools/graphics/guff/default.nix +++ b/pkgs/tools/graphics/guff/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = [ maintainers.marsam ]; platforms = platforms.all; + mainProgram = "guff"; }; } diff --git a/pkgs/tools/graphics/ibniz/default.nix b/pkgs/tools/graphics/ibniz/default.nix index a74267846c1d6..04aadf911e1e1 100644 --- a/pkgs/tools/graphics/ibniz/default.nix +++ b/pkgs/tools/graphics/ibniz/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; platforms = platforms.linux; maintainers = [ maintainers.dezgeg ]; + mainProgram = "ibniz"; }; } diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix index 885638c28b8ce..fe23866bda0bb 100644 --- a/pkgs/tools/graphics/imgur-screenshot/default.nix +++ b/pkgs/tools/graphics/imgur-screenshot/default.nix @@ -25,5 +25,6 @@ in stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.mit; maintainers = with maintainers; [ lw ]; + mainProgram = "imgur-screenshot"; }; } diff --git a/pkgs/tools/graphics/imgurbash2/default.nix b/pkgs/tools/graphics/imgurbash2/default.nix index 6c0e827a84881..e577c8be5a3d2 100644 --- a/pkgs/tools/graphics/imgurbash2/default.nix +++ b/pkgs/tools/graphics/imgurbash2/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; maintainers = with maintainers; [ abbradar ]; homepage = "https://github.com/ram-on/imgurbash2"; + mainProgram = "imgurbash2"; }; } diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 35000088fea9b..391780a4df350 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.publicDomain; maintainers = with maintainers; [ rycee ]; platforms = platforms.all; + mainProgram = "jhead"; }; } diff --git a/pkgs/tools/graphics/jpegexiforient/default.nix b/pkgs/tools/graphics/jpegexiforient/default.nix index 09d096e7b687b..bdf2ce12e837b 100644 --- a/pkgs/tools/graphics/jpegexiforient/default.nix +++ b/pkgs/tools/graphics/jpegexiforient/default.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation { license = licenses.free; platforms = platforms.all; maintainers = with maintainers; [ infinisil ]; + mainProgram = "jpegexiforient"; }; } diff --git a/pkgs/tools/graphics/leela/default.nix b/pkgs/tools/graphics/leela/default.nix index 6676e47ad492e..7ddf02d163693 100644 --- a/pkgs/tools/graphics/leela/default.nix +++ b/pkgs/tools/graphics/leela/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl3; maintainers = [ lib.maintainers.puffnfresh ]; platforms = lib.platforms.linux; + mainProgram = "leela"; }; } diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 8edde6e3f428b..69084a8b53702 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation rec { platforms = platforms.gnu ++ platforms.linux; maintainers = with maintainers; [ pSub ]; + mainProgram = "logstalgia"; }; } diff --git a/pkgs/tools/graphics/lsix/default.nix b/pkgs/tools/graphics/lsix/default.nix index dcf078654b82d..7cbe2ee8626c4 100644 --- a/pkgs/tools/graphics/lsix/default.nix +++ b/pkgs/tools/graphics/lsix/default.nix @@ -32,5 +32,6 @@ stdenvNoCC.mkDerivation rec { license = licenses.gpl3Only; platforms = platforms.all; maintainers = with maintainers; [ kidonng ]; + mainProgram = "lsix"; }; } diff --git a/pkgs/tools/graphics/mangohud/default.nix b/pkgs/tools/graphics/mangohud/default.nix index e42ca26cfb08b..5dc243ec2d7ec 100644 --- a/pkgs/tools/graphics/mangohud/default.nix +++ b/pkgs/tools/graphics/mangohud/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: { # Unpack subproject sources postUnpack = ''( cd "$sourceRoot/subprojects" - ${lib.optionalString finalAttrs.doCheck '' + ${lib.optionalString finalAttrs.finalPackage.doCheck '' cp -R --no-preserve=mode,ownership ${cmocka.src} cmocka ''} cp -R --no-preserve=mode,ownership ${imgui.src} imgui-${imgui.version} @@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { mesonFlags = [ "-Dwith_wayland=enabled" "-Duse_system_spdlog=enabled" - "-Dtests=${if finalAttrs.doCheck then "enabled" else "disabled"}" + "-Dtests=${if finalAttrs.finalPackage.doCheck then "enabled" else "disabled"}" ] ++ lib.optionals gamescopeSupport [ "-Dmangoapp=true" "-Dmangoapp_layer=true" @@ -215,7 +215,7 @@ stdenv.mkDerivation (finalAttrs: { addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so" '' + lib.optionalString gamescopeSupport '' addOpenGLRunpath "$out/bin/mangoapp" - '' + lib.optionalString finalAttrs.doCheck '' + '' + lib.optionalString finalAttrs.finalPackage.doCheck '' # libcmocka.so is only used for tests rm "$out/lib/libcmocka.so" ''; diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix index 7eb1d6cce8184..a391a62ccb68b 100644 --- a/pkgs/tools/graphics/mscgen/default.nix +++ b/pkgs/tools/graphics/mscgen/default.nix @@ -49,5 +49,6 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.unix; + mainProgram = "mscgen"; }; } diff --git a/pkgs/tools/graphics/nifskope/default.nix b/pkgs/tools/graphics/nifskope/default.nix index f74b720ea9ea3..056b3ad8d0651 100644 --- a/pkgs/tools/graphics/nifskope/default.nix +++ b/pkgs/tools/graphics/nifskope/default.nix @@ -63,5 +63,6 @@ stdenv.mkDerivation { maintainers = with maintainers; [ eelco ]; platforms = platforms.linux; license = licenses.bsd3; + mainProgram = "NifSkope"; }; } diff --git a/pkgs/tools/graphics/nip2/default.nix b/pkgs/tools/graphics/nip2/default.nix index 08ec885aed143..651baf547a9e7 100644 --- a/pkgs/tools/graphics/nip2/default.nix +++ b/pkgs/tools/graphics/nip2/default.nix @@ -52,5 +52,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ kovirobi ]; platforms = platforms.unix; + mainProgram = "nip2"; }; } diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix index 2f70dec897c04..bbabcaf6b8000 100644 --- a/pkgs/tools/graphics/optipng/default.nix +++ b/pkgs/tools/graphics/optipng/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { description = "A PNG optimizer"; license = licenses.zlib; platforms = platforms.unix; + mainProgram = "optipng"; }; } diff --git a/pkgs/tools/graphics/oxipng/default.nix b/pkgs/tools/graphics/oxipng/default.nix index 8f4793edb45d8..23f9692597a3a 100644 --- a/pkgs/tools/graphics/oxipng/default.nix +++ b/pkgs/tools/graphics/oxipng/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec { description = "A multithreaded lossless PNG compression optimizer"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ dywedir ]; + mainProgram = "oxipng"; }; } diff --git a/pkgs/tools/graphics/pdf2svg/default.nix b/pkgs/tools/graphics/pdf2svg/default.nix index c6d2eab45376d..b68ba12ebfe9b 100644 --- a/pkgs/tools/graphics/pdf2svg/default.nix +++ b/pkgs/tools/graphics/pdf2svg/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.ianwookim ]; platforms = platforms.unix; + mainProgram = "pdf2svg"; }; } diff --git a/pkgs/tools/graphics/pdftag/default.nix b/pkgs/tools/graphics/pdftag/default.nix index c10412c976cef..90b8dde05f37c 100644 --- a/pkgs/tools/graphics/pdftag/default.nix +++ b/pkgs/tools/graphics/pdftag/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ leenaars ]; platforms = platforms.unix; + mainProgram = "pdftag"; }; } diff --git a/pkgs/tools/graphics/pdftoipe/default.nix b/pkgs/tools/graphics/pdftoipe/default.nix index d7e757e679bf5..e969d90f9e05b 100644 --- a/pkgs/tools/graphics/pdftoipe/default.nix +++ b/pkgs/tools/graphics/pdftoipe/default.nix @@ -50,5 +50,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/otfried/ipe-tools/releases"; license = licenses.gpl3Plus; maintainers = with maintainers; [ yrd ]; + mainProgram = "pdftoipe"; }; } diff --git a/pkgs/tools/graphics/perceptualdiff/default.nix b/pkgs/tools/graphics/perceptualdiff/default.nix index 919b99327110a..aa88b33aa3819 100644 --- a/pkgs/tools/graphics/perceptualdiff/default.nix +++ b/pkgs/tools/graphics/perceptualdiff/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ uri-canva ]; platforms = platforms.unix; + mainProgram = "perceptualdiff"; }; } diff --git a/pkgs/tools/graphics/piglit/default.nix b/pkgs/tools/graphics/piglit/default.nix index 561268b3f4b3a..aa076d1b84e08 100644 --- a/pkgs/tools/graphics/piglit/default.nix +++ b/pkgs/tools/graphics/piglit/default.nix @@ -73,5 +73,6 @@ stdenv.mkDerivation rec { license = licenses.free; # custom license. See COPYING in the source repo. platforms = platforms.mesaPlatforms; maintainers = with maintainers; [ Flakebi ]; + mainProgram = "piglit"; }; } diff --git a/pkgs/tools/graphics/pixel2svg/default.nix b/pkgs/tools/graphics/pixel2svg/default.nix index 8e5e866249003..1094cad56a331 100644 --- a/pkgs/tools/graphics/pixel2svg/default.nix +++ b/pkgs/tools/graphics/pixel2svg/default.nix @@ -16,5 +16,6 @@ python310Packages.buildPythonPackage rec { description = "Converts pixel art to SVG - pixel by pixel"; license = licenses.gpl3Plus; maintainers = with maintainers; [ annaaurora ]; + mainProgram = "pixel2svg.py"; }; } diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix index a90881dad224a..d6ed7a6960fc3 100644 --- a/pkgs/tools/graphics/pngcheck/default.nix +++ b/pkgs/tools/graphics/pngcheck/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.free; platforms = platforms.unix; maintainers = with maintainers; [ starcraft66 ]; + mainProgram = "pngcheck"; }; } diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index 16c710ceb79f6..8ce9965eae254 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "A PNG optimizer"; license = lib.licenses.free; platforms = with lib.platforms; linux ++ darwin; + mainProgram = "pngcrush"; }; } diff --git a/pkgs/tools/graphics/pngloss/default.nix b/pkgs/tools/graphics/pngloss/default.nix index eafd77054e40b..7eca91f42d7dc 100644 --- a/pkgs/tools/graphics/pngloss/default.nix +++ b/pkgs/tools/graphics/pngloss/default.nix @@ -31,5 +31,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; maintainers = with maintainers; [ _2gn ]; + mainProgram = "pngloss"; }; } diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix index 2b86f5e5e1365..c80d4a65adc96 100644 --- a/pkgs/tools/graphics/pngout/default.nix +++ b/pkgs/tools/graphics/pngout/default.nix @@ -46,5 +46,6 @@ stdenv.mkDerivation rec { homepage = "http://advsys.net/ken/utils.htm"; platforms = lib.attrNames platforms; maintainers = [ lib.maintainers.sander ]; + mainProgram = "pngout"; }; } diff --git a/pkgs/tools/graphics/pngtoico/default.nix b/pkgs/tools/graphics/pngtoico/default.nix index dae0802427fcd..a537e16d96aec 100644 --- a/pkgs/tools/graphics/pngtoico/default.nix +++ b/pkgs/tools/graphics/pngtoico/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation rec { description = "Small utility to convert a set of PNG images to Microsoft ICO format"; license = lib.licenses.gpl2Plus; platforms = with lib.platforms; linux; + mainProgram = "pngtoico"; }; } diff --git a/pkgs/tools/graphics/povray/default.nix b/pkgs/tools/graphics/povray/default.nix index f9a08543fb956..5e432a0d13c4c 100644 --- a/pkgs/tools/graphics/povray/default.nix +++ b/pkgs/tools/graphics/povray/default.nix @@ -57,5 +57,6 @@ stdenv.mkDerivation rec { description = "Persistence of Vision Raytracer"; license = licenses.free; platforms = platforms.linux; + mainProgram = "povray"; }; } diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index df3d1c6a69386..3bd4c1a86fbcf 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = [ maintainers.marcweber ]; platforms = platforms.unix; + mainProgram = "pstoedit"; }; } diff --git a/pkgs/tools/graphics/qrcode/default.nix b/pkgs/tools/graphics/qrcode/default.nix index 3f14044040055..e870f53da82e8 100644 --- a/pkgs/tools/graphics/qrcode/default.nix +++ b/pkgs/tools/graphics/qrcode/default.nix @@ -2,17 +2,15 @@ stdenv.mkDerivation { pname = "qrcode"; - version = "unstable-2022-01-10"; + version = "unstable-2023-12-02"; src = fetchFromGitHub { owner = "qsantos"; repo = "qrcode"; - rev = "f4475866bbf963ad118db936060f606eedc224d5"; - hash = "sha256-IbWYSAc0PvSWcxKaPUXDldGDCK/lPZjptepYtLppPmA="; + rev = "96fac69ad3e4f616ce75c0e3ef4ed0574cfab315"; + hash = "sha256-Aesjys6FchB6qcLRWJNGfcEZRlO3stw3+IM8Xe2pF+Q="; }; - env.NIX_CFLAGS_COMPILE = "-Wno-error=unused-result"; - makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; installPhase = '' @@ -27,5 +25,6 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; maintainers = with maintainers; [ raskin ]; platforms = with platforms; unix; + mainProgram = "qrcode"; }; } diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch index 17490b7ce777b..faeb65d3b8475 100644 --- a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch +++ b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/cmakelists.patch @@ -1,11 +1,11 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index a234caa..d94388a 100644 +index 1e7b71a..9db85b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -107,6 +107,8 @@ if(USE_SYSTEM_NCNN) - + find_package(Threads) - + + include("${GLSLANG_TARGET_DIR}/SPIRV-Tools/SPIRV-ToolsTarget.cmake") + include("${GLSLANG_TARGET_DIR}/SPIRV-Tools-opt/SPIRV-Tools-optTargets.cmake") include("${GLSLANG_TARGET_DIR}/OSDependentTargets.cmake") diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix index 05cb130467a7a..4bc67f1e6a47d 100644 --- a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix +++ b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/default.nix @@ -12,21 +12,21 @@ stdenv.mkDerivation rec { pname = "Real-ESRGAN-ncnn-vulkan"; - version = "0.1.3.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "xinntao"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eLAIlOl1sUxijeVPFG+NscZGxDdtrQqVkMuxhegESHk="; + sha256 = "sha256-F+NfkAbk8UtAKzsF42ppPF2UGjK/M6iFfBsRRBbCmcI="; }; sourceRoot = "${src.name}/src"; models = fetchzip { # Choose the newst release from https://github.com/xinntao/Real-ESRGAN/releases to update - url = "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.3.0/realesrgan-ncnn-vulkan-20211212-ubuntu.zip"; + url = "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesrgan-ncnn-vulkan-20220424-ubuntu.zip"; stripRoot = false; - sha256 = "sha256-17k6fewVEXxx7hi+vPXjHAOq4IIUHLh7WC80CwTeFKI="; + sha256 = "sha256-1YiPzv1eGnHrazJFRvl37+C1F2xnoEbN0UQYkxLT+JQ="; }; patches = [ @@ -60,5 +60,6 @@ stdenv.mkDerivation rec { license = licenses.mit; maintainers = with maintainers; [ tilcreator ]; platforms = platforms.all; + mainProgram = "realesrgan-ncnn-vulkan"; }; } diff --git a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/models_path.patch b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/models_path.patch index 43b8e4503be2c..8cd2d6d1e9829 100644 --- a/pkgs/tools/graphics/realesrgan-ncnn-vulkan/models_path.patch +++ b/pkgs/tools/graphics/realesrgan-ncnn-vulkan/models_path.patch @@ -1,14 +1,14 @@ diff --git a/main.cpp b/main.cpp -index eb6f6c8..b230bed 100644 +index ebe0e62..ef3a1ed 100644 --- a/main.cpp +++ b/main.cpp -@@ -110,7 +110,7 @@ static void print_usage() +@@ -109,7 +109,7 @@ static void print_usage() fprintf(stderr, " -o output-path output image path (jpg/png/webp) or directory\n"); - fprintf(stderr, " -s scale upscale ratio (can be 2, 4. default=4)\n"); + fprintf(stderr, " -s scale upscale ratio (can be 2, 3, 4. default=4)\n"); fprintf(stderr, " -t tile-size tile size (>=32/0=auto, default=0) can be 0,0,0 for multi-gpu\n"); -- fprintf(stderr, " -m model-path folder path to pre-trained models(default=models)\n"); -+ fprintf(stderr, " -m model-path folder path to pre-trained models(default=REPLACE_MODELS)\n"); - fprintf(stderr, " -n model-name model name (default=realesrgan-x4plus, can be realesrgan-x4plus | realesrgan-x4plus-anime | realesrnet-x4plus | RealESRGANv2-animevideo-xsx2 | RealESRGANv2-animevideo-xsx4 | RealESRGANv2-anime-xsx2 | RealESRGANv2-anime-xsx4)\n"); +- fprintf(stderr, " -m model-path folder path to the pre-trained models. default=models\n"); ++ fprintf(stderr, " -m model-path folder path to the pre-trained models. default=REPLACE_MODELS\n"); + fprintf(stderr, " -n model-name model name (default=realesr-animevideov3, can be realesr-animevideov3 | realesrgan-x4plus | realesrgan-x4plus-anime | realesrnet-x4plus)\n"); fprintf(stderr, " -g gpu-id gpu device to use (default=auto) can be 0,1,2 for multi-gpu\n"); fprintf(stderr, " -j load:proc:save thread count for load/proc/save (default=1:2:2) can be 1:2,2,2:2 for multi-gpu\n"); @@ -438,7 +438,7 @@ int main(int argc, char** argv) @@ -17,6 +17,6 @@ index eb6f6c8..b230bed 100644 std::vector<int> tilesize; - path_t model = PATHSTR("models"); + path_t model = PATHSTR("REPLACE_MODELS"); - path_t modelname = PATHSTR("realesrgan-x4plus"); + path_t modelname = PATHSTR("realesr-animevideov3"); std::vector<int> gpuid; int jobs_load = 1; diff --git a/pkgs/tools/graphics/s2png/default.nix b/pkgs/tools/graphics/s2png/default.nix index d3f8b74512a80..940e9db05419b 100644 --- a/pkgs/tools/graphics/s2png/default.nix +++ b/pkgs/tools/graphics/s2png/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = [ lib.maintainers.dbohdan ]; platforms = lib.platforms.unix; + mainProgram = "s2png"; }; } diff --git a/pkgs/tools/graphics/sanjuuni/default.nix b/pkgs/tools/graphics/sanjuuni/default.nix index 71807b0db0195..6b96e6ad5a92b 100644 --- a/pkgs/tools/graphics/sanjuuni/default.nix +++ b/pkgs/tools/graphics/sanjuuni/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.tomodachi94 ]; license = licenses.gpl2Plus; broken = stdenv.isDarwin; + mainProgram = "sanjuuni"; }; } diff --git a/pkgs/tools/graphics/shot-scraper/default.nix b/pkgs/tools/graphics/shot-scraper/default.nix index e083014f8a983..60aee277b60f5 100644 --- a/pkgs/tools/graphics/shot-scraper/default.nix +++ b/pkgs/tools/graphics/shot-scraper/default.nix @@ -35,5 +35,6 @@ python3.pkgs.buildPythonApplication rec { changelog = "https://github.com/simonw/shot-scraper/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ techknowlogick ]; + mainProgram = "shot-scraper"; }; } diff --git a/pkgs/tools/graphics/shotgun/default.nix b/pkgs/tools/graphics/shotgun/default.nix index 30d676d4b2efe..d2d3c92982f69 100644 --- a/pkgs/tools/graphics/shotgun/default.nix +++ b/pkgs/tools/graphics/shotgun/default.nix @@ -19,5 +19,6 @@ rustPlatform.buildRustPackage rec { license = with licenses; [ mpl20 ]; maintainers = with maintainers; [ figsoda lumi novenary ]; platforms = platforms.linux; + mainProgram = "shotgun"; }; } diff --git a/pkgs/tools/graphics/smartcrop/default.nix b/pkgs/tools/graphics/smartcrop/default.nix index d08c11fd3ebf2..7660607a9a479 100644 --- a/pkgs/tools/graphics/smartcrop/default.nix +++ b/pkgs/tools/graphics/smartcrop/default.nix @@ -23,5 +23,6 @@ buildGoModule { homepage = "https://github.com/muesli/smartcrop"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "smartcrop"; }; } diff --git a/pkgs/tools/graphics/sng/default.nix b/pkgs/tools/graphics/sng/default.nix index 8ebfd967828be..a8db32128a5e4 100644 --- a/pkgs/tools/graphics/sng/default.nix +++ b/pkgs/tools/graphics/sng/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { license = licenses.zlib; maintainers = [ maintainers.dezgeg ]; platforms = platforms.unix; + mainProgram = "sng"; }; } diff --git a/pkgs/tools/graphics/spirv-cross/default.nix b/pkgs/tools/graphics/spirv-cross/default.nix index 642a49c39b843..cd7489be9aec7 100644 --- a/pkgs/tools/graphics/spirv-cross/default.nix +++ b/pkgs/tools/graphics/spirv-cross/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = platforms.all; license = licenses.asl20; maintainers = with maintainers; [ Flakebi ]; + mainProgram = "spirv-cross"; }; }) diff --git a/pkgs/tools/graphics/steghide/default.nix b/pkgs/tools/graphics/steghide/default.nix index 74011917d5fbf..c62761bb2a213 100644 --- a/pkgs/tools/graphics/steghide/default.nix +++ b/pkgs/tools/graphics/steghide/default.nix @@ -40,5 +40,6 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = with platforms; unix; + mainProgram = "steghide"; }; }) diff --git a/pkgs/tools/graphics/stegsolve/default.nix b/pkgs/tools/graphics/stegsolve/default.nix index 3f147ab0decab..a42b3c304b288 100644 --- a/pkgs/tools/graphics/stegsolve/default.nix +++ b/pkgs/tools/graphics/stegsolve/default.nix @@ -55,5 +55,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { }; maintainers = with maintainers; [ emilytrau ]; platforms = platforms.all; + mainProgram = "stegsolve"; }; }) diff --git a/pkgs/tools/graphics/svg2pdf/default.nix b/pkgs/tools/graphics/svg2pdf/default.nix index 27ef2edd0fa8a..24065574ddcca 100644 --- a/pkgs/tools/graphics/svg2pdf/default.nix +++ b/pkgs/tools/graphics/svg2pdf/default.nix @@ -5,16 +5,20 @@ rustPlatform.buildRustPackage rec { pname = "svg2pdf"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "typst"; repo = "svg2pdf"; rev = "v${version}"; - hash = "sha256-Xy1ID2/M3v9/ZEo8fWEDlJ8+cmgAMdHhs27xDfe8IYQ="; + hash = "sha256-mWj9zWxqcJ+5VFYSaeNLxClWdOGd34JboZBwT8E75Ew="; }; - cargoHash = "sha256-l3671zvqSM4CY7lOXOur0Q6PBDVf6jXnhZ/8kADWQz4="; - buildFeatures = [ "cli" ]; + + cargoHash = "sha256-zP448dFnkoPca/GJA2kT5ht1fVGkWN0XdaKEePJaloQ="; + + cargoBuildFlags = [ + "-p=svg2pdf-cli" + ]; meta = with lib; { description = "Convert SVG files to PDFs"; @@ -22,5 +26,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/typst/svg2pdf/releases/tag/${src.rev}"; license = with licenses; [ asl20 mit ]; maintainers = with maintainers; [ doronbehar figsoda ]; + mainProgram = "svg2pdf"; }; } diff --git a/pkgs/tools/graphics/svgbob/default.nix b/pkgs/tools/graphics/svgbob/default.nix index e5974d04e1ae1..b09d8dee1ab0a 100644 --- a/pkgs/tools/graphics/svgbob/default.nix +++ b/pkgs/tools/graphics/svgbob/default.nix @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/ivanceras/svgbob/raw/${version}/Changelog.md"; license = licenses.asl20; maintainers = [ maintainers.marsam ]; + mainProgram = "svgbob"; }; } diff --git a/pkgs/tools/graphics/svgcleaner/default.nix b/pkgs/tools/graphics/svgcleaner/default.nix index c2938a69b57ac..1ec42817456a0 100644 --- a/pkgs/tools/graphics/svgcleaner/default.nix +++ b/pkgs/tools/graphics/svgcleaner/default.nix @@ -22,5 +22,6 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/RazrFalcon/svgcleaner/releases"; license = licenses.gpl2; maintainers = with maintainers; [ yuu ]; + mainProgram = "svgcleaner"; }; } diff --git a/pkgs/tools/graphics/textplots/default.nix b/pkgs/tools/graphics/textplots/default.nix index a423ca9f30e27..81d9b5de3e367 100644 --- a/pkgs/tools/graphics/textplots/default.nix +++ b/pkgs/tools/graphics/textplots/default.nix @@ -18,5 +18,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/loony-bean/textplots-rs"; license = licenses.mit; maintainers = with maintainers; [ figsoda ]; + mainProgram = "textplots"; }; } diff --git a/pkgs/tools/graphics/texture-synthesis/default.nix b/pkgs/tools/graphics/texture-synthesis/default.nix index d4f66357fadcf..7122450587a71 100644 --- a/pkgs/tools/graphics/texture-synthesis/default.nix +++ b/pkgs/tools/graphics/texture-synthesis/default.nix @@ -26,5 +26,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/embarkstudios/texture-synthesis"; license = with licenses; [ mit /* or */ asl20 ]; maintainers = with maintainers; [ figsoda ]; + mainProgram = "texture-synthesis"; }; } diff --git a/pkgs/tools/graphics/timg/default.nix b/pkgs/tools/graphics/timg/default.nix index 43a2ae16ed344..2379e3c8188e1 100644 --- a/pkgs/tools/graphics/timg/default.nix +++ b/pkgs/tools/graphics/timg/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "timg"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "hzeller"; repo = "timg"; rev = "v${finalAttrs.version}"; - hash = "sha256-e2Uy1jvS0+gdhto4Sgz6YlqEqXJ7KGUAA6iuixfvvJg="; + hash = "sha256-u52ipc3I57ldKXjmXqFuIXIYIrs5c9TSvgs1HfIu44U="; }; buildInputs = [ diff --git a/pkgs/tools/graphics/twilight/default.nix b/pkgs/tools/graphics/twilight/default.nix index 58d4d0df91338..52941f7b96d7f 100644 --- a/pkgs/tools/graphics/twilight/default.nix +++ b/pkgs/tools/graphics/twilight/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ ]; + mainProgram = "twilight"; }; } diff --git a/pkgs/tools/graphics/viu/default.nix b/pkgs/tools/graphics/viu/default.nix index ade2dd7331bff..83c97376676ac 100644 --- a/pkgs/tools/graphics/viu/default.nix +++ b/pkgs/tools/graphics/viu/default.nix @@ -29,5 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/atanunq/viu"; license = licenses.mit; maintainers = with maintainers; [ chuangzhu ]; + mainProgram = "viu"; }; } diff --git a/pkgs/tools/graphics/vkbasalt-cli/default.nix b/pkgs/tools/graphics/vkbasalt-cli/default.nix index 0d54f695e9af6..efe704ace2935 100644 --- a/pkgs/tools/graphics/vkbasalt-cli/default.nix +++ b/pkgs/tools/graphics/vkbasalt-cli/default.nix @@ -27,5 +27,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://gitlab.com/TheEvilSkeleton/vkbasalt-cli"; license = with licenses; [ lgpl3Only gpl3Only ]; maintainers = with maintainers; [ martfont ]; + mainProgram = "vkbasalt"; }; } diff --git a/pkgs/tools/graphics/vkdisplayinfo/default.nix b/pkgs/tools/graphics/vkdisplayinfo/default.nix index a48c4d1154fe6..3a88b2e21147e 100644 --- a/pkgs/tools/graphics/vkdisplayinfo/default.nix +++ b/pkgs/tools/graphics/vkdisplayinfo/default.nix @@ -44,5 +44,6 @@ stdenv.mkDerivation rec { platforms = platforms.linux; license = licenses.boost; maintainers = [ maintainers.LunNova ]; + mainProgram = "vkdisplayinfo"; }; } diff --git a/pkgs/tools/graphics/vkmark/default.nix b/pkgs/tools/graphics/vkmark/default.nix index 2923c786507ee..d9c4f8a2024f3 100644 --- a/pkgs/tools/graphics/vkmark/default.nix +++ b/pkgs/tools/graphics/vkmark/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = with licenses; [ lgpl21Plus ]; platforms = platforms.linux; maintainers = with maintainers; [ muscaln ]; + mainProgram = "vkmark"; }; } diff --git a/pkgs/tools/graphics/vulkan-cts/default.nix b/pkgs/tools/graphics/vulkan-cts/default.nix index aba088a1128f2..983d96f8d1f36 100644 --- a/pkgs/tools/graphics/vulkan-cts/default.nix +++ b/pkgs/tools/graphics/vulkan-cts/default.nix @@ -1,6 +1,7 @@ { lib, stdenv , fetchFromGitHub , fetchurl +, runCommand , cmake , ffmpeg_4 , libdrm @@ -12,6 +13,7 @@ , libXdmcp , libxcb , makeWrapper +, mesa , ninja , pkg-config , python3 @@ -37,13 +39,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "vulkan-cts"; - version = "1.3.7.0"; + version = "1.3.7.2"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "VK-GL-CTS"; rev = "${finalAttrs.pname}-${finalAttrs.version}"; - hash = "sha256-f7i7gytk3cKeFQD0FR+nrUR2o0FWaJWKG7OpDz9u42E="; + hash = "sha256-TnHFCEGKgn1U00aUDMX7UEWSeTjzysmX7rOQCZTL8FU="; }; prePatch = '' @@ -104,6 +106,12 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru.updateScript = ./update.sh; + passthru.tests.lavapipe = runCommand "vulkan-cts-tests-lavapipe" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } '' + # Expand the wildcard to pick the existing architecture + export VK_ICD_FILENAMES=$(echo ${mesa.drivers}/share/vulkan/icd.d/lvp_icd.*.json) + deqp-vk -n dEQP-VK.api.smoke.triangle + touch $out + ''; meta = with lib; { description = "Khronos Vulkan Conformance Tests"; diff --git a/pkgs/tools/graphics/vulkan-cts/sources.nix b/pkgs/tools/graphics/vulkan-cts/sources.nix index 59480657da068..647b5e12c2d91 100644 --- a/pkgs/tools/graphics/vulkan-cts/sources.nix +++ b/pkgs/tools/graphics/vulkan-cts/sources.nix @@ -32,8 +32,8 @@ rec { nvidia-video-samples = fetchFromGitHub { owner = "Igalia"; repo = "vk_video_samples"; - rev = "cts-integration-0.9.9-1"; - hash = "sha256-vHUyGAx/n8yTnrFjeefbb8LsHxONxsjH3BG2D/RO99E="; + rev = "cts-integration-0.9.9-2"; + hash = "sha256-ftHhb5u3l7WbgEu6hHynBnvNbVOn5TFne915M17jiAQ="; }; spirv-headers = fetchFromGitHub { diff --git a/pkgs/tools/graphics/vulkan-helper/default.nix b/pkgs/tools/graphics/vulkan-helper/default.nix index 8db735c662e84..404ce734b5b31 100644 --- a/pkgs/tools/graphics/vulkan-helper/default.nix +++ b/pkgs/tools/graphics/vulkan-helper/default.nix @@ -33,5 +33,6 @@ rustPlatform.buildRustPackage rec { license = licenses.mit; maintainers = with maintainers; [ aidalgol ]; platforms = platforms.linux; + mainProgram = "vulkan-helper"; }; } diff --git a/pkgs/tools/graphics/vulkan-tools/default.nix b/pkgs/tools/graphics/vulkan-tools/default.nix index e148f51d86893..d590ac7d340c6 100644 --- a/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/pkgs/tools/graphics/vulkan-tools/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, buildPackages , cmake , pkg-config , python3 @@ -72,12 +73,14 @@ stdenv.mkDerivation rec { dontPatchELF = true; + env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER="${buildPackages.wayland-scanner}/bin/wayland-scanner"; + cmakeFlags = [ # Don't build the mock ICD as it may get used instead of other drivers, if installed "-DBUILD_ICD=OFF" # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH "-DCMAKE_INSTALL_RPATH=${libraryPath}" - "-DPKG_CONFIG_EXECUTABLE=${pkg-config}/bin/pkg-config" + "-DPKG_CONFIG_EXECUTABLE=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config" "-DGLSLANG_INSTALL_DIR=${glslang}" # Hide dev warnings that are useless for packaging "-Wno-dev" diff --git a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index f936ab83fb560..dd2c15c8fda45 100644 --- a/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -42,5 +42,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = [ lib.maintainers.xzfc ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; + mainProgram = "waifu2x-converter-cpp"; }; } diff --git a/pkgs/tools/graphics/xcolor/default.nix b/pkgs/tools/graphics/xcolor/default.nix index dabe14d895fa7..50aa912522d99 100644 --- a/pkgs/tools/graphics/xcolor/default.nix +++ b/pkgs/tools/graphics/xcolor/default.nix @@ -43,5 +43,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/Soft/xcolor"; maintainers = with lib.maintainers; [ moni ]; license = licenses.mit; + mainProgram = "xcolor"; }; } diff --git a/pkgs/tools/graphics/xcur2png/default.nix b/pkgs/tools/graphics/xcur2png/default.nix index e8d761c6d8420..5d5396aea273f 100644 --- a/pkgs/tools/graphics/xcur2png/default.nix +++ b/pkgs/tools/graphics/xcur2png/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ romildo ]; + mainProgram = "xcur2png"; }; } diff --git a/pkgs/tools/graphics/yaxg/default.nix b/pkgs/tools/graphics/yaxg/default.nix index 9d83ae71d3335..dd428ae0c427f 100644 --- a/pkgs/tools/graphics/yaxg/default.nix +++ b/pkgs/tools/graphics/yaxg/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { platforms = platforms.all; license = licenses.gpl3Plus; maintainers = with maintainers; [ neonfuz ]; + mainProgram = "yaxg"; }; } |