diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/tools/graphics')
19 files changed, 298 insertions, 55 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix index 67afac2cdccd..6b8c6870a668 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.nix @@ -1,24 +1,32 @@ -{ stdenv, fetchFromGitHub, fetchurl +{ stdenv, fetchFromGitHub, fetchurl, fetchpatch , autoreconfHook, bison, glm, yacc, flex , freeglut, ghostscriptX, imagemagick, fftw , boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv , python3Packages -, zlib, perl +, zlib, perl, curl , texLive, texinfo , darwin }: stdenv.mkDerivation rec { - version = "2.66"; + version = "2.67"; pname = "asymptote"; src = fetchFromGitHub { owner = "vectorgraphics"; repo = pname; rev = version; - sha256 = "0c445j950n6nxgr1zxj7a26daa5d9f3i91506b7r7627s943b1kd"; + sha256 = "sha256:1lawj2gf0985clzbyym26s5mxxp2syl1dqqxfzk0sq9s30l2rj3l"; }; + patches = + (stdenv.lib.optional (stdenv.lib.versionOlder version "2.68") + (fetchpatch { + url = "https://github.com/vectorgraphics/asymptote/commit/3361214340d58235f4dbb8f24017d0cd5d94da72.patch"; + sha256 = "sha256:1z2b41x8v7683myd45lq6niixpdjy0b185x0xl61130vrijhq5nm"; + })) + ; + nativeBuildInputs = [ autoreconfHook bison @@ -30,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = [ ghostscriptX imagemagick fftw boehmgc ncurses readline gsl libsigsegv - zlib perl + zlib perl curl texLive ] ++ (with python3Packages; [ python diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.upstream b/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.upstream deleted file mode 100644 index e86d81ba4435..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/asymptote/default.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url https://sourceforge.net/projects/asymptote/files/ -SF_version_dir -version_link 'src[.]tgz/download$' -SF_redirect diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix index a12e5dbb8bb3..24e43044697d 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/diagrams-builder/default.nix @@ -2,7 +2,7 @@ If user need access to more haskell package for building his diagrams, he simply has to pass these package through the extra packages function as follow in `config.nix`: - + ~~~ diagrams-builder.override { extraPackages = self : [myHaskellPackage]; @@ -15,7 +15,7 @@ let # Used same technique as for the yiCustom package. - wrappedGhc = ghcWithPackages + wrappedGhc = ghcWithPackages (self: [ diagrams-builder ] ++ extraPackages self); ghcVersion = wrappedGhc.version; @@ -25,7 +25,7 @@ let --set NIX_GHC ${wrappedGhc}/bin/ghc \ --set NIX_GHC_LIBDIR ${wrappedGhc}/lib/ghc-${ghcVersion} ''; - + backends = ["svg" "cairo" "ps"]; in @@ -35,10 +35,10 @@ stdenv.mkDerivation { buildInputs = [ makeWrapper ]; - buildCommand = with stdenv.lib; + buildCommand = with stdenv.lib; concatStrings (intersperse "\n" (map exeWrapper backends)); # Will be faster to build the wrapper locally then to fetch it from a binary cache. preferLocalBuild = true; meta = diagrams-builder.meta; -}
\ No newline at end of file +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/dpic/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/dpic/default.nix index 7b7eea3d5095..ea65f3dbb55c 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/dpic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/dpic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "dpic"; - version = "2020.06.01"; + version = "2020.09.15"; src = fetchurl { url = "https://ece.uwaterloo.ca/~aplevich/dpic/${pname}-${version}.tar.gz"; - sha256 = "1gbkpbjwjaaifxff8amm9b47dynq4l4698snjdgnn4flndw62q88"; + sha256 = "0gmmp4dlir3bn892nm55a3q8cfsj8yg7fp1dixmhsdhsrgmg1b83"; }; # The prefix passed to configure is not used. diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/exifprobe/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/exifprobe/default.nix new file mode 100644 index 000000000000..93a9be58b72a --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/exifprobe/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "exifprobe"; + version = "unstable-2018-06-19"; + + src = fetchFromGitHub { + owner = "hfiguiere"; + repo = "exifprobe"; + rev = "ce1ea2bc3dbbe8092b26f41cd89831cafe633d69"; + sha256 = "1c1fhc0v1m452lgnfcijnvrc0by06qfbhn3zkliqi60kv8l2isbp"; + }; + + CFLAGS = [ "-O2" ]; + + installFlags = [ "DESTDIR=$(out)" ]; + + postInstall = '' + mv $out/usr/bin $out/bin + mv $out/usr/share $out/share + rm -r $out/usr + ''; + + meta = with stdenv.lib; { + description = "Tool for reading EXIF data from image files produced by digital cameras"; + homepage = "https://github.com/hfiguiere/exifprobe"; + license = licenses.bsd2; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gifski/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gifski/default.nix index 4758dece42f4..aa247a4c9177 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gifski/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gifski/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "gifski"; - version = "1.2.0"; + version = "1.2.4"; src = fetchFromGitHub { owner = "ImageOptim"; repo = "gifski"; rev = version; - sha256 = "0yziqgvjjb5bblmm060li7dv1i23gpn0f75jb72z8cdf2wg1qmxb"; + sha256 = "0mr4ni75klmzfjivfv5xmcdw03y1gjvkz1d297gwh46zq1q7blf3"; }; - cargoSha256 = "1y4q6p6hbmpwdpahmspgngm842qrq1srl7319wslq9ydl09m1x3x"; + cargoSha256 = "0wm139lik6w2hwg72j8hcphp0z89bbabfxjmfyqrih6akyzb0l01"; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gmic/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gmic/default.nix index ccc4a23cb558..e8e9472cabdf 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gmic/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gmic/default.nix @@ -3,7 +3,7 @@ , cmake , ninja , pkg-config -, opencv3 +, opencv , openexr , graphicsmagick , fftw @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "gmic"; - version = "2.9.2"; + version = "2.9.4"; outputs = [ "out" "lib" "dev" "man" ]; src = fetchurl { url = "https://gmic.eu/files/source/gmic_${version}.tar.gz"; - sha256 = "14acph914a8lp6qqfmp319ggqjg3i3hmalmnpk3mp07m7vpv2p9q"; + sha256 = "1ixcdq16gmgh1brrb6mgdibypq9lvh8gnz86b5mmyxlnyi4fw2vr"; }; nativeBuildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { libjpeg libtiff libpng - opencv3 + opencv openexr graphicsmagick ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix index c7f0beba8fb8..b8c344258bb9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/gromit-mpx/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "gromit-mpx"; - version = "1.3.1"; + version = "1.4"; src = fetchFromGitHub { owner = "bk138"; repo = "gromit-mpx"; rev = version; - sha256 = "1dvn7vwg4fg1a3lfj5f7nij1vcxm27gyf2wr817f3qb4sx5xmjwy"; + sha256 = "1xn14r7lhay720y78j1fs4amp5lia39kpq7vzv02x4nnwhgbsd9r"; }; nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/optar/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/optar/default.nix index 4eee8acb9798..3061a5cebaf9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/optar/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/optar/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "Optar stands for OPTical ARchiver - it's a codec for encoding data on paper"; + description = "OPTical ARchiver - it's a codec for encoding data on paper"; homepage = "http://ronja.twibright.com/optar/"; license = licenses.gpl2; maintainers = with maintainers; [ peterhoeg ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/oxipng/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/oxipng/default.nix index 965c799a217f..1c89a1574c54 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/oxipng/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/oxipng/default.nix @@ -1,20 +1,15 @@ -{ stdenv, fetchFromGitHub, rustPlatform }: +{ stdenv, fetchCrate, rustPlatform }: rustPlatform.buildRustPackage rec { - version = "3.0.1"; + version = "4.0.2"; pname = "oxipng"; - src = fetchFromGitHub { - owner = "shssoichiro"; - repo = pname; - rev = "v${version}"; - sha256 = "11lncwxksm7aqczy9ay1qnba2wmgfsirhgrl6vv1jlgj41b7mzi5"; + src = fetchCrate { + inherit version pname; + sha256 = "0m36af9w1l6pc71fjbgyzcsszizwayvcv5d750zz2bnj23c77m69"; }; - cargoSha256 = "0lalb981qzlnmqfg170mh6lnc0qlzb94wc39mf859g2jvxk3pkrl"; - - # https://crates.io/crates/cloudflare-zlib#arm-vs-nightly-rust - cargoBuildFlags = [ "--features=cloudflare-zlib/arm-always" ]; + cargoSha256 = "16fby8ncdq0dyg9r0glrqwi04sja34br306c5sj22cq1dm3bb64q"; doCheck = !stdenv.isAarch64 && !stdenv.isDarwin; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/pfstools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/pfstools/default.nix index 1c437a3f05cd..f570251374cf 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/pfstools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/pfstools/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, cmake, pkgconfig, darwin +{ stdenv, mkDerivation, fetchurl, cmake, pkgconfig, darwin , openexr, zlib, imagemagick, libGLU, libGL, freeglut, fftwFloat -, fftw, gsl, libexif, perl, opencv2, qt5, netpbm +, fftw, gsl, libexif, perl, opencv2, qtbase, netpbm }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "pfstools"; version = "2.1.0"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ openexr zlib imagemagick fftwFloat - fftw gsl libexif perl opencv2 qt5.qtbase netpbm + fftw gsl libexif perl opencv2 qtbase netpbm ] ++ (if stdenv.isDarwin then (with darwin.apple_sdk.frameworks; [ OpenGL GLUT ]) else [ diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/piglit/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/piglit/default.nix new file mode 100644 index 000000000000..e2c2b6e6e972 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/piglit/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, fetchFromGitLab +, lib +, cmake +, freeglut +, libGL +, libGLU +, libglvnd +, makeWrapper +, ninja +, pkg-config +, python3 +, waffle +, wayland +, libX11 +, libXrender +, libxcb +, libxkbcommon +}: + +stdenv.mkDerivation rec { + pname = "piglit"; + version = "unstable-2020-10-23"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mesa"; + repo = "piglit"; + rev = "59e695c16fdcdd4ea4f16365f0e397a93cef7b80"; + sha256 = "kx0+2Sdvdc3SbpAIl2OuGCWCpaLJC/7cXG+ZLvf92g8="; + }; + + buildInputs = [ + freeglut + libGL + libGLU + libglvnd + libX11 + libXrender + libxcb + libxkbcommon + (python3.withPackages (ps: with ps; [ + Mako + numpy + ])) + waffle + wayland + ]; + + nativeBuildInputs = [ + cmake + makeWrapper + ninja + pkg-config + ]; + + # Find data dir: piglit searches for the data directory in some places, however as it is wrapped, + # it search in ../lib/.piglit-wrapped, we just replace the script name with "piglit" again. + prePatch = '' + substituteInPlace piglit \ + --replace 'script_basename_noext = os.path.splitext(os.path.basename(__file__))[0]' 'script_basename_noext = "piglit"' + ''; + + postInstall = '' + wrapProgram $out/bin/piglit \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} \ + --prefix PATH : "${waffle}/bin" + ''; + + meta = with lib; { + description = "An OpenGL test suite, and test-suite runner"; + homepage = "https://gitlab.freedesktop.org/mesa/piglit"; + license = licenses.free; # custom license. See COPYING in the source repo. + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/vips/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vips/default.nix index eb5afebaa675..2e745fc1a7c9 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -13,6 +13,7 @@ , libgsf , libexif , libheif +, librsvg , ApplicationServices , python27 , libpng @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { pname = "vips"; - version = "8.10.1"; + version = "8.10.2"; outputs = [ "bin" "out" "man" "dev" ]; @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "0zfhp86vbxs5qdnjy8hvdcjslfkafvd3s3rjr2dppwm0iz4gdbfx"; + sha256 = "1psi39a4h0awwbyizbsk467z0djwq0rh8hvkklbsd5b92m7768sp"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -63,6 +64,7 @@ stdenv.mkDerivation rec { libexif libheif libpng + librsvg python27 libpng expat diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/viu/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/viu/default.nix index a434b38453eb..39b12326e806 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/viu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/viu/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "viu"; - version = "1.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "atanunq"; repo = "viu"; rev = "v${version}"; - sha256 = "1algvndpl63g3yzp3hhbgm7839njpbmw954nsiwf0j591spz4lph"; + sha256 = "1q248jnbv64mkvg18465dpvjkw2v2hfqyvdvdixyrwyrnlv5cicv"; }; # tests are failing, reported at upstream: https://github.com/atanunq/viu/issues/40 doCheck = false; - cargoSha256 = "1jccaln72aqa9975nbs95gimndqx5kgfkjmh40z6chx1hvn4m2ga"; + cargoSha256 = "18rskn8fchlgk295yk8sc2g1x6h43rmhqif871hgzdx1i35sbajr"; meta = with lib; { description = "A command-line application to view images from the terminal written in Rust"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix new file mode 100644 index 000000000000..3a7473530d60 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-extension-layer/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, cmake, writeText, vulkan-headers, jq }: + +stdenv.mkDerivation rec { + pname = "vulkan-extension-layer"; + version = "2020-11-20"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "Vulkan-ExtensionLayer"; + rev = "7474cb8e1f70e9f4a8bf382708a7f15465453af5"; + sha256 = "1lxkgcnv32wqk4hlckv13xy84g38jzgc4qxp9vsbkrgz87hkdvwj"; + }; + + nativeBuildInputs = [ cmake jq ]; + + buildInputs = [ vulkan-headers ]; + + # Help vulkan-loader find the validation layers + setupHook = writeText "setup-hook" '' + export XDG_DATA_DIRS=@out@/share:$XDG_DATA_DIRS + ''; + + # Include absolute paths to layer libraries in their associated + # layer definition json files. + preFixup = '' + for f in "$out"/share/vulkan/explicit_layer.d/*.json "$out"/share/vulkan/implicit_layer.d/*.json; do + jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path" + mv tmp.json "$f" + done + ''; + + meta = with stdenv.lib; { + description = "Layers providing Vulkan features when native support is unavailable"; + homepage = "https://github.com/KhronosGroup/Vulkan-ExtensionLayer/"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = with maintainers; [ expipiplus1 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix new file mode 100644 index 000000000000..9ce87b4cb671 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools-lunarg/default.nix @@ -0,0 +1,86 @@ +{ stdenv, cmake, expat, fetchFromGitHub, jq, lib, libXdmcp, libXrandr, libffi +, libxcb, pkgconfig, python3, symlinkJoin, vulkan-headers, vulkan-loader +, vulkan-validation-layers, wayland, writeText, xcbutilkeysyms, xcbutilwm +, xlibsWrapper }: + +stdenv.mkDerivation rec { + pname = "vulkan-tools-lunarg"; + # The version must match that in vulkan-headers + version = "1.2.141.0"; + + src = (assert version == vulkan-headers.version; fetchFromGitHub { + owner = "LunarG"; + repo = "VulkanTools"; + rev = "sdk-${version}"; + sha256 = "1zsgc1hdmivdahzrarx7a5byhgnmm5ahz366l92fmdb8pffgq42g"; + fetchSubmodules = true; + }); + + nativeBuildInputs = [ cmake pkgconfig python3 jq ]; + + buildInputs = [ + expat + libXdmcp + libXrandr + libffi + libxcb + wayland + xcbutilkeysyms + xcbutilwm + xlibsWrapper + ]; + + cmakeFlags = [ + "-DVULKAN_HEADERS_INSTALL_DIR=${vulkan-headers}" + "-DVULKAN_LOADER_INSTALL_DIR=${vulkan-loader}" + "-DVULKAN_VALIDATIONLAYERS_INSTALL_DIR=${ + symlinkJoin { + name = "vulkan-validation-layers-merged"; + paths = [ vulkan-validation-layers.headers vulkan-validation-layers ]; + } + }" + ]; + + preConfigure = '' + # We need to run this update script which generates some source files, + # Remove the line in it which calls 'git submodule update' though. + # Also patch the scripts in ./scripts + update=update_external_sources.sh + patchShebangs $update + patchShebangs scripts/* + sed -i '/^git /d' $update + ./$update + ''; + + # Include absolute paths to layer libraries in their associated + # layer definition json files. + preFixup = '' + for f in "$out"/etc/vulkan/explicit_layer.d/*.json "$out"/etc/vulkan/implicit_layer.d/*.json; do + jq <"$f" >tmp.json ".layer.library_path = \"$out/lib/\" + .layer.library_path" + mv tmp.json "$f" + done + ''; + + enableParallelBuilding = true; + + # Same as vulkan-validation-layers + libraryPath = lib.strings.makeLibraryPath [ vulkan-loader ]; + dontPatchELF = true; + + # Help vulkan-loader find the validation layers + setupHook = writeText "setup-hook" '' + export XDG_CONFIG_DIRS=@out@/etc''${XDG_CONFIG_DIRS:+:''${XDG_CONFIG_DIRS}} + ''; + + meta = with stdenv.lib; { + description = "LunarG Vulkan Tools and Utilities"; + longDescription = '' + Tools to aid in Vulkan development including useful layers, trace and + replay, and tests. + ''; + homepage = "https://github.com/LunarG/VulkanTools"; + platforms = platforms.linux; + license = licenses.asl20; + maintainers = [ maintainers.expipiplus1 ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix index e320e4e6ef3b..ff620ef8287b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/vulkan-tools/default.nix @@ -30,8 +30,13 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "LunarG Vulkan loader"; - homepage = "https://www.lunarg.com"; + description = "Khronos official Vulkan Tools and Utilities"; + longDescription = '' + This project provides Vulkan tools and utilities that can assist + development by enabling developers to verify their applications correct + use of the Vulkan API. + ''; + homepage = "https://github.com/KhronosGroup/Vulkan-Tools"; platforms = platforms.linux; license = licenses.asl20; maintainers = [ maintainers.ralith ]; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix index 66c8b1d5cc74..fa2088ca297b 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/waifu2x-converter-cpp/default.nix @@ -1,16 +1,16 @@ -{ cmake, fetchFromGitHub, opencv3, stdenv, opencl-headers +{ cmake, fetchFromGitHub, makeWrapper, opencv3, stdenv, ocl-icd, opencl-headers , cudaSupport ? false, cudatoolkit ? null }: stdenv.mkDerivation rec { pname = "waifu2x-converter-cpp"; - version = "5.2.4"; + version = "5.3.3"; src = fetchFromGitHub { owner = "DeadSix27"; repo = pname; rev = "v${version}"; - sha256 = "0r7xcjqbyaa20gsgmjj7645640g3nb2bn1pc1nlfplwlzjxmz213"; + sha256 = "04r0xyjknvcwk70ilj1p3qwlcz3i6sqgcp0qbc9qwxnsgrrgz09w"; }; patchPhase = '' @@ -19,10 +19,14 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - opencv3 opencl-headers + ocl-icd opencv3 opencl-headers ] ++ stdenv.lib.optional cudaSupport cudatoolkit; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake makeWrapper ]; + + preFixup = '' + wrapProgram $out/bin/waifu2x-converter-cpp --prefix LD_LIBRARY_PATH : "${ocl-icd}/lib" + ''; meta = { description = "Improved fork of Waifu2X C++ using OpenCL and OpenCV"; diff --git a/infra/libkookie/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix b/infra/libkookie/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix index 3ca9a7b5e8d6..9a52d4531854 100644 --- a/infra/libkookie/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/tools/graphics/yafaray-core/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "yafaray-core"; - version = "3.5.0"; + version = "3.5.1"; src = fetchFromGitHub { owner = "YafaRay"; repo = "Core"; rev = "v${version}"; - sha256 = "05r08ynm6p9jq9l3v1v3lqkrfx3bm6zlqcxm1yk7mdv1zv2yxikd"; + sha256 = "043ixf3h4ay2fahsw9lh0pha82f7ri04mlfhvn2pg251012jvhrx"; }; preConfigure = '' |