(cherry picked from commit 9ede0de)

(cherry picked from commit 9c786d8)

(cherry picked from commit 18245fd)

(cherry picked from commit c85cf60)

New features since version 3.2.0:

  * G'MIC Plugin
  * Touch Painting
  * Smart Patch Tool
  * New Brush Presets

The full release notes can be found at:

https://krita.org/en/release-notes-for-krita-3-2/

Version 3.2.1 contains these fixes:

  * Crash on startup if only OpenGL 2.1 is found: if you had to disable
    opengl for 3.2.0, you can try to enable it again
  * A crash when changing layer types in the gmic-qt plugin
  * A bug where gmic-qt could crash on odd-sized images
  * A regression where using the text tool would break the brush tool
  * The option to use the native platform's file dialogs was restored
  * A bug where selecting the line tool would disable the flow slider
  * Some issues with the LUT docker were fixed

Upstream release notes for 3.2.1:

https://krita.org/en/item/krita-3-2-1-released/

I've dropped the patch, because it was already from the upstream
development version and thus is also included in this release.

Built and tested using a few images and just playing around with a few
new features.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @abbradar, @Mic92, @kragniz
(cherry picked from commit 8180085)

(cherry picked from commit 94400c0)

(cherry picked from commit 9f740f1)

(cherry picked from commit 63f3b35)

This prevents opensubdiv (and thus blender) from having all of
cudatoolkit in its closure.

(cherry picked from commit bb1c9b0)

CUDA toolkit 8 doesn't support gcc 6, so we have to build opensubdiv
and blender with gcc 5.

(cherry picked from commit afc0218)

(cherry picked from commit 222e186)

(cherry picked from commit 44db65d)

(cherry picked from commit 02f439d)

(cherry picked from commit 08b1bc9)

(cherry picked from commit d0aa64a)

(cherry picked from commit 349782c)

(cherry picked from commit 70eb31c)

(cherry picked from commit ea1d5e9)

(cherry picked from commit 077dd9f)

…sed on NIX_COREFOUNDATION_RPATH

(cherry picked from commit 92652b4)

This will get propagated down to other libraries loaded because
everything in nixpkgs references CF based on an rpath entry.

(cherry picked from commit cc1bfbd)

(cherry picked from commit 5a28fd6)

(cherry picked from commit a5168fe)

This reverts commit 12f4609.

When the user specifies the networking.nameservers setting in the
configuration file, it must take precedence over automatically
derived settings.

The culprit was services.bind that made the resolver set to
127.0.0.1 and ignore the nameserver setting.

This patch adds a flag to services.bind to override the nameserver
to localhost. It defaults to true. Setting this to false prevents the
service.bind and dnsmasq.resolveLocalQueries settings from
overriding the users' settings.

Also, when the user specifies a domain to search, it must be set in
the resolver configuration, even if the user does not specify any
nameservers.

https://blog.fuzzing-project.org/60-Optionsbleed-HTTP-OPTIONS-method-can-leak-Apaches-server-memory.html
(cherry picked from commit c9d11b8)

The bzero-patch was merged upstream in
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@16103, so it does no
longer apply.

Additionally - to make the build succeed on darwin systems more recent
than our nixpkgs.darwin.xnu kernel version - we need to teach the build
the version of the xnu headers we provide, instead of letting the build
figure out the actual system version using `uname -r`.

(cherry picked from commit c71fd76)
(cherry picked from commit cab5d25d3081a6d13773264000a308a7e07938b8)

The enosys patch is not needed anymore since the patch is included in
this maintenance release.

(cherry picked from commit 9005970)

(cherry picked from commit bebdd7a)

In the maintenance release bump in
9005970 a certain change to /test/ was
backported from Python 3:

- bpo-30207: To simplify backports from Python 3, the test.test_support
  module was converted into a package and renamed to test.support.  The
  test.script_helper module was moved into the test.support package.
  Names test.test_support and test.script_helper are left as aliases to
  test.support and test.support.script_helper.

(cherry picked from commit 96d15ea)

(cherry picked from commit 8fa1b39)

sandboxing enabled

(cherry picked from commit 4535008)

Currently the `rpc-gssd.service` has a `ConditionPathExists` clause that can
never be met, because it's looking for stateful data inside `/nix/store`.

`auth-rpcgss-module.service` also only starts if this file exists.

Fixes NixOS#29509.

(cherry picked from commit 98a2316)

(cherry picked from commit 3b7c686)

per usual, staging has been updated as well!

(cherry picked from commit 5522cd5)

(cherry picked from commit 6075d4a)

(cherry picked from commit 4e12dbb)

* Add pim-data-exporter

* pim-data-exporter: fix indentation

(cherry picked from commit b292438)

(cherry picked from commit f4b2074)

(cherry picked from commit 9d2a2dc)

Boot fails when a keyfile is configured for all encrypted filesystems
and no other luks devices are configured. This is because luks support is only
enabled in the initrd, when boot.initrd.luks.devices has entries. When a
fileystem has a keyfile configured though, it is setup by a custom
command, not by boot.initrd.luks.

This commit adds an internal config flag to enable luks support in the
initrd file, even if there are no luks devices configured.

(cherry picked from commit 2000fba)

  * indentation, retab
  * url handling for alternative version names
  * handling for alt. download url format
  * made unknown channel error non-fatal

(cherry picked from commit 14f2e0c)

(cherry picked from commit a2444a2)

See http://blog.qt.io/blog/2017/09/05/qt-creator-4-4-0-released/ for
release information

(cherry picked from commit bd170e7)

(cherry picked from commit e4a859a)

(cherry picked from commit 8758a4d)

mate.mate-desktop: https://hydra.nixos.org/build/61110037
gdmap: https://hydra.nixos.org/build/61144743
redsocks: https://hydra.nixos.org/build/61123106
resolv_wrapper: https://hydra.nixos.org/build/61121132
ogmtools: https://hydra.nixos.org/build/61108726
mp3info: https://hydra.nixos.org/build/61139015
lxappearance-gtk3: https://hydra.nixos.org/build/61126327
hdf5-fortran: https://hydra.nixos.org/build/61146631
pqiv: https://hydra.nixos.org/build/61124724

(cherry picked from commit ab71280)

The last upgrade (137142a) broke the
build on i686. Thanks @globin for noticing this.

(cherry picked from commit 6f02c3b)