diff options
Diffstat (limited to 'pkgs/applications')
48 files changed, 413 insertions, 159 deletions
diff --git a/pkgs/applications/audio/fomp/default.nix b/pkgs/applications/audio/fomp/default.nix index ece8dc8d1ea5..f9f57b1ed55b 100644 --- a/pkgs/applications/audio/fomp/default.nix +++ b/pkgs/applications/audio/fomp/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "fomp"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { url = "https://download.drobilla.net/${pname}-${version}.tar.bz2"; - sha256 = "01ld6yjrqrki6zwac8lmwmqkr5rv0sdham4pfbfkjwck4hi1gqqw"; + sha256 = "sha256-xnGijydiO3B7BjSlryFuH1j/OPio9hCYbniq2IXp2W8="; }; nativeBuildInputs = [ pkg-config wafHook ]; diff --git a/pkgs/applications/audio/linuxband/default.nix b/pkgs/applications/audio/linuxband/default.nix index 057d45c85e99..118b54ad8587 100644 --- a/pkgs/applications/audio/linuxband/default.nix +++ b/pkgs/applications/audio/linuxband/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "linuxband"; src = fetchurl { - url = "http://linuxband.org/assets/sources/${pname}-${version}.tar.gz"; + url = "https://linuxband.org/assets/sources/${pname}-${version}.tar.gz"; sha256 = "1r71h4yg775m4gax4irrvygmrsclgn503ykmc2qwjsxa42ri4n2n"; }; @@ -29,7 +29,7 @@ in stdenv.mkDerivation rec { meta = { description = "A GUI front-end for MMA: Type in the chords, choose the groove and it will play an accompaniment"; - homepage = "http://linuxband.org/"; + homepage = "https://linuxband.org/"; license = lib.licenses.gpl2; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index 59b17d9c811d..4e30e32774da 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.42"; + version = "0.43"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1c21sbdm6pp3kwhnzc7c6ksna7madvsmfa7j91as2g8485symqv2"; + sha256 = "sha256-/bynLU4/QtUawBjhcaajjuUDUwaSt6zk4/4TZqfQX3c="; }; buildInputs = [ glib ncurses mpd_clientlib boost ] diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 64ca6823b912..f6560a7abcfb 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -12,11 +12,11 @@ assert taglibSupport -> (taglib != null); with lib; stdenv.mkDerivation rec { pname = "ncmpcpp"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "https://rybczak.net/ncmpcpp/stable/${pname}-${version}.tar.bz2"; - sha256 = "0x35nd4v31sma8fliqdbn1nxpjyi8hv472318sfb3xbmr4wlm0fb"; + sha256 = "sha256-+qv2FXyMsbJKBZryduFi+p+aO5zTgQxDuRKIYMk4Ohs="; }; configureFlags = [ "BOOST_LIB_SUFFIX=" ] diff --git a/pkgs/applications/audio/qmmp/default.nix b/pkgs/applications/audio/qmmp/default.nix index f079b99af771..b75af645bb38 100644 --- a/pkgs/applications/audio/qmmp/default.nix +++ b/pkgs/applications/audio/qmmp/default.nix @@ -12,7 +12,7 @@ }: # Additional plugins that can be added: -# wavpack (http://www.wavpack.com/) +# wavpack (https://www.wavpack.com/) # gme (Game music support) # Ogg Opus support # BS2B effect plugin (http://bs2b.sourceforge.net/) diff --git a/pkgs/applications/blockchains/bitcoin-classic.nix b/pkgs/applications/blockchains/bitcoin-classic.nix index 796c48a7c58a..bd1c9611d561 100644 --- a/pkgs/applications/blockchains/bitcoin-classic.nix +++ b/pkgs/applications/blockchains/bitcoin-classic.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version; - version = "1.3.8"; + version = "1.3.8uahf"; src = fetchFromGitHub { owner = "bitcoinclassic"; repo = "bitcoinclassic"; rev = "v${version}"; - sha256 = "06ij9v7zbdnhxq9429nnxiw655cp8idldj18l7fmj94gqx07n5vh"; + sha256 = "sha256-V1cOB5FLotGS5jup/aVaiDiyr/v2KJ2SLcIu/Hrjuwk="; }; nativeBuildInputs = [ pkg-config autoreconfHook ]; diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix index d185c30ff435..8726fc1d7935 100644 --- a/pkgs/applications/graphics/avocode/default.nix +++ b/pkgs/applications/graphics/avocode/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "avocode"; - version = "4.11.0"; + version = "4.11.1"; src = fetchurl { url = "https://media.avocode.com/download/avocode-app/${version}/avocode-${version}-linux.zip"; - sha256 = "sha256-50aGechzlVVRQz6WOASHRjT46BKbwyhbt7/0oq2PsOg="; + sha256 = "sha256-Qe5mV9GBLHsmzMQg6dKib/sTnNdyOTj4wYQ9xd/iqJM="; }; libPath = lib.makeLibraryPath (with xorg; [ diff --git a/pkgs/applications/graphics/dia/CVE-2019-19451.patch b/pkgs/applications/graphics/dia/CVE-2019-19451.patch new file mode 100644 index 000000000000..28d6598330a3 --- /dev/null +++ b/pkgs/applications/graphics/dia/CVE-2019-19451.patch @@ -0,0 +1,11 @@ +diff -ru a/app/app_procs.c b/app/app_procs.c +--- a/app/app_procs.c 2021-01-30 11:09:52.000000000 -0500 ++++ b/app/app_procs.c 2021-01-30 11:11:05.000000000 -0500 +@@ -785,6 +785,7 @@ + + if (!filename) { + g_print (_("Filename conversion failed: %s\n"), filenames[i]); ++ ++i; + continue; + } + diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix index 6fe8aed8f674..d9de3eb7fc12 100644 --- a/pkgs/applications/graphics/dia/default.nix +++ b/pkgs/applications/graphics/dia/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation { sha256 = "1fyxfrzdcs6blxhkw3bcgkksaf3byrsj4cbyrqgb4869k3ynap96"; }; + patches = [ + ./CVE-2019-19451.patch + ]; + buildInputs = [ gtk2 libxml2 gettext python libxml2Python docbook5 libxslt docbook_xsl libart_lgpl ] diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index b2a5b771211c..555bfbe17e7f 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -35,7 +35,7 @@ let } // attrs // { - name = "gimp-plugin-${name}"; + name = "${gimp.name}-plugin-${name}"; buildInputs = [ gimp gimp.gtk diff --git a/pkgs/applications/graphics/glimpse/default.nix b/pkgs/applications/graphics/glimpse/default.nix new file mode 100644 index 000000000000..de85fb9bf174 --- /dev/null +++ b/pkgs/applications/graphics/glimpse/default.nix @@ -0,0 +1,197 @@ +{ stdenv +, lib +, fetchFromGitHub +, substituteAll +, pkg-config +, intltool +, babl +, gegl +, gtk2 +, glib +, gdk-pixbuf +, isocodes +, pango +, cairo +, freetype +, fontconfig +, lcms +, libpng +, libjpeg +, poppler +, poppler_data +, libtiff +, libmng +, librsvg +, libwmf +, zlib +, libzip +, ghostscript +, aalib +, shared-mime-info +, python2 +, libexif +, gettext +, xorg +, glib-networking +, libmypaint +, gexiv2 +, harfbuzz +, mypaint-brushes1 +, libwebp +, libheif +, libgudev +, openexr +, AppKit +, Cocoa +, gtk-mac-integration-gtk2 +, libxslt +, automake +, autoconf +, libtool +, makeWrapper +, autoreconfHook +, gtk-doc +}: +let + python = python2.withPackages (pp: [ pp.pygtk ]); +in +stdenv.mkDerivation rec { + pname = "glimpse"; + version = "0.2.0"; + + outputs = [ "out" "dev" ]; + + src = fetchFromGitHub { + owner = "glimpse-editor"; + repo = "Glimpse"; + rev = "v${version}"; + sha256 = "sha256-qbZQmAo7fuJWWbn0QTyxAwAenZOdsGueUq5/3IV8Njc="; + }; + + patches = [ + # to remove compiler from the runtime closure, reference was retained via + # gimp --version --verbose output + (substituteAll { + src = ./remove-cc-reference.patch; + cc_version = stdenv.cc.cc.name; + }) + ../gimp/hardcode-plugin-interpreters.patch + ]; + + postPatch = '' + ln -s ${gtk-doc}/share/gtk-doc/data/gtk-doc.make . + ''; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + intltool + gettext + automake + autoconf + makeWrapper + gtk-doc + libxslt + libtool + ]; + + buildInputs = [ + babl + gegl + gtk2 + glib + gdk-pixbuf + pango + cairo + gexiv2 + harfbuzz + isocodes + freetype + fontconfig + lcms + libpng + libjpeg + poppler + poppler_data + libtiff + openexr + libmng + librsvg + libwmf + zlib + libzip + ghostscript + aalib + shared-mime-info + libwebp + libheif + python + libexif + xorg.libXpm + glib-networking + libmypaint + mypaint-brushes1 + ] ++ lib.optionals stdenv.isDarwin [ + AppKit + Cocoa + gtk-mac-integration-gtk2 + ] ++ lib.optionals stdenv.isLinux [ + libgudev + ]; + + # needed by gimp-2.0.pc + propagatedBuildInputs = [ + gegl + ]; + + # Check if librsvg was built with --disable-pixbuf-loader. + PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}"; + + preAutoreconf = '' + # The check runs before glib-networking is registered + export GIO_EXTRA_MODULES="${glib-networking}/lib/gio/modules:$GIO_EXTRA_MODULES" + ''; + + postFixup = '' + wrapProgram $out/bin/glimpse-${lib.versions.majorMinor version} \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + ''; + + passthru = rec { + # The declarations for `glimpse-with-plugins` wrapper, + # used for determining plug-in installation paths + majorVersion = "2.0"; + targetPluginDir = "lib/glimpse/${majorVersion}/plug-ins"; + targetScriptDir = "share/glimpse/${majorVersion}/scripts"; + targetDataDir = "share/gimp/${majorVersion}"; + targetLibDir = "lib/gimp/${majorVersion}"; + + # probably its a good idea to use the same gtk in plugins ? + gtk = gtk2; + }; + + configureFlags = [ + "--without-webkit" # old version is required + "--with-bug-report-url=https://github.com/NixOS/nixpkgs/issues/new" + "--with-icc-directory=/run/current-system/sw/share/color/icc" + # fix libdir in pc files (${exec_prefix} needs to be passed verbatim) + "--libdir=\${exec_prefix}/lib" + ]; + + # on Darwin, + # test-eevl.c:64:36: error: initializer element is not a compile-time constant + doCheck = !stdenv.isDarwin; + + enableParallelBuilding = true; + + meta = with lib; { + description = "An open source image editor based on the GNU Image Manipulation Program"; + longDescription = '' + Glimpse is an open source image editor based on the GNU Image Manipulation Program (GIMP). The goal is to experiment with new ideas and expand the use of free software. + ''; + homepage = "https://glimpse-editor.org"; + maintainers = with maintainers; [ ashkitten erictapen ]; + license = licenses.gpl3Plus; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/graphics/glimpse/plugins/default.nix b/pkgs/applications/graphics/glimpse/plugins/default.nix new file mode 100644 index 000000000000..48c65c3d5646 --- /dev/null +++ b/pkgs/applications/graphics/glimpse/plugins/default.nix @@ -0,0 +1,11 @@ +# Use `glimpse-with-plugins` package for Glimpse with all plug-ins. +# If you just want a subset of plug-ins, you can specify them explicitly: +# `glimpse-with-plugins.override { plugins = with glimpsePlugins; [ gap ]; }`. + +{ gimpPlugins, glimpse }: + +# This attrs can be extended in the future if there happen to be glimpse-only +# plugins or some that need further modification in order to work with Glimpse. +gimpPlugins.overrideScope' (self: super: { + gimp = glimpse; +}) diff --git a/pkgs/applications/graphics/glimpse/remove-cc-reference.patch b/pkgs/applications/graphics/glimpse/remove-cc-reference.patch new file mode 100644 index 000000000000..e63bf88dfdd7 --- /dev/null +++ b/pkgs/applications/graphics/glimpse/remove-cc-reference.patch @@ -0,0 +1,13 @@ +diff --git a/app/gimp-version.c b/app/gimp-version.c +index b584398231..1b40a1570f 100644 +--- a/app/gimp-version.c ++++ b/app/gimp-version.c +@@ -230,7 +230,7 @@ gimp_version (gboolean be_verbose, + GIMP_BUILD_ID, + gimp_version_get_revision (), + GIMP_BUILD_PLATFORM_FAMILY, +- CC_VERSION, ++ "@cc_version@", + lib_versions); + g_free (lib_versions); + diff --git a/pkgs/applications/graphics/glimpse/wrapper.nix b/pkgs/applications/graphics/glimpse/wrapper.nix new file mode 100644 index 000000000000..cdfb2f668731 --- /dev/null +++ b/pkgs/applications/graphics/glimpse/wrapper.nix @@ -0,0 +1,30 @@ +{ lib, symlinkJoin, glimpse, makeWrapper, glimpsePlugins, gnome3, plugins ? null }: + +let + allPlugins = lib.filter (pkg: lib.isDerivation pkg && !pkg.meta.broken or false) (lib.attrValues glimpsePlugins); + selectedPlugins = if plugins == null then allPlugins else plugins; + extraArgs = map (x: x.wrapArgs or "") selectedPlugins; + versionBranch = lib.versions.majorMinor glimpse.version; + +in +symlinkJoin { + name = "glimpse-with-plugins-${glimpse.version}"; + + paths = [ glimpse ] ++ selectedPlugins; + + buildInputs = [ makeWrapper ]; + + postBuild = '' + for each in glimpse-${versionBranch} glimpse-console-${versionBranch}; do + wrapProgram $out/bin/$each \ + --set GIMP2_PLUGINDIR "$out/lib/glimpse/2.0" \ + --set GIMP2_DATADIR "$out/share/glimpse/2.0" \ + --prefix GTK_PATH : "${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ + ${toString extraArgs} + done + + for each in glimpse glimpse-console; do + ln -sf "$each-${versionBranch}" $out/bin/$each + done + ''; +} diff --git a/pkgs/applications/graphics/graphicsmagick/default.nix b/pkgs/applications/graphics/graphicsmagick/default.nix index 5916cdd3b4a0..24e064e721ba 100644 --- a/pkgs/applications/graphics/graphicsmagick/default.nix +++ b/pkgs/applications/graphics/graphicsmagick/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "graphicsmagick"; - version = "1.3.35"; + version = "1.3.36"; src = fetchurl { url = "mirror://sourceforge/graphicsmagick/GraphicsMagick-${version}.tar.xz"; - sha256 = "0l024l4hawm9s3jqrgi2j0lxgm61dqh8sgkj1017ma7y11hqv2hq"; + sha256 = "0ilg6fkppb4avzais1dvi3qf6ln7v3mzj7gjm83w7pwwfpg3ynsx"; }; patches = [ diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index d70e3c5f0d59..ba6af5d781f2 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -50,11 +50,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/${pname}-${version}.tar.xz"; - sha256 = "1hjp5nnyx2m3miji6q4lcb6zgbi498v641dc7apkqqvayknrb4ng"; + sha256 = "sha256-2j4jBRGgjL8h6GcQ0WFFhZT+qHhn6RV7Z+0BoE6ieYo="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be diff --git a/pkgs/applications/graphics/lightburn/default.nix b/pkgs/applications/graphics/lightburn/default.nix index d90ef152401e..18fe87b128de 100644 --- a/pkgs/applications/graphics/lightburn/default.nix +++ b/pkgs/applications/graphics/lightburn/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "lightburn"; - version = "0.9.19"; + version = "0.9.20"; 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 = "0j3ydivd666fphmgi3ar48xabgi2dcky7p2fyfl7ghxjplflqs9q"; + sha256 = "sha256-FtkBIoz5u70DbZZBH4uSaAkmOphWA9H0uYuukIPVGUM="; }; buildInputs = [ diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index d838cd4e859f..47d2ee52f813 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , mkDerivation , fetchurl , poppler_utils @@ -16,7 +17,7 @@ , hyphen , unrarSupport ? false , chmlib -, pythonPackages +, python3Packages , libusb1 , libmtp , xdg_utils @@ -26,11 +27,11 @@ mkDerivation rec { pname = "calibre"; - version = "4.23.0"; + version = "5.10.1"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; |