diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/applications/graphics')
48 files changed, 695 insertions, 419 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix index bd4fa4b531be..a1e39cfebe0e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -14,8 +14,8 @@ let else throw "ImageMagick is not supported on this platform."; cfg = { - version = "7.0.10-27"; - sha256 = "1fqwbg2ws6ix3bymx7ncb4k4f6bg8q44n9xnlvngjapflnrmhcph"; + version = "7.0.10-35"; + sha256 = "0hcqvn3n3ip2fia48d1nb1m4r5ir00vbaa62xqni30kglh3n2sfh"; patches = []; }; in diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/akira/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/akira/default.nix index 4038d653a3da..4d0cc46bb596 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/akira/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/akira/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { description = "Native Linux Design application built in Vala and GTK"; homepage = "https://github.com/akiraux/Akira"; license = licenses.gpl3; - maintainers = with maintainers; [ filalex77 neonfuz ] ++ pantheon.maintainers; + maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ pantheon.maintainers; platforms = platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/avocode/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/avocode/default.nix index 53779041fc90..6d4fa501710d 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/avocode/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.7.0"; + version = "4.10.4"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "0kn0422k4vi2qifasnkd0cjf5l6z0rmkqv6l46ygxk3qyykjnqcm"; + sha256 = "06xf5y2mljk3pd74ap9n90bhhidbzpg5c6wws361ygd4f3x86c46"; }; libPath = stdenv.lib.makeLibraryPath (with xorg; [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/batik/builder.sh b/infra/libkookie/nixpkgs/pkgs/applications/graphics/batik/builder.sh deleted file mode 100755 index c6cf64bf3700..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/batik/builder.sh +++ /dev/null @@ -1,7 +0,0 @@ -set -e - -source $stdenv/setup - -unzip $src -mkdir $out -mv batik-* $out/batik diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/batik/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/batik/default.nix index 3c78c8b6dbd2..52a2589b409c 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/batik/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/batik/default.nix @@ -1,25 +1,23 @@ -{stdenv, fetchurl, unzip}: +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + pname = "batik"; + version = "1.13"; -stdenv.mkDerivation { - name = "batik-1.6"; - builder = ./builder.sh; src = fetchurl { - url = "http://tarballs.nixos.org/batik-1.6.zip"; - sha256 = "0cf15dspmzcnfda8w5lbsdx28m4v2rpq1dv5zx0r0n99ihqd1sh6"; + url = "mirror://apache/xmlgraphics/batik/binaries/batik-bin-${version}.tar.gz"; + sha256 = "16sq90nbs6psgm3xz30sbs6r5dnpd3qzsvr1xvnp4yipwjcmhmkw"; }; - buildInputs = [unzip]; - meta = with stdenv.lib; { description = "Java based toolkit for handling SVG"; homepage = "https://xmlgraphics.apache.org/batik"; license = licenses.asl20; platforms = platforms.unix; - knownVulnerabilities = [ - # vulnerabilities as of 16th October 2018 from https://xmlgraphics.apache.org/security.html: - "CVE-2018-8013" - "CVE-2017-5662" - "CVE-2015-0250" - ]; }; + + installPhase = '' + mkdir $out + cp -r * $out/ + ''; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix index 209a6a4753b1..26fabc364ba3 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/cloudcompare/default.nix @@ -18,17 +18,17 @@ mkDerivation rec { pname = "cloudcompare"; - version = "2.11.0"; + version = "2.11.2"; src = fetchFromGitHub { owner = "CloudCompare"; repo = "CloudCompare"; rev = "v${version}"; - sha256 = "02ahhhivgb9k1aygw1m35wdvhaizag1r98mb0r6zzrs5p4y64wlb"; + sha256 = "0sb2h08iaf6zrf54sg6ql6wm63q5vq0kpd3gffdm26z8w6j6wv3s"; # As of writing includes (https://github.com/CloudCompare/CloudCompare/blob/a1c589c006fc325e8b560c77340809b9c7e7247a/.gitmodules): # * libE57Format # * PoissonRecon - # In > 2.11 it will also contain + # In a future version it will also contain # * CCCoreLib fetchSubmodules = true; }; @@ -53,7 +53,7 @@ mkDerivation rec { ]; cmakeFlags = [ - # TODO: This will become -DCCCORELIB_USE_TBB=ON in > 2.11.0, see + # TODO: This will become -DCCCORELIB_USE_TBB=ON in a future version, see # https://github.com/CloudCompare/CloudCompare/commit/f5a0c9fd788da26450f3fa488b2cf0e4a08d255f "-DCOMPILE_CC_CORE_LIB_WITH_TBB=ON" "-DOPTION_USE_DXF_LIB=ON" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/comical/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/comical/default.nix index 8e6e151aff6a..800709de054a 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/comical/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/comical/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, wxGTK, utillinux, zlib }: +{stdenv, fetchurl, wxGTK, util-linux, zlib }: stdenv.mkDerivation rec { name = "comical-0.8"; @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/comical/${name}.tar.gz"; sha256 = "0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e"; }; - buildInputs = [ wxGTK utillinux zlib ]; + buildInputs = [ wxGTK util-linux zlib ]; preBuild="makeFlags=\"prefix=$out\""; patches = [ ./wxgtk-2.8.patch ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/deskew/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/deskew/default.nix index 422c7a0e15e8..6af6d93477a5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/deskew/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/deskew/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchFromBitbucket, libtiff, fpc }: +{ stdenv, fetchFromGitHub, libtiff, fpc }: stdenv.mkDerivation rec { pname = "deskew"; version = "1.25"; - src = fetchFromBitbucket { + src = fetchFromGitHub { owner = "galfar"; - repo = "app-deskew"; + repo = pname; rev = "v${version}"; sha256 = "0zjjj66qhgqkmfxl3q7p78dv4xl4ci918pgl4d5259pqdj1bfgc8"; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/digikam/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/digikam/default.nix index 52de023e1681..1e4b397db231 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/digikam/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/digikam/default.nix @@ -39,7 +39,7 @@ , marble , libGL , libGLU -, opencv3 +, opencv , pcre , threadweaver , x265 @@ -83,7 +83,7 @@ mkDerivation rec { libusb1 libGL libGLU - opencv3 + opencv pcre x265 @@ -118,9 +118,12 @@ mkDerivation rec { "-DENABLE_QWEBENGINE=on" ]; + dontWrapGApps = true; + preFixup = '' - gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]}) - gappsWrapperArgs+=(--suffix DK_PLUGIN_PATH : ${placeholder "out"}/${qtbase.qtPluginPrefix}/${pname}) + 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" diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/drawio/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/drawio/default.nix index 5a5ce5d8b210..892d81753e65 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/drawio/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/drawio/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "drawio"; - version = "13.7.3"; + version = "13.9.9"; src = fetchurl { url = "https://github.com/jgraph/drawio-desktop/releases/download/v${version}/draw.io-x86_64-${version}.rpm"; - sha256 = "14wcj9jbpv1rg0g7djihzzq088aj96mwys4rc9540ajbkbbm9d36"; + hash = "sha256-+rNbLHpkFnvM7gDFbZ9AItPIA2IVTmscz+gTXF8riIY="; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/drawpile/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/drawpile/default.nix index e210d03406b7..cf37512ad9f5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/drawpile/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/drawpile/default.nix @@ -74,7 +74,7 @@ in mkDerivation rec { src = fetchFromGitHub { owner = "drawpile"; repo = "drawpile"; - rev = "${version}"; + rev = version; sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM="; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/feh/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/feh/default.nix index 82128f81353f..0c7f3e8fe107 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/feh/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/feh/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, makeWrapper , xorg, imlib2, libjpeg, libpng , curl, libexif, jpegexiforient, perlPackages -, enableAutoreload ? true }: +, enableAutoreload ? !stdenv.hostPlatform.isDarwin }: with stdenv.lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.5"; + version = "3.6"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "07jklibpi4ig9pbdrwhllsfffxn2h8xf4ma36qii00w4hb69v3rq"; + sha256 = "1n6gbyzlc3kx2cq9wfz7azn7mrjmcc9pq436k1n4mrh0lik5sxw7"; }; outputs = [ "out" "man" "doc" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/fondo/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/fondo/default.nix index e80fbee1b71e..a4d925da3dee 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/fondo/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/fondo/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "fondo"; - version = "1.3.9"; + version = "1.4.0"; src = fetchFromGitHub { owner = "calo001"; repo = pname; rev = version; - sha256 = "1gyi80j2c38j62miv8a8nsx1pad169sa4fx0b85m2yv0x7fz492w"; + sha256 = "0cdcn4qmdryk2x327f1z3pq8pg4cb0q1jr779gh8s6nqajyk8nqm"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/freecad/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/freecad/default.nix index f9322add5c09..3a5d36dfac19 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/freecad/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/freecad/default.nix @@ -9,13 +9,13 @@ let pythonPackages = python3Packages; in mkDerivation rec { pname = "freecad-unstable"; - version = "2020-09-25"; + version = "2020-10-17"; src = fetchFromGitHub { owner = "FreeCAD"; repo = "FreeCAD"; - rev = "7616153b3c31ace006169cdc2fdafab484498858"; - sha256 = "1vffvzv3gkndfj2k8ik0afyk9rgngnr4aai5py66qd63qd7kmxch"; + rev = "f3bdaaa55a6c03b297924c40819d23e4603fa55b"; + sha256 = "1q1iy4i9k65v8z7h8a6r4bf5ycn124jp26xwp0xwbar4gnkx2jiq"; }; nativeBuildInputs = [ @@ -32,6 +32,7 @@ in mkDerivation rec { libGLU libXmu qtbase qttools qtwebengine qtxmlpatterns ] ++ (with pythonPackages; [ matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost + GitPython # for addon manager ]); cmakeFlags = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/freecad/stable.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/freecad/stable.nix deleted file mode 100644 index 657caeca8b3d..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/freecad/stable.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv, mkDerivation, fetchFromGitHub, fetchpatch, cmake, ninja, coin3d, -xercesc, ode, eigen, qtbase, qttools, qtwebkit, wrapQtAppsHook, -opencascade-occt, gts, hdf5, vtk, medfile, zlib, python3Packages, swig, -gfortran, libXmu, soqt, libf2c, libGLU, makeWrapper, pkgconfig, mpi ? null }: - -assert mpi != null; - -let - pythonPackages = python3Packages; -in mkDerivation rec { - pname = "freecad"; - version = "0.18.4"; - - src = fetchFromGitHub { - owner = "FreeCAD"; - repo = "FreeCAD"; - rev = version; - sha256 = "1phs9a0px5fnzpyx930cz39p5dis0f0yajxzii3c3sazgkzrd55s"; - }; - - nativeBuildInputs = [ - cmake - ninja - pkgconfig - pythonPackages.pyside2-tools - wrapQtAppsHook - ]; - - buildInputs = [ - cmake coin3d xercesc ode eigen opencascade-occt gts - zlib swig gfortran soqt libf2c makeWrapper mpi vtk hdf5 medfile - libGLU libXmu qtbase qttools qtwebkit - ] ++ (with pythonPackages; [ - matplotlib pycollada shiboken2 pyside2 pyside2-tools pivy python boost - ]); - - # Fix missing app icon on Wayland. Has been upstreamed and should be safe to - # remove in versions >= 0.19 - patches = [ - (fetchpatch { - url = "https://github.com/FreeCAD/FreeCAD/commit/c4d2a358ca125d51d059dfd72dcbfba326196dfc.patch"; - sha256 = "0yqc9zrxgi2c2xcidm8wh7a9yznkphqvjqm9742qm5fl20p8gl4h"; - }) - ]; - - cmakeFlags = [ - "-DBUILD_QT5=ON" - "-DSHIBOKEN_INCLUDE_DIR=${pythonPackages.shiboken2}/include" - "-DSHIBOKEN_LIBRARY=Shiboken2::libshiboken" - ("-DPYSIDE_INCLUDE_DIR=${pythonPackages.pyside2}/include" - + ";${pythonPackages.pyside2}/include/PySide2/QtCore" - + ";${pythonPackages.pyside2}/include/PySide2/QtWidgets" - + ";${pythonPackages.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"; - ''; - - # Their main() removes PYTHONPATH=, and we rely on it. - preConfigure = '' - sed '/putenv("PYTHONPATH/d' -i src/Main/MainGui.cpp - - qtWrapperArgs+=(--prefix PYTHONPATH : "$PYTHONPATH") - ''; - - qtWrapperArgs = [ - "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" - ]; - - postFixup = '' - mv $out/share/doc $out - ''; - - meta = with stdenv.lib; { - description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; - homepage = "https://www.freecadweb.org/"; - license = licenses.lgpl2Plus; - maintainers = with maintainers; [ viric gebner ]; - platforms = platforms.linux; - }; -} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/geeqie/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/geeqie/default.nix index 51c066196efd..629abb3321d5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/geeqie/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/geeqie/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "geeqie"; - version = "1.4"; + version = "1.5.1"; src = fetchurl { url = "http://geeqie.org/${pname}-${version}.tar.xz"; - sha256 = "0ciygvcxb78pqg59r6p061mkbpvkgv2rv3r79j3kgv3kalb3ln2w"; + sha256 = "02m1vqaasin249xx792cdj11xyag8lnanwzxd108y7y34g9xam28"; }; patches = [ @@ -19,12 +19,6 @@ stdenv.mkDerivation rec { url = "https://src.fedoraproject.org/rpms/geeqie/raw/132fb04a1a5e74ddb333d2474f7edb9a39dc8d27/f/geeqie-1.4-goodbye-changelog.patch"; sha256 = "00a35dds44kjjdqsbbfk0x9y82jspvsbpm2makcm1ivzlhjjgszn"; }) - # Fixes build with exiv2 0.27.1 - (fetchpatch { - name = "geeqie-exiv2-0.27.patch"; - url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/geeqie-exiv2-0.27.patch?h=packages/geeqie&id=dee28a8b3e9039b9cd6927b5a93ef2a07cd8271d"; - sha256 = "05skpbyp8pcq92psgijyccc8liwfy2cpwprw6m186pf454yb5y9p"; - }) ]; preConfigure = "./autogen.sh"; @@ -32,6 +26,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig autoconf automake gettext intltool wrapGAppsHook ]; + buildInputs = [ gtk3 lcms2 exiv2 libchamplain clutter-gtk ffmpegthumbnailer fbida ]; @@ -63,7 +58,7 @@ stdenv.mkDerivation rec { homepage = "http://geeqie.sourceforge.net"; - maintainers = with maintainers; [ jfrankenau pSub ]; + maintainers = with maintainers; [ jfrankenau pSub markus1189 ]; platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/default.nix index 025f97b54e69..4ba7cb8eb036 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/default.nix @@ -163,8 +163,10 @@ in stdenv.mkDerivation rec { # The declarations for `gimp-with-plugins` wrapper, # used for determining plug-in installation paths majorVersion = "${lib.versions.major version}.0"; - targetPluginDir = "lib/gimp/${majorVersion}/plug-ins"; - targetScriptDir = "share/gimp/${majorVersion}/scripts"; + targetLibDir = "lib/gimp/${majorVersion}"; + targetDataDir = "share/gimp/${majorVersion}"; + targetPluginDir = "${targetLibDir}/plug-ins"; + targetScriptDir = "${targetDataDir}/scripts"; # probably its a good idea to use the same gtk in plugins ? gtk = gtk2; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix index 0b5e6a7f379f..84f5abfce063 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix @@ -1,33 +1,51 @@ -# install these packages into your profile. Then add -# ~/.nix-profile/gimp-version-plugins to your plugin list you can find at -# preferences -> Folders -> Plug-ins -# same applies for the scripts +# Use `gimp-with-plugins` package for GIMP with all plug-ins. +# If you just want a subset of plug-ins, you can specify them explicitly: +# `gimp-with-plugins.override { plugins = with gimpPlugins; [ gap ]; }`. + +{ config, lib, pkgs }: + +let + inherit (pkgs) stdenv fetchurl pkg-config intltool glib fetchFromGitHub; +in + +lib.makeScope pkgs.newScope (self: -{ config, pkgs, gimp }: let - inherit (pkgs) stdenv fetchurl pkgconfig intltool glib fetchFromGitHub; - inherit (gimp) targetPluginDir targetScriptDir; + # Use GIMP from the scope. + inherit (self) gimp; - pluginDerivation = a: let - name = a.name or "${a.pname}-${a.version}"; + pluginDerivation = attrs: let + name = attrs.name or "${attrs.pname}-${attrs.version}"; in stdenv.mkDerivation ({ prePhases = "extraLib"; extraLib = '' installScripts(){ - mkdir -p $out/${targetScriptDir}/${name}; - for p in "$@"; do cp "$p" -r $out/${targetScriptDir}/${name}; done + mkdir -p $out/${gimp.targetScriptDir}/${name}; + for p in "$@"; do cp "$p" -r $out/${gimp.targetScriptDir}/${name}; done } installPlugins(){ - mkdir -p $out/${targetPluginDir}/${name}; - for p in "$@"; do cp "$p" -r $out/${targetPluginDir}/${name}; done + mkdir -p $out/${gimp.targetPluginDir}/${name}; + for p in "$@"; do cp "$p" -r $out/${gimp.targetPluginDir}/${name}; done } ''; + + # Override installation paths. + PKG_CONFIG_GIMP_2_0_GIMPLIBDIR = "${placeholder "out"}/${gimp.targetLibDir}"; + PKG_CONFIG_GIMP_2_0_GIMPDATADIR = "${placeholder "out"}/${gimp.targetDataDir}"; } - // a + // attrs // { name = "gimp-plugin-${name}"; - buildInputs = [ gimp gimp.gtk glib ] ++ (a.buildInputs or []); - nativeBuildInputs = [ pkgconfig intltool ] ++ (a.nativeBuildInputs or []); + buildInputs = [ + gimp + gimp.gtk + glib + ] ++ (attrs.buildInputs or []); + + nativeBuildInputs = [ + pkg-config + intltool + ] ++ (attrs.nativeBuildInputs or []); } ); @@ -35,10 +53,11 @@ let phases = [ "extraLib" "installPhase" ]; installPhase = "installScripts ${src}"; } // attrs); - in +{ + # Allow overriding GIMP package in the scope. + inherit (pkgs) gimp; -stdenv.lib.makeScope pkgs.newScope (self: with self; { gap = pluginDerivation { /* menu: Video @@ -49,10 +68,6 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql"; }; NIX_LDFLAGS = "-lm"; - patchPhase = '' - sed -e 's,^\(GIMP_PLUGIN_DIR=\).*,\1'"$out/${gimp.name}-plugins", \ - -e 's,^\(GIMP_DATA_DIR=\).*,\1'"$out/share/${gimp.name}", -i configure - ''; hardeningDisable = [ "format" ]; meta = with stdenv.lib; { description = "The GIMP Animation Package"; @@ -85,22 +100,6 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { }; }; - focusblur = pluginDerivation rec { - /* menu: - Blur/Focus Blur - */ - name = "focusblur-3.2.6"; - buildInputs = with pkgs; [ fftwSinglePrec ]; - patches = [ ./patches/focusblur-glib.patch ]; - postInstall = "fail"; - installPhase = "installPlugins src/focusblur"; - src = fetchurl { - url = "http://registry.gimp.org/files/${name}.tar.bz2"; - sha256 = "1gqf3hchz7n7v5kpqkhqh8kwnxbsvlb5cr2w2n7ngrvl56f5xs1h"; - }; - meta.broken = true; - }; - resynthesizer = pluginDerivation rec { /* menu: Edit/Fill with pattern seamless... @@ -115,7 +114,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { version = "2.0.3"; buildInputs = with pkgs; [ fftw ]; nativeBuildInputs = with pkgs; [ autoreconfHook ]; - makeFlags = [ "GIMP_LIBDIR=${placeholder "out"}/lib/gimp/2.0" ]; + makeFlags = [ "GIMP_LIBDIR=${placeholder "out"}/${gimp.targetLibDir}" ]; src = fetchFromGitHub { owner = "bootchk"; repo = "resynthesizer"; @@ -143,24 +142,25 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { name = "wavelet-sharpen-0.1.2"; NIX_LDFLAGS = "-lm"; src = fetchurl { - url = "http://registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; + url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/wavelet-sharpen-0.1.2.tar.gz"; sha256 = "0vql1k67i21g5ivaa1jh56rg427m0icrkpryrhg75nscpirfxxqw"; }; installPhase = "installPlugins src/wavelet-sharpen"; # TODO translations are not copied .. How to do this on nix? }; - lqrPlugin = pluginDerivation { + lqrPlugin = pluginDerivation rec { /* menu: Layer/Liquid Rescale */ - name = "lqr-plugin-0.6.1"; + pname = "lqr-plugin"; + version = "0.7.2"; buildInputs = with pkgs; [ liblqr1 ]; - src = fetchurl { - url = "http://registry.gimp.org/files/gimp-lqr-plugin-0.6.1.tar.bz2"; - sha256 = "00hklkpcimcbpjly4rjhfipaw096cpy768g9wixglwrsyqhil7l9"; + src = fetchFromGitHub { + owner = "carlobaldassi"; + repo = "gimp-lqr-plugin"; + rev = "v${version}"; + sha256 = "81ajdZ2zQi/THxnBlSeT36tVTEzrS1YqLGpHMhFTKAo="; }; - #postInstall = ''mkdir -p $out/nix-support; echo "${liblqr1}" > "$out/nix-support/propagated-user-env-packages"''; - installPhase = "installPlugins src/gimp-lqr-plugin"; }; gmic = pkgs.gmic-qt.override { @@ -212,37 +212,8 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { lightning = scriptDerivation { name = "Lightning"; src = fetchurl { - url = "http://registry.gimp.org/files/Lightning.scm"; + url = "https://github.com/pixlsus/registry.gimp.org_static/raw/master/registry.gimp.org/files/Lightning.scm"; sha256 = "c14a8f4f709695ede3f77348728a25b3f3ded420da60f3f8de3944b7eae98a49"; }; }; - - /* space in name trouble ? - - rainbowPlasma = scriptDerivation { - # http://registry.gimp.org/node/164 - name = "rainbow-plasma"; - src = fetchurl { - url = "http://registry.gimp.org/files/Rainbow Plasma.scm"; - sha256 = "34308d4c9441f9e7bafa118af7ec9540f10ea0df75e812e2f3aa3fd7b5344c23"; - name = "Rainbow-Plasma.scm"; # nix doesn't like spaces, does it? - }; - }; - */ - - /* doesn't seem to be working :-( - lightningGate = scriptDerivation { - # http://registry.gimp.org/node/153 - name = "lightning-gate"; - src = fetchurl { - url = "http://registry.gimp.org/files/LightningGate.scm"; - sha256 = "181w1zi9a99kn2mfxjp43wkwcgw5vbb6iqjas7a9mhm8p04csys2"; - }; - }; - */ - -} // stdenv.lib.optionalAttrs (config.allowAliases or true) { - - resynthesizer2 = resynthesizer; - }) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix index 841728d3a294..7e8ce913f022 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gimp/wrapper.nix @@ -2,7 +2,7 @@ let allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues gimpPlugins); -selectedPlugins = if plugins == null then allPlugins else plugins; +selectedPlugins = lib.filter (pkg: pkg != gimpPlugins.gimp) (if plugins == null then allPlugins else plugins); extraArgs = map (x: x.wrapArgs or "") selectedPlugins; versionBranch = stdenv.lib.versions.majorMinor gimp.version; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix index 337b8f4cba6c..0d4b06c8c6d5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gnome-photos/default.nix @@ -1,5 +1,6 @@ { stdenv , fetchurl +, fetchpatch , at-spi2-core , babl , dbus @@ -35,17 +36,32 @@ stdenv.mkDerivation rec { pname = "gnome-photos"; - version = "3.34.2"; + version = "3.38.0"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "06ml5sf8xhpan410msqz085hmfc7082d368pb82yq646y9pcfn9w"; + sha256 = "1i64w69kk3sdf9vn7npnwrhy8qjwn0vizq200x3pgmbrfm3kjzv6"; }; patches = [ ./installed-tests-path.patch + + # Port to Tracker 3 + # https://gitlab.gnome.org/GNOME/gnome-photos/-/merge_requests/135 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/f39a85bb1a82093f4ba615494ff7e95609674fc2.patch"; + sha256 = "M5r5WuB1JpUBVN3KxNvpMiPWj0pIpT+ImQMOiGtUgT4="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/3d847ff80d429cadf0bc59aa50caa37bf27c0201.patch"; + sha256 = "zGjSL1qpWVJ/5Ifgh2CbhFSBR/WDAra8F+YUOemyxyU="; + }) + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/gnome-photos/commit/2eb923726147b05c936dee64b205d833525db1df.patch"; + sha256 = "vCA6NXHzmNf2GoLqzWwIyziC6puJgJ0QTLeKWsAEFAE="; + }) ]; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix index d27c2636e25e..c36d576cc8e2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gnuclad/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = "https://launchpad.net/gnuclad"; - description = "gnuclad tries to help the environment by creating trees. It's primary use will be generating cladogram trees for the GNU/Linux distro timeline project"; + description = "gnuclad tries to help the environment by creating trees. Its primary use will be generating cladogram trees for the GNU/Linux distro timeline project"; license = licenses.gpl3Plus; maintainers = with maintainers; [ mog ]; platforms = platforms.linux; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix index b7a1a8c4a6f9..b8b21e71c930 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/graphicsmagick/default.nix @@ -24,10 +24,10 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2 zlib libtool libwebp - ] - ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + ]; - nativeBuildInputs = [ xz ]; + nativeBuildInputs = [ xz ] + ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames; postInstall = '' sed -i 's/-ltiff.*'\'/\'/ $out/bin/* diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gthumb/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gthumb/default.nix index 27e8e00bdb3a..7dbe03d9f281 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/gthumb/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/gthumb/default.nix @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { pname = "gthumb"; - version = "3.10.0"; + version = "3.10.1"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0j7cxp4hhkvkckyvll6pmqkv5rwrknlzq9j1my0grb01b8wzhw9y"; + sha256 = "0gm7q6n9lnjsdqpx5b0cqjayhzwnplqb6p5pshzhbfp2zqd2g9ss"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/hydrus/default.nix new file mode 100644 index 000000000000..8e9998dde393 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/hydrus/default.nix @@ -0,0 +1,112 @@ +{ stdenv +, fetchFromGitHub +, lzma +, qt5 +, wrapQtAppsHook +, miniupnpc_2 +, swftools +, pythonPackages +}: + +pythonPackages.buildPythonPackage { + pname = "hydrus"; + version = "420"; + format = "other"; + + src = fetchFromGitHub { + owner = "hydrusnetwork"; + repo = "hydrus"; + rev = "067c4862a0ed8dd9264b464c69975b520139809f"; + sha256 = "12x0rv2yxsczdaxvpb5ggf4jwzjd1vd7ml0r61s4342zwvjrhji9"; + }; + + nativeBuildInputs = [ + wrapQtAppsHook + ]; + + propagatedBuildInputs = with pythonPackages; [ + beautifulsoup4 + html5lib + lxml + numpy + opencv4 + pillow + psutil + pyopenssl + pyyaml + requests + send2trash + service-identity + twisted + lz4 + lzma + pysocks + matplotlib + qtpy + pyside2 + ]; + + checkInputs = with pythonPackages; [ nose httmock ]; + + # most tests are failing, presumably because we are not using test.py + checkPhase = '' + nosetests $src/hydrus/test \ + -e TestClientAPI \ + -e TestClientConstants \ + -e TestClientDaemons \ + -e TestClientData \ + -e TestClientDB \ + -e TestClientDBDuplicates \ + -e TestClientDBTags \ + -e TestClientImageHandling \ + -e TestClientImportOptions \ + -e TestClientListBoxes \ + -e TestClientMigration \ + -e TestClientNetworking \ + -e TestClientTags \ + -e TestClientThreading \ + -e TestDialogs \ + -e TestFunctions \ + -e TestHydrusNATPunch \ + -e TestHydrusSerialisable \ + -e TestHydrusServer \ + -e TestHydrusSessions \ + -e TestServer \ + ''; + + extraOutputsToLink = [ "doc" ]; + + postPatch = '' + sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${miniupnpc_2}/bin/upnpc";' \ + -i ./hydrus/core/HydrusNATPunch.py + + sed 's;os\.path\.join(\sHC\.BIN_DIR,.*;"${swftools}/bin/swfrender";' \ + -i ./hydrus/core/HydrusFlashHandling.py + ''; + + #doCheck = true; + + installPhase = '' + # Move the hydrus module and related directories + mkdir -p $out/${pythonPackages.python.sitePackages} + mv {hydrus,static} $out/${pythonPackages.python.sitePackages} + mv help $out/doc/ + + # install the hydrus binaries + mkdir -p $out/bin + install -m0755 server.py $out/bin/hydrus-server + install -m0755 client.py $out/bin/hydrus-client + ''; + + dontWrapQtApps = true; + preFixup = '' + makeWrapperArgs+=("''${qtWrapperArgs[@]}") + ''; + + meta = with stdenv.lib; { + description = "Danbooru-like image tagging and searching system for the desktop"; + license = licenses.wtfpl; + homepage = "https://hydrusnetwork.github.io/hydrus/"; + maintainers = [ maintainers.evanjs ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/imgbrd-grabber/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/imgbrd-grabber/default.nix new file mode 100644 index 000000000000..22a35b3a4cc3 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/imgbrd-grabber/default.nix @@ -0,0 +1,94 @@ +{ stdenv +, cmake +, fetchFromGitHub +, wrapQtAppsHook +, qtmultimedia +, qttools +, qtscript +, qtdeclarative +, qtbase +, autogen +, automake +, makeWrapper +, catch2 +, nodejs +, libpulseaudio +, openssl +, rsync +, typescript +}: +stdenv.mkDerivation rec { + pname = "imgbrd-grabber"; + + version = "7.3.2"; + src = fetchFromGitHub { + owner = "Bionus"; + repo = "imgbrd-grabber"; + rev = "v${version}"; + sha256 = "053rwvcr88fcba0447a6r115cgnqsm9rl066z8d5jacqnhdij58k"; + fetchSubmodules = true; + }; + + buildInputs = [ + openssl + makeWrapper + libpulseaudio + typescript + ]; + + nativeBuildInputs = [ + qtmultimedia + qtbase + qtdeclarative + qttools + nodejs + cmake + wrapQtAppsHook + ]; + + extraOutputsToLink = [ "doc" ]; + + postPatch = '' + # the package.sh script provides some install helpers + # using this might make it easier to maintain/less likely for the + # install phase to fail across version bumps + patchShebangs ./scripts/package.sh + + # ensure the script uses the rsync package from nixpkgs + substituteInPlace ../scripts/package.sh --replace "rsync" "${rsync}/bin/rsync" + + + # the npm build step only runs typescript + # run this step directly so it doesn't try and fail to download the unnecessary node_modules, etc. + substituteInPlace ./sites/CMakeLists.txt --replace "npm install" "npm run build" + + # remove the vendored catch2 + rm -rf tests/src/vendor/catch + + # link the catch2 sources from nixpkgs + ln -sf ${catch2.src} tests/src/vendor/catch + ''; + + postInstall = '' + # move the binaries to the share/Grabber folder so + # some relative links can be resolved (e.g. settings.ini) + mv $out/bin/* $out/share/Grabber/ + + cd ../.. + # run the package.sh with $out/share/Grabber as the $APP_DIR + sh ./scripts/package.sh $out/share/Grabber + + # add symlinks for the binaries to $out/bin + ln -s $out/share/Grabber/Grabber $out/bin/Grabber + ln -s $out/share/Grabber/Grabber-cli $out/bin/Grabber-cli + ''; + + sourceRoot = "source/src"; + + meta = with stdenv.lib; { + description = "Very customizable imageboard/booru downloader with powerful filenaming features"; + license = licenses.asl20; + homepage = "https://bionus.github.io/imgbrd-grabber/"; + maintainers = [ maintainers.evanjs ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/imgp/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/imgp/default.nix index 80420202c053..1f6e20f465a2 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/imgp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/imgp/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "imgp"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "jarun"; repo = pname; rev = "v${version}"; - sha256 = "13r4fn3dd0nyidfhrr7zzpls5ifbyqdwxhyvpkqr8ahchws7wfc6"; + sha256 = "1miabaxd5pwxn0va4drzj1d4ppxvyqsrrd4xw1j6qr52yci0lms8"; }; propagatedBuildInputs = [ pillow ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/imv/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/imv/default.nix index 276c2cd3d7ea..faf748730583 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/imv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/imv/default.nix @@ -1,8 +1,23 @@ -{ stdenv, fetchFromGitHub -, freeimage, fontconfig, pkgconfig -, asciidoc, docbook_xsl, libxslt, cmocka -, librsvg, pango, libxkbcommon, wayland -, libGLU, icu +{ asciidoc +, cmocka +, docbook_xsl +, fetchFromGitHub +, fontconfig +, freeimage +, icu +, libGLU +, libheif +, libjpeg_turbo +, libpng +, librsvg +, libtiff +, libxkbcommon +, libxslt +, netsurf +, pango +, pkgconfig +, stdenv +, wayland }: stdenv.mkDerivation rec { @@ -10,37 +25,31 @@ stdenv.mkDerivation rec { version = "4.1.0"; src = fetchFromGitHub { - owner = "eXeC64"; - repo = "imv"; - rev = "v${version}"; + owner = "eXeC64"; + repo = "imv"; + rev = "v${version}"; sha256 = "0gk8g178i961nn3bls75a8qpv6wvfvav6hd9lxca1skaikd33zdx"; }; - preBuild = '' - # Version is 4.0.1, but Makefile was not updated - sed -i 's/echo v4\.0\.0/echo v4.0.1/' Makefile - ''; - - nativeBuildInputs = [ - asciidoc - cmocka - docbook_xsl - libxslt - ]; + nativeBuildInputs = [ asciidoc cmocka docbook_xsl libxslt ]; buildInputs = [ freeimage + icu libGLU + libjpeg_turbo librsvg libxkbcommon + netsurf.libnsgif pango pkgconfig wayland - icu ]; installFlags = [ "PREFIX=$(out)" "CONFIGPREFIX=$(out)/etc" ]; + makeFlags = [ "BACKEND_LIBJPEG=yes" "BACKEND_LIBNSGIF=yes" ]; + postFixup = '' # The `bin/imv` script assumes imv-wayland or imv-x11 in PATH, # so we have to fix those to the binaries we installed into the /nix/store @@ -53,9 +62,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A command line image viewer for tiling window managers"; - homepage = "https://github.com/eXeC64/imv"; - license = licenses.gpl2; + homepage = "https://github.com/eXeC64/imv"; + license = licenses.gpl2; maintainers = with maintainers; [ rnhmjoj markus1189 ]; - platforms = platforms.all; + platforms = platforms.all; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix index 66a758f9fe51..013d3bec3527 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/inkscape/extensions.nix @@ -1,5 +1,7 @@ { stdenv , fetchFromGitHub +, runCommand +, inkcut }: { @@ -34,4 +36,8 @@ platforms = platforms.all; }; }; + inkcut = (runCommand "inkcut-inkscape-plugin" {} '' + mkdir -p $out/share/inkscape/extensions + cp ${inkcut}/share/inkscape/extensions/* $out/share/inkscape/extensions + ''); } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/krita/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/krita/default.nix index 95a3e1e09280..9bb78d199968 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/krita/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.3.0"; + version = "4.4.1"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "19qlpp9ds60bab73pwi64dq1zn4zn2hcdkrxhjr1j438mc4pflsd"; + sha256 = "1bmmfvmawnlihbqkksdrwxfkaip4nfsi97w83fmvkyxl4jk715vr"; }; # *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359 diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix index 3f8d507e9927..e53c36b59cd9 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix @@ -7,24 +7,24 @@ let bgrabitmap = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgrabitmap"; - rev = "v11.2.4"; - sha256 = "1zk88crfn07md16wg6af4i8nlx4ikkhxq9gfk49jirwimgwbf1md"; + rev = "v11.2.5"; + sha256 = "0w5pdihsxn039kalkf4cx23j69hz5r09qmhd358h2n74irv1r3x1"; }; bgracontrols = fetchFromGitHub { owner = "bgrabitmap"; repo = "bgracontrols"; - rev = "v6.9"; - sha256 = "0hwjlqlwqs4fqxlgay84hccs1lm3c6i9nmq9sxzrip410mggnjyw"; + rev = "v7.0"; + sha256 = "0qz3cscrc9jvhrix1hbmzhdxv6mxk0mz9azr46canflsydda8fjy"; }; in stdenv.mkDerivation rec { pname = "lazpaint"; - version = "7.1.4"; + version = "7.1.5"; src = fetchFromGitHub { owner = "bgrabitmap"; repo = "lazpaint"; rev = "v${version}"; - sha256 = "19b0wrjjyvz3g2d2gdsz8ihc1clda5v22yb597an8j9sblp9m0nf"; + sha256 = "0bpk3rlqzbxvgrxmrzs0hcrgwhsqnpjqv1kdd9cp09knimmksvy5"; }; nativeBuildInputs = [ lazarus fpc makeWrapper ]; @@ -56,10 +56,6 @@ in stdenv.mkDerivation rec { # Python is needed for scripts makeWrapper $out/share/lazpaint/lazpaint $out/bin/lazpaint \ --prefix PATH : ${stdenv.lib.makeBinPath [ python3 ]} - - substituteInPlace $out/share/applications/lazpaint.desktop \ - --replace /usr/share/pixmaps/lazpaint.png $out/share/pixmaps/lazpaint.png \ - --replace /usr/share/lazpaint/lazpaint $out/bin/lazpaint ''; meta = with stdenv.lib; { diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/lightburn/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/lightburn/default.nix index a5a255338e8a..9d2c6c4dd59f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/lightburn/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "0.9.16"; + version = "0.9.19"; nativeBuildInputs = [ p7zip @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; - sha256 = "0xmpglfzff3jpxbr304czsa24fbp497b69yd8kjkjdp2cd0l70qc"; + sha256 = "0j3ydivd666fphmgi3ar48xabgi2dcky7p2fyfl7ghxjplflqs9q"; }; buildInputs = [ @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "LightBurn is layout, editing, and control software for your laser cutter"; + description = "Layout, editing, and control software for your laser cutter"; homepage = "https://lightburnsoftware.com/"; license = stdenv.lib.licenses.unfree; maintainers = with stdenv.lib.maintainers; [ q3k ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix index a3ab52ba8715..384ddac5b4c5 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/mandelbulber/default.nix @@ -19,13 +19,13 @@ assert withOpenCL -> ocl-icd != null; mkDerivation rec { pname = "mandelbulber"; - version = "2.22"; + version = "2.23"; src = fetchFromGitHub { owner = "buddhi1980"; repo = "mandelbulber2"; rev = version; - sha256 = "011y2nl0jakf29cxprjmj1ifqc9iva61q5f4kk47b03gq7jw8sl4"; + sha256 = "08izphj7jyk3wsq3qbzaf2fplys80vr39wliqc1i4c5cr90nrq1l"; }; nativeBuildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix new file mode 100644 index 000000000000..c9110cbea0b1 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/mcomix3/default.nix @@ -0,0 +1,99 @@ +{ stdenv +, lib +, fetchFromGitHub +, python3 +, wrapGAppsHook +, gobject-introspection +, gtk3 +, gdk-pixbuf +# Recommended Dependencies: +, unrarSupport ? false +, unrar +, p7zip +, lhasa +, mupdf +}: + +python3.pkgs.buildPythonApplication rec { + pname = "mcomix3"; + version = "unstable-2020-11-23"; + + # fetch from github because no official release on pypi/github and no build system + src = fetchFromGitHub { + repo = "${pname}"; + owner = "multiSnow"; + rev = "cdcb27533dc7ee2ebf7b0a8ab5ba10e61c0b8ff8"; + sha256 = "0q9xgl60ryf7qmy5vgzgfry4rvw5j9rb4d1ilxmpjmvm7dd3fm2k"; + }; + + buildInputs = [ gobject-introspection gtk3 gdk-pixbuf ]; + nativeBuildInputs = [ wrapGAppsHook ]; + propagatedBuildInputs = (with python3.pkgs; [ pillow pygobject3 pycairo ]); + + format = "other"; + + # Correct wrapper behavior, see https://github.com/NixOS/nixpkgs/issues/56943 + # until https://github.com/NixOS/nixpkgs/pull/102613 + strictDeps = false; + + preInstall = '' + libdir=$out/lib/${python3.libPrefix}/site-packages + mkdir -p $out/share/{icons/hicolor,man/man1,applications,metainfo,thumbnailers} + mkdir -p $out/bin $libdir + ''; + + installPhase = '' + runHook preInstall + + ${python3.executable} installer.py --srcdir=mcomix --target=$libdir + mv $libdir/mcomix/mcomixstarter.py $out/bin/${pname} + mv $libdir/mcomix/comicthumb.py $out/bin/comicthumb + mv $libdir/mcomix/mcomix/* $libdir/mcomix + + runHook postInstall + ''; + + postInstall = '' + rmdir $libdir/mcomix/mcomix + cp man/* $out/share/man/man1/ + cp -r mime/icons/* $out/share/icons/hicolor/ + cp mime/*.desktop $out/share/applications/ + cp mime/*.appdata.xml $out/share/metainfo/ + cp mime/*.thumbnailer $out/share/thumbnailers/ + for folder in $out/share/icons/hicolor/*; do + mkdir $folder/{apps,mimetypes} + mv $folder/*.png $folder/mimetypes + cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbr.png + cp $folder/mimetypes/application-x-cbt.png $folder/mimetypes/application-x-cbz.png + done + ''; + + # to prevent double wrapping + dontWrapGApps = true; + preFixup = '' + makeWrapperArgs+=( + "''${gappsWrapperArgs[@]}" + "--prefix" "PATH" ":" "${lib.makeBinPath ([ p7zip lhasa mupdf ] ++ lib.optional (unrarSupport) unrar)}" + ) + ''; + + # real pytests seem to be broken upstream + checkPhase = '' + $out/bin/comicthumb --help > /dev/null + $out/bin/${pname} --help > /dev/null + ''; + + meta = with stdenv.lib; { + description = "Comic book reader and image viewer; python3 fork of mcomix"; + longDescription = '' + User-friendly, customizable image viewer, specifically designed to handle + comic books and manga supporting a variety of container formats + (including CBR, CBZ, CB7, CBT, LHA and PDF) + ''; + homepage = "https://github.com/multiSnow/mcomix3"; + changelog = "https://github.com/multiSnow/mcomix3/blob/gtk3/ChangeLog"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ confus ]; + platforms = platforms.all; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/meme/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/meme/default.nix index 5f8a0bb6eed3..8cbc776132e6 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/meme/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/meme/default.nix @@ -1,8 +1,12 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv +, buildGoPackage +, unstableGitUpdater +, fetchFromGitHub +}: buildGoPackage rec { - pname = "meme-unstable"; - version = "2017-09-10"; + pname = "meme"; + version = "unstable-2017-09-10"; owner = "nomad-software"; repo = "meme"; @@ -14,6 +18,8 @@ buildGoPackage rec { sha256 = "1gbsv1d58ck6mj89q31s5b0ppw51ab76yqgz39jgwqnkidvzdfly"; }; + passthru.updateScript = unstableGitUpdater { }; + meta = with stdenv.lib; { description = "A command line utility for creating image macro style memes"; homepage = "https://github.com/nomad-software/meme"; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix index 2c3e9fa865af..3f91fae0beb7 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "0cbbbf93gxx768fs6pldy25xk46k7mc8k94r3f7cd83f1qd3s5zn"; + sha256 = "13b1ncpx189ca0h70j5cdp0jwlj95kasysryz1l6g13cwn9n6mii"; }; - vendorSha256 = "1i0w4284icbl40yrjny9qd5iqrq18x63lrs7p1gz58nybc606azx"; + vendorSha256 = "11w9i1829hk1qb9w24dyxv1bi49358a274g60x11fp5x5cw7bqa7"; # No tests doCheck = false; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/photoflare/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/photoflare/default.nix new file mode 100644 index 000000000000..f619d79c0f55 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/photoflare/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, stdenv, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools +}: + +mkDerivation rec { + pname = "photoflare"; + version = "1.6.6"; + + src = fetchFromGitHub { + owner = "PhotoFlare"; + repo = "photoflare"; + rev = "v${version}"; + sha256 = "07lrlxagv1bljj607s8m0zsbzx9jrvi18bnxahnm7r4i5car5x2d"; + }; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase graphicsmagick ]; + + qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + + NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A cross-platform image editor with a powerful features and a very friendly graphical user interface"; + homepage = "https://photoflare.io"; + maintainers = [ maintainers.omgbebebe ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/photoflow/CMakeLists.patch b/infra/libkookie/nixpkgs/pkgs/applications/graphics/photoflow/CMakeLists.patch new file mode 100644 index 000000000000..7d3d62b41b42 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/photoflow/CMakeLists.patch @@ -0,0 +1,13 @@ +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9b48beea..078ba20d 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -603,7 +603,7 @@ ENDIF(APPLE) + # + # photoflow executable + # +-add_executable(photoflow main.cc ${RESOURCE_OBJECT}) ++add_executable(photoflow main.cc version.cc ${RESOURCE_OBJECT}) + IF(APPLE) + set_target_properties(photoflow PROPERTIES LINK_FLAGS " -framework ApplicationServices ") + ENDIF(APPLE) diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/photoflow/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/photoflow/default.nix index 9fec8b99c1bd..cb8ef65b2e9e 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/photoflow/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/photoflow/default.nix @@ -1,42 +1,75 @@ -{ stdenv, fetchFromGitHub, gettext, glib, libxml2, pkgconfig, swig, automake, gobject-introspection, cmake, ninja, libtiff, libjpeg, fftw, exiv2, lensfun, gtkmm2, libraw, lcms2, libexif, vips, expat, pcre, pugixml }: +{ automake +, cmake +, exiv2 +, expat +, fetchFromGitHub +, fftw +, fftwFloat +, gettext +, glib +, gobject-introspection +, gtkmm2 +, lcms2 +, lensfun +, libexif +, libiptcdata +, libjpeg +, libraw +, libtiff +, libxml2 +, ninja +, openexr +, pcre +, pkgconfig +, pugixml +, stdenv +, swig +, vips +}: -stdenv.mkDerivation { - name = "photoflow-unstable-2018-08-28"; +stdenv.mkDerivation rec { + pname = "photoflow"; + version = "2020-08-28"; src = fetchFromGitHub { owner = "aferrero2707"; - repo = "PhotoFlow"; - rev = "df03f2538ddd232e693c307db4ab63eb5bdfea38"; - sha256 = "08ybhv08h24y4li8wb4m89xgrz1szlwpksf6vjharp8cznn4y4x9"; + repo = pname; + rev = "8472024fb91175791e0eb23c434c5b58ecd250eb"; + sha256 = "1bq4733hbh15nwpixpyhqfn3bwkg38amdj2xc0my0pii8l9ln793"; }; + patches = [ ./CMakeLists.patch ]; + nativeBuildInputs = [ + automake + cmake gettext glib + gobject-introspection libxml2 + ninja pkgconfig swig - automake - gobject-introspection - cmake - ninja ]; buildInputs = [ - libtiff - libjpeg - fftw exiv2 - lensfun + expat + fftw + fftwFloat gtkmm2 # Could be build with gtk3 but proper UI theme is missing and therefore not very usable with gtk3 # See: https://discuss.pixls.us/t/help-needed-for-gtk3-theme/5803 - libraw lcms2 + lensfun libexif - vips - expat + libiptcdata + libjpeg + libraw + libtiff + openexr pcre pugixml + vips ]; cmakeFlags = [ @@ -51,6 +84,7 @@ stdenv.mkDerivation { license = licenses.gpl3Plus; maintainers = [ maintainers.MtP ]; platforms = platforms.linux; - broken = true; + # sse3 is not supported on aarch64 + badPlatforms = [ "aarch64-linux" ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/pqiv/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/pqiv/default.nix index bb29101b4c7f..96efc091ef2b 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/pqiv/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/pqiv/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation (rec { pname = "pqiv"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "phillipberndt"; repo = "pqiv"; rev = version; - sha256 = "06cwm28b7j1skwp21s5snmj1pqh3xh6y2i5v4w3pz0b8k3053h9i"; + sha256 = "18nvrqmlifh4m8nfs0d19sb9d1l3a95xc89qxqdr881jcxdsgflw"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/qvge/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/qvge/default.nix new file mode 100644 index 000000000000..d8080e6fbb44 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/qvge/default.nix @@ -0,0 +1,39 @@ +{ lib +, mkDerivation +, fetchFromGitHub +, substituteAll +, qmake +, qtx11extras +, graphviz +}: + +mkDerivation rec { + pname = "qvge"; + version = "0.6.1"; + + src = fetchFromGitHub { + owner = "ArsMasiuk"; + repo = pname; + rev = "v${version}"; + sha256 = "0j4ih03nl6iihhnxrfldkarg9hvxb62lpr58xspn417d3gj6xjll"; + }; + + prePatch = "cd src"; + + patches = (substituteAll { + src = ./set-graphviz-path.patch; + inherit graphviz; + }); + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ qtx11extras ]; + + meta = with lib; { + description = "Qt Visual Graph Editor"; + homepage = "https://github.com/ArsMasiuk/qvge"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + platforms = with platforms; linux; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/qvge/set-graphviz-path.patch b/infra/libkookie/nixpkgs/pkgs/applications/graphics/qvge/set-graphviz-path.patch new file mode 100644 index 000000000000..d18eb81c5d04 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/qvge/set-graphviz-path.patch @@ -0,0 +1,13 @@ +diff --git i/commonui/CNodeEditorUIController.cpp w/commonui/CNodeEditorUIController.cpp +index 7dacd48..64983e4 100644 +--- i/commonui/CNodeEditorUIController.cpp ++++ w/commonui/CNodeEditorUIController.cpp +@@ -123,7 +123,7 @@ CNodeEditorUIController::CNodeEditorUIController(CMainWindow *parent) : + QString pathToGraphviz = QCoreApplication::applicationDirPath() + "/../tools/graphviz"; + m_optionsData.graphvizPath = QFileInfo(pathToGraphviz).absoluteFilePath(); + #else +- m_optionsData.graphvizPath = ""; ++ m_optionsData.graphvizPath = "@graphviz@/bin"; + #endif + m_gvController->setPathToGraphviz(m_optionsData.graphvizPath); + diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/qview/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/qview/default.nix index b6f25795665a..001616ab41dd 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/qview/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/qview/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "qview"; - version = "3.0"; + version = "4.0"; src = fetchFromGitHub { owner = "jurplel"; repo = "qView"; rev = version; - sha256 = "15a91bs3wcqhgf76wzigbn10hayg628j84pq4j2vaxar94ak0vk7"; + sha256 = "15n9cq7w3ckinnx38hvncxrbkv4qm4k51sal41q4y0pkvhmafhnr"; }; nativeBuildInputs = [ qmake ]; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix index 11b497176939..c1255c016f4f 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/renderdoc/default.nix @@ -13,14 +13,14 @@ let pythonPackages = python3Packages; in mkDerivation rec { - version = "1.10"; + version = "1.11"; pname = "renderdoc"; src = fetchFromGitHub { owner = "baldurk"; repo = "renderdoc"; rev = "v${version}"; - sha256 = "1ibf2lv3q69fkzv1nsva2mbdjlayrpxicrd96d9nfcw64f2mv6ds"; + sha256 = "01r4fq03fpyhwvn47wx3dw29vcadcd0qml00h36q38cq3pi9x42j"; }; buildInputs = [ diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/rx/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/rx/default.nix index 53e8109fef51..9350d7c5cd78 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/rx/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/rx/default.nix @@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec { description = "Modern and extensible pixel editor implemented in Rust"; homepage = "https://rx.cloudhead.io/"; license = licenses.gpl3; - maintainers = with maintainers; [ minijackson filalex77 ]; + maintainers = with maintainers; [ minijackson Br1ght0ne ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/vuescan/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/vuescan/default.nix deleted file mode 100644 index 142e8f0b69f0..000000000000 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/vuescan/default.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ stdenv -, fetchurl -, gnutar -, autoPatchelfHook -, glibc -, gtk2 -, xorg -, libgudev -, undmg -}: - -let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - - pname = "vuescan"; - - # Minor versions are released using the same file name - version = "9.7"; - versionString = builtins.replaceStrings ["."] [""] version; - - src = let - base = "https://www.hamrick.com/files/"; - in { - x86_64-darwin = fetchurl { - url = "${base}/vuex64${versionString}.dmg"; - sha256 = "045ihd2pj0zmzjfwn2qmv5114yvs9vf6mw6sf4x3hwcdmpk40sfh"; - }; - i686-darwin = fetchurl { - url = "${base}/vuex32${versionString}.dmg"; - sha256 = "0nny1jm3s1nr7xm03mcy3zgxvslznnvc8a5gn93gjww6gwg9rcn6"; - }; - x86_64-linux = fetchurl { - url = "${base}/vuex64${versionString}.tgz"; - sha256 = "0jkj92w3y66dcxwq3kkg7vhqxljwf9dqs563xbkh1r7piyjfwycm"; - }; - i686-linux = fetchurl { - url = "${base}/vuex32${versionString}.tgz"; - sha256 = "03qac9c0sg21jwz91nzzwk3ml8byv06ay9wiq00dl62nmhs20r5m"; - }; - aarch64-linux = fetchurl { - url = "${base}/vuea64${versionString}.tgz"; - sha256 = "17viy7kcb78j0p3ik99psabmkgpwpmgvk96wjhn9aar48gpyr1wj"; - }; - armv6l-linux = fetchurl { - url = "${base}/vuea32${versionString}.tgz"; - sha256 = "0m7sp18bdf2l2yf3q3z6c3i0bm4mq2h4ndm6qfvyknip0h11gv7i"; - }; - }.${system} or throwSystem; - - meta = with stdenv.lib; { - description = "Scanner software supporting a wide range of devices"; - homepage = "https://hamrick.com/"; - license = licenses.unfree; - maintainers = with maintainers; [ evax ]; - platforms = [ - "x86_64-darwin" "i686-darwin" - "x86_64-linux" "i686-linux" - "aarch64-linux" "armv6l-linux" - ]; - }; - - linux = stdenv.mkDerivation rec { - inherit pname version src meta; - - # Stripping the binary breaks the license form - dontStrip = true; - - nativeBuildInputs = [ - gnutar - autoPatchelfHook - ]; - - buildInputs = [ - glibc - gtk2 - xorg.libSM - libgudev - ]; - - unpackPhase = '' - tar xfz $src - ''; - - installPhase = '' - install -m755 -D VueScan/vuescan $out/bin/vuescan - ''; - }; - - darwin = stdenv.mkDerivation { - inherit pname version src meta; - - nativeBuildInputs = [ undmg ]; - - sourceRoot = { - x86_64-darwin = "vuex64${versionString}.dmg"; - i686-darwin = "vuex32${versionString}.dmg"; - }.${system} or throwSystem; - - installPhase = '' - mkdir -p $out/Applications/VueScan.app - cp -R . $out/Applications/VueScan.app - ''; - }; -in if stdenv.isDarwin - then darwin - else linux diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/xlife/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/xlife/default.nix new file mode 100644 index 000000000000..cc7013739985 --- /dev/null +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/xlife/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchsvn, xorg }: + +stdenv.mkDerivation { + pname = "xlife"; + version = "6.7.5"; + + src = fetchsvn { + url = "https://svn.code.sf.net/p/xlife-cal/xlife/trunk"; + rev = "365"; + sha256 = "1gadlcp32s179kd7ypxr8cymd6s060p6z4c2vnx94i8bmiw3nn8h"; + }; + + nativeBuildInputs = with xorg; [ imake gccmakedep ]; + buildInputs = [ xorg.libX11 ]; + + hardeningDisable = [ "format" ]; + installPhase = '' + install -Dm755 xlife -t $out/bin + install -Dm755 lifeconv -t $out/bin + ''; + + meta = with stdenv.lib; { + homepage = "http://litwr2.atspace.eu/xlife.php"; + description = "Conway's Game of Life and other cellular automata, for X"; + license = licenses.hpndSellVariant; + maintainers = with maintainers; [ djanatyn ]; + }; +} diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix index ba396bfd92c5..da453b426786 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/xournalpp/default.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation rec { pname = "xournalpp"; - version = "1.0.18"; + version = "1.0.19"; src = fetchFromGitHub { owner = "xournalpp"; repo = pname; rev = version; - sha256 = "0a9ygbmd4dwgck3k8wsrm2grynqa0adb12wwspzmzvpisbadffjy"; + sha256 = "05nx4cmrka6hwdn7r91yy4h46qpa9k7iy9dkgaq3hrkh9z3fxlkq"; }; nativeBuildInputs = [ cmake gettext pkgconfig wrapGAppsHook ]; @@ -54,8 +54,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Xournal++ is a handwriting Notetaking software with PDF annotation support"; - homepage = "https://github.com/xournalpp/xournalpp"; - license = licenses.gpl2; + homepage = "https://xournalpp.github.io/"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ andrew-d sikmir ]; platforms = platforms.linux; }; diff --git a/infra/libkookie/nixpkgs/pkgs/applications/graphics/yed/default.nix b/infra/libkookie/nixpkgs/pkgs/applications/graphics/yed/default.nix index f92e910eacce..d7c83704dca4 100644 --- a/infra/libkookie/nixpkgs/pkgs/applications/graphics/yed/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/applications/graphics/yed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper, unzip, jre }: +{ stdenv, fetchzip, makeWrapper, unzip, jre, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "yEd"; @@ -9,16 +9,25 @@ stdenv.mkDerivation rec { sha256 = "0sd73s700f3gqq5zq1psrqjg6ff2gv49f8vd37v6bv65vdxqxryq"; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ]; + # For wrapGAppsHook setup hook + buildInputs = [ (jre.gtk3 or null) ]; - installPhase = '' + dontConfigure = true; + dontBuild = true; + dontInstall = true; + + preFixup = '' mkdir -p $out/yed cp -r * $out/yed mkdir -p $out/bin + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") makeWrapper ${jre}/bin/java $out/bin/yed \ + ''${makeWrapperArgs[@]} \ --add-flags "-jar $out/yed/yed.jar --" ''; + dontWrapGApps = true; meta = with stdenv.lib; { license = licenses.unfree; |